Merge upstream/master

Author: DHRUV6029

.github/workflows/prestocpp-linux-adapters-build.yml

@@ -11,7 +11,7 @@ jobs:
   prestocpp-linux-adapters-build:
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-adapters-build-${{ github.event.pull_request.number }}
       cancel-in-progress: true

.github/workflows/prestocpp-linux-build-and-unit-test.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: changes
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-build-test-${{ github.event.pull_request.number }}
       cancel-in-progress: true
@@ -135,7 +135,10 @@ jobs:
     needs: [changes, prestocpp-linux-build-for-test]
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      volumes:
+        - /usr:/host_usr
+        - /opt:/host_opt
     env:
       MAVEN_OPTS: -Xmx4G -XX:+ExitOnOutOfMemoryError
       MAVEN_FAST_INSTALL: -B -V --quiet -T 1C -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true
@@ -156,6 +159,23 @@ jobs:
         # it doesn't work
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
+      # We cannot use the github action to free disk space from the runner
+      # because we are in the container and not on the runner anymore.
+      - name: Free Disk Space
+        run: |
+          # Re-used from free-disk-space github action.
+          getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+          # Show before
+          echo "Original available disk space: " $(getAvailableSpace)
+          # Remove DotNet.
+          rm -rf /host_usr/share/dotnet || true
+          # Remove android
+          rm -rf /host_usr/local/lib/android || true
+          # Remove CodeQL
+          rm -rf /host_opt/hostedtoolcache/CodeQL || true
+          # Show after
+          echo "New available disk space: " $(getAvailableSpace)
+
       - name: Download artifacts
         if: |
           github.event_name == 'schedule' || needs.changes.outputs.codechange == 'true'
@@ -201,14 +221,19 @@ jobs:
           github.event_name == 'schedule' || needs.changes.outputs.codechange == 'true'
         run: |
           export PRESTO_SERVER_PATH="${GITHUB_WORKSPACE}/presto-native-execution/_build/release/presto_cpp/main/presto_server"
-          export TESTFILES=`find ./presto-native-execution/src/test -type f -name 'TestPrestoNative*.java'`
+          # Find TestPrestoNative*.java files and iceberg test files
+          export TESTFILES=$(find ./presto-native-execution/src/test -type f -name 'TestPrestoNative*.java'; find ./presto-native-execution/src/test/java/com/facebook/presto/nativeworker/iceberg -type f -name '*.java')
           # Convert file paths to comma separated class names
           export TESTCLASSES=
           for test_file in $TESTFILES
           do
             tmp=${test_file##*/}
             test_class=${tmp%%\.*}
-            export TESTCLASSES="${TESTCLASSES},$test_class"
+            # Exclude CTE tests as they can fail with unknown functions.
+            # Issue https://github.com/prestodb/presto/issues/26827.
+            if [[ ! "$test_class" =~ ^TestPrestoNativeCte\.* ]]; then
+              export TESTCLASSES="${TESTCLASSES},$test_class"
+            fi
           done
           export TESTCLASSES=${TESTCLASSES#,}
           echo "TESTCLASSES = $TESTCLASSES"
@@ -235,7 +260,10 @@ jobs:
         storage-format: [PARQUET, DWRF]
         enable-sidecar: [true, false]
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      volumes:
+        - /usr:/host_usr
+        - /opt:/host_opt
     env:
       MAVEN_OPTS: -Xmx4G -XX:+ExitOnOutOfMemoryError
       MAVEN_FAST_INSTALL: -B -V --quiet -T 1C -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true
@@ -256,6 +284,23 @@ jobs:
         # it doesn't work
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
+      # We cannot use the github action to free disk space from the runner
+      # because we are in the container and not on the runner anymore.
+      - name: Free Disk Space
+        run: |
+          # Re-used from free-disk-space github action.
+          getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+          # Show before
+          echo "Original available disk space: " $(getAvailableSpace)
+          # Remove DotNet.
+          rm -rf /host_usr/share/dotnet || true
+          # Remove android
+          rm -rf /host_usr/local/lib/android || true
+          # Remove CodeQL
+          rm -rf /host_opt/hostedtoolcache/CodeQL || true
+          # Show after
+          echo "New available disk space: " $(getAvailableSpace)
+
       - name: Download artifacts
         if: |
           github.event_name == 'schedule' || needs.changes.outputs.codechange == 'true'
@@ -343,7 +388,10 @@ jobs:
       group: ${{ github.workflow }}-prestocpp-linux-presto-on-spark-e2e-tests-${{ matrix.storage-format }}-${{ matrix.enable-sidecar }}-${{ github.event.pull_request.number }}
       cancel-in-progress: true
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      volumes:
+        - /usr:/host_usr
+        - /opt:/host_opt
     env:
       MAVEN_OPTS: -Xmx4G -XX:+ExitOnOutOfMemoryError
       MAVEN_FAST_INSTALL: -B -V --quiet -T 1C -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true
@@ -364,6 +412,23 @@ jobs:
         # it doesn't work
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
+      # We cannot use the github action to free disk space from the runner
+      # because we are in the container and not on the runner anymore.
+      - name: Free Disk Space
+        run: |
+          # Re-used from free-disk-space github action.
+          getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+          # Show before
+          echo "Original available disk space: " $(getAvailableSpace)
+          # Remove DotNet.
+          rm -rf /host_usr/share/dotnet || true
+          # Remove android
+          rm -rf /host_usr/local/lib/android || true
+          # Remove CodeQL
+          rm -rf /host_opt/hostedtoolcache/CodeQL || true
+          # Show after
+          echo "New available disk space: " $(getAvailableSpace)
+
       - name: Download artifacts
         if: |
           github.event_name == 'schedule' || needs.changes.outputs.codechange == 'true'
@@ -436,7 +501,10 @@ jobs:
     needs: [changes, prestocpp-linux-build-for-test]
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      volumes:
+        - /usr:/host_usr
+        - /opt:/host_opt
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-presto-sidecar-tests-${{ github.event.pull_request.number }}
       cancel-in-progress: true
@@ -459,6 +527,23 @@ jobs:
         # it doesn't work
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
+      # We cannot use the github action to free disk space from the runner
+      # because we are in the container and not on the runner anymore.
+      - name: Free Disk Space
+        run: |
+          # Re-used from free-disk-space github action.
+          getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+          # Show before
+          echo "Original available disk space: " $(getAvailableSpace)
+          # Remove DotNet.
+          rm -rf /host_usr/share/dotnet || true
+          # Remove android
+          rm -rf /host_usr/local/lib/android || true
+          # Remove CodeQL
+          rm -rf /host_opt/hostedtoolcache/CodeQL || true
+          # Show after
+          echo "New available disk space: " $(getAvailableSpace)
+
       - name: Download artifacts
         if: |
           github.event_name == 'schedule' || needs.changes.outputs.codechange == 'true'
@@ -528,7 +613,10 @@ jobs:
     needs: [changes, prestocpp-linux-build-for-test]
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      volumes:
+        - /usr:/host_usr
+        - /opt:/host_opt
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-presto-plan-checker-router-plugin-tests-${{ github.event.pull_request.number }}
       cancel-in-progress: true
@@ -551,6 +639,23 @@ jobs:
         # it doesn't work
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
+      # We cannot use the github action to free disk space from the runner
+      # because we are in the container and not on the runner anymore.
+      - name: Free Disk Space
+        run: |
+          # Re-used from free-disk-space github action.
+          getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+          # Show before
+          echo "Original available disk space: " $(getAvailableSpace)
+          # Remove DotNet.
+          rm -rf /host_usr/share/dotnet || true
+          # Remove android
+          rm -rf /host_usr/local/lib/android || true
+          # Remove CodeQL
+          rm -rf /host_opt/hostedtoolcache/CodeQL || true
+          # Show after
+          echo "New available disk space: " $(getAvailableSpace)
+
       - name: Download artifacts
         if: |
           github.event_name == 'schedule' || needs.changes.outputs.codechange == 'true'

.github/workflows/prestocpp-linux-build.yml

@@ -26,7 +26,7 @@ jobs:
       contents: read
     needs: changes
     container:
-      image: prestodb/presto-native-dependency:0.296-20251021214746-7eb2686
+      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt

.github/workflows/prestocpp-macos-build.yml

@@ -27,7 +27,7 @@ jobs:
   prestocpp-macos-build-engine:
     strategy:
       matrix:
-        os: [macos-13, macos-15]
+        os: [macos-15]
     runs-on: ${{ matrix.os }}
     needs: changes
     permissions:
@@ -121,13 +121,6 @@ jobs:
           export PATH=$(brew --prefix m4)/bin:$(brew --prefix bison)/bin:${PATH}
           export BOOST_ROOT=${INSTALL_PREFIX}
           cd presto-native-execution
-          if [[ "${{ matrix.os }}" == "macos-13" ]]; then
-            # Velox sets -Wno-sign-compare but it needs to apply to Arrow.
-            # There is also a conflict with Arrow and Velox (Glog) macros which are fixed
-            # in a newer version of Arrow. The issues cannot be easily fixed in Velox so
-            # override the warnings that would throw errors.
-            export CXXFLAGS="-Wno-error=sign-compare -Wno-error=macro-redefined"
-          fi
           cmake -B _build/${BUILD_TYPE} \
             -GNinja -DTREAT_WARNINGS_AS_ERRORS=1 \
             -DENABLE_ALL_WARNINGS=1 \

.gitignore

@@ -28,9 +28,11 @@ benchmark_outputs
 *.class
 .checkstyle
 .mvn/timing.properties
+.mvn/maven.config
 .editorconfig
 node_modules
 presto-docs-venv/
+.m2/
 
 #==============================================================================#
 # presto-native-execution

NOTICES

@@ -1,3 +1,21 @@
 The code for the t-digest was originally authored by Ted Dunning
 
 Adrien Grand contributed the heart of the AVLTreeDigest (https://github.com/jpountz)
+
+This product includes software from the Apache DataSketches C++ project.
+* https://github.com/apache/datasketches-cpp/tree/master/theta
+which contains the following NOTICE file:
+-------
+Apache DataSketches C++
+Copyright 2025 The Apache Software Foundation
+
+Copyright 2015-2018 Yahoo Inc.
+Copyright 2019-2020 Verizon Media
+Copyright 2021- Yahoo Inc.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Prior to moving to ASF, the software for this project was developed at
+Yahoo Inc. (https://developer.yahoo.com).
+-------

README.md

@@ -31,6 +31,8 @@ Presto is a standard Maven project. Simply run the following command from the pr
 
 On the first build, Maven will download all the dependencies from the internet and cache them in the local repository (`~/.m2/repository`), which can take a considerable amount of time. Subsequent builds will be faster.
 
+When building multiple Presto projects locally, each project may write updates to the user's global M2 cache, which could cause build issues. You can configure your local `.mvn/maven.config` to support a local cache specific to that project via `-Dmaven.repo.local=./.m2/repository`.
+
 Presto has a comprehensive set of unit tests that can take several minutes to run. You can disable the tests when building:
 
     ./mvnw clean install -DskipTests

pom.xml

@@ -83,7 +83,7 @@
         <dep.commons.compress.version>1.27.1</dep.commons.compress.version>
         <dep.protobuf-java.version>4.29.0</dep.protobuf-java.version>
         <dep.jetty.version>12.0.29</dep.jetty.version>
-        <dep.netty.version>4.1.128.Final</dep.netty.version>
+        <dep.netty.version>4.1.130.Final</dep.netty.version>
         <dep.reactor-netty.version>1.2.8</dep.reactor-netty.version>
         <dep.snakeyaml.version>2.5</dep.snakeyaml.version>
         <dep.gson.version>2.12.1</dep.gson.version>
@@ -500,6 +500,13 @@
                 <type>test-jar</type>
             </dependency>
 
+            <dependency>
+                <groupId>com.facebook.presto</groupId>
+                <artifactId>presto-delta</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+            </dependency>
+
             <dependency>
                 <groupId>com.teradata</groupId>
                 <artifactId>re2j-td</artifactId>
@@ -1547,7 +1554,7 @@
             <dependency>
                 <groupId>com.microsoft.sqlserver</groupId>
                 <artifactId>mssql-jdbc</artifactId>
-                <version>12.10.2.jre8</version>
+                <version>13.2.1.jre11</version>
             </dependency>
 
             <dependency>
@@ -1636,7 +1643,7 @@
             <dependency>
                 <groupId>org.apache.thrift</groupId>
                 <artifactId>libthrift</artifactId>
-                <version>0.14.1</version>
+                <version>0.18.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.httpcomponents</groupId>

presto-accumulo/pom.xml

@@ -17,7 +17,7 @@
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <dep.accumulo.version>1.10.1</dep.accumulo.version>
         <dep.curator.version>2.12.0</dep.curator.version>
-        <dep.log4j.version>2.24.3</dep.log4j.version>
+        <dep.log4j.version>2.25.3</dep.log4j.version>
         <air.check.skip-modernizer>true</air.check.skip-modernizer>
     </properties>
 

presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Field.java

@@ -86,14 +86,6 @@ public Field(Optional<NodeLocation> nodeLocation, Optional<QualifiedName> relati
         this.aliased = aliased;
     }
 
-    public static Field newUnqualified(Optional<String> name, Type type)
-    {
-        requireNonNull(name, "name is null");
-        requireNonNull(type, "type is null");
-
-        return new Field(Optional.empty(), Optional.empty(), name, type, false, Optional.empty(), Optional.empty(), false);
-    }
-
     public Optional<NodeLocation> getNodeLocation()
     {
         return nodeLocation;