From 8273664b0503d149b90e142b8fd7bb20c2e37c4d Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 19 Mar 2025 15:47:23 -0700 Subject: [PATCH 01/27] Upgrade airlift, jetty, and guice in root POM --- pom.xml | 21 ++++++++++----------- presto-main/pom.xml | 2 +- presto-tests/pom.xml | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 02a5c42b78f03..8ed1243ccd6f6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.facebook.airlift airbase - 104 + 105 com.facebook.presto @@ -44,7 +44,7 @@ 3.3.9 4.7.1 - 0.216 + 0.219 ${dep.airlift.version} 0.38 0.6 @@ -60,7 +60,6 @@ 7.5 8.11.3 3.8.0 - 1.2.13 1.13.1 1.6.8 9.7.1 @@ -76,19 +75,19 @@ 3.4.1 2.9.0 3.1.3 - 2.36.0 + 2.37.0 32.1.0-jre 2.15.4 3.0.0 1.11.4 1.26.2 4.29.0 + 12.0.18 4.1.119.Final 2.0 - 9.4.56.v20240826 2.12.1 3.18.0 - 5.1.0 + 7.0.0 17.0.0 diff --git a/presto-atop/pom.xml b/presto-atop/pom.xml index a3bc34c9fb5aa..090ef5a080c6a 100644 --- a/presto-atop/pom.xml +++ b/presto-atop/pom.xml @@ -59,24 +59,24 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-base-arrow-flight/pom.xml b/presto-base-arrow-flight/pom.xml index 0dac0755fcd06..72b399382ca33 100644 --- a/presto-base-arrow-flight/pom.xml +++ b/presto-base-arrow-flight/pom.xml @@ -17,6 +17,16 @@ -Xss10M + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + org.apache.arrow @@ -84,8 +94,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -119,9 +129,8 @@ - com.google.code.findbugs - jsr305 - true + jakarta.annotation + jakarta.annotation-api @@ -134,17 +143,19 @@ configuration + joda-time joda-time + test org.jdbi jdbi3-core + test - org.testng testng @@ -228,6 +239,12 @@ org.apache.maven.plugins maven-dependency-plugin + + + com.fasterxml.jackson.core:jackson-databind + com.facebook.airlift:log-manager + + org.basepom.maven diff --git a/presto-base-jdbc/pom.xml b/presto-base-jdbc/pom.xml index c1f625c026d4c..9d0acdcd740cf 100644 --- a/presto-base-jdbc/pom.xml +++ b/presto-base-jdbc/pom.xml @@ -53,24 +53,23 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - com.google.code.findbugs - jsr305 - true + joda-time + joda-time - joda-time - joda-time + jakarta.inject + jakarta.inject-api @@ -78,6 +77,11 @@ javax.inject + + org.locationtech.jts + jts-core + + com.facebook.presto @@ -184,6 +188,12 @@ test-jar + + com.facebook.presto + presto-analyzer + test + + com.facebook.presto presto-tpch diff --git a/presto-benchmark-driver/pom.xml b/presto-benchmark-driver/pom.xml index 7af8a14ae9d7c..cd6001fb40c48 100644 --- a/presto-benchmark-driver/pom.xml +++ b/presto-benchmark-driver/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} com.facebook.presto.benchmark.driver.PrestoBenchmarkDriver + 17 @@ -58,8 +59,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-benchmark-runner/pom.xml b/presto-benchmark-runner/pom.xml index 58cfab2984565..d03bd7ce80c72 100644 --- a/presto-benchmark-runner/pom.xml +++ b/presto-benchmark-runner/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} com.facebook.presto.benchmark.PrestoBenchmarkRunner + 17 @@ -63,8 +64,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -82,16 +83,6 @@ presto-parser - - com.facebook.presto - presto-main - - - - com.facebook.presto - presto-main-base - - com.facebook.presto presto-thrift-connector @@ -128,24 +119,23 @@ - com.google.code.findbugs - jsr305 - true + jakarta.inject + jakarta.inject-api - javax.inject - javax.inject + com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.core - jackson-core + jakarta.annotation + jakarta.annotation-api - javax.annotation - javax.annotation-api + com.google.errorprone + error_prone_annotations @@ -154,6 +144,18 @@ + + com.facebook.presto + presto-main + test + + + + com.facebook.presto + presto-main-base + test + + com.facebook.presto presto-memory @@ -190,4 +192,21 @@ test + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:log-manager + + + + com.google.errorprone:error_prone_annotations + + + + + diff --git a/presto-benchmark/pom.xml b/presto-benchmark/pom.xml index 690e6659f1118..7aaf635ca82a0 100644 --- a/presto-benchmark/pom.xml +++ b/presto-benchmark/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 17 @@ -42,14 +43,8 @@ - com.facebook.presto - presto-memory - - - - com.google.code.findbugs - jsr305 - true + jakarta.annotation + jakarta.annotation-api @@ -106,8 +101,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api runtime @@ -118,6 +113,12 @@ test + + com.facebook.presto + presto-memory + test + + org.openjdk.jmh jmh-core diff --git a/presto-bigquery/pom.xml b/presto-bigquery/pom.xml index 3bab0fe6bdd75..0608bcfbb386d 100644 --- a/presto-bigquery/pom.xml +++ b/presto-bigquery/pom.xml @@ -127,6 +127,12 @@ opencensus-contrib-http-util 0.31.1 + + + javax.annotation + javax.annotation-api + 1.3.2 + @@ -253,13 +259,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -390,7 +396,7 @@ com.fasterxml.jackson.core:jackson-core - javax.annotation:javax.annotation-api + jakarta.annotation:jakarta.annotation-api com.fasterxml.jackson.core:jackson-databind com.google.api.grpc:proto-google-common-protos @@ -409,6 +415,16 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:log-manager + + + diff --git a/presto-bytecode/pom.xml b/presto-bytecode/pom.xml index e287dbb45985e..71636585e18c8 100644 --- a/presto-bytecode/pom.xml +++ b/presto-bytecode/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 8 @@ -39,9 +40,13 @@ - com.google.code.findbugs - jsr305 - true + com.google.errorprone + error_prone_annotations + + + + jakarta.annotation + jakarta.annotation-api diff --git a/presto-cache/pom.xml b/presto-cache/pom.xml index 0ce336b24725f..27c3bfce92b5e 100644 --- a/presto-cache/pom.xml +++ b/presto-cache/pom.xml @@ -28,8 +28,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -58,18 +58,18 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true @@ -91,6 +91,18 @@ org.alluxio alluxio-core-common + + + jakarta.servlet + jakarta.servlet-api + + + + + + io.dropwizard.metrics + metrics-core + 4.1.11 @@ -158,10 +170,11 @@ org.apache.maven.plugins maven-dependency-plugin - + - io.dropwizard.metrics:metrics-core - + io.dropwizard.metrics:metrics-core + org.alluxio:alluxio-core-client-fs + diff --git a/presto-cassandra/pom.xml b/presto-cassandra/pom.xml index 5e648684dab28..dec62cf156764 100644 --- a/presto-cassandra/pom.xml +++ b/presto-cassandra/pom.xml @@ -28,24 +28,24 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true - com.facebook.airlift - bootstrap + jakarta.annotation + jakarta.annotation-api com.facebook.airlift - json + bootstrap com.facebook.airlift - concurrent + json @@ -69,13 +69,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -144,6 +144,12 @@ test + + com.facebook.airlift + concurrent + test + + com.facebook.presto presto-tpch @@ -192,7 +198,7 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.16 @@ -233,6 +239,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.fasterxml.jackson.core:jackson-databind + + + diff --git a/presto-cli/pom.xml b/presto-cli/pom.xml index f87cd6835062e..190615e4bfd5c 100644 --- a/presto-cli/pom.xml +++ b/presto-cli/pom.xml @@ -63,14 +63,13 @@ - com.google.code.findbugs - jsr305 - true + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -108,6 +107,12 @@ jackson-core + + com.google.errorprone + error_prone_annotations + true + + org.testng @@ -148,19 +153,6 @@ - - org.basepom.maven - duplicate-finder-maven-plugin - - - - org.fusesource.jansi - jansi - - - - - org.skife.maven really-executable-jar-maven-plugin @@ -177,6 +169,28 @@ + + + org.basepom.maven + duplicate-finder-maven-plugin + + + + org.fusesource.jansi + jansi + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:json + + + diff --git a/presto-clickhouse/pom.xml b/presto-clickhouse/pom.xml index 55718d5c66f4c..6d514cdc46263 100644 --- a/presto-clickhouse/pom.xml +++ b/presto-clickhouse/pom.xml @@ -46,8 +46,8 @@ - com.google.code.findbugs - jsr305 + jakarta.annotation + jakarta.annotation-api @@ -61,8 +61,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -117,8 +117,8 @@ log - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.facebook.presto diff --git a/presto-client/pom.xml b/presto-client/pom.xml index 28510e1b098c0..f40350d6428d3 100644 --- a/presto-client/pom.xml +++ b/presto-client/pom.xml @@ -13,21 +13,30 @@ ${project.parent.basedir} + 8 com.facebook.presto presto-spi + + com.facebook.presto presto-common - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations + true + + + + jakarta.annotation + jakarta.annotation-api true @@ -110,6 +119,11 @@ test + + jakarta.inject + jakarta.inject-api + + com.facebook.drift drift-protocol @@ -140,6 +154,9 @@ com.squareup.okio:okio-jvm org.jetbrains.kotlin:kotlin-stdlib-jdk8 + + jakarta.inject:jakarta.inject-api + diff --git a/presto-common/pom.xml b/presto-common/pom.xml index 53fa83d4fb464..db1bd56ab10c9 100644 --- a/presto-common/pom.xml +++ b/presto-common/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 8 @@ -21,6 +22,12 @@ jackson-annotations + + jakarta.inject + jakarta.inject-api + test + + io.airlift slice @@ -32,8 +39,14 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations + true + + + + jakarta.annotation + jakarta.annotation-api true diff --git a/presto-delta/pom.xml b/presto-delta/pom.xml index d4608ba432867..73a41cbc3a9e4 100644 --- a/presto-delta/pom.xml +++ b/presto-delta/pom.xml @@ -16,8 +16,19 @@ ${project.parent.basedir} true 3.2.0 + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + io.delta @@ -116,13 +127,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -327,8 +338,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/presto-druid/pom.xml b/presto-druid/pom.xml index 0b0e993341cbc..1757ede51b953 100644 --- a/presto-druid/pom.xml +++ b/presto-druid/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 2.24.3 + 17 @@ -27,6 +28,21 @@ + + + + org.hibernate + hibernate-validator + 7.0.5.Final + + + org.glassfish + jakarta.el + 4.0.1 + + + + org.apache.druid @@ -175,8 +191,8 @@ - com.google.code.findbugs - jsr305 + jakarta.annotation + jakarta.annotation-api true @@ -208,13 +224,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-elasticsearch/pom.xml b/presto-elasticsearch/pom.xml index 23f703579680b..44f3ad380cb76 100644 --- a/presto-elasticsearch/pom.xml +++ b/presto-elasticsearch/pom.xml @@ -70,18 +70,18 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -329,8 +329,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test @@ -384,6 +384,9 @@ org.apache.maven.plugins maven-dependency-plugin + + org.elasticsearch:elasticsearch-x-content + org.yaml:snakeyaml:jar diff --git a/presto-example-http/pom.xml b/presto-example-http/pom.xml index 40e3ece436c07..50a592d15d9be 100644 --- a/presto-example-http/pom.xml +++ b/presto-example-http/pom.xml @@ -48,13 +48,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -137,8 +137,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/presto-expressions/pom.xml b/presto-expressions/pom.xml index ae3a0b39d275f..d2a89562e3f33 100644 --- a/presto-expressions/pom.xml +++ b/presto-expressions/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 8 diff --git a/presto-function-namespace-managers-common/pom.xml b/presto-function-namespace-managers-common/pom.xml index 8652f90fb4714..231fd3de0aa8a 100644 --- a/presto-function-namespace-managers-common/pom.xml +++ b/presto-function-namespace-managers-common/pom.xml @@ -10,6 +10,7 @@ ${project.parent.basedir} + 8 presto-function-namespace-managers-common @@ -26,8 +27,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -48,8 +49,15 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations + true + + + + jakarta.annotation + jakarta.annotation-api + true diff --git a/presto-function-namespace-managers/pom.xml b/presto-function-namespace-managers/pom.xml index e99f9d2c4f224..6b363a5caeb1a 100644 --- a/presto-function-namespace-managers/pom.xml +++ b/presto-function-namespace-managers/pom.xml @@ -13,7 +13,18 @@ ${project.parent.basedir} + 17 + + + + + org.slf4j + slf4j-api + 2.0.16 + + + @@ -108,18 +119,18 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -152,11 +163,13 @@ com.fasterxml.jackson.core jackson-databind + runtime com.fasterxml.jackson.datatype jackson-datatype-jdk8 + runtime @@ -208,8 +221,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api test diff --git a/presto-function-server/pom.xml b/presto-function-server/pom.xml index 26bfc4671fb9a..981d1a2dbc6c6 100644 --- a/presto-function-server/pom.xml +++ b/presto-function-server/pom.xml @@ -9,9 +9,13 @@ presto-function-server - presto-function-namespace-managers + presto-function-server jar + + 17 + + @@ -34,11 +38,6 @@ presto-common - - com.facebook.presto - presto-function-namespace-managers - - com.facebook.airlift node @@ -90,8 +89,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -110,18 +109,13 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - com.google.code.findbugs - jsr305 - - - - com.facebook.drift - drift-api + com.google.errorprone + error_prone_annotations @@ -140,6 +134,13 @@ ${project.version} + + + com.facebook.presto + presto-function-namespace-managers + test + + com.facebook.presto presto-tests diff --git a/presto-geospatial-toolkit/pom.xml b/presto-geospatial-toolkit/pom.xml index 2743e0cbd6f2a..6ea2332967dcd 100644 --- a/presto-geospatial-toolkit/pom.xml +++ b/presto-geospatial-toolkit/pom.xml @@ -57,8 +57,8 @@ - com.google.code.findbugs - jsr305 + jakarta.annotation + jakarta.annotation-api true diff --git a/presto-google-sheets/pom.xml b/presto-google-sheets/pom.xml index c61515ca18a25..f14e545213d7f 100644 --- a/presto-google-sheets/pom.xml +++ b/presto-google-sheets/pom.xml @@ -103,13 +103,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-grpc-api/pom.xml b/presto-grpc-api/pom.xml index 001bfd79d8e39..1d8806228edac 100644 --- a/presto-grpc-api/pom.xml +++ b/presto-grpc-api/pom.xml @@ -79,8 +79,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api @@ -106,6 +106,9 @@ com.google.protobuf:protoc:3.25.1:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:1.64.0:exe:${os.detected.classifier} + + @generated=omit + @@ -122,7 +125,7 @@ - javax.annotation:javax.annotation-api + jakarta.annotation:jakarta.annotation-api diff --git a/presto-hana/pom.xml b/presto-hana/pom.xml index 89f8f36e50668..58b29dbc5c586 100644 --- a/presto-hana/pom.xml +++ b/presto-hana/pom.xml @@ -49,8 +49,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-hdfs-core/pom.xml b/presto-hdfs-core/pom.xml index 04104df64ba82..71d9da6d8714f 100644 --- a/presto-hdfs-core/pom.xml +++ b/presto-hdfs-core/pom.xml @@ -21,9 +21,8 @@ - com.google.code.findbugs - jsr305 - true + jakarta.annotation + jakarta.annotation-api @@ -97,4 +96,18 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + io.airlift:slice + + + + + diff --git a/presto-hive-common/pom.xml b/presto-hive-common/pom.xml index ea54bc6dfd2e9..8e1c1ba1105cc 100644 --- a/presto-hive-common/pom.xml +++ b/presto-hive-common/pom.xml @@ -36,11 +36,16 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + io.airlift slice @@ -64,11 +69,12 @@ com.facebook.presto.hadoop hadoop-apache2 + test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -92,13 +98,14 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api com.facebook.presto presto-hdfs-core + test diff --git a/presto-hive-function-namespace/pom.xml b/presto-hive-function-namespace/pom.xml index 1d9d7459be398..52f25606701a9 100644 --- a/presto-hive-function-namespace/pom.xml +++ b/presto-hive-function-namespace/pom.xml @@ -16,6 +16,16 @@ ${project.parent.basedir} + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.google.guava @@ -23,8 +33,8 @@ - com.google.code.findbugs - jsr305 + jakarta.annotation + jakarta.annotation-api @@ -46,8 +56,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -110,11 +120,6 @@ guice - - org.jetbrains - annotations - - org.openjdk.jol jol-core @@ -128,6 +133,12 @@ test + + org.jetbrains + annotations + test + + com.facebook.airlift testing diff --git a/presto-hive-hadoop2/pom.xml b/presto-hive-hadoop2/pom.xml index 1c9fd384fd6d0..332c82c74f16a 100644 --- a/presto-hive-hadoop2/pom.xml +++ b/presto-hive-hadoop2/pom.xml @@ -15,8 +15,19 @@ ${project.parent.basedir} + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.presto @@ -44,6 +55,16 @@ runtime + + com.facebook.airlift + json + + + + com.facebook.presto + presto-hdfs-core + + com.facebook.presto @@ -158,6 +179,27 @@ + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.guava:guava + com.facebook.airlift:concurrent + com.facebook.airlift:json + com.facebook.airlift:stats + com.facebook.presto:presto-cache + com.facebook.presto:presto-hive-common + com.facebook.presto:presto-hive-metastore + com.facebook.presto:presto-hdfs-core + + + + + + default diff --git a/presto-hive-metastore/pom.xml b/presto-hive-metastore/pom.xml index d7e118017ab1f..0d3a1779878f9 100644 --- a/presto-hive-metastore/pom.xml +++ b/presto-hive-metastore/pom.xml @@ -15,6 +15,16 @@ ${project.parent.basedir} + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.presto @@ -75,6 +85,17 @@ com.facebook.airlift security + + + com.google.errorprone + error_prone_annotations + true + + + + jakarta.annotation + jakarta.annotation-api + com.fasterxml.jackson.core @@ -122,13 +143,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml index 826dcb8065c9b..a33c7ba8feea9 100644 --- a/presto-hive/pom.xml +++ b/presto-hive/pom.xml @@ -15,8 +15,19 @@ ${project.parent.basedir} 5g + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.airlift @@ -171,8 +182,8 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true @@ -187,8 +198,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -248,8 +259,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -262,6 +273,11 @@ jackson-databind + + jakarta.annotation + jakarta.annotation-api + + org.roaringbitmap RoaringBitmap @@ -508,7 +524,12 @@ org.glassfish.jersey.core:jersey-common:jar org.eclipse.jetty:jetty-server:jar + org.apache.httpcomponents:httpclient + + com.fasterxml.jackson.core:jackson-core + com.amazonaws:aws-java-sdk-glue + diff --git a/presto-hudi/pom.xml b/presto-hudi/pom.xml index 29a4dfdabfed4..e832bcfec555d 100644 --- a/presto-hudi/pom.xml +++ b/presto-hudi/pom.xml @@ -13,8 +13,19 @@ ${project.parent.basedir} + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.google.guava @@ -39,8 +50,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -129,8 +140,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml index adc6002c287b9..992ff10c2c146 100644 --- a/presto-iceberg/pom.xml +++ b/presto-iceberg/pom.xml @@ -13,10 +13,21 @@ ${project.parent.basedir} + 17 1.5.0 0.95.0 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.airlift @@ -208,11 +219,16 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + com.google.guava guava @@ -231,13 +247,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -368,8 +384,8 @@ jackson-databind - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -396,8 +412,8 @@ jackson-databind - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -406,6 +422,7 @@ org.projectnessie.nessie nessie-client ${dep.nessie.version} + runtime org.slf4j @@ -424,8 +441,8 @@ jackson-databind - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -502,6 +519,10 @@ jjwt-jackson runtime + + com.facebook.airlift + node + @@ -516,6 +537,12 @@ test + + jakarta.servlet + jakarta.servlet-api + test + + com.facebook.presto presto-cache @@ -549,6 +576,18 @@ test + + com.facebook.airlift + http-server + test + + + + org.apache.httpcomponents.core5 + httpcore5 + 5.2.4 + + com.facebook.presto presto-hive @@ -597,6 +636,7 @@ testng test + com.facebook.presto presto-testing-docker @@ -662,28 +702,38 @@ org.apache.commons commons-math3 + test + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:node + org.projectnessie.nessie:nessie-model + org.apache.httpcomponents.core5:httpcore5 + com.amazonaws:aws-java-sdk-s3 + com.amazonaws:aws-java-sdk-core + + + + + + + + + + + + + + - - org.apache.maven.plugins - maven-dependency-plugin - - - - org.glassfish.jersey.core:jersey-common:jar - org.eclipse.jetty:jetty-server:jar - - com.facebook.airlift:http-server:jar - com.facebook.airlift:node:jar - javax.servlet:javax.servlet-api:jar - org.apache.httpcomponents.core5:httpcore5:jar - - - org.basepom.maven duplicate-finder-maven-plugin diff --git a/presto-jdbc/pom.xml b/presto-jdbc/pom.xml index 0874168b47043..b22ee31f6f58c 100644 --- a/presto-jdbc/pom.xml +++ b/presto-jdbc/pom.xml @@ -110,8 +110,8 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true @@ -247,7 +247,15 @@ - + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:security + + + org.apache.maven.plugins maven-shade-plugin @@ -335,7 +343,10 @@ com.google.thirdparty ${shadeBase}.guava - + + com.google.errorprone + ${shadeBase}.com.google.errorprone + io.airlift ${shadeBase}.io.airlift @@ -344,13 +355,17 @@ com.facebook.airlift ${shadeBase}.com.facebook.airlift + + jakarta.annotation + ${shadeBase}.jakarta.annotation + javax.annotation ${shadeBase}.javax.annotation - javax.inject - ${shadeBase}.inject + jakarta.inject + ${shadeBase}.jakarta.inject org.openjdk.jol @@ -380,6 +395,10 @@ com.google.j2objc ${shadeBase}.j2objc + + com.google.code + ${shadeBase}.com.google.code + org.apache.commons ${shadeBase}.apache.commons diff --git a/presto-jmx/pom.xml b/presto-jmx/pom.xml index dbdd12950e12d..2d0df3c89c552 100644 --- a/presto-jmx/pom.xml +++ b/presto-jmx/pom.xml @@ -48,13 +48,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true @@ -64,13 +64,13 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -153,4 +153,19 @@ test + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.fasterxml.jackson.core:jackson-databind + + + + + diff --git a/presto-kafka/pom.xml b/presto-kafka/pom.xml index c7119f4e326b6..c155aee0a14b3 100644 --- a/presto-kafka/pom.xml +++ b/presto-kafka/pom.xml @@ -18,6 +18,16 @@ 2.12.2 + + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + 2.16.2 + + + + com.facebook.airlift @@ -55,8 +65,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -83,8 +93,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -210,6 +220,12 @@ + + org.apache.kafka + kafka-metadata + test + + org.apache.kafka kafka-clients diff --git a/presto-kudu/pom.xml b/presto-kudu/pom.xml index 5c0777dd909c9..5a07ab7950e1e 100644 --- a/presto-kudu/pom.xml +++ b/presto-kudu/pom.xml @@ -76,13 +76,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-lark-sheets/pom.xml b/presto-lark-sheets/pom.xml index 6e3b3fd3baea0..ffed6fa28c29d 100644 --- a/presto-lark-sheets/pom.xml +++ b/presto-lark-sheets/pom.xml @@ -53,16 +53,21 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + com.larksuite.oapi larksuite-oapi @@ -155,4 +160,19 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:log + com.facebook.airlift:log-manager + + + + + diff --git a/presto-local-file/pom.xml b/presto-local-file/pom.xml index bd1183f362a44..ff2b8910559b4 100644 --- a/presto-local-file/pom.xml +++ b/presto-local-file/pom.xml @@ -33,11 +33,6 @@ configuration - - com.facebook.airlift - json - - com.google.guava guava @@ -49,13 +44,8 @@ - javax.inject - javax.inject - - - - com.fasterxml.jackson.core - jackson-databind + jakarta.inject + jakarta.inject-api @@ -108,6 +98,19 @@ test + + + com.facebook.airlift + json + test + + + + com.fasterxml.jackson.core + jackson-databind + test + + org.testng testng diff --git a/presto-main-base/pom.xml b/presto-main-base/pom.xml index d6015d585090f..77a9b41b76829 100644 --- a/presto-main-base/pom.xml +++ b/presto-main-base/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 8 @@ -81,11 +82,6 @@ presto-expressions - - com.google.code.findbugs - jsr305 - - com.facebook.airlift bootstrap @@ -129,6 +125,7 @@ com.facebook.airlift log-manager + runtime @@ -154,6 +151,7 @@ com.facebook.drift drift-server + test @@ -164,6 +162,7 @@ com.facebook.drift drift-transport-spi + compile @@ -189,6 +188,7 @@ com.facebook.drift drift-codec-utils + runtime @@ -202,18 +202,13 @@ - javax.servlet - javax.servlet-api + com.google.errorprone + error_prone_annotations - javax.annotation - javax.annotation-api - - - - javax.ws.rs - javax.ws.rs-api + jakarta.annotation + jakarta.annotation-api @@ -247,13 +242,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -320,6 +315,7 @@ com.facebook.presto presto-function-namespace-managers-common + test @@ -528,6 +524,8 @@ com.facebook.presto:presto-ui:jar + + com.facebook.drift:drift-transport-spi diff --git a/presto-main/pom.xml b/presto-main/pom.xml index f11978c427342..8d7d3340be675 100644 --- a/presto-main/pom.xml +++ b/presto-main/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 17 @@ -67,8 +68,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -92,8 +93,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api @@ -150,8 +151,8 @@ guava - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations com.facebook.drift @@ -206,12 +207,12 @@ presto-memory-context - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api com.facebook.presto @@ -244,8 +245,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -388,6 +389,13 @@ com.squareup.okhttp3 mockwebserver test + + + + org.hamcrest + hamcrest-core + + @@ -415,6 +423,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + com.facebook.drift:drift-protocol + + + diff --git a/presto-matching/pom.xml b/presto-matching/pom.xml index 46d1641407842..a6c49f18cf7be 100644 --- a/presto-matching/pom.xml +++ b/presto-matching/pom.xml @@ -26,6 +26,7 @@ ${project.parent.basedir} + 8 diff --git a/presto-memory-context/pom.xml b/presto-memory-context/pom.xml index c749c5576ff61..33d8891e58edf 100644 --- a/presto-memory-context/pom.xml +++ b/presto-memory-context/pom.xml @@ -14,15 +14,21 @@ ${project.parent.basedir} + 8 - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + com.google.guava guava diff --git a/presto-memory/pom.xml b/presto-memory/pom.xml index b090e49453709..2a9cfb8accaea 100644 --- a/presto-memory/pom.xml +++ b/presto-memory/pom.xml @@ -39,8 +39,8 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true @@ -50,13 +50,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-mongodb/pom.xml b/presto-mongodb/pom.xml index f7cab2144f6e4..e33898baff2bf 100644 --- a/presto-mongodb/pom.xml +++ b/presto-mongodb/pom.xml @@ -38,8 +38,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -73,8 +73,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-mysql/pom.xml b/presto-mysql/pom.xml index b0dfefa871dd8..3877888401a9f 100644 --- a/presto-mysql/pom.xml +++ b/presto-mysql/pom.xml @@ -39,8 +39,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -49,8 +49,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api + + + + com.esri.geometry + esri-geometry-api @@ -66,11 +71,6 @@ provided - - com.esri.geometry - esri-geometry-api - - org.openjdk.jol jol-core @@ -189,6 +189,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.esri.geometry:esri-geometry-api + + + diff --git a/presto-native-execution/pom.xml b/presto-native-execution/pom.xml index 0d54301ce6a73..c0023f8678b42 100644 --- a/presto-native-execution/pom.xml +++ b/presto-native-execution/pom.xml @@ -15,22 +15,36 @@ ${project.parent.basedir} src/checkstyle/presto-checks.xml + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.presto presto-tpch + test io.airlift.tpch tpch + test com.google.guava guava + test @@ -41,21 +55,25 @@ org.testng testng + test org.assertj assertj-core + test com.facebook.presto presto-main-base + test com.facebook.presto presto-main + test @@ -68,16 +86,19 @@ com.facebook.presto presto-common + test com.facebook.presto presto-tests + test com.facebook.presto presto-function-namespace-managers + test @@ -90,12 +111,13 @@ com.facebook.presto presto-spi + test com.facebook.presto presto-iceberg - runtime + test org.xerial.snappy @@ -128,6 +150,7 @@ com.facebook.presto presto-iceberg test-jar + test com.esotericsoftware @@ -151,12 +174,13 @@ com.facebook.presto presto-hive-metastore + test com.facebook.presto presto-hive - runtime + test org.xerial.snappy @@ -176,12 +200,14 @@ com.facebook.presto.hive hive-apache + test com.facebook.presto presto-hive test-jar + test org.xerial.snappy @@ -226,16 +252,19 @@ com.facebook.airlift log + test com.facebook.airlift log-manager + test com.facebook.airlift testing + test org.testcontainers @@ -253,11 +282,6 @@ presto-jdbc test - - org.apache.commons - commons-lang3 - test - diff --git a/presto-native-sidecar-plugin/pom.xml b/presto-native-sidecar-plugin/pom.xml index f4a147c7b06d2..ad44f717b165e 100644 --- a/presto-native-sidecar-plugin/pom.xml +++ b/presto-native-sidecar-plugin/pom.xml @@ -15,8 +15,7 @@ ${project.parent.basedir} - 1.8 - 1.8 + 17 @@ -46,8 +45,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -125,11 +124,16 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + com.facebook.presto @@ -228,6 +232,13 @@ com.squareup.okhttp3 mockwebserver test + + + + org.hamcrest + hamcrest-core + + @@ -285,6 +296,9 @@ We add it here to keep it in compile scope while only using it directly in tests.--> org.jetbrains:annotations + + com.facebook.airlift:log-manager + diff --git a/presto-native-tests/pom.xml b/presto-native-tests/pom.xml index 8ee879c6e3803..538b4c8343d01 100644 --- a/presto-native-tests/pom.xml +++ b/presto-native-tests/pom.xml @@ -20,6 +20,7 @@ org.testng testng + test @@ -67,6 +68,7 @@ com.google.guava guava + test @@ -162,6 +164,18 @@ ${project.version} test + + + com.facebook.presto + presto-hive + test + + + + com.facebook.airlift + units + test + diff --git a/presto-oracle/pom.xml b/presto-oracle/pom.xml index cf3bd52780553..11b0aec3d8eb5 100644 --- a/presto-oracle/pom.xml +++ b/presto-oracle/pom.xml @@ -56,13 +56,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -198,6 +198,21 @@ + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.guava:guava + com.facebook.airlift:log + + + + + + ci diff --git a/presto-orc/pom.xml b/presto-orc/pom.xml index ead647e3b93f8..22c7eafc38b55 100644 --- a/presto-orc/pom.xml +++ b/presto-orc/pom.xml @@ -41,6 +41,11 @@ log + + com.facebook.airlift + concurrent + + io.airlift aircompressor @@ -77,10 +82,14 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true - provided + + + + jakarta.annotation + jakarta.annotation-api @@ -193,6 +202,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.errorprone:error_prone_annotations + + + diff --git a/presto-parquet/pom.xml b/presto-parquet/pom.xml index fc1c5beb487cc..aeebbd67b0e8c 100644 --- a/presto-parquet/pom.xml +++ b/presto-parquet/pom.xml @@ -15,11 +15,27 @@ ${project.parent.basedir} + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.airlift configuration + + + com.facebook.airlift + concurrent + + com.facebook.presto presto-memory-context @@ -62,9 +78,8 @@ - com.google.code.findbugs - jsr305 - true + jakarta.annotation + jakarta.annotation-api @@ -84,11 +99,6 @@ runtime - - com.facebook.presto.hadoop - hadoop-apache2 - - com.facebook.presto @@ -118,6 +128,12 @@ test + + com.facebook.presto.hadoop + hadoop-apache2 + test + + org.apache.commons commons-lang3 diff --git a/presto-parser/pom.xml b/presto-parser/pom.xml index 899b89f64915a..fbff41c9efe7a 100644 --- a/presto-parser/pom.xml +++ b/presto-parser/pom.xml @@ -13,17 +13,24 @@ ${project.parent.basedir} + 8 - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - com.google.code.findbugs - jsr305 + jakarta.annotation + jakarta.annotation-api + true + + + + com.google.errorprone + error_prone_annotations true diff --git a/presto-password-authenticators/pom.xml b/presto-password-authenticators/pom.xml index bce08cada1122..a3a5e274332bd 100644 --- a/presto-password-authenticators/pom.xml +++ b/presto-password-authenticators/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + 17 @@ -49,13 +50,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-pinot-toolkit/pom.xml b/presto-pinot-toolkit/pom.xml index 2b306101e0f81..ac413d2a30a8b 100644 --- a/presto-pinot-toolkit/pom.xml +++ b/presto-pinot-toolkit/pom.xml @@ -15,8 +15,19 @@ ${project.parent.basedir} 1.38.0 + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + org.apache.pinot @@ -147,12 +158,12 @@ jackson-annotations - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api jakarta.validation @@ -195,7 +206,7 @@ jcl-over-slf4j - javax.servlet + jakarta.servlet servlet-api @@ -215,16 +226,16 @@ RoaringBitmap - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api org.reflections reflections - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.checkerframework @@ -444,11 +455,6 @@ - - com.google.code.findbugs - jsr305 - - com.facebook.airlift stats @@ -460,8 +466,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -513,8 +519,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -620,8 +626,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test @@ -649,6 +655,23 @@ commons-codec commons-codec + + + jakarta.annotation + jakarta.annotation-api + + + + com.google.errorprone + error_prone_annotations + true + + + + com.facebook.presto + presto-analyzer + test + @@ -657,7 +680,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 default diff --git a/presto-pinot/pom.xml b/presto-pinot/pom.xml index 1da6659136c18..f4a9fa91b305f 100644 --- a/presto-pinot/pom.xml +++ b/presto-pinot/pom.xml @@ -14,8 +14,19 @@ ${project.parent.basedir} + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.presto diff --git a/presto-plan-checker-router-plugin/pom.xml b/presto-plan-checker-router-plugin/pom.xml index ca2876789d9db..e62baad8607d5 100644 --- a/presto-plan-checker-router-plugin/pom.xml +++ b/presto-plan-checker-router-plugin/pom.xml @@ -18,6 +18,7 @@ ${project.parent.basedir} -Xms4g -Xmx4g + 17 @@ -101,8 +102,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -137,8 +138,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test @@ -187,7 +188,7 @@ com.facebook.presto - presto-main-base + presto-main test test-jar ${project.version} @@ -276,6 +277,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + com.facebook.airlift:log-manager + + + diff --git a/presto-plugin-toolkit/pom.xml b/presto-plugin-toolkit/pom.xml index b3af5b98f01fd..9de6b4c61f614 100644 --- a/presto-plugin-toolkit/pom.xml +++ b/presto-plugin-toolkit/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + 8 @@ -38,13 +39,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-postgresql/pom.xml b/presto-postgresql/pom.xml index 8b24e2c20d143..217f6a54096b8 100644 --- a/presto-postgresql/pom.xml +++ b/presto-postgresql/pom.xml @@ -44,8 +44,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -192,6 +192,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.guava:guava + com.esri.geometry:esri-geometry-api + + + diff --git a/presto-product-tests/pom.xml b/presto-product-tests/pom.xml index 293d212ac3737..c4218ae2adf4e 100644 --- a/presto-product-tests/pom.xml +++ b/presto-product-tests/pom.xml @@ -16,6 +16,7 @@ com.facebook.presto.tests.TemptoProductTestRunner true 2.12.2 + 17 @@ -32,6 +33,16 @@ commons-logging 1.3.5 + + javax.annotation + javax.annotation-api + 1.3.2 + + + net.bytebuddy + byte-buddy + 1.17.1 + @@ -129,8 +140,8 @@ testing - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api com.facebook.airlift @@ -148,6 +159,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + com.facebook.airlift http-client diff --git a/presto-prometheus/pom.xml b/presto-prometheus/pom.xml index 6b497e0750b18..fce2f24835f54 100644 --- a/presto-prometheus/pom.xml +++ b/presto-prometheus/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + 17 @@ -74,18 +75,18 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -180,8 +181,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/presto-proxy/pom.xml b/presto-proxy/pom.xml index 82d675e4ba9b1..759a0dc7154ac 100644 --- a/presto-proxy/pom.xml +++ b/presto-proxy/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} com.facebook.presto.proxy.PrestoProxy + 17 @@ -109,23 +110,23 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -134,8 +135,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api @@ -166,6 +167,12 @@ + + com.facebook.presto + presto-spi + test + + com.facebook.presto presto-testng-services diff --git a/presto-rcfile/pom.xml b/presto-rcfile/pom.xml index 96da04cb80df1..563433aaf2401 100644 --- a/presto-rcfile/pom.xml +++ b/presto-rcfile/pom.xml @@ -17,6 +17,11 @@ + + jakarta.annotation + jakarta.annotation-api + + io.airlift slice @@ -52,12 +57,6 @@ jol-core - - com.google.code.findbugs - jsr305 - true - - org.jetbrains annotations diff --git a/presto-record-decoder/pom.xml b/presto-record-decoder/pom.xml index be1d5d7b477ef..03af128eb25d3 100644 --- a/presto-record-decoder/pom.xml +++ b/presto-record-decoder/pom.xml @@ -32,13 +32,8 @@ - javax.inject - javax.inject - - - - com.facebook.airlift - json + jakarta.inject + jakarta.inject-api @@ -114,5 +109,25 @@ presto-main-base test + + + com.facebook.airlift + json + test + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.fasterxml.jackson.core:jackson-annotations + + + + + diff --git a/presto-redis/pom.xml b/presto-redis/pom.xml index 049b68e90c8bc..7bdc8f4d4217b 100644 --- a/presto-redis/pom.xml +++ b/presto-redis/pom.xml @@ -54,8 +54,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -63,19 +63,25 @@ jedis + + org.apache.commons + commons-pool2 + 2.11.1 + + joda-time joda-time - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -201,6 +207,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.fasterxml.jackson.core:jackson-core + + + diff --git a/presto-redshift/pom.xml b/presto-redshift/pom.xml index 73761c7a3f739..905ed33b7ee8a 100644 --- a/presto-redshift/pom.xml +++ b/presto-redshift/pom.xml @@ -46,8 +46,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -112,4 +112,18 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.guava:guava + + + + + diff --git a/presto-resource-group-managers/pom.xml b/presto-resource-group-managers/pom.xml index 43f42d8dc8379..30d090d532be9 100644 --- a/presto-resource-group-managers/pom.xml +++ b/presto-resource-group-managers/pom.xml @@ -19,8 +19,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api @@ -75,19 +75,19 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-router/pom.xml b/presto-router/pom.xml index 48dd3194e06d0..73c28471c6c14 100644 --- a/presto-router/pom.xml +++ b/presto-router/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} com.facebook.presto.router.PrestoRouter + 17 @@ -114,33 +115,33 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations @@ -186,7 +187,7 @@ com.facebook.presto - presto-main-base + presto-main test test-jar diff --git a/presto-session-property-managers/pom.xml b/presto-session-property-managers/pom.xml index 36f3dc88b9b36..548c7de776d37 100644 --- a/presto-session-property-managers/pom.xml +++ b/presto-session-property-managers/pom.xml @@ -44,13 +44,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/presto-singlestore/pom.xml b/presto-singlestore/pom.xml index ba10c6b7e8b64..e1cddd1595eb9 100644 --- a/presto-singlestore/pom.xml +++ b/presto-singlestore/pom.xml @@ -50,8 +50,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -187,6 +187,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:log + + + diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index e2bcff9c8d4de..1f4c1c0db587a 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -129,13 +129,13 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -169,8 +169,8 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations @@ -189,8 +189,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -257,6 +257,7 @@ com.facebook.presto presto-function-namespace-managers-common + test @@ -322,6 +323,17 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.presto:presto-expressions + it.unimi.dsi:fastutil + com.facebook.airlift:log-manager + + + diff --git a/presto-spark-common/pom.xml b/presto-spark-common/pom.xml index 94657e653ec0f..9db981d55e5f9 100644 --- a/presto-spark-common/pom.xml +++ b/presto-spark-common/pom.xml @@ -42,8 +42,8 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true diff --git a/presto-spark-launcher/pom.xml b/presto-spark-launcher/pom.xml index 289f17706dd59..e08e207c62098 100644 --- a/presto-spark-launcher/pom.xml +++ b/presto-spark-launcher/pom.xml @@ -28,8 +28,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -70,12 +70,12 @@ ${shadeBase}.io.airlift.airline - javax.inject - ${shadeBase}.javax.inject + jakarta.inject + ${shadeBase}.jakarta.inject - javax.annotation - ${shadeBase}.javax.annotation + jakarta.annotation + ${shadeBase}.jakarta.annotation org.checkerframework diff --git a/presto-spark-testing/pom.xml b/presto-spark-testing/pom.xml index a18cffefcf92d..661b86be66bbf 100644 --- a/presto-spark-testing/pom.xml +++ b/presto-spark-testing/pom.xml @@ -15,11 +15,6 @@ - - io.airlift - units - - com.facebook.airlift log @@ -30,6 +25,12 @@ guava + + io.airlift + units + test + + com.facebook.presto presto-testng-services diff --git a/presto-spi/pom.xml b/presto-spi/pom.xml index 1ef9f5bf6a7e5..6e0b110b4fa65 100644 --- a/presto-spi/pom.xml +++ b/presto-spi/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 8 @@ -38,8 +39,14 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations + true + + + + jakarta.annotation + jakarta.annotation-api true diff --git a/presto-sqlserver/pom.xml b/presto-sqlserver/pom.xml index a53e13cac214c..c6f546061fa68 100644 --- a/presto-sqlserver/pom.xml +++ b/presto-sqlserver/pom.xml @@ -43,8 +43,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-testing-server-launcher/pom.xml b/presto-testing-server-launcher/pom.xml index 46375e02c304a..11b52a5439723 100644 --- a/presto-testing-server-launcher/pom.xml +++ b/presto-testing-server-launcher/pom.xml @@ -14,6 +14,7 @@ com.facebook.presto.server.testing.TestingPrestoServerLauncher ${project.parent.basedir} + 17 @@ -33,8 +34,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api diff --git a/presto-testng-services/pom.xml b/presto-testng-services/pom.xml index a2b6c06ebc1ee..df44a67efb294 100644 --- a/presto-testng-services/pom.xml +++ b/presto-testng-services/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + 8 @@ -48,8 +49,8 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations diff --git a/presto-tests/pom.xml b/presto-tests/pom.xml index e4197a9c1afc5..d287fef506e72 100644 --- a/presto-tests/pom.xml +++ b/presto-tests/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 5g + 17 @@ -68,10 +69,6 @@ presto-tpch - - com.facebook.presto - presto-blackhole - com.facebook.presto @@ -155,13 +152,13 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api @@ -242,8 +239,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -257,8 +254,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api @@ -279,6 +276,19 @@ + + com.facebook.presto + presto-blackhole + test + + + + com.facebook.presto + presto-main + test + test-jar + + com.facebook.presto presto-testng-services @@ -327,32 +337,34 @@ org.apache.ratis ratis-client true + test org.apache.ratis ratis-common true + test org.apache.ratis ratis-server - runtime + test true org.apache.ratis ratis-grpc - runtime + test true org.apache.ratis ratis-server-api - runtime + test true @@ -422,6 +434,22 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.fasterxml.jackson.datatype:jackson-datatype-jdk8 + jakarta.ws.rs:jakarta.ws.rs-api + jakarta.servlet:jakarta.servlet-api + com.facebook.presto:presto-memory-context + com.facebook.airlift:concurrent + com.facebook.presto:presto-function-namespace-managers-common + com.facebook.drift:drift-codec + com.facebook.airlift:jaxrs + + + diff --git a/presto-thrift-api/pom.xml b/presto-thrift-api/pom.xml index 429a0af75f3b1..564867bcb455a 100644 --- a/presto-thrift-api/pom.xml +++ b/presto-thrift-api/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + 8 @@ -24,11 +25,16 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + com.facebook.drift drift-api diff --git a/presto-thrift-connector/pom.xml b/presto-thrift-connector/pom.xml index be95eb9b65c43..a5bf5af2d211a 100644 --- a/presto-thrift-connector/pom.xml +++ b/presto-thrift-connector/pom.xml @@ -28,6 +28,11 @@ drift-client + + com.facebook.drift + drift-transport-spi + + com.facebook.drift drift-codec @@ -49,11 +54,16 @@ - com.google.code.findbugs - jsr305 + com.google.errorprone + error_prone_annotations true + + jakarta.annotation + jakarta.annotation-api + + com.facebook.airlift bootstrap @@ -80,8 +90,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api @@ -90,8 +100,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api @@ -198,4 +208,19 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.drift:drift-transport-spi + com.facebook.drift:drift-codec + + + + + diff --git a/presto-thrift-testing-server/pom.xml b/presto-thrift-testing-server/pom.xml index b8c169e8c4bab..0402d2aac0f83 100644 --- a/presto-thrift-testing-server/pom.xml +++ b/presto-thrift-testing-server/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} com.facebook.presto.connector.thrift.server.ThriftTpchServer + 17 @@ -38,12 +39,6 @@ guava - - com.google.code.findbugs - jsr305 - true - - com.facebook.presto presto-tpch @@ -70,8 +65,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api @@ -114,17 +109,32 @@ presto-main-base - - org.testng testng + + + com.facebook.presto presto-testng-services test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.testng:testng + + + + + diff --git a/presto-tpcds/pom.xml b/presto-tpcds/pom.xml index 6d2d68f8f7c00..51c63044324c2 100644 --- a/presto-tpcds/pom.xml +++ b/presto-tpcds/pom.xml @@ -144,4 +144,18 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.facebook.airlift:json + + + + + diff --git a/presto-tpch/pom.xml b/presto-tpch/pom.xml index 3c1a5561dc909..50cf8b98e881c 100644 --- a/presto-tpch/pom.xml +++ b/presto-tpch/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + 8 diff --git a/presto-verifier/pom.xml b/presto-verifier/pom.xml index 28d3b592ce10d..5582143ef1fa7 100644 --- a/presto-verifier/pom.xml +++ b/presto-verifier/pom.xml @@ -15,8 +15,19 @@ ${project.parent.basedir} com.facebook.presto.verifier.PrestoVerifier ${project.artifactId} + 17 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.facebook.presto @@ -106,12 +117,6 @@ jackson-databind - - com.google.code.findbugs - jsr305 - true - - com.google.guava guava @@ -152,6 +157,12 @@ http-client + + com.google.errorprone + error_prone_annotations + true + + com.facebook.airlift json @@ -173,23 +184,23 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -351,6 +362,11 @@ + + + com.facebook.airlift:log-manager + + diff --git a/redis-hbo-provider/pom.xml b/redis-hbo-provider/pom.xml index a2c18d630e691..b094e648fbbbe 100644 --- a/redis-hbo-provider/pom.xml +++ b/redis-hbo-provider/pom.xml @@ -11,6 +11,7 @@ ${project.parent.basedir} 6.5.1.RELEASE + 17 redis-hbo-provider @@ -34,6 +35,11 @@ netty-transport + + com.google.errorprone + error_prone_annotations + + org.testng testng diff --git a/src/checkstyle/presto-checks.xml b/src/checkstyle/presto-checks.xml index b62efcbb0f6ce..30d4993f631d3 100644 --- a/src/checkstyle/presto-checks.xml +++ b/src/checkstyle/presto-checks.xml @@ -85,7 +85,7 @@ - + From eb3f2e86a521627c0a8f5e16b41b59cbd8f8b9a7 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Fri, 2 May 2025 10:26:12 -0700 Subject: [PATCH 03/27] Move Java code from javax to jakarta 1. Migrates imports from javax.* to jakarta.* 2. Moves some files in presto-main-base to presto-main that depend on jakarta.ws.rs because the version of jakarta.ws.rs that we now use requires java 17 bytecode. --- .../presto/accumulo/AccumuloClient.java | 3 +- .../presto/accumulo/AccumuloConnector.java | 3 +- .../presto/accumulo/AccumuloMetadata.java | 3 +- .../accumulo/AccumuloMetadataFactory.java | 2 +- .../presto/accumulo/AccumuloModule.java | 5 +- .../presto/accumulo/AccumuloSplitManager.java | 3 +- .../presto/accumulo/AccumuloTableManager.java | 3 +- .../presto/accumulo/conf/AccumuloConfig.java | 5 +- .../conf/AccumuloSessionProperties.java | 3 +- .../index/ColumnCardinalityCache.java | 5 +- .../presto/accumulo/index/IndexLookup.java | 5 +- .../presto/accumulo/index/Indexer.java | 3 +- .../accumulo/io/AccumuloPageSinkProvider.java | 3 +- .../io/AccumuloRecordSetProvider.java | 3 +- .../metadata/ZooKeeperMetadataManager.java | 3 +- .../presto/sql/analyzer/Analysis.java | 5 +- .../sql/analyzer/BuiltInQueryPreparer.java | 3 +- .../presto/sql/analyzer/RelationId.java | 3 +- .../presto/sql/analyzer/RelationType.java | 6 +- .../presto/sql/analyzer/ResolvedField.java | 3 +- .../facebook/presto/sql/analyzer/Scope.java | 7 +- .../facebook/presto/atop/AtopConnector.java | 3 +- .../presto/atop/AtopConnectorConfig.java | 5 +- .../facebook/presto/atop/AtopMetadata.java | 3 +- .../facebook/presto/atop/AtopPageSource.java | 3 +- .../presto/atop/AtopPageSourceProvider.java | 3 +- .../presto/atop/AtopProcessFactory.java | 5 +- .../presto/atop/AtopSplitManager.java | 3 +- .../presto/atop/AtopTableLayoutHandle.java | 3 +- .../plugin/arrow/ArrowBlockBuilder.java | 3 +- .../facebook/plugin/arrow/ArrowMetadata.java | 3 +- .../plugin/arrow/ArrowPageSourceProvider.java | 3 +- .../com/facebook/plugin/arrow/ArrowSplit.java | 3 +- .../plugin/arrow/ArrowSplitManager.java | 3 +- .../TestingArrowBlockBuilder.java | 3 +- .../TestingArrowFlightClientHandler.java | 3 +- .../presto/plugin/jdbc/BaseJdbcClient.java | 5 +- .../presto/plugin/jdbc/BaseJdbcConfig.java | 7 +- .../presto/plugin/jdbc/JdbcClient.java | 3 +- .../presto/plugin/jdbc/JdbcConnector.java | 3 +- .../presto/plugin/jdbc/JdbcMetadataCache.java | 3 +- .../plugin/jdbc/JdbcMetadataConfig.java | 5 +- .../plugin/jdbc/JdbcMetadataFactory.java | 2 +- .../plugin/jdbc/JdbcOutputTableHandle.java | 3 +- .../plugin/jdbc/JdbcPageSinkProvider.java | 3 +- .../plugin/jdbc/JdbcRecordSetProvider.java | 3 +- .../presto/plugin/jdbc/JdbcSplit.java | 3 +- .../presto/plugin/jdbc/JdbcSplitManager.java | 3 +- .../presto/plugin/jdbc/JdbcTableHandle.java | 3 +- .../plugin/jdbc/SimpleTestJdbcConfig.java | 3 +- .../driver/PrestoBenchmarkDriver.java | 3 +- .../benchmark/event/BenchmarkPhaseEvent.java | 3 +- .../benchmark/event/BenchmarkQueryEvent.java | 3 +- .../benchmark/event/BenchmarkSuiteEvent.java | 3 +- .../benchmark/event/JsonEventClient.java | 3 +- .../benchmark/framework/BenchmarkRunner.java | 3 +- .../framework/BenchmarkRunnerConfig.java | 3 +- .../prestoaction/PrestoClusterConfig.java | 3 +- .../presto/benchmark/retry/RetryConfig.java | 3 +- .../source/BenchmarkSuiteConfig.java | 3 +- .../source/MySqlBenchmarkSuiteConfig.java | 3 +- .../presto/benchmark/AbstractBenchmark.java | 3 +- .../plugin/bigquery/BigQueryConfig.java | 5 +- .../plugin/bigquery/BigQueryConnector.java | 3 +- .../plugin/bigquery/BigQueryMetadata.java | 3 +- .../bigquery/BigQueryPageSourceProvider.java | 3 +- .../BigQueryStorageClientFactory.java | 3 +- .../facebook/presto/bytecode/ArrayOpCode.java | 3 +- .../presto/bytecode/BytecodeBlock.java | 3 - .../presto/bytecode/ClassDefinition.java | 14 +-- .../presto/bytecode/ClassGenerator.java | 4 +- .../facebook/presto/bytecode/ClassInfo.java | 10 +- .../presto/bytecode/FieldDefinition.java | 3 +- .../presto/bytecode/MethodDefinition.java | 17 ++- .../facebook/presto/bytecode/Parameter.java | 2 +- .../presto/bytecode/ParameterizedType.java | 5 +- .../bytecode/control/CaseStatement.java | 3 +- .../expression/BytecodeExpression.java | 10 +- .../expression/BytecodeExpressions.java | 19 +-- .../GetFieldBytecodeExpression.java | 3 +- .../expression/InvokeBytecodeExpression.java | 3 +- .../InvokeDynamicBytecodeExpression.java | 3 +- .../NewArrayBytecodeExpression.java | 3 +- .../SetFieldBytecodeExpression.java | 3 +- .../instruction/InvokeInstruction.java | 16 +-- .../facebook/presto/cache/CacheConfig.java | 3 +- .../facebook/presto/cache/CacheManager.java | 3 +- .../com/facebook/presto/cache/CacheStats.java | 3 +- .../facebook/presto/cache/CachingModule.java | 3 +- .../presto/cache/ForCachingFileSystem.java | 2 +- .../AlluxioCachingConfigurationProvider.java | 3 +- .../cache/filemerge/FileMergeCacheConfig.java | 3 +- .../filemerge/FileMergeCacheManager.java | 5 +- .../cassandra/CassandraClientConfig.java | 7 +- .../cassandra/CassandraClientModule.java | 3 +- .../cassandra/CassandraColumnHandle.java | 3 +- .../presto/cassandra/CassandraConnector.java | 3 +- .../presto/cassandra/CassandraMetadata.java | 3 +- .../cassandra/CassandraPageSinkProvider.java | 3 +- .../cassandra/CassandraPartitionManager.java | 3 +- .../cassandra/CassandraRecordSetProvider.java | 3 +- .../cassandra/CassandraSessionProperties.java | 3 +- .../cassandra/CassandraSplitManager.java | 3 +- .../cassandra/CassandraTokenSplitManager.java | 3 +- .../cassandra/RebindSafeMBeanServer.java | 2 +- .../presto/cassandra/ReopeningCluster.java | 5 +- .../java/com/facebook/presto/cli/Console.java | 3 +- .../java/com/facebook/presto/cli/Pager.java | 3 +- .../presto/cli/ThreadInterruptor.java | 2 +- .../plugin/clickhouse/ClickHouseClient.java | 5 +- .../plugin/clickhouse/ClickHouseConfig.java | 5 +- .../clickhouse/ClickHouseConnector.java | 3 +- .../clickhouse/ClickHouseMetadataFactory.java | 2 +- .../ClickHouseOutputTableHandle.java | 3 +- .../ClickHousePageSinkProvider.java | 3 +- .../ClickHouseRecordSetProvider.java | 3 +- .../plugin/clickhouse/ClickHouseSplit.java | 3 +- .../clickhouse/ClickHouseSplitManager.java | 3 +- .../clickhouse/ClickHouseTableHandle.java | 3 +- .../clickhouse/ClickHouseTableProperties.java | 3 +- .../presto/plugin/clickhouse/ForBaseJdbc.java | 2 +- .../ClickHouseQueryGenerator.java | 3 +- .../presto/client/ClientTypeSignature.java | 3 +- .../client/ClientTypeSignatureParameter.java | 3 +- .../com/facebook/presto/client/Column.java | 3 +- .../facebook/presto/client/ErrorLocation.java | 3 +- .../facebook/presto/client/FailureInfo.java | 5 +- .../presto/client/GCSOAuthInterceptor.java | 8 +- .../facebook/presto/client/JsonResponse.java | 3 +- .../facebook/presto/client/NodeVersion.java | 3 +- .../facebook/presto/client/OkHttpUtil.java | 11 +- .../facebook/presto/client/QueryError.java | 5 +- .../facebook/presto/client/QueryResults.java | 5 +- .../facebook/presto/client/ServerInfo.java | 3 +- .../facebook/presto/client/SpnegoHandler.java | 2 +- .../facebook/presto/client/StageStats.java | 3 +- .../presto/client/StatementClient.java | 3 +- .../presto/client/StatementClientV1.java | 5 +- .../presto/client/StatementStats.java | 5 +- .../presto/common/QualifiedObjectName.java | 3 +- .../com/facebook/presto/common/Utils.java | 3 +- .../common/block/AbstractArrayBlock.java | 3 +- .../presto/common/block/AbstractMapBlock.java | 3 +- .../presto/common/block/AbstractRowBlock.java | 3 +- .../presto/common/block/ArrayBlock.java | 3 +- .../common/block/ArrayBlockBuilder.java | 3 +- .../presto/common/block/BlockUtil.java | 3 +- .../presto/common/block/ByteArrayBlock.java | 3 +- .../common/block/ByteArrayBlockBuilder.java | 3 +- .../common/block/ClosingBlockLease.java | 3 - .../presto/common/block/ColumnarMap.java | 3 +- .../presto/common/block/Int128ArrayBlock.java | 3 +- .../common/block/Int128ArrayBlockBuilder.java | 3 +- .../presto/common/block/IntArrayBlock.java | 3 +- .../common/block/IntArrayBlockBuilder.java | 3 +- .../presto/common/block/LongArrayBlock.java | 3 +- .../common/block/LongArrayBlockBuilder.java | 3 +- .../presto/common/block/MapBlock.java | 3 +- .../presto/common/block/MapBlockBuilder.java | 3 +- .../presto/common/block/RowBlock.java | 3 +- .../presto/common/block/RowBlockBuilder.java | 3 +- .../common/block/RunLengthEncodedBlock.java | 3 +- .../presto/common/block/ShortArrayBlock.java | 3 +- .../common/block/ShortArrayBlockBuilder.java | 3 +- .../presto/common/block/SingleMapBlock.java | 3 +- .../common/block/VariableWidthBlock.java | 3 +- .../block/VariableWidthBlockBuilder.java | 3 +- .../presto/common/type/DistinctType.java | 3 +- .../common/predicate/TestSortedRangeSet.java | 2 +- .../facebook/presto/delta/DeltaClient.java | 3 +- .../facebook/presto/delta/DeltaConfig.java | 3 +- .../facebook/presto/delta/DeltaConnector.java | 3 +- .../facebook/presto/delta/DeltaMetadata.java | 3 +- .../facebook/presto/delta/DeltaModule.java | 5 +- .../presto/delta/DeltaPageSourceProvider.java | 3 +- .../presto/delta/DeltaSessionProperties.java | 3 +- .../presto/delta/DeltaSplitManager.java | 3 +- .../presto/delta/DeltaTableProperties.java | 3 +- .../rule/DeltaPlanOptimizerProvider.java | 3 +- .../facebook/presto/druid/DruidClient.java | 5 +- .../facebook/presto/druid/DruidConfig.java | 5 +- .../facebook/presto/druid/DruidConnector.java | 3 +- .../facebook/presto/druid/DruidMetadata.java | 3 +- .../presto/druid/DruidPageSourceProvider.java | 3 +- .../presto/druid/DruidPlanOptimizer.java | 3 +- .../presto/druid/DruidQueryGenerator.java | 3 +- .../presto/druid/DruidSessionProperties.java | 3 +- .../presto/druid/DruidSplitManager.java | 3 +- .../facebook/presto/druid/ForDruidClient.java | 2 +- .../DruidBasicAuthHttpRequestFilter.java | 3 +- .../ingestion/DruidPageSinkProvider.java | 3 +- .../druid/ingestion/DruidPageWriter.java | 3 +- .../druid/metadata/DruidSegmentInfo.java | 3 +- .../presto/druid/zip/ZipFileData.java | 3 +- .../presto/druid/zip/ZipFileEntry.java | 2 +- .../elasticsearch/AwsSecurityConfig.java | 3 +- .../elasticsearch/ElasticsearchConfig.java | 5 +- .../elasticsearch/ElasticsearchConnector.java | 3 +- .../ElasticsearchConnectorModule.java | 3 +- .../elasticsearch/ElasticsearchMetadata.java | 3 +- .../ElasticsearchPageSourceProvider.java | 3 +- .../ElasticsearchSplitManager.java | 3 +- .../elasticsearch/NodesSystemTable.java | 3 +- .../presto/elasticsearch/PasswordConfig.java | 3 +- .../client/ElasticsearchClient.java | 6 +- .../presto/example/ExampleClient.java | 3 +- .../presto/example/ExampleConfig.java | 3 +- .../presto/example/ExampleConnector.java | 3 +- .../presto/example/ExampleMetadata.java | 3 +- .../presto/example/ExampleModule.java | 3 +- .../example/ExampleRecordSetProvider.java | 3 +- .../presto/example/ExampleSplitManager.java | 3 +- .../presto/example/ExampleHttpServer.java | 9 +- .../presto/expressions/DynamicFilters.java | 4 - ...actSqlInvokedFunctionNamespaceManager.java | 11 +- .../functionNamespace/ServingCatalog.java | 2 +- .../InMemoryFunctionNamespaceManager.java | 5 +- ...estSqlInvokedFunctionNamespaceManager.java | 12 +- .../thrift/AbstractAnnotatedProvider.java | 72 ++++++++++++ .../thrift/ContextualAddressSelector.java | 2 +- ...ContextualSimpleAddressSelectorBinder.java | 2 +- .../thrift/ThriftSqlFunctionExecutor.java | 4 +- ...onFileBasedFunctionDefinitionProvider.java | 3 +- ...JsonFileBasedFunctionNamespaceManager.java | 3 +- ...leBasedFunctionNamespaceManagerConfig.java | 3 +- .../mysql/MySqlConnectionConfig.java | 3 +- .../mysql/MySqlConnectionModule.java | 5 +- .../mysql/MySqlFunctionNamespaceManager.java | 34 ++---- .../MySqlFunctionNamespaceManagerConfig.java | 3 +- .../RestBasedFunctionNamespaceManager.java | 15 +-- ...stBasedFunctionNamespaceManagerConfig.java | 3 +- .../rest/RestSqlFunctionExecutor.java | 14 +-- ...TestRestBasedFunctionNamespaceManager.java | 20 ++-- .../TestMySqlFunctionNamespaceManager.java | 2 +- .../presto/server/FunctionPluginManager.java | 5 +- .../presto/server/FunctionResource.java | 21 ++-- .../geospatial/serde/EsriGeometrySerde.java | 3 +- .../geospatial/serde/JtsGeometrySerde.java | 4 +- .../presto/geospatial/TestKdbTree.java | 4 +- .../presto/google/sheets/SheetsClient.java | 3 +- .../presto/google/sheets/SheetsConfig.java | 5 +- .../presto/google/sheets/SheetsConnector.java | 3 +- .../presto/google/sheets/SheetsMetadata.java | 3 +- .../presto/google/sheets/SheetsModule.java | 3 +- .../google/sheets/SheetsSplitManager.java | 3 +- .../presto/plugin/hana/HanaClient.java | 3 +- .../facebook/presto/hive/BlockLocation.java | 3 +- .../presto/hive/HiveCommonClientConfig.java | 7 +- .../hive/HiveCommonSessionProperties.java | 3 +- .../facebook/presto/hive/MetadataUtils.java | 4 +- .../presto/hive/PartitionNameWithVersion.java | 3 +- .../presto/hive/SortingFileWriterConfig.java | 5 +- .../security/AWSSecurityMappingConfig.java | 5 +- .../hive/functions/ForHiveFunction.java | 2 +- .../HiveFunctionNamespaceManager.java | 3 +- .../functions/StaticHiveFunctionRegistry.java | 3 +- .../functions/gen/CompilerOperations.java | 3 +- .../presto/hive/ForCachingHiveMetastore.java | 2 +- .../hive/ForMetastoreHdfsEnvironment.java | 2 +- .../hive/ForRecordingHiveMetastore.java | 2 +- .../facebook/presto/hive/HdfsEnvironment.java | 3 +- .../presto/hive/HiveBasicStatistics.java | 3 +- .../hive/HiveColumnConverterProvider.java | 3 +- .../presto/hive/MetastoreClientConfig.java | 9 +- .../AbstractCachingHiveMetastore.java | 3 +- .../hive/metastore/BooleanStatistics.java | 3 +- .../presto/hive/metastore/Column.java | 3 +- .../presto/hive/metastore/Database.java | 3 +- .../presto/hive/metastore/DateStatistics.java | 3 +- .../hive/metastore/DecimalStatistics.java | 3 +- .../hive/metastore/DoubleStatistics.java | 3 +- .../hive/metastore/HiveColumnStatistics.java | 3 +- .../hive/metastore/HivePartitionMutator.java | 3 +- .../hive/metastore/HivePartitionName.java | 3 +- .../hive/metastore/HivePrivilegeInfo.java | 3 +- .../presto/hive/metastore/HiveTableName.java | 3 +- .../InMemoryCachingHiveMetastore.java | 5 +- .../hive/metastore/IntegerStatistics.java | 3 +- .../InvalidateMetastoreCacheProcedure.java | 5 +- .../hive/metastore/MetastoreConfig.java | 3 +- .../presto/hive/metastore/MetastoreUtil.java | 3 +- .../presto/hive/metastore/Partition.java | 3 +- .../hive/metastore/PartitionFilter.java | 3 +- .../hive/metastore/PartitionStatistics.java | 3 +- .../metastore/RecordingHiveMetastore.java | 5 +- .../SemiTransactionalHiveMetastore.java | 3 +- .../presto/hive/metastore/SortingColumn.java | 3 +- .../presto/hive/metastore/Storage.java | 3 +- .../presto/hive/metastore/StorageFormat.java | 3 +- .../facebook/presto/hive/metastore/Table.java | 3 +- .../hive/metastore/UserDatabaseKey.java | 3 +- .../presto/hive/metastore/UserTableKey.java | 3 +- .../metastore/file/FileHiveMetastore.java | 5 +- .../file/FileHiveMetastoreConfig.java | 3 +- .../metastore/glue/ForGlueHiveMetastore.java | 2 +- .../metastore/glue/GlueCatalogApiStats.java | 3 +- .../metastore/glue/GlueHiveMetastore.java | 5 +- .../glue/GlueHiveMetastoreConfig.java | 5 +- .../thrift/BridgingHiveMetastore.java | 3 +- .../thrift/HiveMetastoreApiStats.java | 3 +- .../thrift/HiveMetastoreClientFactory.java | 24 ++-- .../metastore/thrift/StaticHiveCluster.java | 3 +- .../thrift/StaticMetastoreConfig.java | 3 +- .../metastore/thrift/ThriftHiveMetastore.java | 5 +- .../metastore/thrift/ThriftMetastoreUtil.java | 3 +- .../thrift/InMemoryHiveMetastore.java | 3 +- .../presto/hive/CachingDirectoryLister.java | 3 +- .../presto/hive/ConcurrentLazyQueue.java | 2 +- .../hive/CreateEmptyPartitionProcedure.java | 5 +- ...rectoryListCacheInvalidationProcedure.java | 5 +- .../hive/ForCachingDirectoryLister.java | 2 +- .../facebook/presto/hive/ForFileRename.java | 2 +- .../com/facebook/presto/hive/ForHdfs.java | 2 +- .../facebook/presto/hive/ForHiveClient.java | 2 +- .../presto/hive/ForHiveMetastore.java | 2 +- .../presto/hive/ForZeroRowFileCreator.java | 2 +- .../hive/GenericHiveRecordCursorProvider.java | 3 +- .../hive/HdfsConfigurationInitializer.java | 2 +- .../presto/hive/HiveAnalyzeProperties.java | 3 +- .../presto/hive/HiveClientConfig.java | 9 +- .../presto/hive/HiveClientModule.java | 3 +- .../presto/hive/HiveCoercionPolicy.java | 3 +- .../HiveEncryptionInformationProvider.java | 3 +- .../presto/hive/HiveHdfsConfiguration.java | 3 +- .../presto/hive/HiveLocationService.java | 3 +- .../presto/hive/HiveMetadataFactory.java | 3 +- .../presto/hive/HivePageSinkProvider.java | 3 +- .../facebook/presto/hive/HivePageSource.java | 3 +- .../presto/hive/HivePageSourceProvider.java | 3 +- .../presto/hive/HivePartitionKey.java | 3 +- .../presto/hive/HivePartitionManager.java | 3 +- .../presto/hive/HiveSessionProperties.java | 3 +- .../presto/hive/HiveSplitManager.java | 3 +- .../facebook/presto/hive/HiveSplitSource.java | 3 +- .../presto/hive/HiveStagingFileCommitter.java | 3 +- .../presto/hive/HiveTableProperties.java | 3 +- .../hive/HiveTableWritabilityChecker.java | 3 +- .../presto/hive/HiveTransactionManager.java | 3 +- .../com/facebook/presto/hive/HiveUtil.java | 3 +- .../presto/hive/HiveZeroRowFileCreator.java | 3 +- .../presto/hive/InternalHiveSplit.java | 3 +- .../presto/hive/OrcFileWriterConfig.java | 3 +- .../presto/hive/OrcFileWriterFactory.java | 3 +- .../presto/hive/RcFileFileWriterFactory.java | 3 +- .../presto/hive/RebindSafeMBeanServer.java | 2 +- .../hive/SyncPartitionMetadataProcedure.java | 5 +- .../presto/hive/WriteCompletedEvent.java | 5 +- .../authentication/AuthenticationModules.java | 3 +- .../CachingKerberosHadoopAuthentication.java | 2 +- .../DirectHdfsAuthentication.java | 3 +- .../authentication/HdfsKerberosConfig.java | 3 +- .../ImpersonatingHdfsAuthentication.java | 3 +- .../KerberosHiveMetastoreAuthentication.java | 2 +- .../MetastoreKerberosConfig.java | 3 +- .../cache/HiveCachingHdfsConfiguration.java | 3 +- .../gcs/HiveGcsConfigurationInitializer.java | 3 +- .../orc/DwrfAggregatedPageSourceFactory.java | 3 +- .../hive/orc/DwrfBatchPageSourceFactory.java | 3 +- .../orc/DwrfSelectivePageSourceFactory.java | 3 +- .../orc/OrcAggregatedPageSourceFactory.java | 3 +- .../hive/orc/OrcBatchPageSourceFactory.java | 3 +- .../orc/OrcSelectivePageSourceFactory.java | 3 +- .../hive/orc/TupleDomainFilterCache.java | 3 +- .../pagefile/PageFilePageSourceFactory.java | 3 +- .../hive/pagefile/PageFileWriterFactory.java | 3 +- .../ParquetAggregatedPageSourceFactory.java | 3 +- .../parquet/ParquetPageSourceFactory.java | 3 +- .../ParquetSelectivePageSourceFactory.java | 3 +- .../hive/rcfile/RcFilePageSourceFactory.java | 3 +- .../facebook/presto/hive/s3/HiveS3Config.java | 5 +- .../presto/hive/s3/PrestoS3ClientFactory.java | 3 +- .../hive/s3/PrestoS3ConfigurationUpdater.java | 3 +- ...3SecurityMappingConfigurationProvider.java | 3 +- .../ForAWSS3DynamicConfigurationProvider.java | 2 +- .../S3SelectRecordCursorProvider.java | 3 +- .../hive/security/LegacyAccessControl.java | 3 +- .../presto/hive/security/SecurityConfig.java | 3 +- .../security/SqlStandardAccessControl.java | 3 +- .../hive/security/ranger/ForRangerInfo.java | 2 +- .../RangerBasedAccessControlConfig.java | 3 +- .../RangerBasicAuthHttpRequestFilter.java | 3 +- .../presto/hive/security/ranger/Users.java | 3 +- .../presto/hive/security/ranger/VXUser.java | 3 +- .../facebook/presto/hive/util/AsyncQueue.java | 5 +- .../parquet/BenchmarkParquetPageSource.java | 3 +- .../com/facebook/presto/hudi/HudiConfig.java | 9 +- .../presto/hudi/HudiMetadataFactory.java | 3 +- .../com/facebook/presto/hudi/HudiModule.java | 2 +- .../presto/hudi/HudiPageSourceProvider.java | 3 +- .../presto/hudi/HudiPartitionManager.java | 3 +- .../presto/hudi/HudiSessionProperties.java | 3 +- .../presto/hudi/HudiSplitManager.java | 3 +- .../split/ForHudiBackgroundSplitLoader.java | 2 +- .../hudi/split/ForHudiSplitAsyncQueue.java | 2 +- .../presto/hudi/split/ForHudiSplitSource.java | 2 +- .../presto/iceberg/HiveTableOperations.java | 5 +- .../presto/iceberg/IcebergCommonModule.java | 3 +- .../presto/iceberg/IcebergConfig.java | 11 +- .../iceberg/IcebergFileWriterFactory.java | 3 +- .../iceberg/IcebergHiveMetadataFactory.java | 3 +- .../IcebergHiveTableOperationsConfig.java | 3 +- .../iceberg/IcebergNativeCatalogFactory.java | 3 +- .../iceberg/IcebergNativeMetadataFactory.java | 3 +- .../iceberg/IcebergPageSinkProvider.java | 3 +- .../iceberg/IcebergPageSourceProvider.java | 3 +- .../iceberg/IcebergSessionProperties.java | 3 +- .../presto/iceberg/IcebergSplitManager.java | 3 +- .../iceberg/IcebergTableProperties.java | 3 +- .../presto/iceberg/PartitionFields.java | 3 +- .../presto/iceberg/PartitionTransforms.java | 3 +- .../presto/iceberg/SortParameters.java | 3 +- .../presto/iceberg/TableStatisticsMaker.java | 3 +- .../iceberg/delete/EqualityDeleteFilter.java | 3 +- .../iceberg/delete/PositionDeleteFilter.java | 3 +- .../changelog/ApplyChangelogState.java | 3 +- .../hive/IcebergFileHiveMetastore.java | 5 +- .../nessie/IcebergNessieCatalogFactory.java | 3 +- .../iceberg/nessie/IcebergNessieConfig.java | 3 +- .../procedure/ExpireSnapshotsProcedure.java | 5 +- .../procedure/FastForwardBranchProcedure.java | 5 +- ...anifestFileCacheInvalidationProcedure.java | 5 +- .../procedure/RegisterTableProcedure.java | 5 +- .../iceberg/procedure/RemoveOrphanFiles.java | 5 +- .../RollbackToSnapshotProcedure.java | 5 +- .../RollbackToTimestampProcedure.java | 5 +- .../SetCurrentSnapshotProcedure.java | 5 +- .../procedure/SetTablePropertyProcedure.java | 5 +- ...tisticsFileCacheInvalidationProcedure.java | 5 +- .../procedure/UnregisterTableProcedure.java | 5 +- .../rest/IcebergRestCatalogFactory.java | 3 +- .../iceberg/rest/IcebergRestConfig.java | 3 +- .../iceberg/rest/IcebergRestTestUtil.java | 2 +- .../rest/IcebergRestCatalogServlet.java | 9 +- .../facebook/presto/jdbc/WarningsManager.java | 5 +- .../presto/connector/jmx/JmxConnector.java | 3 +- .../connector/jmx/JmxConnectorConfig.java | 5 +- .../connector/jmx/JmxHistoricalData.java | 3 +- .../presto/connector/jmx/JmxMetadata.java | 2 +- .../connector/jmx/JmxPeriodicSampler.java | 5 +- .../connector/jmx/JmxRecordSetProvider.java | 2 +- .../presto/connector/jmx/JmxSplitManager.java | 3 +- .../jmx/util/RebindSafeMBeanServer.java | 2 +- .../facebook/presto/kafka/KafkaConnector.java | 3 +- .../presto/kafka/KafkaConnectorConfig.java | 3 +- .../presto/kafka/KafkaConnectorModule.java | 3 +- .../facebook/presto/kafka/KafkaMetadata.java | 3 +- .../presto/kafka/KafkaPageSinkProvider.java | 3 +- .../presto/kafka/KafkaRecordSetProvider.java | 3 +- .../presto/kafka/KafkaSecurityConfig.java | 3 +- .../presto/kafka/KafkaSplitManager.java | 3 +- .../kafka/PlainTextKafkaConsumerManager.java | 3 +- .../kafka/PlainTextKafkaProducerFactory.java | 3 +- .../kafka/SaslKafkaConsumerManager.java | 3 +- .../encoder/DispatchingRowEncoderFactory.java | 3 +- .../encoder/json/JsonRowEncoderFactory.java | 3 +- .../file/FileTableDescriptionSupplier.java | 5 +- .../FileTableDescriptionSupplierConfig.java | 3 +- .../kafka/security/KafkaSaslConfig.java | 3 +- .../FileKafkaClusterMetadataSupplier.java | 3 +- .../presto/kafka/TestKafkaSecurityConfig.java | 3 +- .../kafka/security/TestKafkaSaslConfig.java | 3 +- .../presto/kudu/KuduClientConfig.java | 5 +- .../facebook/presto/kudu/KuduConnector.java | 3 +- .../facebook/presto/kudu/KuduMetadata.java | 3 +- .../com/facebook/presto/kudu/KuduModule.java | 3 +- .../presto/kudu/KuduPageSinkProvider.java | 3 +- .../presto/kudu/KuduRecordSetProvider.java | 3 +- .../presto/kudu/KuduSplitManager.java | 3 +- .../procedures/RangePartitionProcedures.java | 3 +- .../kudu/properties/KuduTableProperties.java | 3 +- .../lark/sheets/LarkSheetsConnector.java | 3 +- .../lark/sheets/LarkSheetsMetadata.java | 3 +- .../sheets/LarkSheetsRecordSetProvider.java | 3 +- .../lark/sheets/api/LarkSheetsApiFactory.java | 5 +- .../presto/localfile/LocalFileConnector.java | 3 +- .../presto/localfile/LocalFileMetadata.java | 3 +- .../localfile/LocalFileRecordSetProvider.java | 3 +- .../localfile/LocalFileSplitManager.java | 3 +- .../presto/localfile/LocalFileTables.java | 3 +- .../presto/ClientRequestFilterManager.java | 5 +- .../presto/GroupByHashPageIndexerFactory.java | 3 +- .../facebook/presto/PagesIndexPageSorter.java | 3 +- .../presto/SystemSessionProperties.java | 3 +- .../facebook/presto/block/BlockJsonSerde.java | 3 +- .../presto/catalogserver/CatalogServer.java | 3 +- .../RandomCatalogServerAddressSelector.java | 3 +- .../catalogserver/RemoteMetadataManager.java | 3 +- .../presto/connector/ConnectorManager.java | 9 +- .../system/AnalyzePropertiesSystemTable.java | 3 +- .../connector/system/CatalogSystemTable.java | 3 +- .../system/ColumnPropertiesSystemTable.java | 3 +- .../system/GlobalSystemConnectorFactory.java | 3 +- .../connector/system/KillQueryProcedure.java | 3 +- .../connector/system/NodeSystemTable.java | 3 +- .../connector/system/QuerySystemTable.java | 3 +- .../system/SchemaPropertiesSystemTable.java | 3 +- .../system/SystemConnectorModule.java | 3 +- .../system/TablePropertiesSystemTable.java | 3 +- .../connector/system/TaskSystemTable.java | 3 +- .../system/TransactionsSystemTable.java | 3 +- .../system/jdbc/CatalogJdbcTable.java | 3 +- .../system/jdbc/ColumnJdbcTable.java | 3 +- .../system/jdbc/SchemaJdbcTable.java | 3 +- .../connector/system/jdbc/TableJdbcTable.java | 3 +- .../connector/system/jdbc/TypesJdbcTable.java | 3 +- .../facebook/presto/cost/CostCalculator.java | 3 +- .../cost/CostCalculatorUsingExchanges.java | 5 +- .../CostCalculatorWithEstimatedExchanges.java | 5 +- .../facebook/presto/cost/CostComparator.java | 3 +- .../presto/cost/FilterStatsCalculator.java | 5 +- .../cost/HistoryBasedOptimizationConfig.java | 3 +- .../presto/cost/ScalarStatsCalculator.java | 3 +- .../presto/cost/StatsCalculatorModule.java | 3 +- .../presto/cost/TaskCountEstimator.java | 3 +- .../dispatcher/CoordinatorLocation.java | 23 ---- .../presto/dispatcher/DispatchExecutor.java | 5 +- .../presto/dispatcher/DispatchInfo.java | 19 +-- .../presto/dispatcher/DispatchManager.java | 7 +- .../FailedLocalDispatchQueryFactory.java | 3 +- .../dispatcher/LocalCoordinatorLocation.java | 35 ------ .../facebook/presto/event/QueryMonitor.java | 3 +- .../presto/event/QueryMonitorConfig.java | 3 +- .../presto/event/QueryProgressMonitor.java | 9 +- .../facebook/presto/event/SplitMonitor.java | 5 +- .../eventlistener/EventListenerConfig.java | 3 +- .../AccessControlCheckerExecution.java | 3 +- .../presto/execution/AlterFunctionTask.java | 3 +- .../presto/execution/ClusterSizeMonitor.java | 9 +- .../presto/execution/CreateFunctionTask.java | 3 +- .../execution/CreateMaterializedViewTask.java | 3 +- .../presto/execution/CreateTypeTask.java | 3 +- .../presto/execution/CreateViewTask.java | 3 +- .../execution/DDLDefinitionExecution.java | 3 +- .../execution/DataDefinitionExecution.java | 3 +- .../presto/execution/DropFunctionTask.java | 3 +- .../EagerPlanValidationExecutionMBean.java | 3 +- .../execution/ExecutionFailureInfo.java | 5 +- .../execution/ExplainAnalyzeContext.java | 2 +- .../facebook/presto/execution/Failure.java | 3 +- .../execution/ForEagerPlanValidation.java | 2 +- .../presto/execution/ForQueryExecution.java | 2 +- .../presto/execution/ForTimeoutThread.java | 2 +- .../presto/execution/FutureStateChange.java | 5 +- .../com/facebook/presto/execution/Input.java | 3 +- .../execution/NodeResourceStatusConfig.java | 3 +- .../presto/execution/NodeTaskMap.java | 5 +- .../com/facebook/presto/execution/Output.java | 3 +- .../execution/PartialResultQueryManager.java | 3 +- .../presto/execution/PrepareTask.java | 3 +- .../presto/execution/QueryExecutionMBean.java | 3 +- .../presto/execution/QueryIdGenerator.java | 3 +- .../facebook/presto/execution/QueryInfo.java | 5 +- .../presto/execution/QueryManagerConfig.java | 7 +- .../presto/execution/QueryManagerStats.java | 3 +- .../presto/execution/QueryStateMachine.java | 9 +- .../facebook/presto/execution/QueryStats.java | 3 +- .../presto/execution/QueryTracker.java | 5 +- .../execution/SessionDefinitionExecution.java | 3 +- .../execution/SplitConcurrencyController.java | 3 +- .../presto/execution/SqlQueryExecution.java | 5 +- .../presto/execution/SqlStageExecution.java | 5 +- .../facebook/presto/execution/SqlTask.java | 3 +- .../presto/execution/SqlTaskExecution.java | 9 +- .../presto/execution/SqlTaskManager.java | 9 +- .../execution/StageExecutionStateMachine.java | 3 +- .../presto/execution/StageExecutionStats.java | 3 +- .../facebook/presto/execution/StageInfo.java | 3 +- .../presto/execution/StateMachine.java | 5 +- .../facebook/presto/execution/TaskInfo.java | 3 +- .../execution/TaskManagementExecutor.java | 3 +- .../presto/execution/TaskManagerConfig.java | 9 +- .../presto/execution/TaskStateMachine.java | 3 +- .../TaskThresholdMemoryRevokingScheduler.java | 9 +- .../buffer/ArbitraryOutputBuffer.java | 5 +- .../buffer/BroadcastOutputBuffer.java | 3 +- .../presto/execution/buffer/ClientBuffer.java | 7 +- .../execution/buffer/LazyOutputBuffer.java | 5 +- .../buffer/LifespanSerializedPageTracker.java | 3 +- .../buffer/OutputBufferMemoryManager.java | 7 +- .../buffer/SerializedPageReference.java | 3 +- .../buffer/SpoolingOutputBuffer.java | 5 +- .../buffer/SpoolingOutputBufferFactory.java | 5 +- .../executor/MultilevelSplitQueue.java | 7 +- .../presto/execution/executor/Priority.java | 2 +- .../execution/executor/TaskExecutor.java | 11 +- .../presto/execution/executor/TaskHandle.java | 5 +- .../executor/TaskPriorityTracker.java | 2 +- .../resourceGroups/InternalResourceGroup.java | 5 +- .../InternalResourceGroupManager.java | 9 +- .../resourceGroups/ResourceGroupManager.java | 3 +- .../BroadcastOutputBufferManager.java | 5 +- .../FixedSourcePartitionedScheduler.java | 3 +- .../execution/scheduler/NetworkTopology.java | 3 +- .../execution/scheduler/NodeScheduler.java | 5 +- .../scheduler/NodeSchedulerConfig.java | 5 +- .../scheduler/NodeSchedulerExporter.java | 7 +- .../PartitionedOutputBufferManager.java | 3 +- .../scheduler/PhasedExecutionSchedule.java | 3 +- .../scheduler/ScaledOutputBufferManager.java | 3 +- .../execution/scheduler/SectionExecution.java | 3 +- .../scheduler/SectionExecutionFactory.java | 3 +- .../scheduler/SplitSchedulerStats.java | 3 +- .../group/DynamicLifespanScheduler.java | 3 +- .../group/FixedLifespanScheduler.java | 3 +- .../nodeSelection/NodeSelectionStats.java | 3 +- .../TopologyAwareNodeSelector.java | 3 +- .../warnings/DefaultWarningCollector.java | 5 +- .../index/IndexHandleJacksonModule.java | 3 +- .../memory/ClusterMemoryLeakDetector.java | 5 +- .../presto/memory/ClusterMemoryPool.java | 5 +- .../presto/memory/ForMemoryManager.java | 2 +- .../presto/memory/LocalMemoryManager.java | 3 +- .../memory/LocalMemoryManagerExporter.java | 7 +- .../presto/memory/LowMemoryMonitor.java | 7 +- .../presto/memory/MemoryManagerConfig.java | 3 +- .../facebook/presto/memory/MemoryPool.java | 5 +- .../presto/memory/NodeMemoryConfig.java | 3 +- .../facebook/presto/memory/QueryContext.java | 5 +- .../memory/ReservedSystemMemoryConfig.java | 3 +- ...uiltInTypeAndFunctionNamespaceManager.java | 3 +- .../presto/metadata/CatalogManager.java | 3 +- .../metadata/ColumnHandleJacksonModule.java | 3 +- .../metadata/DelegatingMetadataManager.java | 3 +- .../DeleteTableHandleJacksonModule.java | 3 +- .../presto/metadata/ForNodeManager.java | 2 +- .../metadata/FunctionAndTypeManager.java | 5 +- .../metadata/FunctionHandleJacksonModule.java | 3 +- .../presto/metadata/HandleResolver.java | 3 +- .../presto/metadata/InMemoryNodeManager.java | 5 +- .../InsertTableHandleJacksonModule.java | 3 +- .../presto/metadata/MetadataManager.java | 3 +- .../OutputTableHandleJacksonModule.java | 3 +- .../PartitioningHandleJacksonModule.java | 3 +- .../presto/metadata/ProcedureRegistry.java | 3 +- .../presto/metadata/QualifiedTablePrefix.java | 3 +- .../metadata/SessionPropertyManager.java | 5 +- .../SessionPropertyProviderConfig.java | 3 +- .../presto/metadata/SplitJacksonModule.java | 3 +- .../presto/metadata/StaticCatalogStore.java | 3 +- .../metadata/StaticCatalogStoreConfig.java | 3 +- .../StaticFunctionNamespaceStore.java | 3 +- .../StaticFunctionNamespaceStoreConfig.java | 3 +- .../metadata/StaticTypeManagerStore.java | 3 +- .../StaticTypeManagerStoreConfig.java | 3 +- .../metadata/TableHandleJacksonModule.java | 3 +- .../TableLayoutHandleJacksonModule.java | 3 +- .../metadata/ThriftRemoteNodeState.java | 5 +- .../TransactionHandleJacksonModule.java | 3 +- .../presto/operator/CompletedWork.java | 2 +- .../com/facebook/presto/operator/Driver.java | 3 +- .../facebook/presto/operator/DriverStats.java | 5 +- .../presto/operator/DriverYieldSignal.java | 5 +- .../operator/DynamicFilterSourceOperator.java | 3 +- .../presto/operator/ExchangeClient.java | 7 +- .../presto/operator/ExchangeClientConfig.java | 5 +- .../operator/ExchangeClientFactory.java | 5 +- .../FileFragmentResultCacheConfig.java | 3 +- .../FileFragmentResultCacheManager.java | 3 +- .../facebook/presto/operator/ForExchange.java | 2 +- .../presto/operator/ForScheduler.java | 2 +- .../presto/operator/HashBuilderOperator.java | 5 +- .../operator/InterpretedHashGenerator.java | 3 +- .../presto/operator/JoinFilterFunction.java | 3 +- .../facebook/presto/operator/JoinHash.java | 3 +- .../facebook/presto/operator/JoinProbe.java | 3 +- .../presto/operator/LookupJoinOperator.java | 3 +- .../presto/operator/LookupJoinOperators.java | 3 +- .../presto/operator/LookupSource.java | 3 +- .../presto/operator/MergeHashSort.java | 3 +- .../presto/operator/OperationTimer.java | 5 +- .../presto/operator/OperatorContext.java | 7 +- .../presto/operator/OperatorStats.java | 5 +- .../presto/operator/OuterLookupSource.java | 7 +- .../presto/operator/PageBufferClient.java | 7 +- .../facebook/presto/operator/PagesIndex.java | 3 +- .../operator/PagesSpatialIndexFactory.java | 7 +- .../operator/PartitionedConsumption.java | 7 +- .../operator/PartitionedLookupSource.java | 7 +- .../PartitionedLookupSourceFactory.java | 7 +- .../presto/operator/PipelineContext.java | 3 +- .../presto/operator/PipelineStats.java | 5 +- .../presto/operator/PipelineStatus.java | 2 +- .../presto/operator/ReferenceCount.java | 5 +- .../presto/operator/SetBuilderOperator.java | 5 +- .../presto/operator/SimpleArrayAllocator.java | 3 +- .../presto/operator/SpatialJoinOperator.java | 3 +- .../operator/SpilledLookupSourceHandle.java | 7 +- .../facebook/presto/operator/TaskContext.java | 5 +- .../operator/TaskExchangeClientManager.java | 3 +- .../UncheckedStackArrayAllocator.java | 3 +- .../facebook/presto/operator/WindowInfo.java | 3 +- .../presto/operator/WindowOperator.java | 3 +- .../presto/operator/WorkProcessor.java | 3 +- .../presto/operator/WorkProcessorUtils.java | 3 +- .../AggregationFromAnnotationsParser.java | 3 +- .../GenericAccumulatorFactory.java | 3 +- .../noisyaggregation/sketch/SfmSketch.java | 3 +- .../partial/SkipAggregationBuilder.java | 3 +- .../reservoirsample/ReservoirSample.java | 3 +- .../sketch/kll/KllSketchAggregationState.java | 3 +- .../LongDecimalWithOverflowStateFactory.java | 3 +- .../annotations/FunctionsParserHelper.java | 3 +- .../operator/exchange/LocalExchange.java | 5 +- .../exchange/LocalExchangeMemoryManager.java | 7 +- .../exchange/LocalExchangeSource.java | 7 +- .../operator/exchange/PageReference.java | 3 +- .../operator/index/IndexJoinLookupStats.java | 3 +- .../presto/operator/index/IndexLoader.java | 7 +- .../operator/index/IndexLookupSource.java | 3 +- .../presto/operator/index/IndexSnapshot.java | 3 +- .../presto/operator/index/PageBuffer.java | 3 +- .../index/PagesIndexBuilderOperator.java | 3 +- .../operator/index/StreamingIndexedData.java | 3 +- .../presto/operator/index/UpdateRequest.java | 3 +- .../DictionaryAwarePageProjection.java | 3 +- .../operator/project/MergingPageOutput.java | 5 +- .../operator/project/PageProcessor.java | 3 +- .../AbstractBlockEncodingBuffer.java | 3 +- .../OptimizedPartitionedOutputOperator.java | 3 +- .../PartitionedOutputOperator.java | 3 +- .../presto/operator/scalar/UrlFunctions.java | 3 +- .../operator/unnest/UnnestBlockBuilder.java | 3 +- .../ClusterMemoryManagerService.java | 7 +- .../ClusterQueryTrackerService.java | 7 +- .../resourcemanager/ForResourceManager.java | 2 +- .../RandomResourceManagerAddressSelector.java | 3 +- .../presto/resourcemanager/RatisServer.java | 5 +- .../ResourceManagerClusterStateProvider.java | 5 +- .../ResourceManagerConfig.java | 3 +- .../ResourceManagerResourceGroupService.java | 3 +- .../ResourceManagerServer.java | 3 +- .../presto/security/AccessControlManager.java | 3 +- .../server/AsyncHttpExecutionMBean.java | 3 +- .../presto/server/BasicQueryInfo.java | 5 +- .../presto/server/BasicQueryStats.java | 3 +- .../presto/server/ExchangeExecutionMBean.java | 3 +- .../facebook/presto/server/ForAsyncRpc.java | 2 +- .../presto/server/ForStatementResource.java | 2 +- .../facebook/presto/server/ForWorkerInfo.java | 2 +- .../server/GracefulShutdownHandler.java | 7 +- .../server/InternalCommunicationConfig.java | 5 +- .../presto/server/NodeResourceStatus.java | 3 +- .../facebook/presto/server/PluginManager.java | 5 +- .../presto/server/PluginManagerConfig.java | 3 +- .../presto/server/QuerySessionSupplier.java | 5 +- .../presto/server/ResourceGroupInfo.java | 3 +- .../facebook/presto/server/ServerConfig.java | 3 +- .../presto/server/SessionContext.java | 3 +- .../server/SessionPropertyDefaults.java | 3 +- .../SimpleHttpResponseHandlerStats.java | 5 +- .../server/SqlInvokedFunctionCodec.java | 3 +- .../server/StatementHttpExecutionMBean.java | 3 +- .../protocol/QueryBlockingRateLimiter.java | 3 +- .../presto/server/remotetask/Backoff.java | 3 +- .../security/PrestoAuthenticatorManager.java | 3 +- .../server/security/SecurityConfig.java | 3 +- .../thrift/ThriftServerInfoService.java | 3 +- .../server/thrift/ThriftTaskService.java | 3 +- .../facebook/presto/spiller/FileHolder.java | 4 +- .../spiller/FileSingleStreamSpiller.java | 3 +- .../FileSingleStreamSpillerFactory.java | 5 +- .../spiller/GenericPartitioningSpiller.java | 3 +- .../presto/spiller/GenericSpiller.java | 3 +- .../presto/spiller/LocalSpillContext.java | 3 +- .../presto/spiller/LocalTempStorage.java | 3 +- .../presto/spiller/NodeSpillConfig.java | 3 +- .../presto/spiller/SpillSpaceTracker.java | 5 +- .../TempStorageSingleStreamSpiller.java | 3 +- ...TempStorageSingleStreamSpillerFactory.java | 3 +- .../TempStorageStandaloneSpillerFactory.java | 3 +- .../split/CloseableSplitSourceProvider.java | 3 +- .../presto/split/SampledSplitSource.java | 3 +- .../facebook/presto/split/SplitManager.java | 3 +- .../facebook/presto/sql/Serialization.java | 3 +- .../presto/sql/SqlEnvironmentConfig.java | 5 +- .../sql/analyzer/AggregationAnalyzer.java | 3 +- .../sql/analyzer/AnalyzerProviderManager.java | 3 +- .../BuiltInQueryPreparerProvider.java | 3 +- .../sql/analyzer/ExpressionAnalyzer.java | 3 +- .../presto/sql/analyzer/FeaturesConfig.java | 11 +- .../sql/analyzer/ForMetadataExtractor.java | 2 +- .../presto/sql/analyzer/FunctionsConfig.java | 3 +- .../sql/analyzer/MetadataExtractorMBean.java | 3 +- .../presto/sql/analyzer/QueryExplainer.java | 3 +- .../QueryPreparerProviderManager.java | 3 +- ...reshMaterializedViewPredicateAnalyzer.java | 3 +- .../ExpressionOptimizerManager.java | 3 +- .../presto/sql/gen/CompilerOperations.java | 3 +- .../presto/sql/gen/ExpressionCompiler.java | 3 +- .../facebook/presto/sql/gen/JoinCompiler.java | 3 +- .../sql/gen/JoinFilterFunctionCompiler.java | 3 +- .../presto/sql/gen/PageFunctionCompiler.java | 5 +- .../gen/RowExpressionPredicateCompiler.java | 3 +- .../presto/sql/planner/CompilerConfig.java | 3 +- .../ConnectorPlanOptimizerManager.java | 3 +- .../planner/ExpressionDomainTranslator.java | 3 +- .../presto/sql/planner/LazySplitSource.java | 3 +- .../planner/LocalDynamicFiltersCollector.java | 5 +- .../sql/planner/LocalExecutionPlanner.java | 3 +- .../sql/planner/NodePartitioningManager.java | 3 +- .../presto/sql/planner/PlanFragment.java | 3 +- .../presto/sql/planner/PlanFragmenter.java | 3 +- .../presto/sql/planner/PlanOptimizers.java | 7 +- .../presto/sql/planner/RelationPlanner.java | 3 +- .../facebook/presto/sql/planner/SubPlan.java | 3 +- .../presto/sql/planner/iterative/Memo.java | 3 +- .../optimizations/ActualProperties.java | 3 +- .../OptimizerInformationCollector.java | 5 +- .../optimizations/PreferredProperties.java | 3 +- .../presto/sql/planner/plan/ApplyNode.java | 3 +- .../planner/plan/EnforceSingleRowNode.java | 3 +- .../presto/sql/planner/plan/ExchangeNode.java | 3 +- .../sql/planner/plan/ExplainAnalyzeNode.java | 3 +- .../presto/sql/planner/plan/GroupIdNode.java | 3 +- .../sql/planner/plan/IndexJoinNode.java | 3 +- .../sql/planner/plan/LateralJoinNode.java | 3 +- .../presto/sql/planner/plan/OffsetNode.java | 3 +- .../sql/planner/plan/RemoteSourceNode.java | 3 +- .../sql/planner/plan/RowNumberNode.java | 3 +- .../presto/sql/planner/plan/SampleNode.java | 3 +- .../sql/planner/plan/TopNRowNumberNode.java | 3 +- .../presto/sql/planner/plan/UpdateNode.java | 3 +- .../sql/planner/sanity/PlanChecker.java | 3 +- .../PlanCheckerProviderManagerConfig.java | 3 +- .../RowExpressionDeterminismEvaluator.java | 3 +- .../RowExpressionDomainTranslator.java | 5 +- .../presto/storage/TempStorageManager.java | 3 +- .../com/facebook/presto/tdigest/Centroid.java | 2 +- .../com/facebook/presto/tdigest/TDigest.java | 3 +- .../testing/TestingAccessControlManager.java | 3 +- .../testing/TestingWarningCollector.java | 5 +- .../presto/tracing/TracerProviderManager.java | 3 +- .../transaction/ForTransactionManager.java | 2 +- .../InMemoryTransactionManager.java | 5 +- .../transaction/TransactionManagerConfig.java | 5 +- .../ConfidenceBasedNodeTtlFetcherManager.java | 5 +- .../presto/type/TypeDeserializer.java | 3 +- .../facebook/presto/util/DateTimeUtils.java | 3 +- .../com/facebook/presto/util/Failures.java | 3 +- .../presto/util/FinalizerService.java | 9 +- .../facebook/presto/util/GcStatusMonitor.java | 6 +- .../com/facebook/presto/util/PowerOfTwo.java | 4 +- .../presto/util/PowerOfTwoValidator.java | 4 +- .../facebook/presto/util/QueryInfoUtils.java | 100 ++++++++++++++++ .../facebook/presto/version/EmbedVersion.java | 3 +- .../execution/MockRemoteTaskFactory.java | 3 +- .../execution/buffer/TestClientBuffer.java | 5 +- .../operator/scalar/TestScalarValidation.java | 3 +- .../server/TestThriftTaskIntegration.java | 3 +- .../presto/split/MockSplitSource.java | 3 +- .../facebook/presto/util/MockPowerOfTwo.java | 3 +- .../presto/dispatcher/LocalDispatchQuery.java | 2 +- .../dispatcher/LocalDispatchQueryFactory.java | 3 +- .../execution/MemoryRevokingScheduler.java | 7 +- .../presto/execution/SqlQueryManager.java | 9 +- .../FailureDetectorConfig.java | 9 +- .../HeartbeatFailureDetector.java | 13 +-- .../presto/memory/ClusterMemoryManager.java | 7 +- .../presto/memory/HighMemoryTaskKiller.java | 6 +- .../presto/memory/MemoryResource.java | 23 ++-- .../presto/memory/RemoteNodeMemory.java | 5 +- .../presto/metadata/DiscoveryNodeManager.java | 11 +- .../presto/metadata/HttpRemoteNodeState.java | 7 +- .../presto/operator/HttpRpcShuffleClient.java | 3 +- .../operator/ThriftRpcShuffleClient.java | 3 +- .../DistributedClusterStatsResource.java | 15 ++- .../DistributedQueryInfoResource.java | 33 +++--- .../DistributedQueryResource.java | 39 +++---- .../DistributedResourceGroupInfoResource.java | 31 +++-- .../DistributedTaskInfoResource.java | 31 +++-- .../ResourceManagerClusterStatusSender.java | 7 +- .../resourcemanager/ResourceManagerProxy.java | 15 ++- .../AsyncPageTransportForwardFilter.java | 14 +-- .../server/AsyncPageTransportServlet.java | 25 ++-- .../presto/server/CatalogServerModule.java | 3 +- .../presto/server/ClusterStatsResource.java | 33 +++--- .../presto/server/CoordinatorModule.java | 7 +- .../server/HttpRequestSessionContext.java | 13 +-- .../presto/server/HttpServerModule.java | 5 +- .../server/InternalAuthenticationManager.java | 5 +- .../facebook/presto/server/NodeResource.java | 9 +- .../facebook/presto/server/QueryResource.java | 43 ++++--- .../presto/server/QueryStateInfoResource.java | 41 ++++--- .../presto/server/RequestErrorTracker.java | 3 +- .../presto/server/RequestHelpers.java | 2 +- .../ResourceGroupStateInfoResource.java | 43 ++++--- .../ResourceManagerHeartbeatResource.java | 11 +- .../presto/server/ResourceManagerModule.java | 3 +- .../server/SerializedPageWriteListener.java | 7 +- .../presto/server/ServerInfoResource.java | 25 ++-- .../presto/server/ServerMainModule.java | 9 +- .../facebook/presto/server/StageResource.java | 11 +- .../presto/server/StatusResource.java | 17 ++- .../presto/server/TaskExecutorResource.java | 13 +-- .../presto/server/TaskInfoResource.java | 37 +++--- .../facebook/presto/server/TaskResource.java | 41 ++++--- .../presto/server/ThreadResource.java | 11 +- .../presto/server/ThrowableMapper.java | 19 ++- .../facebook/presto/server/WebUiResource.java | 16 +-- .../facebook/presto/server/WorkerModule.java | 3 +- .../presto/server/WorkerResource.java | 21 ++-- .../ExecutingQueryResponseProvider.java | 5 +- .../protocol/ExecutingStatementResource.java | 33 +++--- .../LocalExecutingQueryResponseProvider.java | 9 +- .../server/protocol/LocalQueryProvider.java | 15 ++- .../presto/server/protocol/Query.java | 15 ++- .../server/protocol/QueryResourceUtil.java | 109 ++---------------- .../protocol/QueuedStatementResource.java | 75 ++++++------ .../ContinuousTaskStatusFetcher.java | 3 +- .../remotetask/HttpLocationFactory.java | 3 +- .../server/remotetask/HttpRemoteTask.java | 5 +- .../remotetask/HttpRemoteTaskFactory.java | 5 +- .../HttpRemoteTaskWithEventLoop.java | 3 +- .../server/remotetask/TaskInfoFetcher.java | 3 +- .../server/security/AuthenticationFilter.java | 25 ++-- .../security/CustomPrestoAuthenticator.java | 5 +- .../InternalAuthenticationFilter.java | 21 ++-- .../security/JsonWebTokenAuthenticator.java | 4 +- .../server/security/JsonWebTokenConfig.java | 3 +- .../security/PasswordAuthenticator.java | 5 +- .../server/security/ServletSecurityUtils.java | 3 +- .../server/testing/TestingPrestoServer.java | 15 ++- .../ThriftTaskUpdateRequestBodyReader.java | 15 ++- .../presto/TestClientRequestFilterPlugin.java | 3 +- .../TestHeartbeatFailureDetector.java | 5 +- .../metadata/TestDiscoveryNodeManager.java | 3 +- .../TestingExchangeHttpClientHandler.java | 2 +- ...estResourceManagerClusterStatusSender.java | 0 .../server/MockContainerRequestContext.java | 36 ++++-- .../presto/server/MockHttpServletRequest.java | 60 +++++----- .../server/TestGenerateTokenFilter.java | 11 +- .../server/TestHttpRequestSessionContext.java | 5 +- .../presto/server/TestParseToJsonData.java | 0 .../server/TestQuerySessionSupplier.java | 3 +- .../facebook/presto/server/TestServer.java | 8 +- .../presto/server/TestThreadResource.java | 0 .../TestThriftServerInfoIntegration.java | 3 +- .../server/remotetask/TestHttpRemoteTask.java | 27 +++-- .../TestHttpRemoteTaskWithEventLoop.java | 27 +++-- .../TestCustomPrestoAuthenticator.java | 3 +- .../TestInternalAuthenticationFilter.java | 7 +- .../TestJsonWebTokenAuthenticator.java | 3 +- .../AbstractAggregatedMemoryContext.java | 7 +- .../memory/context/MemoryTrackingContext.java | 3 +- .../context/SimpleLocalMemoryContext.java | 5 +- .../presto/plugin/memory/MemoryConfig.java | 3 +- .../presto/plugin/memory/MemoryConnector.java | 3 +- .../presto/plugin/memory/MemoryMetadata.java | 5 +- .../plugin/memory/MemoryPageSinkProvider.java | 3 +- .../memory/MemoryPageSourceProvider.java | 3 +- .../plugin/memory/MemoryPagesStore.java | 7 +- .../plugin/memory/MemorySplitManager.java | 3 +- .../presto/mongodb/MongoClientConfig.java | 7 +- .../presto/mongodb/MongoClientModule.java | 3 +- .../presto/mongodb/MongoConnector.java | 3 +- .../presto/mongodb/MongoPageSinkProvider.java | 3 +- .../mongodb/MongoPageSourceProvider.java | 3 +- .../presto/mongodb/MongoSplitManager.java | 3 +- .../presto/plugin/mysql/MySqlClient.java | 8 +- .../presto/plugin/mysql/MySqlConfig.java | 3 +- .../core/special/Distribution.java | 5 +- .../src/checkstyle/presto-checks.xml | 2 +- .../NativeFunctionNamespaceManager.java | 3 +- .../PlanConversionFailureInfo.java | 5 +- .../presto/plugin/oracle/OracleClient.java | 3 +- .../presto/plugin/oracle/OracleConfig.java | 7 +- .../facebook/presto/orc/OrcOutputBuffer.java | 3 +- .../presto/orc/OrcSelectiveRecordReader.java | 3 +- .../com/facebook/presto/orc/OrcWriter.java | 3 +- .../metadata/statistics/StringStatistics.java | 3 +- .../AbstractLongSelectiveStreamReader.java | 3 +- .../orc/reader/BooleanBatchStreamReader.java | 3 +- .../reader/BooleanSelectiveStreamReader.java | 3 +- .../orc/reader/ByteBatchStreamReader.java | 3 +- .../orc/reader/ByteSelectiveStreamReader.java | 3 +- .../orc/reader/DecimalBatchStreamReader.java | 3 +- .../orc/reader/DoubleBatchStreamReader.java | 3 +- .../reader/DoubleSelectiveStreamReader.java | 3 +- .../orc/reader/FloatBatchStreamReader.java | 3 +- .../orc/reader/ListBatchStreamReader.java | 3 +- .../presto/orc/reader/ListFilter.java | 3 +- .../orc/reader/ListSelectiveStreamReader.java | 3 +- .../LongDictionaryBatchStreamReader.java | 3 +- .../LongDictionarySelectiveStreamReader.java | 3 +- .../reader/LongDirectBatchStreamReader.java | 3 +- .../LongDirectSelectiveStreamReader.java | 3 +- .../orc/reader/LongSelectiveStreamReader.java | 3 +- .../reader/MapDirectBatchStreamReader.java | 3 +- .../MapDirectSelectiveStreamReader.java | 3 +- .../orc/reader/MapFlatBatchStreamReader.java | 3 +- .../reader/MapFlatSelectiveStreamReader.java | 3 +- .../orc/reader/MapSelectiveStreamReader.java | 3 +- .../orc/reader/SelectiveReaderContext.java | 3 +- .../SliceDictionaryBatchStreamReader.java | 3 +- .../SliceDictionarySelectiveReader.java | 3 +- .../reader/SliceDirectBatchStreamReader.java | 3 +- .../SliceDirectSelectiveStreamReader.java | 3 +- .../reader/SliceSelectiveStreamReader.java | 3 +- .../orc/reader/StructBatchStreamReader.java | 3 +- .../reader/StructSelectiveStreamReader.java | 3 +- .../reader/TimestampBatchStreamReader.java | 3 +- .../TimestampSelectiveStreamReader.java | 3 +- .../stream/CheckpointInputStreamSource.java | 3 +- .../presto/orc/stream/InputStreamSource.java | 2 +- .../orc/stream/MissingInputStreamSource.java | 2 +- .../orc/stream/PresentOutputStream.java | 3 +- .../presto/orc/stream/SharedBuffer.java | 3 +- .../orc/stream/ValueInputStreamSource.java | 2 +- .../orc/writer/CompressionBufferPool.java | 3 +- .../orc/writer/DictionaryRowGroupBuilder.java | 3 +- .../orc/BenchmarkSelectiveStreamReaders.java | 3 +- .../parquet/writer/PrimitiveColumnWriter.java | 3 +- .../writer/valuewriter/UuidValuesWriter.java | 3 +- .../presto/sql/ExpressionFormatter.java | 4 +- .../com/facebook/presto/sql/SqlFormatter.java | 4 +- .../presto/sql/parser/AstBuilder.java | 14 +-- .../RefreshableSqlBaseParserInitializer.java | 2 +- .../facebook/presto/sql/parser/SqlParser.java | 3 +- .../presto/sql/testing/TreeAssertions.java | 3 +- .../facebook/presto/sql/tree/AstVisitor.java | 2 +- .../com/facebook/presto/sql/tree/Extract.java | 3 +- .../presto/sql/tree/QualifiedName.java | 10 +- .../password/file/FileAuthenticator.java | 3 +- .../presto/password/file/FileConfig.java | 3 +- .../password/ldap/LdapAuthenticator.java | 2 +- .../presto/password/ldap/LdapConfig.java | 5 +- .../presto/password/ldap/TestLdapConfig.java | 5 +- .../com/facebook/presto/pinot/ForPinot.java | 2 +- .../presto/pinot/PinotClusterInfoFetcher.java | 3 +- .../facebook/presto/pinot/PinotConfig.java | 5 +- .../presto/pinot/PinotConnection.java | 3 +- .../facebook/presto/pinot/PinotConnector.java | 3 +- .../facebook/presto/pinot/PinotMetadata.java | 3 +- .../facebook/presto/pinot/PinotMetrics.java | 3 +- .../presto/pinot/PinotMetricsStats.java | 3 +- .../facebook/presto/pinot/PinotModule.java | 3 +- .../presto/pinot/PinotPageSourceProvider.java | 3 +- .../presto/pinot/PinotPlanOptimizer.java | 3 +- .../presto/pinot/PinotSessionProperties.java | 3 +- .../presto/pinot/PinotSplitManager.java | 3 +- .../presto/pinot/RebindSafeMBeanServer.java | 3 +- .../PinotBrokerAuthenticationProvider.java | 3 +- ...PinotControllerAuthenticationProvider.java | 3 +- .../pinot/query/PinotQueryGenerator.java | 3 +- .../PlanCheckerRouterPluginPrestoClient.java | 4 +- .../PlanCheckerRouterPluginScheduler.java | 3 +- .../TestPlanCheckerRouterPlugin.java | 7 +- .../base/security/FileBasedAccessControl.java | 3 +- .../FileBasedAccessControlConfig.java | 3 +- .../plugin/postgresql/PostgreSqlClient.java | 3 +- .../tests/hive/HivePartitioningTest.java | 3 +- .../tests/hive/TestHivePartitionsTable.java | 3 +- .../hive/TestSymlinkTableListCaching.java | 3 +- .../presto/tests/hive/TestSymlinkTables.java | 3 +- .../tests/hive/TestSyncPartitionMetadata.java | 3 +- .../facebook/presto/tests/jdbc/JdbcTests.java | 5 +- .../QueryStatsClientModuleProvider.java | 3 +- .../plugin/prometheus/PrometheusClient.java | 2 +- .../plugin/prometheus/PrometheusClock.java | 2 +- .../prometheus/PrometheusConnector.java | 3 +- .../prometheus/PrometheusConnectorConfig.java | 5 +- .../plugin/prometheus/PrometheusMetadata.java | 3 +- .../plugin/prometheus/PrometheusModule.java | 3 +- .../PrometheusRecordSetProvider.java | 3 +- .../prometheus/PrometheusSplitManager.java | 3 +- .../prometheus/PrometheusHttpServer.java | 9 +- .../com/facebook/presto/proxy/ForProxy.java | 2 +- .../presto/proxy/JsonWebTokenHandler.java | 3 +- .../facebook/presto/proxy/ProxyConfig.java | 3 +- .../facebook/presto/proxy/ProxyResource.java | 47 ++++---- .../facebook/presto/rcfile/RcFileWriter.java | 3 +- .../decoder/DispatchingRowDecoderFactory.java | 3 +- .../decoder/json/JsonRowDecoderFactory.java | 3 +- .../facebook/presto/redis/RedisConnector.java | 3 +- .../presto/redis/RedisConnectorConfig.java | 5 +- .../presto/redis/RedisConnectorModule.java | 3 +- .../presto/redis/RedisJedisManager.java | 6 +- .../facebook/presto/redis/RedisMetadata.java | 3 +- .../presto/redis/RedisRecordSetProvider.java | 3 +- .../presto/redis/RedisSplitManager.java | 3 +- .../redis/RedisTableDescriptionSupplier.java | 3 +- .../plugin/redshift/RedshiftClient.java | 3 +- .../AbstractResourceConfigurationManager.java | 3 +- .../FileResourceGroupConfig.java | 3 +- ...FileResourceGroupConfigurationManager.java | 3 +- .../resourceGroups/db/ForEnvironment.java | 2 +- .../resourceGroups/db/MysqlDaoProvider.java | 5 +- ...dingResourceGroupConfigurationManager.java | 9 +- .../resourceGroups/db/H2DaoProvider.java | 5 +- .../facebook/presto/router/RouterConfig.java | 3 +- .../presto/router/RouterPluginManager.java | 5 +- .../presto/router/RouterResource.java | 25 ++-- .../presto/router/cluster/ClusterManager.java | 5 +- .../router/cluster/ClusterStatusResource.java | 15 ++- .../router/cluster/ForClusterInfoTracker.java | 2 +- .../router/cluster/ForQueryInfoTracker.java | 2 +- .../router/cluster/RemoteInfoFactory.java | 3 +- .../router/cluster/RemoteQueryInfo.java | 3 +- .../presto/router/cluster/RemoteState.java | 7 +- .../presto/router/cluster/RequestInfo.java | 3 +- .../predictor/ForQueryCpuPredictor.java | 2 +- .../predictor/ForQueryMemoryPredictor.java | 2 +- .../router/predictor/PredictorManager.java | 3 +- .../presto/router/predictor/RemoteQuery.java | 3 +- .../router/predictor/RemoteQueryCpu.java | 3 +- .../router/predictor/RemoteQueryFactory.java | 3 +- .../router/predictor/RemoteQueryMemory.java | 3 +- .../router/scheduler/RoundRobinScheduler.java | 3 +- .../presto/router/TestHealthChecks.java | 3 +- .../router/TestRouterAuthentication.java | 3 +- .../facebook/presto/router/TestSelectors.java | 3 +- presto-server/NOTICE | 2 +- .../session/FileSessionPropertyManager.java | 3 +- .../FileSessionPropertyManagerConfig.java | 3 +- .../plugin/singlestore/SingleStoreClient.java | 3 +- .../presto/spark/PrestoSparkConfig.java | 9 +- .../presto/spark/PrestoSparkModule.java | 2 +- .../PrestoSparkQueryExecutionFactory.java | 5 +- .../presto/spark/PrestoSparkService.java | 3 +- .../spark/PrestoSparkSessionContext.java | 3 +- .../spark/PrestoSparkSessionProperties.java | 3 +- ...toSparkSessionPropertyManagerProvider.java | 5 +- .../PrestoSparkAccessControlChecker.java | 3 +- .../AbstractPrestoSparkQueryExecution.java | 3 +- .../execution/PrestoSparkDiskPageInput.java | 3 +- .../PrestoSparkExecutionExceptionFactory.java | 3 +- .../execution/PrestoSparkOutputBuffer.java | 3 +- .../spark/execution/PrestoSparkPageInput.java | 5 +- .../spark/execution/PrestoSparkRowBatch.java | 3 +- .../PrestoSparkSerializedPageInput.java | 3 +- .../property/NativeExecutionNodeConfig.java | 3 +- .../shuffle/PrestoSparkShufflePageInput.java | 3 +- .../task/PrestoSparkTaskExecution.java | 5 +- .../task/PrestoSparkTaskExecutorFactory.java | 3 +- .../PrestoSparkNodePartitioningManager.java | 3 +- .../planner/IterativePlanFragmenter.java | 3 +- .../planner/PrestoSparkPlanFragmenter.java | 3 +- .../planner/PrestoSparkQueryPlanner.java | 3 +- .../spark/planner/PrestoSparkRddFactory.java | 3 +- .../PrestoSparkStatsCalculatorModule.java | 3 +- .../optimizers/AdaptivePlanOptimizers.java | 7 +- .../spark/util/PrestoSparkFailureUtils.java | 3 +- .../spark/PrestoSparkQueryStatusInfo.java | 3 +- .../launcher/PrestoSparkLauncherCommand.java | 3 +- presto-spark-package/NOTICE | 2 +- .../spi/eventlistener/OperatorStatistics.java | 3 +- .../spi/function/TypeVariableConstraint.java | 3 +- .../facebook/presto/spi/page/PagesSerde.java | 3 - .../presto/spi/plan/AggregationNode.java | 3 +- .../presto/spi/plan/CteConsumerNode.java | 3 +- .../presto/spi/plan/CteProducerNode.java | 3 +- .../presto/spi/plan/CteReferenceNode.java | 3 +- .../plan/DataOrganizationSpecification.java | 3 +- .../facebook/presto/spi/plan/DeleteNode.java | 3 +- .../presto/spi/plan/DistinctLimitNode.java | 3 +- .../facebook/presto/spi/plan/ExceptNode.java | 3 +- .../facebook/presto/spi/plan/FilterNode.java | 3 +- .../presto/spi/plan/IntersectNode.java | 3 +- .../facebook/presto/spi/plan/JoinNode.java | 3 +- .../facebook/presto/spi/plan/LimitNode.java | 3 +- .../presto/spi/plan/MarkDistinctNode.java | 3 +- .../presto/spi/plan/MergeJoinNode.java | 3 +- .../presto/spi/plan/MetadataDeleteNode.java | 3 +- .../facebook/presto/spi/plan/Ordering.java | 3 +- .../facebook/presto/spi/plan/OutputNode.java | 3 +- .../presto/spi/plan/Partitioning.java | 3 +- .../presto/spi/plan/PlanFragmentId.java | 3 +- .../facebook/presto/spi/plan/PlanNodeId.java | 3 +- .../facebook/presto/spi/plan/ProjectNode.java | 3 +- .../presto/spi/plan/SemiJoinNode.java | 3 +- .../presto/spi/plan/SetOperationNode.java | 3 +- .../presto/spi/plan/SpatialJoinNode.java | 3 +- .../presto/spi/plan/TableFinishNode.java | 3 +- .../presto/spi/plan/TableScanNode.java | 5 +- .../presto/spi/plan/TableWriterNode.java | 3 +- .../facebook/presto/spi/plan/TopNNode.java | 3 +- .../facebook/presto/spi/plan/UnionNode.java | 3 +- .../facebook/presto/spi/plan/UnnestNode.java | 3 +- .../facebook/presto/spi/plan/ValuesNode.java | 3 +- .../facebook/presto/spi/plan/WindowNode.java | 3 +- .../presto/spi/procedure/Procedure.java | 3 +- .../presto/spi/relation/CallExpression.java | 3 +- .../spi/relation/ConstantExpression.java | 3 +- .../relation/InputReferenceExpression.java | 3 +- .../relation/LambdaDefinitionExpression.java | 3 +- .../spi/relation/SpecialFormExpression.java | 3 +- .../relation/VariableReferenceExpression.java | 3 +- .../plugin/sqlserver/SqlServerClient.java | 3 +- .../testing/TestingPrestoServerLauncher.java | 3 +- .../services/LogTestDurationListener.java | 3 +- .../presto/tests/H2ConnectionModule.java | 7 +- .../facebook/presto/execution/TestQueues.java | 5 +- .../db/H2ResourceGroupsModule.java | 3 +- .../server/TestAsyncPageTransportServlet.java | 5 +- .../tests/TestRestSqlFunctionExecutor.java | 15 ++- .../presto/tests/TestServerInfoResource.java | 5 +- .../connector/PrestoThriftColumnMetadata.java | 3 +- .../PrestoThriftNullableColumnSet.java | 3 +- .../PrestoThriftNullableSchemaName.java | 3 +- .../PrestoThriftNullableTableMetadata.java | 3 +- .../connector/PrestoThriftNullableToken.java | 3 +- .../api/connector/PrestoThriftPageResult.java | 3 +- .../api/connector/PrestoThriftSplitBatch.java | 3 +- .../connector/PrestoThriftTableMetadata.java | 3 +- .../connector/PrestoThriftTupleDomain.java | 3 +- .../api/datatypes/PrestoThriftBigint.java | 3 +- .../datatypes/PrestoThriftBigintArray.java | 3 +- .../api/datatypes/PrestoThriftBlock.java | 7 +- .../api/datatypes/PrestoThriftBoolean.java | 3 +- .../api/datatypes/PrestoThriftDate.java | 3 +- .../api/datatypes/PrestoThriftDouble.java | 3 +- .../datatypes/PrestoThriftHyperLogLog.java | 3 +- .../api/datatypes/PrestoThriftInteger.java | 3 +- .../api/datatypes/PrestoThriftJson.java | 3 +- .../api/datatypes/PrestoThriftTimestamp.java | 3 +- .../api/datatypes/PrestoThriftVarchar.java | 3 +- .../thrift/api/datatypes/SliceData.java | 3 +- .../presto/thrift/api/udf/ThriftUdfPage.java | 3 +- .../api/udf/UdfExecutionFailureInfo.java | 5 +- .../valuesets/PrestoThriftRangeValueSet.java | 3 +- .../api/valuesets/PrestoThriftValueSet.java | 3 +- .../connector/thrift/ThriftColumnHandle.java | 3 +- .../connector/thrift/ThriftConnector.java | 3 +- .../thrift/ThriftConnectorConfig.java | 5 +- .../thrift/ThriftIndexPageSource.java | 3 +- .../connector/thrift/ThriftIndexProvider.java | 3 +- .../connector/thrift/ThriftMetadata.java | 3 +- .../presto/connector/thrift/ThriftModule.java | 3 +- .../thrift/ThriftPageSourceProvider.java | 3 +- .../thrift/ThriftSessionProperties.java | 3 +- .../connector/thrift/ThriftSplitManager.java | 5 +- .../annotations/ForMetadataRefresh.java | 2 +- .../ExtendedSimpleAddressSelectorBinder.java | 54 ++++++++- .../thrift/util/RebindSafeMBeanServer.java | 2 +- .../thrift/server/ThriftTpchService.java | 5 +- .../TableStatisticsDataRepository.java | 6 +- .../tpch/statistics/StatisticsEstimator.java | 4 +- .../TableStatisticsDataRepository.java | 6 +- .../presto/tpch/TestTpchMetadata.java | 7 +- presto-verifier/NOTICE | 2 +- .../verifier/annotation/ForControl.java | 2 +- .../presto/verifier/annotation/ForHelper.java | 2 +- .../presto/verifier/annotation/ForTest.java | 2 +- .../checksum/ArrayColumnChecksum.java | 2 +- .../checksum/ArrayColumnValidator.java | 3 +- .../verifier/checksum/ChecksumValidator.java | 5 +- .../checksum/FloatingPointColumnChecksum.java | 2 +- .../FloatingPointColumnValidator.java | 3 +- .../verifier/checksum/MapColumnChecksum.java | 2 +- .../verifier/checksum/MapColumnValidator.java | 3 +- .../verifier/checksum/RowColumnValidator.java | 5 +- .../checksum/SimpleColumnChecksum.java | 2 +- .../checksum/SimpleColumnValidator.java | 3 +- .../event/DeterminismAnalysisDetails.java | 3 +- .../event/DeterminismAnalysisRun.java | 3 +- .../event/HumanReadableEventClient.java | 3 +- .../verifier/event/JsonEventClient.java | 3 +- .../presto/verifier/event/QueryFailure.java | 3 +- .../presto/verifier/event/QueryInfo.java | 3 +- .../verifier/event/VerifierQueryEvent.java | 3 +- .../framework/DeterminismAnalyzerConfig.java | 5 +- .../QueryConfigurationOverridesConfig.java | 3 +- .../framework/VerificationFactory.java | 3 +- .../framework/VerificationManager.java | 7 +- .../verifier/framework/VerifierConfig.java | 5 +- .../verifier/framework/VerifierModule.java | 5 +- .../DefaultClientInfoFactory.java | 3 +- .../prestoaction/JdbcUrlSelector.java | 3 +- .../prestoaction/PrestoActionConfig.java | 7 +- .../prestoaction/QueryActionsConfig.java | 3 +- .../prestoaction/QueryActionsModule.java | 3 +- .../verifier/resolver/ClusterSizeFetcher.java | 6 +- .../FailureResolverManagerFactory.java | 3 +- .../IgnoredFunctionsMismatchResolver.java | 3 +- .../TooManyOpenPartitionsFailureResolver.java | 3 +- ...nyOpenPartitionsFailureResolverConfig.java | 3 +- .../verifier/retry/ForClusterConnection.java | 2 +- .../presto/verifier/retry/ForPresto.java | 2 +- .../presto/verifier/retry/RetryConfig.java | 3 +- .../verifier/rewrite/QueryRewriteConfig.java | 3 +- .../VerificationQueryRewriterFactory.java | 3 +- .../AbstractJdbiSnapshotQueryConsumer.java | 3 +- .../AbstractJdbiSnapshotQuerySupplier.java | 3 +- .../AbstractJdbiSourceQuerySupplier.java | 3 +- .../source/MySqlSourceQueryConfig.java | 3 +- .../source/MySqlSourceQuerySupplier.java | 3 +- .../source/MysqlSnapshotQueryConsumer.java | 3 +- .../source/MysqlSnapshotQuerySupplier.java | 3 +- .../source/PrestoQuerySourceQueryConfig.java | 3 +- .../PrestoQuerySourceQuerySupplier.java | 3 +- .../presto/verifier/VerifierTestUtil.java | 3 +- .../RedisPlanStatisticsProvider.java | 3 +- .../statistic/RedisProviderApiStats.java | 3 +- 1293 files changed, 2518 insertions(+), 3596 deletions(-) create mode 100644 presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/AbstractAnnotatedProvider.java delete mode 100644 presto-main-base/src/main/java/com/facebook/presto/dispatcher/CoordinatorLocation.java delete mode 100644 presto-main-base/src/main/java/com/facebook/presto/dispatcher/LocalCoordinatorLocation.java rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/memory/MemoryResource.java (86%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java (98%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java (90%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java (95%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java (90%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java (96%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/StageResource.java (88%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/StatusResource.java (92%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/TaskExecutorResource.java (86%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/ThreadResource.java (97%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/ThrowableMapper.java (81%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/WebUiResource.java (80%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java (97%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/protocol/Query.java (98%) rename {presto-main-base => presto-main}/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java (75%) rename {presto-main-base => presto-main}/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java (100%) rename {presto-main-base => presto-main}/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java (79%) rename {presto-main-base => presto-main}/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java (92%) rename {presto-main-base => presto-main}/src/test/java/com/facebook/presto/server/TestParseToJsonData.java (100%) rename {presto-main-base => presto-main}/src/test/java/com/facebook/presto/server/TestThreadResource.java (100%) rename {presto-main-base => presto-main}/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java (99%) diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloClient.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloClient.java index e923d3d740bb0..3600665a2006b 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloClient.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloClient.java @@ -39,6 +39,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import jakarta.inject.Inject; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; @@ -52,8 +53,6 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.io.Text; -import javax.inject.Inject; - import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloConnector.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloConnector.java index f0a96454c5336..05a34eb9c50b5 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloConnector.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloConnector.java @@ -28,8 +28,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadata.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadata.java index 1829981653204..d585bf8464f88 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadata.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadata.java @@ -42,8 +42,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadataFactory.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadataFactory.java index 89151dda058e0..031c93e1b167f 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadataFactory.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloMetadataFactory.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.accumulo; -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloModule.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloModule.java index 57168596ddeda..28e3b2895bfd4 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloModule.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloModule.java @@ -32,6 +32,8 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; @@ -42,9 +44,6 @@ import org.apache.log4j.Level; import org.apache.log4j.PatternLayout; -import javax.inject.Inject; -import javax.inject.Provider; - import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.airlift.json.JsonBinder.jsonBinder; import static com.facebook.airlift.json.JsonCodecBinder.jsonCodecBinder; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloSplitManager.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloSplitManager.java index e9e2966e6bc12..f1b24c6c745ca 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloSplitManager.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloSplitManager.java @@ -32,8 +32,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloTableManager.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloTableManager.java index 0a7099bf3383d..34292611853be 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloTableManager.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloTableManager.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.spi.PrestoException; +import jakarta.inject.Inject; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; @@ -25,8 +26,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; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java index f99f96e79ac03..b911138c582ad 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java @@ -17,9 +17,8 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.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/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java index 304ba6de591c9..cbf11223a6c25 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java index 2e14a31ece8fe..08614330e51c6 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java @@ -28,6 +28,8 @@ import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.apache.accumulo.core.client.BatchScanner; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableNotFoundException; @@ -39,9 +41,6 @@ import org.apache.commons.lang3.tuple.Pair; 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; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java index 1a766643547fb..92186f3980971 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java @@ -25,6 +25,8 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/Indexer.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/Indexer.java index 02930eec39f08..9ff5a6216cac4 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/Indexer.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/Indexer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.accumulo.index; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.accumulo.Types; import com.facebook.presto.accumulo.iterators.MaxByteArrayCombiner; import com.facebook.presto.accumulo.iterators.MinByteArrayCombiner; @@ -49,8 +50,6 @@ import org.apache.commons.lang3.tuple.Pair; 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/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloPageSinkProvider.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloPageSinkProvider.java index 055c48477d56a..6eeb81127eee6 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloPageSinkProvider.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloPageSinkProvider.java @@ -23,10 +23,9 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; +import jakarta.inject.Inject; import org.apache.accumulo.core.client.Connector; -import javax.inject.Inject; - import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloRecordSetProvider.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloRecordSetProvider.java index e1651443a479f..724fcfb7fa9c5 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloRecordSetProvider.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/io/AccumuloRecordSetProvider.java @@ -24,10 +24,9 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import org.apache.accumulo.core.client.Connector; -import javax.inject.Inject; - import java.util.List; import static com.google.common.base.Preconditions.checkArgument; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/metadata/ZooKeeperMetadataManager.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/metadata/ZooKeeperMetadataManager.java index a581839c16c67..b386a8745450e 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/metadata/ZooKeeperMetadataManager.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/metadata/ZooKeeperMetadataManager.java @@ -23,13 +23,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; 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; diff --git a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Analysis.java b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Analysis.java index d9a75e912cebc..66e3f7b0e4dc2 100644 --- a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Analysis.java +++ b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Analysis.java @@ -59,9 +59,8 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multiset; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; +import jakarta.annotation.Nullable; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparer.java b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparer.java index 02181308de7b9..c3c91c5a46bb5 100644 --- a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparer.java +++ b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparer.java @@ -29,8 +29,7 @@ import com.facebook.presto.sql.tree.Statement; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationId.java b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationId.java index b4ff1ad5f3daf..da12259cac66d 100644 --- a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationId.java +++ b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationId.java @@ -14,8 +14,7 @@ package com.facebook.presto.sql.analyzer; import com.facebook.presto.sql.tree.Node; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static com.google.common.base.MoreObjects.toStringHelper; import static java.lang.String.format; diff --git a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationType.java b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationType.java index 5c3d346bcc941..ad1daf917edb8 100644 --- a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationType.java +++ b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/RelationType.java @@ -17,9 +17,7 @@ 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 javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Collection; import java.util.List; @@ -52,7 +50,7 @@ public RelationType(List fields) { requireNonNull(fields, "fields is null"); this.allFields = ImmutableList.copyOf(fields); - this.visibleFields = ImmutableList.copyOf(Iterables.filter(fields, not(Field::isHidden))); + this.visibleFields = ImmutableList.copyOf(fields.stream().filter(not(Field::isHidden)).iterator()); int index = 0; ImmutableMap.Builder builder = ImmutableMap.builder(); diff --git a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/ResolvedField.java b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/ResolvedField.java index 5cacdb0fd6ada..76fa38c82dd64 100644 --- a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/ResolvedField.java +++ b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/ResolvedField.java @@ -14,8 +14,7 @@ package com.facebook.presto.sql.analyzer; import com.facebook.presto.common.type.Type; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import static java.util.Objects.requireNonNull; diff --git a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Scope.java b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Scope.java index 8d91bfdd3657c..7442c6ba64657 100644 --- a/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Scope.java +++ b/presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/Scope.java @@ -19,8 +19,7 @@ import com.facebook.presto.sql.tree.QualifiedName; import com.facebook.presto.sql.tree.WithQuery; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.HashMap; import java.util.List; @@ -31,7 +30,7 @@ import static com.facebook.presto.sql.analyzer.SemanticExceptions.missingAttributeException; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.util.Objects.requireNonNull; @Immutable @@ -137,7 +136,7 @@ private Optional resolveField(Expression node, QualifiedName name throw ambiguousAttributeException(node, name); } else if (matches.size() == 1) { - return Optional.of(asResolvedField(getOnlyElement(matches), fieldIndexOffset, local)); + return Optional.of(asResolvedField(matches.stream().collect(onlyElement()), fieldIndexOffset, local)); } else { if (isColumnReference(name, relation)) { diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnector.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnector.java index 2898dbec0dcad..c758635db645d 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnector.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnector.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java index 8ca4a2446b6fc..a5e11a9de768e 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java @@ -17,9 +17,8 @@ import com.facebook.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.time.ZoneId; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopMetadata.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopMetadata.java index 3c8084a7d1d7b..04f2e84478935 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopMetadata.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopMetadata.java @@ -31,8 +31,7 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSource.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSource.java index a86debc42dd6e..06fdc089a9401 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSource.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSource.java @@ -22,8 +22,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.time.ZonedDateTime; import java.util.List; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSourceProvider.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSourceProvider.java index 3f5a887f99b59..6ebf0da4e88dd 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSourceProvider.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopPageSourceProvider.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.ZonedDateTime; import java.util.List; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java index 4cd5a2478fe6a..fecf2fea94adf 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java @@ -18,9 +18,8 @@ import com.google.common.util.concurrent.TimeLimiter; import com.google.common.util.concurrent.UncheckedTimeoutException; import io.airlift.units.Duration; - -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.io.BufferedReader; import java.io.IOException; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopSplitManager.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopSplitManager.java index 7e31d72ad62fd..1d0d9b89b1341 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopSplitManager.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopSplitManager.java @@ -25,8 +25,7 @@ import com.facebook.presto.spi.NodeManager; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.ZoneId; import java.time.ZonedDateTime; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopTableLayoutHandle.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopTableLayoutHandle.java index bef9cf5ad8096..ec036f500fec4 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopTableLayoutHandle.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopTableLayoutHandle.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.ConnectorTableLayoutHandle; 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/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowBlockBuilder.java b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowBlockBuilder.java index 3a5ce28cd76fd..ed703f1b2444f 100644 --- a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowBlockBuilder.java +++ b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowBlockBuilder.java @@ -39,6 +39,7 @@ import com.google.common.base.CharMatcher; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.inject.Inject; import org.apache.arrow.vector.BigIntVector; import org.apache.arrow.vector.BitVector; import org.apache.arrow.vector.DateDayVector; @@ -69,8 +70,6 @@ import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Field; -import javax.inject.Inject; - import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.time.Duration; diff --git a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowMetadata.java b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowMetadata.java index 4f94432167ec1..4018e8f25fbaf 100644 --- a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowMetadata.java +++ b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowMetadata.java @@ -29,11 +29,10 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.Schema; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowPageSourceProvider.java b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowPageSourceProvider.java index 216939831a2c8..c4c1571c90657 100644 --- a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowPageSourceProvider.java +++ b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowPageSourceProvider.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplit.java b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplit.java index 9308bd60aa934..497aa42bdf845 100644 --- a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplit.java +++ b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplit.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.schedule.NodeSelectionStrategy; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplitManager.java b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplitManager.java index 8e1893917becf..4821e072ab7cf 100644 --- a/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplitManager.java +++ b/presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowSplitManager.java @@ -19,10 +19,9 @@ import com.facebook.presto.spi.FixedSplitSource; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; +import jakarta.inject.Inject; import org.apache.arrow.flight.FlightInfo; -import javax.inject.Inject; - import java.util.List; import static com.google.common.collect.ImmutableList.toImmutableList; diff --git a/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowBlockBuilder.java b/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowBlockBuilder.java index a8752e0690f5e..f42941a96387c 100644 --- a/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowBlockBuilder.java +++ b/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowBlockBuilder.java @@ -19,10 +19,9 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.common.type.VarcharType; +import jakarta.inject.Inject; import org.apache.arrow.vector.types.pojo.Field; -import javax.inject.Inject; - import java.util.Optional; public class TestingArrowBlockBuilder diff --git a/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowFlightClientHandler.java b/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowFlightClientHandler.java index d8e9d1e5929a4..6d5b64e9a8f4e 100644 --- a/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowFlightClientHandler.java +++ b/presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowFlightClientHandler.java @@ -24,6 +24,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.arrow.flight.Action; import org.apache.arrow.flight.CallOption; import org.apache.arrow.flight.CallOptions; @@ -34,8 +35,6 @@ import org.apache.arrow.flight.grpc.CredentialCallOption; import org.apache.arrow.memory.BufferAllocator; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java index 2b00ad0e9299e..7f7bb084b60e2 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java @@ -39,9 +39,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.annotation.Nullable; -import javax.annotation.PreDestroy; +import jakarta.annotation.Nullable; +import jakarta.annotation.PreDestroy; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java index 52f3fda6d3bd3..b5d390944a317 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java @@ -23,10 +23,9 @@ import com.google.inject.spi.Message; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; -import javax.validation.constraints.NotNull; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; +import jakarta.validation.constraints.NotNull; import java.util.Set; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java index 09a0d5c7d17ad..0d2e4e25f3187 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.ConnectorTableMetadata; import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.statistics.TableStatistics; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java index 511899a2e03f9..ade0d2c16ff4a 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java @@ -35,8 +35,7 @@ import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataCache.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataCache.java index 8ef7d92a0a1e2..f98cf11639f96 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataCache.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataCache.java @@ -20,8 +20,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.UncheckedExecutionException; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java index d2bd555f2c53b..6749dd05b4de8 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java @@ -17,9 +17,8 @@ import com.facebook.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/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataFactory.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataFactory.java index 117cfbc7052cb..34031cb093373 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataFactory.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataFactory.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.plugin.jdbc; -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcOutputTableHandle.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcOutputTableHandle.java index 39b18c1778256..4ce7cbc61693e 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcOutputTableHandle.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcOutputTableHandle.java @@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; 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/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcPageSinkProvider.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcPageSinkProvider.java index b5f8e964d02ab..c0484f57a8718 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcPageSinkProvider.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcPageSinkProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcRecordSetProvider.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcRecordSetProvider.java index f304e3fbb0874..17ccfa149d5cb 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcRecordSetProvider.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcRecordSetProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplit.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplit.java index 729717481ce3e..f9377aa4837a9 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplit.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplit.java @@ -23,8 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplitManager.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplitManager.java index 25900ec568938..0473a63ca37e4 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplitManager.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcSplitManager.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.ConnectorTableLayoutHandle; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcTableHandle.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcTableHandle.java index c9ec95841b14f..438c49a6141ff 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcTableHandle.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcTableHandle.java @@ -18,8 +18,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Joiner; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/SimpleTestJdbcConfig.java b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/SimpleTestJdbcConfig.java index 5e4d806e16d9c..7132404ea8280 100644 --- a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/SimpleTestJdbcConfig.java +++ b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/SimpleTestJdbcConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.plugin.jdbc; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * Simple JDBC configuration that doesn't extend BaseJdbcConfig. diff --git a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/PrestoBenchmarkDriver.java b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/PrestoBenchmarkDriver.java index e69dd85139a16..890fe58bb0b99 100644 --- a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/PrestoBenchmarkDriver.java +++ b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/PrestoBenchmarkDriver.java @@ -20,8 +20,7 @@ import com.google.common.collect.ImmutableList; import io.airlift.airline.Command; import io.airlift.airline.HelpOption; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkPhaseEvent.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkPhaseEvent.java index a372cffd6ba3e..8eedfe200d37f 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkPhaseEvent.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkPhaseEvent.java @@ -15,8 +15,7 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventType; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Optional; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java index c83887256ab5d..18d8fb36f8191 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java @@ -16,10 +16,9 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventType; import com.facebook.presto.jdbc.QueryStats; +import com.google.errorprone.annotations.Immutable; import io.airlift.units.Duration; -import javax.annotation.concurrent.Immutable; - import java.util.Optional; import static java.util.Objects.requireNonNull; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkSuiteEvent.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkSuiteEvent.java index c8c09253d9271..23c9918da42c5 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkSuiteEvent.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkSuiteEvent.java @@ -15,8 +15,7 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventType; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import static com.facebook.presto.benchmark.event.BenchmarkSuiteEvent.Status.COMPLETED_WITH_FAILURES; import static com.facebook.presto.benchmark.event.BenchmarkSuiteEvent.Status.FAILED; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/JsonEventClient.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/JsonEventClient.java index 370387a1fc09f..2dc3c744fd993 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/JsonEventClient.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/JsonEventClient.java @@ -18,8 +18,7 @@ import com.facebook.presto.benchmark.framework.BenchmarkRunnerConfig; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunner.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunner.java index e2c9be2063ecc..f741dad12d94f 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunner.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunner.java @@ -19,8 +19,7 @@ import com.facebook.presto.benchmark.source.BenchmarkSuiteSupplier; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; - -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Set; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunnerConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunnerConfig.java index 66f9b1ae4d034..e06c53c41550c 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunnerConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/framework/BenchmarkRunnerConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Optional; import java.util.Set; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java index 31a77ba9a1140..0bd05244e5b54 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java @@ -16,8 +16,7 @@ import com.facebook.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.MINUTES; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java index 477a781fc27e3..19acbaf585fda 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/BenchmarkSuiteConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/BenchmarkSuiteConfig.java index 71502fb785104..59c41cd6aa399 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/BenchmarkSuiteConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/BenchmarkSuiteConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.benchmark.source; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class BenchmarkSuiteConfig { diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/MySqlBenchmarkSuiteConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/MySqlBenchmarkSuiteConfig.java index c1f02f6752efa..0214b5c80ec4d 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/MySqlBenchmarkSuiteConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/source/MySqlBenchmarkSuiteConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.benchmark.source; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class MySqlBenchmarkSuiteConfig { diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java index f931743a55bd8..4cb2f78cdc051 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/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/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConfig.java b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConfig.java index 819bce2a97de1..86e09dba9077e 100644 --- a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConfig.java +++ b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConfig.java @@ -16,9 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.google.auth.oauth2.GoogleCredentials; - -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Min; import java.io.IOException; import java.util.Optional; diff --git a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConnector.java b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConnector.java index 76aa273c04626..9fe60eb1d87c2 100644 --- a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConnector.java +++ b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryConnector.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.spi.transaction.IsolationLevel.READ_COMMITTED; import static com.facebook.presto.spi.transaction.IsolationLevel.checkConnectorSupports; diff --git a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryMetadata.java b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryMetadata.java index e48c5c3c7d7b5..8c028fbf59b7f 100644 --- a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryMetadata.java +++ b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryMetadata.java @@ -39,8 +39,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryPageSourceProvider.java b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryPageSourceProvider.java index 65dd0886560b1..4de0ecbb32266 100644 --- a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryPageSourceProvider.java +++ b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryPageSourceProvider.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryStorageClientFactory.java b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryStorageClientFactory.java index 3e5b94870d5d1..d937ff1594da9 100644 --- a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryStorageClientFactory.java +++ b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryStorageClientFactory.java @@ -18,8 +18,7 @@ import com.google.auth.Credentials; import com.google.cloud.bigquery.storage.v1beta1.BigQueryStorageClient; import com.google.cloud.bigquery.storage.v1beta1.BigQueryStorageSettings; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java index f0191fa266541..4f0b4e379f946 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java @@ -14,8 +14,7 @@ package com.facebook.presto.bytecode; import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Map; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java index 0542796879bba..af8287dfc0375 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java @@ -23,8 +23,6 @@ import com.google.common.collect.ImmutableList; import org.objectweb.asm.MethodVisitor; -import javax.annotation.concurrent.NotThreadSafe; - import java.lang.invoke.MethodType; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -53,7 +51,6 @@ import static com.google.common.base.Preconditions.checkArgument; @SuppressWarnings("UnusedDeclaration") -@NotThreadSafe public class BytecodeBlock implements BytecodeNode { diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java index 1e9c3f32c2b3a..d996ecdc335d4 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java @@ -18,24 +18,22 @@ import com.google.common.collect.ImmutableSet; import org.objectweb.asm.ClassVisitor; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.Set; +import java.util.stream.Stream; import static com.facebook.presto.bytecode.Access.INTERFACE; import static com.facebook.presto.bytecode.Access.STATIC; import static com.facebook.presto.bytecode.Access.a; import static com.facebook.presto.bytecode.Access.toAccessModifier; -import static com.google.common.collect.Iterables.any; -import static com.google.common.collect.Iterables.concat; +import static java.util.Arrays.stream; import static java.util.Objects.requireNonNull; +import static java.util.stream.Stream.concat; import static org.objectweb.asm.Opcodes.ACC_SUPER; import static org.objectweb.asm.Opcodes.V1_8; -@NotThreadSafe public class ClassDefinition { private final EnumSet access; @@ -131,7 +129,7 @@ public void visit(ClassVisitor visitor) { // Generic signature if super class or any interface is generic String signature = null; - if (superClass.isGeneric() || any(interfaces, ParameterizedType::isGeneric)) { + if (superClass.isGeneric() || interfaces.stream().anyMatch(ParameterizedType::isGeneric)) { signature = genericClassSignature(superClass, interfaces); } @@ -293,14 +291,14 @@ public static String genericClassSignature( ParameterizedType... interfaceTypes) { return Joiner.on("").join( - concat(ImmutableList.of(classType), ImmutableList.copyOf(interfaceTypes))); + concat(Stream.of(classType), stream(interfaceTypes)).iterator()); } public static String genericClassSignature( ParameterizedType classType, List interfaceTypes) { - return Joiner.on("").join(concat(ImmutableList.of(classType), interfaceTypes)); + return Joiner.on("").join(concat(Stream.of(classType), interfaceTypes.stream()).iterator()); } @Override diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java index 3edcd220aa79a..344dd593ba82c 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java @@ -39,7 +39,7 @@ import static com.facebook.presto.bytecode.ClassInfoLoader.createClassInfoLoader; import static com.facebook.presto.bytecode.ParameterizedType.typeFromJavaClassName; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static com.google.common.io.CharStreams.nullWriter; import static java.nio.file.Files.createDirectories; import static java.util.Objects.requireNonNull; @@ -117,7 +117,7 @@ public ClassGenerator dumpClassFilesTo(Optional dumpClassPath) public Class defineClass(ClassDefinition classDefinition, Class superType) { Map> classes = defineClasses(ImmutableList.of(classDefinition)); - return getOnlyElement(classes.values()).asSubclass(superType); + return classes.values().stream().collect(onlyElement()).asSubclass(superType); } public Map> defineClasses(List classDefinitions) diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfo.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfo.java index 57f376b364c12..fd4ed87392042 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfo.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfo.java @@ -39,8 +39,8 @@ import static com.facebook.presto.bytecode.ParameterizedType.type; import static com.facebook.presto.bytecode.ParameterizedType.typeFromPathName; -import static com.google.common.collect.Iterables.transform; -import static java.util.Arrays.asList; +import static com.google.common.collect.ImmutableList.toImmutableList; +import static java.util.Arrays.stream; import static java.util.Objects.requireNonNull; /** @@ -61,8 +61,8 @@ public ClassInfo(ClassInfoLoader loader, ClassNode classNode) typeFromPathName(classNode.name), classNode.access, classNode.superName == null ? null : typeFromPathName(classNode.superName), - transform((List) classNode.interfaces, ParameterizedType::typeFromPathName), - (List) classNode.methods); + classNode.interfaces.stream().map(ParameterizedType::typeFromPathName).collect(toImmutableList()), + classNode.methods); } public ClassInfo(ClassInfoLoader loader, Class aClass) @@ -71,7 +71,7 @@ public ClassInfo(ClassInfoLoader loader, Class aClass) type(aClass), aClass.getModifiers(), aClass.getSuperclass() == null ? null : type(aClass.getSuperclass()), - transform(asList(aClass.getInterfaces()), ParameterizedType::type), + stream(aClass.getInterfaces()).map(ParameterizedType::type).collect(toImmutableList()), null); } diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java index e83c696dffbe3..cd9aa7ff9f200 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java @@ -16,11 +16,10 @@ 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 org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; -import javax.annotation.concurrent.Immutable; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java index 7da5638f7d8cf..dd7100f857c75 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java @@ -16,13 +16,10 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.tree.InsnNode; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -32,11 +29,11 @@ import static com.facebook.presto.bytecode.Access.toAccessModifier; import static com.facebook.presto.bytecode.ParameterizedType.type; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.Iterables.transform; +import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.collect.Streams.stream; import static org.objectweb.asm.Opcodes.RETURN; @SuppressWarnings("UnusedDeclaration") -@NotThreadSafe public class MethodDefinition { private final Scope scope; @@ -84,8 +81,8 @@ public MethodDefinition( this.returnType = type(void.class); } this.parameters = ImmutableList.copyOf(parameters); - this.parameterTypes = Lists.transform(this.parameters, Parameter::getType); - this.parameterAnnotations = ImmutableList.copyOf(transform(parameters, input -> new ArrayList<>())); + this.parameterTypes = this.parameters.stream().map(Parameter::getType).collect(toImmutableList()); + this.parameterAnnotations = stream(parameters).>map(input -> new ArrayList<>()).collect(toImmutableList()); Optional thisType = Optional.empty(); if (!declaringClass.isInterface() && !access.contains(STATIC)) { thisType = Optional.of(declaringClass.getType()); @@ -264,7 +261,7 @@ public String toSourceString() Joiner.on(' ').appendTo(sb, access).append(' '); sb.append(returnType.getJavaClassName()).append(' '); sb.append(name).append('('); - Joiner.on(", ").appendTo(sb, transform(parameters, Parameter::getSourceString)).append(')'); + Joiner.on(", ").appendTo(sb, parameters.stream().map(Parameter::getSourceString).collect(toImmutableList())).append(')'); return sb.toString(); } @@ -283,7 +280,7 @@ public static String methodDescription(Class returnType, List> param { return methodDescription( type(returnType), - Lists.transform(parameterTypes, ParameterizedType::type)); + parameterTypes.stream().map(ParameterizedType::type).collect(toImmutableList())); } public static String methodDescription( @@ -299,7 +296,7 @@ public static String methodDescription( { StringBuilder sb = new StringBuilder(); sb.append("("); - Joiner.on("").appendTo(sb, transform(parameterTypes, ParameterizedType::getType)); + Joiner.on("").appendTo(sb, parameterTypes.stream().map(ParameterizedType::getType).iterator()); sb.append(")"); sb.append(returnType.getType()); return sb.toString(); diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/Parameter.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/Parameter.java index 9ec15b0f9e62d..070d6ffc219cc 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/Parameter.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/Parameter.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.bytecode; -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; @Immutable public class Parameter diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java index 8ebc6fa89e818..830adb653dbe3 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java @@ -14,11 +14,10 @@ package com.facebook.presto.bytecode; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.Immutable; +import jakarta.annotation.Nullable; import org.objectweb.asm.Type; -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; - import java.util.List; import static com.google.common.base.Preconditions.checkArgument; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java index d6ab57183ce83..e14b06ef94178 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java @@ -15,8 +15,7 @@ import com.facebook.presto.bytecode.BytecodeNode; import com.facebook.presto.bytecode.instruction.LabelNode; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Objects; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java index 12bcf15b403ac..de0e173524d94 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java @@ -20,6 +20,7 @@ import com.facebook.presto.bytecode.MethodGenerationContext; import com.facebook.presto.bytecode.ParameterizedType; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Streams; import org.objectweb.asm.MethodVisitor; import java.lang.reflect.Field; @@ -30,7 +31,6 @@ import static com.facebook.presto.bytecode.expression.BytecodeExpressions.constantInt; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; -import static com.google.common.collect.Iterables.transform; import static java.util.Arrays.stream; import static java.util.Objects.requireNonNull; @@ -162,13 +162,17 @@ public final BytecodeExpression invoke(String methodName, ParameterizedType retu return invoke(methodName, returnType, - ImmutableList.copyOf(transform(parameters, BytecodeExpression::getType)), + Streams.stream(parameters).map(BytecodeExpression::getType).collect(toImmutableList()), parameters); } public final BytecodeExpression invoke(String methodName, Class returnType, Iterable> parameterTypes, BytecodeExpression... parameters) { - return invoke(methodName, type(returnType), transform(parameterTypes, ParameterizedType::type), ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"))); + return invoke( + methodName, + type(returnType), + Streams.stream(parameterTypes).map(ParameterizedType::type).collect(toImmutableList()), + ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"))); } public final BytecodeExpression invoke(String methodName, ParameterizedType returnType, Iterable parameterTypes, BytecodeExpression... parameters) diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java index c1f0faddd9b2c..5e760b7a25166 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java @@ -18,6 +18,7 @@ import com.facebook.presto.bytecode.OpCode; import com.facebook.presto.bytecode.ParameterizedType; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Streams; import java.lang.invoke.MethodType; import java.lang.reflect.Constructor; @@ -36,7 +37,6 @@ import static com.facebook.presto.bytecode.instruction.Constant.loadString; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; -import static com.google.common.collect.Iterables.transform; import static java.util.Arrays.stream; import static java.util.Objects.requireNonNull; @@ -259,13 +259,16 @@ public static BytecodeExpression newInstance(ParameterizedType returnType, Itera return newInstance( returnType, - ImmutableList.copyOf(transform(parameters, BytecodeExpression::getType)), + Streams.stream(parameters).map(BytecodeExpression::getType).collect(toImmutableList()), parameters); } public static BytecodeExpression newInstance(Class returnType, Iterable> parameterTypes, BytecodeExpression... parameters) { - return newInstance(type(returnType), transform(parameterTypes, ParameterizedType::type), ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"))); + return newInstance( + type(returnType), + Streams.stream(parameterTypes).map(ParameterizedType::type).collect(toImmutableList()), + ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"))); } public static BytecodeExpression newInstance(ParameterizedType returnType, Iterable parameterTypes, BytecodeExpression... parameters) @@ -378,7 +381,7 @@ public static BytecodeExpression invokeStatic( methodTargetType, methodName, returnType, - ImmutableList.copyOf(transform(parameters, BytecodeExpression::getType)), + Streams.stream(parameters).map(BytecodeExpression::getType).collect(toImmutableList()), parameters); } @@ -398,7 +401,7 @@ public static BytecodeExpression invokeStatic( type(methodTargetType), methodName, type(returnType), - transform(parameterTypes, ParameterizedType::type), + Streams.stream(parameterTypes).map(ParameterizedType::type).collect(toImmutableList()), ImmutableList.copyOf(parameters)); } @@ -457,7 +460,7 @@ public static BytecodeExpression invokeDynamic( bootstrapArgs, methodName, type(returnType), - ImmutableList.copyOf(transform(parameters, BytecodeExpression::getType)), + Streams.stream(parameters).map(BytecodeExpression::getType).collect(toImmutableList()), parameters); } @@ -486,7 +489,7 @@ public static BytecodeExpression invokeDynamic( bootstrapArgs, methodName, returnType, - ImmutableList.copyOf(transform(parameters, BytecodeExpression::getType)), + Streams.stream(parameters).map(BytecodeExpression::getType).collect(toImmutableList()), parameters); } @@ -515,7 +518,7 @@ public static BytecodeExpression invokeDynamic( bootstrapArgs, methodName, type(methodType.returnType()), - transform(methodType.parameterList(), ParameterizedType::type), + methodType.parameterList().stream().map(ParameterizedType::type).collect(toImmutableList()), ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"))); } diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java index d1eec06e19b19..57240b68bd15b 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java @@ -19,8 +19,7 @@ import com.facebook.presto.bytecode.MethodGenerationContext; import com.facebook.presto.bytecode.ParameterizedType; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java index 829d7caa61c1f..58140113bd3f0 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java @@ -19,8 +19,7 @@ import com.facebook.presto.bytecode.ParameterizedType; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java index 93937b44f1c7d..570f2c2eacc4f 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.util.List; -import static com.google.common.collect.Iterables.transform; import static java.util.Objects.requireNonNull; class InvokeDynamicBytecodeExpression @@ -75,7 +74,7 @@ protected String formatOneLine() StringBuilder builder = new StringBuilder(); builder.append("[").append(bootstrapMethod.getName()); if (!bootstrapArgs.isEmpty()) { - builder.append("(").append(Joiner.on(", ").join(transform(bootstrapArgs, ConstantBytecodeExpression::renderConstant))).append(")"); + builder.append("(").append(Joiner.on(", ").join(bootstrapArgs.stream().map(ConstantBytecodeExpression::renderConstant).iterator())).append(")"); } builder.append("]=>"); diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java index e6cb9030e472a..986576ee5da3d 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java @@ -20,8 +20,7 @@ import com.facebook.presto.bytecode.instruction.TypeInstruction; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java index 8f62930020f73..7522deef9d02a 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java @@ -19,8 +19,7 @@ import com.facebook.presto.bytecode.MethodGenerationContext; import com.facebook.presto.bytecode.ParameterizedType; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java index b393e567fc629..e5944b4d70ef8 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java +++ b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java @@ -21,6 +21,7 @@ import com.facebook.presto.bytecode.ParameterizedType; import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Streams; import org.objectweb.asm.Handle; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; @@ -38,7 +39,8 @@ import static com.facebook.presto.bytecode.OpCode.INVOKEVIRTUAL; import static com.facebook.presto.bytecode.ParameterizedType.type; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.Iterables.transform; +import static com.google.common.collect.ImmutableList.toImmutableList; +import static java.util.Arrays.stream; import static java.util.Objects.requireNonNull; @SuppressWarnings("UnusedDeclaration") @@ -158,12 +160,12 @@ public static InstructionNode invokeConstructor(Constructor constructor) public static InstructionNode invokeConstructor(Class target, Class... parameterTypes) { - return invokeConstructor(type(target), transform(ImmutableList.copyOf(parameterTypes), ParameterizedType::type)); + return invokeConstructor(type(target), stream(parameterTypes).map(ParameterizedType::type).collect(toImmutableList())); } public static InstructionNode invokeConstructor(Class target, Iterable> parameterTypes) { - return invokeConstructor(type(target), transform(parameterTypes, ParameterizedType::type)); + return invokeConstructor(type(target), Streams.stream(parameterTypes).map(ParameterizedType::type).collect(toImmutableList())); } public static InstructionNode invokeConstructor(ParameterizedType target, ParameterizedType... parameterTypes) @@ -220,7 +222,7 @@ private static InstructionNode invoke(OpCode invocationType, Method method) type(method.getDeclaringClass()), method.getName(), type(method.getReturnType()), - transform(ImmutableList.copyOf(method.getParameterTypes()), ParameterizedType::type)); + stream(method.getParameterTypes()).map(ParameterizedType::type).collect(toImmutableList())); } private static InstructionNode invoke(OpCode invocationType, MethodDefinition method) @@ -247,7 +249,7 @@ private static InstructionNode invoke(OpCode invocationType, Class target, St type(target), name, type(returnType), - transform(parameterTypes, ParameterizedType::type)); + Streams.stream(parameterTypes).map(ParameterizedType::type).collect(toImmutableList())); } // @@ -287,7 +289,7 @@ public static InstructionNode invokeDynamic(String name, { return new InvokeDynamicInstruction(name, type(methodType.returnType()), - transform(methodType.parameterList(), ParameterizedType::type), + methodType.parameterList().stream().map(ParameterizedType::type).collect(toImmutableList()), bootstrapMethod, ImmutableList.copyOf(bootstrapArguments)); } @@ -299,7 +301,7 @@ public static InstructionNode invokeDynamic(String name, { return new InvokeDynamicInstruction(name, type(methodType.returnType()), - transform(methodType.parameterList(), ParameterizedType::type), + methodType.parameterList().stream().map(ParameterizedType::type).collect(toImmutableList()), bootstrapMethod, ImmutableList.copyOf(bootstrapArguments)); } diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java b/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java index 7c223b0ab749e..c783a7bbe0d8c 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.presto.hive.CacheQuotaScope; import io.airlift.units.DataSize; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.net.URI; import java.util.Optional; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/CacheManager.java b/presto-cache/src/main/java/com/facebook/presto/cache/CacheManager.java index 4b4b3e26ed989..44f24c8cf2715 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/CacheManager.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/CacheManager.java @@ -14,10 +14,9 @@ package com.facebook.presto.cache; import com.facebook.presto.hive.CacheQuota; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.slice.Slice; -import javax.annotation.concurrent.ThreadSafe; - @ThreadSafe public interface CacheManager { diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/CacheStats.java b/presto-cache/src/main/java/com/facebook/presto/cache/CacheStats.java index 52ba6a4bb5d8d..d2648a6286a63 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/CacheStats.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/CacheStats.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.cache; +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; -import javax.annotation.concurrent.ThreadSafe; - import java.util.concurrent.atomic.AtomicLong; @ThreadSafe diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/CachingModule.java b/presto-cache/src/main/java/com/facebook/presto/cache/CachingModule.java index 75863b1372606..c58cd597e3f78 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/CachingModule.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/CachingModule.java @@ -22,8 +22,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/ForCachingFileSystem.java b/presto-cache/src/main/java/com/facebook/presto/cache/ForCachingFileSystem.java index 54781e30b3527..5ce88872721c7 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/ForCachingFileSystem.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/ForCachingFileSystem.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.cache; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCachingConfigurationProvider.java b/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCachingConfigurationProvider.java index 4006715a001f1..780228d01fc6f 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCachingConfigurationProvider.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCachingConfigurationProvider.java @@ -16,10 +16,9 @@ import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.hive.DynamicConfigurationProvider; import com.facebook.presto.hive.HdfsContext; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; -import javax.inject.Inject; - import java.net.URI; import static com.facebook.presto.cache.CacheType.ALLUXIO; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java index 063590283c62f..aecc66ca70919 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java @@ -18,8 +18,7 @@ import io.airlift.units.DataSize; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.TimeUnit.DAYS; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java index 246715560e843..b747788531014 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java @@ -32,11 +32,10 @@ import com.google.common.collect.TreeRangeMap; import io.airlift.slice.Slice; import io.airlift.units.DataSize; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java index 59b095bf212ab..afce6e2b697b8 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java @@ -25,10 +25,9 @@ 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 javax.validation.constraints.Size; +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/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientModule.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientModule.java index 364779296f020..bbf8c48c01d34 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientModule.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientModule.java @@ -30,8 +30,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraColumnHandle.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraColumnHandle.java index 56434ad7d889a..5675804b7331b 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraColumnHandle.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraColumnHandle.java @@ -20,8 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects.ToStringHelper; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java index f787974d4b371..016f2c8022465 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java index 75f10c3c85404..f609fb22a47ff 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java @@ -42,8 +42,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPageSinkProvider.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPageSinkProvider.java index 8518647539a7e..37c4d9e0710cc 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPageSinkProvider.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPageSinkProvider.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPartitionManager.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPartitionManager.java index 7c68969c8f0fb..20034e925a8c1 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPartitionManager.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraPartitionManager.java @@ -24,8 +24,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraRecordSetProvider.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraRecordSetProvider.java index f8d450bc76d70..93d4a519e8934 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraRecordSetProvider.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraRecordSetProvider.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.RecordSet; import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSessionProperties.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSessionProperties.java index 24e9e123e4b4e..72715ff119c24 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSessionProperties.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSessionProperties.java @@ -16,8 +16,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSplitManager.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSplitManager.java index e36ef9d0bb6f2..e94faf013066d 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSplitManager.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraSplitManager.java @@ -25,8 +25,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.HashSet; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraTokenSplitManager.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraTokenSplitManager.java index 16cbba7071678..27b536a23cde3 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraTokenSplitManager.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraTokenSplitManager.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/RebindSafeMBeanServer.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/RebindSafeMBeanServer.java index 49dc3c6642368..9525145e4e510 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/RebindSafeMBeanServer.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/RebindSafeMBeanServer.java @@ -14,8 +14,8 @@ package com.facebook.presto.cassandra; import com.facebook.airlift.log.Logger; +import com.google.errorprone.annotations.ThreadSafe; -import javax.annotation.concurrent.ThreadSafe; import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/ReopeningCluster.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/ReopeningCluster.java index 0ebdb248ddf70..4518701f67ef5 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/ReopeningCluster.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/ReopeningCluster.java @@ -17,9 +17,8 @@ import com.datastax.driver.core.Cluster; import com.datastax.driver.core.DelegatingCluster; import com.facebook.airlift.log.Logger; - -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.function.Supplier; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/Console.java b/presto-cli/src/main/java/com/facebook/presto/cli/Console.java index 0deff11d0a1fb..ca4a11927aeb1 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/Console.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/Console.java @@ -26,13 +26,12 @@ import io.airlift.airline.Command; import io.airlift.airline.HelpOption; import io.airlift.units.Duration; +import jakarta.inject.Inject; import jline.console.history.FileHistory; import jline.console.history.History; import jline.console.history.MemoryHistory; import org.fusesource.jansi.AnsiConsole; -import javax.inject.Inject; - import java.io.File; import java.io.IOException; import java.io.PrintStream; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/Pager.java b/presto-cli/src/main/java/com/facebook/presto/cli/Pager.java index 28e282a1ac347..15ef6ddbc93bb 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/Pager.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/Pager.java @@ -14,8 +14,7 @@ package com.facebook.presto.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/presto-cli/src/main/java/com/facebook/presto/cli/ThreadInterruptor.java b/presto-cli/src/main/java/com/facebook/presto/cli/ThreadInterruptor.java index 3dd03f252e705..31cb5105aa8e2 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/ThreadInterruptor.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/ThreadInterruptor.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.cli; -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.io.Closeable; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseClient.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseClient.java index 8359b748f5ef1..5d24e716b65ca 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseClient.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseClient.java @@ -38,9 +38,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java index d8f867cf9674c..9d36f775a6214 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java @@ -18,9 +18,8 @@ import com.facebook.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.MINUTES; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConnector.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConnector.java index a3ced140b87da..f98389b84eabb 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConnector.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConnector.java @@ -34,8 +34,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseMetadataFactory.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseMetadataFactory.java index 4c2d715398dc2..44c8565090308 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseMetadataFactory.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseMetadataFactory.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.plugin.clickhouse; -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseOutputTableHandle.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseOutputTableHandle.java index 805745b1c2b03..ecff7a83eadcc 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseOutputTableHandle.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseOutputTableHandle.java @@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; 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/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHousePageSinkProvider.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHousePageSinkProvider.java index 8c4e9059567a6..4f0edc22687da 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHousePageSinkProvider.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHousePageSinkProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseRecordSetProvider.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseRecordSetProvider.java index 305657fc5eb1d..95db8aa1c7700 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseRecordSetProvider.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseRecordSetProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplit.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplit.java index 2490f86063744..0855b987e28e9 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplit.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplit.java @@ -26,8 +26,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplitManager.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplitManager.java index 9fc449b0353eb..c043a87225ee2 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplitManager.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseSplitManager.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.ConnectorTableLayoutHandle; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableHandle.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableHandle.java index eb761b55a64b7..fb987ae9250e9 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableHandle.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableHandle.java @@ -18,8 +18,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Joiner; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableProperties.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableProperties.java index ebd873463da12..24a23eb78f459 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableProperties.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseTableProperties.java @@ -16,8 +16,7 @@ import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.EnumSet; import java.util.List; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ForBaseJdbc.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ForBaseJdbc.java index cf8259f07fbe0..253929ff657d3 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ForBaseJdbc.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ForBaseJdbc.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.plugin.clickhouse; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/optimization/ClickHouseQueryGenerator.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/optimization/ClickHouseQueryGenerator.java index aa533b6a3cc0c..a9a20fb3bf7b4 100644 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/optimization/ClickHouseQueryGenerator.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/optimization/ClickHouseQueryGenerator.java @@ -39,8 +39,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignature.java b/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignature.java index 00193d4ac37db..2b8daad7e90ec 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignature.java +++ b/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignature.java @@ -23,8 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.ArrayList; import java.util.List; diff --git a/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignatureParameter.java b/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignatureParameter.java index ed0ea3ee3dedb..d7ce430fe8ed6 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignatureParameter.java +++ b/presto-client/src/main/java/com/facebook/presto/client/ClientTypeSignatureParameter.java @@ -28,8 +28,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/presto-client/src/main/java/com/facebook/presto/client/Column.java b/presto-client/src/main/java/com/facebook/presto/client/Column.java index b208722bf364b..e77244cbb1027 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/Column.java +++ b/presto-client/src/main/java/com/facebook/presto/client/Column.java @@ -17,8 +17,7 @@ import com.facebook.presto.common.type.TypeSignature; 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/presto-client/src/main/java/com/facebook/presto/client/ErrorLocation.java b/presto-client/src/main/java/com/facebook/presto/client/ErrorLocation.java index cf0710106bad8..749c99fbd5dfb 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/ErrorLocation.java +++ b/presto-client/src/main/java/com/facebook/presto/client/ErrorLocation.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; 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/presto-client/src/main/java/com/facebook/presto/client/FailureInfo.java b/presto-client/src/main/java/com/facebook/presto/client/FailureInfo.java index 3db250458bd38..1a3e6bd6dd6a0 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/FailureInfo.java +++ b/presto-client/src/main/java/com/facebook/presto/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/presto-client/src/main/java/com/facebook/presto/client/GCSOAuthInterceptor.java b/presto-client/src/main/java/com/facebook/presto/client/GCSOAuthInterceptor.java index eb8572e094e6e..1e2dcd0a0ff37 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/GCSOAuthInterceptor.java +++ b/presto-client/src/main/java/com/facebook/presto/client/GCSOAuthInterceptor.java @@ -20,8 +20,9 @@ import okhttp3.Request; import okhttp3.Response; -import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Paths; import java.util.Collection; import java.util.Optional; import java.util.stream.Collectors; @@ -29,6 +30,7 @@ import static com.facebook.presto.client.GCSOAuthScope.DEVSTORAGE_READ_ONLY; import static com.facebook.presto.client.PrestoHeaders.PRESTO_EXTRA_CREDENTIAL; +import static java.nio.file.Files.newInputStream; import static java.util.Objects.requireNonNull; public class GCSOAuthInterceptor @@ -82,8 +84,8 @@ private synchronized GoogleCredentials getCredentials() private GoogleCredentials createCredentials() { - try { - return GoogleCredentials.fromStream(new FileInputStream(credentialsFilePath)).createScoped(gcsOAuthScopeURLs); + try (InputStream is = newInputStream(Paths.get(credentialsFilePath))) { + return GoogleCredentials.fromStream(is).createScoped(gcsOAuthScopeURLs); } catch (IOException e) { throw new ClientException("Google credential loading error", e); diff --git a/presto-client/src/main/java/com/facebook/presto/client/JsonResponse.java b/presto-client/src/main/java/com/facebook/presto/client/JsonResponse.java index ac8075e6df206..032a12560588c 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/JsonResponse.java +++ b/presto-client/src/main/java/com/facebook/presto/client/JsonResponse.java @@ -14,6 +14,7 @@ package com.facebook.presto.client; import com.facebook.airlift.json.JsonCodec; +import jakarta.annotation.Nullable; import okhttp3.Headers; import okhttp3.MediaType; import okhttp3.OkHttpClient; @@ -21,8 +22,6 @@ import okhttp3.Response; import okhttp3.ResponseBody; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-client/src/main/java/com/facebook/presto/client/NodeVersion.java b/presto-client/src/main/java/com/facebook/presto/client/NodeVersion.java index 40133333464f9..5fbc9c729fa0f 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/NodeVersion.java +++ b/presto-client/src/main/java/com/facebook/presto/client/NodeVersion.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; 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/presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java b/presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java index 91e1427249dd9..7de067264a076 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java +++ b/presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java @@ -34,12 +34,12 @@ import javax.security.auth.x500.X500Principal; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.CookieManager; import java.net.InetSocketAddress; import java.net.Proxy; +import java.nio.file.Paths; import java.security.GeneralSecurityException; import java.security.KeyStore; import java.security.SecureRandom; @@ -57,6 +57,7 @@ import static com.google.common.net.HttpHeaders.USER_AGENT; import static java.net.Proxy.Type.HTTP; import static java.net.Proxy.Type.SOCKS; +import static java.nio.file.Files.newInputStream; import static java.util.Collections.list; import static java.util.Objects.requireNonNull; @@ -197,7 +198,7 @@ public static void setupSsl( char[] keyManagerPassword; try { // attempt to read the key store as a PEM file - keyStore = PemReader.loadKeyStore(new File(keyStorePath.get()), new File(keyStorePath.get()), keyStorePassword); + keyStore = PemReader.loadKeyStore(Paths.get(keyStorePath.get()).toFile(), Paths.get(keyStorePath.get()).toFile(), keyStorePassword); // for PEM encoded keys, the password is used to decrypt the specific key (and does not protect the keystore itself) keyManagerPassword = new char[0]; } @@ -205,7 +206,7 @@ public static void setupSsl( keyManagerPassword = keyStorePassword.map(String::toCharArray).orElse(null); keyStore = KeyStore.getInstance(keystoreType.get()); - try (InputStream in = new FileInputStream(keyStorePath.get())) { + try (InputStream in = newInputStream(Paths.get(keyStorePath.get()))) { keyStore.load(in, keyManagerPassword); } } @@ -219,7 +220,7 @@ public static void setupSsl( KeyStore trustStore = keyStore; if (trustStorePath.isPresent()) { checkArgument(trustStoreType.isPresent(), "truststore type is not present"); - trustStore = loadTrustStore(new File(trustStorePath.get()), trustStorePassword, trustStoreType.get()); + trustStore = loadTrustStore(Paths.get(trustStorePath.get()).toFile(), trustStorePassword, trustStoreType.get()); } // create TrustManagerFactory @@ -288,7 +289,7 @@ private static KeyStore loadTrustStore(File trustStorePath, Optional tru catch (IOException | GeneralSecurityException ignored) { } - try (InputStream in = new FileInputStream(trustStorePath)) { + try (InputStream in = newInputStream(trustStorePath.toPath())) { trustStore.load(in, trustStorePassword.map(String::toCharArray).orElse(null)); } return trustStore; diff --git a/presto-client/src/main/java/com/facebook/presto/client/QueryError.java b/presto-client/src/main/java/com/facebook/presto/client/QueryError.java index 733eeb171ec7f..a2b06482651a0 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/QueryError.java +++ b/presto-client/src/main/java/com/facebook/presto/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/presto-client/src/main/java/com/facebook/presto/client/QueryResults.java b/presto-client/src/main/java/com/facebook/presto/client/QueryResults.java index 58ae6f50dbfdb..d086d2bbf662a 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/QueryResults.java +++ b/presto-client/src/main/java/com/facebook/presto/client/QueryResults.java @@ -17,9 +17,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/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java b/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java index ec199a7c4bda3..327214c7ad327 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java +++ b/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java @@ -18,10 +18,9 @@ import com.facebook.drift.annotations.ThriftStruct; 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/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java b/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java index 85f144a6dfca3..a83bc29b997a5 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java +++ b/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java @@ -15,6 +15,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.concurrent.GuardedBy; import com.sun.security.auth.module.Krb5LoginModule; import io.airlift.units.Duration; import okhttp3.Authenticator; @@ -28,7 +29,6 @@ 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.AppConfigurationEntry; import javax.security.auth.login.Configuration; diff --git a/presto-client/src/main/java/com/facebook/presto/client/StageStats.java b/presto-client/src/main/java/com/facebook/presto/client/StageStats.java index 7c8334047efae..b761dd7ed02f2 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/StageStats.java +++ b/presto-client/src/main/java/com/facebook/presto/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/presto-client/src/main/java/com/facebook/presto/client/StatementClient.java b/presto-client/src/main/java/com/facebook/presto/client/StatementClient.java index 9fce8d205c19f..c1cfdda32766b 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/StatementClient.java +++ b/presto-client/src/main/java/com/facebook/presto/client/StatementClient.java @@ -15,8 +15,7 @@ import com.facebook.presto.common.type.TimeZoneKey; import com.facebook.presto.spi.security.SelectedRole; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.Closeable; import java.util.Map; diff --git a/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java b/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java index 9268195710af3..be3cbefa5f20c 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java +++ b/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java @@ -21,7 +21,9 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; +import jakarta.annotation.Nullable; import okhttp3.Headers; import okhttp3.HttpUrl; import okhttp3.MediaType; @@ -29,9 +31,6 @@ import okhttp3.Request; import okhttp3.RequestBody; -import javax.annotation.Nullable; -import javax.annotation.concurrent.ThreadSafe; - import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; diff --git a/presto-client/src/main/java/com/facebook/presto/client/StatementStats.java b/presto-client/src/main/java/com/facebook/presto/client/StatementStats.java index b958ce32d7d92..ba7da1ebde446 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/StatementStats.java +++ b/presto-client/src/main/java/com/facebook/presto/client/StatementStats.java @@ -16,9 +16,8 @@ import com.facebook.presto.common.RuntimeStats; 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; diff --git a/presto-common/src/main/java/com/facebook/presto/common/QualifiedObjectName.java b/presto-common/src/main/java/com/facebook/presto/common/QualifiedObjectName.java index c5566b0d73882..49f2be4c16e78 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/QualifiedObjectName.java +++ b/presto-common/src/main/java/com/facebook/presto/common/QualifiedObjectName.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Objects; diff --git a/presto-common/src/main/java/com/facebook/presto/common/Utils.java b/presto-common/src/main/java/com/facebook/presto/common/Utils.java index dc31b1778252f..374a55d0c9b30 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/Utils.java +++ b/presto-common/src/main/java/com/facebook/presto/common/Utils.java @@ -17,8 +17,7 @@ import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.predicate.Primitives; import com.facebook.presto.common.type.Type; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.function.Supplier; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractArrayBlock.java index ce8993ac09902..cd7c10f1a7f12 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractArrayBlock.java @@ -14,8 +14,7 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.OptionalInt; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java index 804ad94761474..d1342501e9a15 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractMapBlock.java @@ -15,10 +15,9 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.lang.invoke.MethodHandle; import java.util.Arrays; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractRowBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractRowBlock.java index 6f1492a1bb84c..9af96953d7135 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/AbstractRowBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/AbstractRowBlock.java @@ -14,8 +14,7 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.OptionalInt; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java index 801c589ad1330..8f5c2a60eaa17 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlock.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.common.block; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java index d17581459a401..866022de09a97 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ArrayBlockBuilder.java @@ -15,10 +15,9 @@ import com.facebook.presto.common.type.Type; import io.airlift.slice.SliceInput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/BlockUtil.java b/presto-common/src/main/java/com/facebook/presto/common/block/BlockUtil.java index d940f0dad103c..f2d9b3505d4fb 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/BlockUtil.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/BlockUtil.java @@ -16,8 +16,7 @@ import io.airlift.slice.Slice; import io.airlift.slice.SliceTooLargeException; import io.airlift.slice.Slices; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java index 437464b0d0277..3f025870df11e 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlock.java @@ -14,10 +14,9 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java index a9c658da9547d..ba38e0017bc3d 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ByteArrayBlockBuilder.java @@ -15,10 +15,9 @@ import io.airlift.slice.SliceInput; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.OptionalInt; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ClosingBlockLease.java b/presto-common/src/main/java/com/facebook/presto/common/block/ClosingBlockLease.java index ff48d5a5bf78f..4a8f366fc2cf8 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ClosingBlockLease.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ClosingBlockLease.java @@ -13,8 +13,6 @@ */ package com.facebook.presto.common.block; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.List; import static java.util.Arrays.asList; @@ -22,7 +20,6 @@ import static java.util.Collections.unmodifiableList; import static java.util.Objects.requireNonNull; -@NotThreadSafe public final class ClosingBlockLease implements BlockLease { diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java index 94f8b2c539147..c6d0c7ad9cbb2 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ColumnarMap.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.common.block; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import static io.airlift.slice.SizeOf.sizeOf; import static java.util.Objects.requireNonNull; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java index 8e90829b456dc..d3b4c6a81abe2 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlock.java @@ -16,10 +16,9 @@ import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java index 1684dfd87e455..9daf19e7f1f90 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/Int128ArrayBlockBuilder.java @@ -17,10 +17,9 @@ import io.airlift.slice.SliceInput; import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.OptionalInt; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java index a5dc040acae80..11a4139425ddb 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlock.java @@ -14,10 +14,9 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java index e91286d02569c..1c3c2d5c10d3b 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/IntArrayBlockBuilder.java @@ -15,10 +15,9 @@ import io.airlift.slice.SliceInput; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.OptionalInt; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java index d36fcfc59ef74..43e3cae5eda64 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlock.java @@ -14,10 +14,9 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java index 45dd5b8e509fb..e3dd877a72f83 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/LongArrayBlockBuilder.java @@ -15,10 +15,9 @@ import io.airlift.slice.SliceInput; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.OptionalInt; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java index fadf644fcce90..fbe0520ab7b7e 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlock.java @@ -14,10 +14,9 @@ package com.facebook.presto.common.block; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.lang.invoke.MethodHandle; import java.util.Arrays; import java.util.Objects; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java index e8ab8cdd8f9b2..28630e5a78000 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/MapBlockBuilder.java @@ -17,10 +17,9 @@ import com.facebook.presto.common.NotSupportedException; import com.facebook.presto.common.type.Type; import io.airlift.slice.SliceInput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.lang.invoke.MethodHandle; import java.util.Arrays; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java index db8856a217310..8fde479c047ca 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlock.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.common.block; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java index 4e8b2a78eaac7..905446bee6890 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/RowBlockBuilder.java @@ -16,10 +16,9 @@ import com.facebook.presto.common.type.Type; import io.airlift.slice.SliceInput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.List; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java index 9deeaf7faa4cb..28a553ca9184b 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/RunLengthEncodedBlock.java @@ -17,10 +17,9 @@ import com.facebook.presto.common.type.Type; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Objects; import java.util.OptionalInt; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java index 47744726f74c5..d2bc76964e1e6 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlock.java @@ -14,10 +14,9 @@ package com.facebook.presto.common.block; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java index 3b949233d4968..a60b736677dbd 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/ShortArrayBlockBuilder.java @@ -15,10 +15,9 @@ import io.airlift.slice.SliceInput; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.OptionalInt; import java.util.function.ObjLongConsumer; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java index d09e889347aca..b3dae6395630e 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/SingleMapBlock.java @@ -17,10 +17,9 @@ import com.facebook.presto.common.GenericInternalException; import com.facebook.presto.common.NotSupportedException; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.lang.invoke.MethodHandle; import java.util.Objects; import java.util.OptionalInt; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java index 08978b4707b17..51d339f72bae4 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlock.java @@ -17,10 +17,9 @@ import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; import io.airlift.slice.UnsafeSlice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java index 29b9a038a082f..6f14f596892b6 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java +++ b/presto-common/src/main/java/com/facebook/presto/common/block/VariableWidthBlockBuilder.java @@ -19,10 +19,9 @@ import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; import io.airlift.slice.UnsafeSlice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Arrays; diff --git a/presto-common/src/main/java/com/facebook/presto/common/type/DistinctType.java b/presto-common/src/main/java/com/facebook/presto/common/type/DistinctType.java index c79b7f8e0a3f0..1c5a6fd01fe99 100644 --- a/presto-common/src/main/java/com/facebook/presto/common/type/DistinctType.java +++ b/presto-common/src/main/java/com/facebook/presto/common/type/DistinctType.java @@ -19,10 +19,9 @@ import com.facebook.presto.common.block.BlockBuilderStatus; import com.facebook.presto.common.block.UncheckedBlock; import com.facebook.presto.common.function.SqlFunctionProperties; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.slice.Slice; -import javax.annotation.concurrent.ThreadSafe; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-common/src/test/java/com/facebook/presto/common/predicate/TestSortedRangeSet.java b/presto-common/src/test/java/com/facebook/presto/common/predicate/TestSortedRangeSet.java index 087073c432bd5..a096c0462ff5d 100644 --- a/presto-common/src/test/java/com/facebook/presto/common/predicate/TestSortedRangeSet.java +++ b/presto-common/src/test/java/com/facebook/presto/common/predicate/TestSortedRangeSet.java @@ -64,7 +64,7 @@ public void testEmptySet() assertTrue(rangeSet.isNone()); assertFalse(rangeSet.isAll()); assertFalse(rangeSet.isSingleValue()); - assertTrue(Iterables.isEmpty(rangeSet.getOrderedRanges())); + assertFalse(rangeSet.getOrderedRanges().stream().findAny().isPresent()); assertEquals(rangeSet.getRangeCount(), 0); assertEquals(rangeSet.complement(), SortedRangeSet.all(BIGINT)); assertFalse(rangeSet.includesMarker(Marker.lowerUnbounded(BIGINT))); diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaClient.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaClient.java index bf8ff349c0d3e..919b59b953fd0 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaClient.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaClient.java @@ -30,11 +30,10 @@ import io.delta.kernel.internal.InternalScanFileUtils; import io.delta.kernel.internal.SnapshotImpl; import io.delta.kernel.utils.CloseableIterator; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.io.IOException; import java.io.UncheckedIOException; import java.time.Instant; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConfig.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConfig.java index 2a87649c69ad5..74f91269ba77a 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConfig.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.delta; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class DeltaConfig { diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConnector.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConnector.java index 111bf2087ba7f..48c6d1e443c9c 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConnector.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaConnector.java @@ -28,8 +28,7 @@ import com.facebook.presto.spi.connector.classloader.ClassLoaderSafeConnectorSplitManager; import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaMetadata.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaMetadata.java index c89e8204998e0..d0b45969dd390 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaMetadata.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaMetadata.java @@ -43,8 +43,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaModule.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaModule.java index 8898de615c37d..598eadcdd5bf7 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaModule.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaModule.java @@ -52,9 +52,8 @@ import com.google.inject.Provides; import com.google.inject.Scopes; import com.google.inject.multibindings.Multibinder; - -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.concurrent.ExecutorService; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaPageSourceProvider.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaPageSourceProvider.java index 9420438b6fd96..a47b6de549a88 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaPageSourceProvider.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaPageSourceProvider.java @@ -48,6 +48,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; @@ -64,8 +65,6 @@ import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.MessageType; -import javax.inject.Inject; - import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSessionProperties.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSessionProperties.java index f7eef23f202e0..73aa2fd9f09ce 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSessionProperties.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSessionProperties.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSplitManager.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSplitManager.java index 86e20b35a7a4a..150e1b1d03457 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSplitManager.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaSplitManager.java @@ -26,8 +26,7 @@ import io.delta.kernel.internal.InternalScanFileUtils; import io.delta.kernel.utils.CloseableIterator; import io.delta.kernel.utils.FileStatus; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaTableProperties.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaTableProperties.java index 77029fd359a9b..fad3a62c5e01f 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaTableProperties.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaTableProperties.java @@ -18,8 +18,7 @@ import com.facebook.presto.hive.HiveStorageFormat; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/rule/DeltaPlanOptimizerProvider.java b/presto-delta/src/main/java/com/facebook/presto/delta/rule/DeltaPlanOptimizerProvider.java index 5367945535b1e..0f1a00aca9143 100644 --- a/presto-delta/src/main/java/com/facebook/presto/delta/rule/DeltaPlanOptimizerProvider.java +++ b/presto-delta/src/main/java/com/facebook/presto/delta/rule/DeltaPlanOptimizerProvider.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.connector.ConnectorPlanOptimizerProvider; import com.facebook.presto.spi.relation.RowExpressionService; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java index ee35e7159ae7e..12ad524e0f322 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java @@ -33,9 +33,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import io.airlift.units.Duration; -import org.checkerframework.checker.nullness.qual.Nullable; - -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.io.BufferedReader; import java.io.IOException; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java index a5b6a49d5785e..1e9c6f1519ee0 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java @@ -20,12 +20,11 @@ import com.google.common.collect.ImmutableList; import io.airlift.units.Duration; import io.airlift.units.MinDuration; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; -import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; - import java.util.List; import java.util.Map; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidConnector.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidConnector.java index 109bd5e826e5d..2a638746894a3 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidConnector.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidConnector.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidMetadata.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidMetadata.java index 0f4f58b29acc8..ed1be3af7fb84 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidMetadata.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidMetadata.java @@ -38,8 +38,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidPageSourceProvider.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidPageSourceProvider.java index ffc710e7fb1dc..58f01cded0b1c 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidPageSourceProvider.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidPageSourceProvider.java @@ -30,13 +30,12 @@ import com.facebook.presto.spi.SplitContext; import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidPlanOptimizer.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidPlanOptimizer.java index 0259bbc8c2234..9b94c16d40a80 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidPlanOptimizer.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidPlanOptimizer.java @@ -34,8 +34,7 @@ import com.facebook.presto.spi.relation.RowExpression; import com.facebook.presto.spi.relation.VariableReferenceExpression; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidQueryGenerator.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidQueryGenerator.java index 714bd5ddef09d..16101c5eeac63 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidQueryGenerator.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidQueryGenerator.java @@ -35,8 +35,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidSessionProperties.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidSessionProperties.java index b717ff69a8005..e2213f93590e7 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidSessionProperties.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidSessionProperties.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidSplitManager.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidSplitManager.java index be8b0a468e27e..b2bba614a628d 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidSplitManager.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidSplitManager.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/ForDruidClient.java b/presto-druid/src/main/java/com/facebook/presto/druid/ForDruidClient.java index 7e2161ab92565..6c22b27d53afe 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/ForDruidClient.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/ForDruidClient.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.druid; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/authentication/DruidBasicAuthHttpRequestFilter.java b/presto-druid/src/main/java/com/facebook/presto/druid/authentication/DruidBasicAuthHttpRequestFilter.java index 34ffbcc78d534..64be14f787e67 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/authentication/DruidBasicAuthHttpRequestFilter.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/authentication/DruidBasicAuthHttpRequestFilter.java @@ -17,8 +17,7 @@ import com.facebook.airlift.http.client.HttpRequestFilter; import com.facebook.airlift.http.client.Request; import com.facebook.presto.druid.DruidConfig; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageSinkProvider.java b/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageSinkProvider.java index 34f32088e993c..6e0d430fd39e5 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageSinkProvider.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageSinkProvider.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageWriter.java b/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageWriter.java index b12edc35cd203..8c0e308ded35a 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageWriter.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/ingestion/DruidPageWriter.java @@ -21,13 +21,12 @@ import com.facebook.presto.spi.PrestoException; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.io.IOException; import java.util.UUID; import java.util.zip.GZIPOutputStream; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/metadata/DruidSegmentInfo.java b/presto-druid/src/main/java/com/facebook/presto/druid/metadata/DruidSegmentInfo.java index ca38860637b1c..f0126630fd1a3 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/metadata/DruidSegmentInfo.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/metadata/DruidSegmentInfo.java @@ -16,8 +16,7 @@ import com.facebook.presto.spi.PrestoException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileData.java b/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileData.java index d7b1de996ba58..2ee4ceb5ffbcb 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileData.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileData.java @@ -28,8 +28,7 @@ import com.facebook.presto.druid.DataInputSource; import com.facebook.presto.spi.PrestoException; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.nio.charset.Charset; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileEntry.java b/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileEntry.java index 4242d14d6619a..0ccebe0b562d7 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileEntry.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/zip/ZipFileEntry.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.druid.zip; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.EnumSet; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/AwsSecurityConfig.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/AwsSecurityConfig.java index ebe350f8c5347..ad4dc9de3599f 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/AwsSecurityConfig.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/AwsSecurityConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.elasticsearch; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Optional; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java index 43cfd6ba33d8a..354264b0fd0e2 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java @@ -18,9 +18,8 @@ import com.facebook.airlift.configuration.ConfigSecuritySensitive; 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.Optional; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnector.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnector.java index 00666829bddf7..6c4ba99c8ccad 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnector.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnector.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnectorModule.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnectorModule.java index 4cd973f38793e..8358adffa92d7 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnectorModule.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConnectorModule.java @@ -22,8 +22,7 @@ import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer; import com.google.inject.Binder; import com.google.inject.Scopes; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.configuration.ConditionalModule.installModuleIf; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchMetadata.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchMetadata.java index 93bb8a3d0f13a..aa8b62bbad357 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchMetadata.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchMetadata.java @@ -45,8 +45,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.BaseEncoding; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchPageSourceProvider.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchPageSourceProvider.java index c1b67b4178712..e59a11feb73d7 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchPageSourceProvider.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchPageSourceProvider.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.SplitContext; import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchSplitManager.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchSplitManager.java index be0c5d48ddb1b..4c4e1a0caa0a6 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchSplitManager.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchSplitManager.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/NodesSystemTable.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/NodesSystemTable.java index 42265df65512c..69f94bda2b35f 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/NodesSystemTable.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/NodesSystemTable.java @@ -29,8 +29,7 @@ import com.facebook.presto.spi.SystemTable; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/PasswordConfig.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/PasswordConfig.java index d2def0d8a3e40..159b4f304b4f6 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/PasswordConfig.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/PasswordConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigSecuritySensitive; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class PasswordConfig { diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java index 42a0e4a69680b..bf2eed35a39f7 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java @@ -34,6 +34,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.units.Duration; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; @@ -62,9 +65,6 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleClient.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleClient.java index 07c7b1bc1367d..f4d9bbcd15c6d 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleClient.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleClient.java @@ -21,8 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.Resources; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConfig.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConfig.java index 7ef582d3195a0..49730aa053385 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConfig.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.example; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.net.URI; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java index 64bf524813eb4..3e539575cb997 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.example.ExampleTransactionHandle.INSTANCE; import static java.util.Objects.requireNonNull; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleMetadata.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleMetadata.java index 4a0b9b7a63564..9653a09277cac 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleMetadata.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleMetadata.java @@ -29,8 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleModule.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleModule.java index 0b8409342203c..dae71956efec1 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleModule.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleModule.java @@ -20,8 +20,7 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.airlift.json.JsonBinder.jsonBinder; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleRecordSetProvider.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleRecordSetProvider.java index 7c4b3e8ab54da..f2b2f5c3c99b5 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleRecordSetProvider.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleRecordSetProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleSplitManager.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleSplitManager.java index d0b4142c34259..ec7a51f2d80d1 100644 --- a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleSplitManager.java +++ b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleSplitManager.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.FixedSplitSource; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; import java.util.ArrayList; diff --git a/presto-example-http/src/test/java/com/facebook/presto/example/ExampleHttpServer.java b/presto-example-http/src/test/java/com/facebook/presto/example/ExampleHttpServer.java index 62c47f670d74e..679464ceec072 100644 --- a/presto-example-http/src/test/java/com/facebook/presto/example/ExampleHttpServer.java +++ b/presto-example-http/src/test/java/com/facebook/presto/example/ExampleHttpServer.java @@ -25,11 +25,10 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.TypeLiteral; - -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/presto-expressions/src/main/java/com/facebook/presto/expressions/DynamicFilters.java b/presto-expressions/src/main/java/com/facebook/presto/expressions/DynamicFilters.java index fce21bb6f52e4..fec5ea16fd44f 100644 --- a/presto-expressions/src/main/java/com/facebook/presto/expressions/DynamicFilters.java +++ b/presto-expressions/src/main/java/com/facebook/presto/expressions/DynamicFilters.java @@ -36,10 +36,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.facebook.presto.common.function.OperatorType.EQUAL; -import static com.facebook.presto.common.function.OperatorType.GREATER_THAN; -import static com.facebook.presto.common.function.OperatorType.GREATER_THAN_OR_EQUAL; -import static com.facebook.presto.common.function.OperatorType.LESS_THAN; -import static com.facebook.presto.common.function.OperatorType.LESS_THAN_OR_EQUAL; import static com.facebook.presto.common.type.StandardTypes.BOOLEAN; import static com.facebook.presto.common.type.StandardTypes.VARCHAR; import static com.facebook.presto.expressions.LogicalRowExpressions.TRUE_CONSTANT; diff --git a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/AbstractSqlInvokedFunctionNamespaceManager.java b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/AbstractSqlInvokedFunctionNamespaceManager.java index b5d17f3c59844..e612926e7c85b 100644 --- a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/AbstractSqlInvokedFunctionNamespaceManager.java +++ b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/AbstractSqlInvokedFunctionNamespaceManager.java @@ -44,9 +44,8 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.UncheckedExecutionException; - -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.annotation.Nonnull; import java.util.Collection; import java.util.List; @@ -90,8 +89,7 @@ public AbstractSqlInvokedFunctionNamespaceManager(String catalogName, SqlFunctio .build(new CacheLoader>() { @Override - @ParametersAreNonnullByDefault - public Collection load(QualifiedObjectName functionName) + public Collection load(@Nonnull QualifiedObjectName functionName) { Collection functions = fetchFunctionsDirect(functionName); for (SqlInvokedFunction function : functions) { @@ -109,8 +107,7 @@ public Collection load(QualifiedObjectName functionName) .build(new CacheLoader() { @Override - @ParametersAreNonnullByDefault - public FunctionMetadata load(SqlFunctionHandle functionHandle) + public FunctionMetadata load(@Nonnull SqlFunctionHandle functionHandle) { return fetchFunctionMetadataDirect(functionHandle); } diff --git a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/ServingCatalog.java b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/ServingCatalog.java index 6178f60cf45ea..63b034c82a129 100644 --- a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/ServingCatalog.java +++ b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/ServingCatalog.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.functionNamespace; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/testing/InMemoryFunctionNamespaceManager.java b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/testing/InMemoryFunctionNamespaceManager.java index 19c5279b570b2..827dd206867ab 100644 --- a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/testing/InMemoryFunctionNamespaceManager.java +++ b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/testing/InMemoryFunctionNamespaceManager.java @@ -28,8 +28,7 @@ import com.facebook.presto.spi.function.SqlFunctionHandle; import com.facebook.presto.spi.function.SqlFunctionId; import com.facebook.presto.spi.function.SqlInvokedFunction; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.Collection; import java.util.List; @@ -109,7 +108,7 @@ public void addUserDefinedType(UserDefinedType type) checkArgument( !userDefinedTypes.containsKey(name), "Parametric type %s already registered", - name); + name); userDefinedTypes.put(name, type); } diff --git a/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java b/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java index fc40f90bedff0..d4b428e589240 100644 --- a/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java +++ b/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java @@ -47,7 +47,7 @@ import static com.facebook.presto.spi.StandardErrorCode.GENERIC_USER_ERROR; import static com.facebook.presto.spi.StandardErrorCode.NOT_FOUND; import static com.facebook.presto.spi.function.RoutineCharacteristics.Language.SQL; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.testng.Assert.assertEquals; @@ -111,19 +111,19 @@ public void testTransactionalGetFunction() FunctionNamespaceTransactionHandle transaction2 = functionNamespaceManager.beginTransaction(); Collection functions2 = functionNamespaceManager.getFunctions(Optional.of(transaction2), POWER_TOWER); assertEquals(functions2.size(), 1); - assertEquals(getOnlyElement(functions2), FUNCTION_POWER_TOWER_DOUBLE.withVersion("1")); + assertEquals(functions2.stream().collect(onlyElement()), FUNCTION_POWER_TOWER_DOUBLE.withVersion("1")); // update the function, second transaction still sees the old functions functionNamespaceManager.createFunction(FUNCTION_POWER_TOWER_DOUBLE_UPDATED, true); functions2 = functionNamespaceManager.getFunctions(Optional.of(transaction2), POWER_TOWER); assertEquals(functions2.size(), 1); - assertEquals(getOnlyElement(functions2), FUNCTION_POWER_TOWER_DOUBLE.withVersion("1")); + assertEquals(functions2.stream().collect(onlyElement()), FUNCTION_POWER_TOWER_DOUBLE.withVersion("1")); // third transaction sees the updated function FunctionNamespaceTransactionHandle transaction3 = functionNamespaceManager.beginTransaction(); Collection functions3 = functionNamespaceManager.getFunctions(Optional.of(transaction3), POWER_TOWER); assertEquals(functions3.size(), 1); - assertEquals(getOnlyElement(functions3), FUNCTION_POWER_TOWER_DOUBLE_UPDATED.withVersion("2")); + assertEquals(functions3.stream().collect(onlyElement()), FUNCTION_POWER_TOWER_DOUBLE_UPDATED.withVersion("2")); functionNamespaceManager.commit(transaction1); functionNamespaceManager.commit(transaction2); @@ -137,8 +137,8 @@ public void testCaching() functionNamespaceManager.createFunction(FUNCTION_POWER_TOWER_DOUBLE, false); // fetchFunctionsDirect does not produce the same function reference - SqlInvokedFunction function1 = getOnlyElement(functionNamespaceManager.fetchFunctionsDirect(POWER_TOWER)); - SqlInvokedFunction function2 = getOnlyElement(functionNamespaceManager.fetchFunctionsDirect(POWER_TOWER)); + SqlInvokedFunction function1 = functionNamespaceManager.fetchFunctionsDirect(POWER_TOWER).stream().collect(onlyElement()); + SqlInvokedFunction function2 = functionNamespaceManager.fetchFunctionsDirect(POWER_TOWER).stream().collect(onlyElement()); assertEquals(function1, function2); assertNotSame(function1, function2); diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/AbstractAnnotatedProvider.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/AbstractAnnotatedProvider.java new file mode 100644 index 0000000000000..2fe177ca1e4eb --- /dev/null +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/AbstractAnnotatedProvider.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2012 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.facebook.presto.functionNamespace.execution.thrift; + +import com.google.inject.Injector; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + +import java.lang.annotation.Annotation; +import java.util.Objects; + +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + +public abstract class AbstractAnnotatedProvider + implements Provider +{ + private final Annotation annotation; + private Injector injector; + + protected AbstractAnnotatedProvider(Annotation annotation) + { + this.annotation = requireNonNull(annotation, "annotation is null"); + } + + @Inject + public final void setInjector(Injector injector) + { + this.injector = injector; + } + + @Override + public final T get() + { + checkState(injector != null, "injector was not set"); + return get(injector, annotation); + } + + protected abstract T get(Injector injector, Annotation annotation); + + @Override + public final boolean equals(Object obj) + { + if (this == obj) { + return true; + } + if ((obj == null) || (getClass() != obj.getClass())) { + return false; + } + AbstractAnnotatedProvider other = (AbstractAnnotatedProvider) obj; + return Objects.equals(this.annotation, other.annotation); + } + + @Override + public final int hashCode() + { + return Objects.hash(annotation); + } +} diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualAddressSelector.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualAddressSelector.java index eb2a84750f416..9ea74681b7094 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualAddressSelector.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualAddressSelector.java @@ -44,6 +44,6 @@ public Optional selectAddress(Optional context) public Optional selectAddress(Optional context, Set attempted) { checkArgument(context.isPresent(), "context is empty"); - return delegates.get(context.get()).selectAddress(Optional.empty(), attempted); + return delegates.get(context.orElseThrow()).selectAddress(Optional.empty(), attempted); } } diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualSimpleAddressSelectorBinder.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualSimpleAddressSelectorBinder.java index cd324fa713d71..d81d3323785de 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualSimpleAddressSelectorBinder.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ContextualSimpleAddressSelectorBinder.java @@ -17,7 +17,6 @@ import com.facebook.drift.client.address.SimpleAddressSelector; import com.facebook.drift.client.address.SimpleAddressSelector.SimpleAddress; import com.facebook.drift.client.address.SimpleAddressSelectorConfig; -import com.facebook.drift.client.guice.AbstractAnnotatedProvider; import com.facebook.drift.client.guice.AddressSelectorBinder; import com.google.common.collect.ImmutableMap; import com.google.inject.Binder; @@ -56,6 +55,7 @@ private static class SimpleAddressSelectorProvider extends AbstractAnnotatedProvider> { private final Map addresses; + protected SimpleAddressSelectorProvider(Annotation annotation, Map addresses) { super(annotation); diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ThriftSqlFunctionExecutor.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ThriftSqlFunctionExecutor.java index 3d05d7bb5e420..981cf8130b2f8 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ThriftSqlFunctionExecutor.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/execution/thrift/ThriftSqlFunctionExecutor.java @@ -56,7 +56,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.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.function.Function.identity; @@ -184,7 +184,7 @@ private SqlFunctionResult toSqlFunctionResult(ThriftUdfResult result, Type retur ThriftUdfPage page = result.getResult(); switch (page.getPageFormat()) { case PRESTO_THRIFT: - return new SqlFunctionResult(getOnlyElement(page.getThriftPage().getThriftBlocks()).toBlock(returnType), result.getUdfStats().getTotalCpuTimeMs()); + return new SqlFunctionResult(page.getThriftPage().getThriftBlocks().stream().collect(onlyElement()).toBlock(returnType), result.getUdfStats().getTotalCpuTimeMs()); case PRESTO_SERIALIZED: checkState(blockEncodingSerde != null, "blockEncodingSerde not set"); PagesSerde pagesSerde = new PagesSerde(blockEncodingSerde, Optional.empty(), Optional.empty(), Optional.empty()); diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionDefinitionProvider.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionDefinitionProvider.java index 749f7cc0d2824..a25fed005d786 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionDefinitionProvider.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionDefinitionProvider.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -61,7 +60,7 @@ public UdfFunctionSignatureMap getUdfDefinition(String filePath) private List getFilesInPath(String filePath, int maxDirectoryDepth) throws IOException { try (Stream stream = Files.find( - Paths.get(filePath), + Path.of(filePath), maxDirectoryDepth, (p, basicFileAttributes) -> p.getFileName().toString().toLowerCase(ENGLISH).endsWith(JSON_FILE_EXTENSION))) { return stream.collect(Collectors.toList()); diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManager.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManager.java index b830b1c4e1863..4617ebfcca253 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManager.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManager.java @@ -36,8 +36,7 @@ import com.facebook.presto.spi.function.SqlFunctionId; import com.facebook.presto.spi.function.SqlInvokedFunction; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManagerConfig.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManagerConfig.java index 46bd6f17a84e7..b9d8a8ec2f472 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManagerConfig.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/json/JsonFileBasedFunctionNamespaceManagerConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class JsonFileBasedFunctionNamespaceManagerConfig { diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionConfig.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionConfig.java index 1952a395b4a69..302637a62b97e 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionConfig.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.functionNamespace.mysql; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class MySqlConnectionConfig { diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionModule.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionModule.java index 1fbe6101b0e29..04b5482abdbe7 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionModule.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlConnectionModule.java @@ -17,13 +17,12 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jdbi.v3.core.ConnectionFactory; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; -import javax.inject.Inject; -import javax.inject.Provider; - import java.sql.DriverManager; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManager.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManager.java index 62e7318828683..15f2783437969 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManager.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManager.java @@ -32,11 +32,10 @@ import com.facebook.presto.spi.function.SqlFunctionHandle; import com.facebook.presto.spi.function.SqlFunctionId; import com.facebook.presto.spi.function.SqlInvokedFunction; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.jdbi.v3.core.Jdbi; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -50,7 +49,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.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static com.google.common.hash.Hashing.sha256; import static java.lang.Long.parseLong; import static java.lang.String.format; @@ -118,10 +117,7 @@ public void addUserDefinedType(UserDefinedType type) public UserDefinedType fetchUserDefinedTypeDirect(QualifiedObjectName typeName) { Optional type = functionNamespaceDao.getUserDefinedType(typeName.getCatalogName(), typeName.getSchemaName(), typeName.getObjectName()); - if (!type.isPresent()) { - throw new PrestoException(NOT_FOUND, format("Type %s not found", typeName)); - } - return type.get(); + return type.orElseThrow(() -> new PrestoException(NOT_FOUND, format("Type %s not found", typeName))); } @Override @@ -139,10 +135,7 @@ protected FunctionMetadata fetchFunctionMetadataDirect(SqlFunctionHandle functio { checkCatalog(functionHandle); Optional function = functionNamespaceDao.getFunction(hash(functionHandle.getFunctionId()), functionHandle.getFunctionId(), getLongVersion(functionHandle)); - if (!function.isPresent()) { - throw new InvalidFunctionHandleException(functionHandle); - } - return sqlInvokedFunctionToMetadata(function.get()); + return sqlInvokedFunctionToMetadata(function.orElseThrow(() -> new InvalidFunctionHandleException(functionHandle))); } @Override @@ -150,10 +143,7 @@ protected ScalarFunctionImplementation fetchFunctionImplementationDirect(SqlFunc { checkCatalog(functionHandle); Optional function = functionNamespaceDao.getFunction(hash(functionHandle.getFunctionId()), functionHandle.getFunctionId(), getLongVersion(functionHandle)); - if (!function.isPresent()) { - throw new InvalidFunctionHandleException(functionHandle); - } - return sqlInvokedFunctionToImplementation(function.get()); + return sqlInvokedFunctionToImplementation(function.orElseThrow(() -> new InvalidFunctionHandleException(functionHandle))); } @Override @@ -189,16 +179,16 @@ public void createFunction(SqlInvokedFunction function, boolean replace) jdbi.useTransaction(handle -> { FunctionNamespaceDao transactionDao = handle.attach(functionNamespaceDaoClass); Optional latestVersion = transactionDao.getLatestRecordForUpdate(hash(function.getFunctionId()), function.getFunctionId()); - if (!replace && latestVersion.isPresent() && !latestVersion.get().isDeleted()) { + if (!replace && latestVersion.isPresent() && !latestVersion.orElseThrow().isDeleted()) { throw new PrestoException(ALREADY_EXISTS, "Function already exists: " + function.getFunctionId()); } - if (!latestVersion.isPresent() || !latestVersion.get().getFunction().hasSameDefinitionAs(function)) { + if (latestVersion.isEmpty() || !latestVersion.orElseThrow().getFunction().hasSameDefinitionAs(function)) { long newVersion = latestVersion.map(SqlInvokedFunctionRecord::getFunction).map(MySqlFunctionNamespaceManager::getLongVersion).orElse(0L) + 1; insertSqlInvokedFunction(transactionDao, function, newVersion); } - else if (latestVersion.get().isDeleted()) { - SqlInvokedFunction latest = latestVersion.get().getFunction(); + else if (latestVersion.orElseThrow().isDeleted()) { + SqlInvokedFunction latest = latestVersion.orElseThrow().getFunction(); checkState(latest.hasVersion(), "Function version missing: %s", latest.getFunctionId()); transactionDao.setDeletionStatus(hash(latest.getFunctionId()), latest.getFunctionId(), getLongVersion(latest), false); } @@ -250,7 +240,7 @@ public void dropFunction(QualifiedObjectName functionName, Optional getSqlFunctions(FunctionNamespaceDao functionNa { List records = new ArrayList<>(); if (parameterTypes.isPresent()) { - SqlFunctionId functionId = new SqlFunctionId(functionName, parameterTypes.get()); + SqlFunctionId functionId = new SqlFunctionId(functionName, parameterTypes.orElseThrow()); functionNamespaceDao.getLatestRecordForUpdate(hash(functionId), functionId).ifPresent(records::add); } else { diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManagerConfig.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManagerConfig.java index 9dd187c605d8f..2f9d7970db2a4 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManagerConfig.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/mysql/MySqlFunctionNamespaceManagerConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.functionNamespace.mysql; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class MySqlFunctionNamespaceManagerConfig { diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManager.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManager.java index 97ca171977ed2..4694911f2e3d0 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManager.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManager.java @@ -40,8 +40,7 @@ import com.facebook.presto.spi.function.SqlFunctionId; import com.facebook.presto.spi.function.SqlInvokedFunction; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; @@ -194,11 +193,7 @@ protected FunctionMetadata fetchFunctionMetadataDirect(SqlFunctionHandle functio checkCatalog(functionHandle); Optional function = getSqlInvokedFunction(functionHandle); - if (!function.isPresent()) { - throw new InvalidFunctionHandleException(functionHandle); - } - - return sqlInvokedFunctionToMetadata(function.get()); + return sqlInvokedFunctionToMetadata(function.orElseThrow(() -> new InvalidFunctionHandleException(functionHandle))); } @Override @@ -207,11 +202,7 @@ protected ScalarFunctionImplementation fetchFunctionImplementationDirect(SqlFunc checkCatalog(functionHandle); Optional function = getSqlInvokedFunction(functionHandle); - if (!function.isPresent()) { - throw new InvalidFunctionHandleException(functionHandle); - } - - return sqlInvokedFunctionToImplementation(function.get()); + return sqlInvokedFunctionToImplementation(function.orElseThrow(() -> new InvalidFunctionHandleException(functionHandle))); } @Override diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManagerConfig.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManagerConfig.java index c4bcea72210ba..303a575bb1a6f 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManagerConfig.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestBasedFunctionNamespaceManagerConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class RestBasedFunctionNamespaceManagerConfig { diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java index 70e1075163968..66b72ea267321 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java @@ -37,14 +37,11 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.InputStreamSliceInput; import io.airlift.slice.SliceInput; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -72,6 +69,7 @@ import static java.net.HttpURLConnection.HTTP_NOT_FOUND; import static java.net.HttpURLConnection.HTTP_OK; import static java.net.HttpURLConnection.HTTP_SERVER_ERROR; +import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; public class RestSqlFunctionExecutor @@ -139,13 +137,7 @@ public CompletableFuture executeFunction( private URI getExecutionEndpoint(RestFunctionHandle restFunctionHandle, SqlFunctionId functionId, String functionVersion) { String encodedFunctionId; - try { - encodedFunctionId = URLEncoder.encode(functionId.toJsonString(), StandardCharsets.UTF_8.toString()); - } - catch (UnsupportedEncodingException e) { - // Should never happen - throw new IllegalStateException("UTF-8 encoding is not supported", e); - } + encodedFunctionId = URLEncoder.encode(functionId.toJsonString(), UTF_8); // Use execution endpoint from handle if present, otherwise use default URI baseUri = restFunctionHandle.getExecutionEndpoint() diff --git a/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/TestRestBasedFunctionNamespaceManager.java b/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/TestRestBasedFunctionNamespaceManager.java index e32a401da5ec9..ecce6415ea0f3 100644 --- a/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/TestRestBasedFunctionNamespaceManager.java +++ b/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/TestRestBasedFunctionNamespaceManager.java @@ -35,18 +35,17 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import java.net.URI; import java.util.ArrayList; import java.util.Arrays; @@ -286,7 +285,8 @@ public static Map> createUpdatedUdfSi } @BeforeMethod - public void setUp() throws Exception + public void setUp() + throws Exception { resource = new TestingFunctionResource(createUdfSignatureMap()); ObjectMapper mapper = new ObjectMapper(); diff --git a/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/mysql/TestMySqlFunctionNamespaceManager.java b/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/mysql/TestMySqlFunctionNamespaceManager.java index 72279f9ba7c19..7f8d3a9f2d766 100644 --- a/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/mysql/TestMySqlFunctionNamespaceManager.java +++ b/presto-function-namespace-managers/src/test/java/com/facebook/presto/functionNamespace/mysql/TestMySqlFunctionNamespaceManager.java @@ -443,7 +443,7 @@ private FunctionHandle getLatestFunctionHandle(SqlFunctionId functionId) .max(comparing(SqlInvokedFunction::getRequiredVersion)); assertTrue(function.isPresent()); functionNamespaceManager.commit(transactionHandle); - return function.get().getRequiredFunctionHandle(); + return function.orElseThrow().getRequiredFunctionHandle(); } private void assertListFunctions(Optional likePattern, Optional escape, SqlInvokedFunction... functions) diff --git a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java index ce337f9d96da7..8a0ea29e6a4ff 100644 --- a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java +++ b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java @@ -20,13 +20,12 @@ import com.facebook.presto.spi.classloader.ThreadContextClassLoader; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.resolver.ArtifactResolver; import io.airlift.resolver.DefaultArtifact; +import jakarta.inject.Inject; import org.sonatype.aether.artifact.Artifact; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; - import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionResource.java b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionResource.java index 0a1f0bf4fd8f5..6c1e9744fa1be 100644 --- a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionResource.java +++ b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionResource.java @@ -39,17 +39,16 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; - -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.UnsupportedEncodingException; import java.lang.invoke.MethodHandle; diff --git a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/EsriGeometrySerde.java b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/EsriGeometrySerde.java index 8df5b565790ce..e591fc5fd18a0 100644 --- a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/EsriGeometrySerde.java +++ b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/EsriGeometrySerde.java @@ -38,8 +38,7 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.SliceInput; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/JtsGeometrySerde.java b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/JtsGeometrySerde.java index d8d7c43366d60..8f052128ec972 100644 --- a/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/JtsGeometrySerde.java +++ b/presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/JtsGeometrySerde.java @@ -38,7 +38,7 @@ import static com.facebook.presto.geospatial.GeometryUtils.isEsriNaN; import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT; import static com.google.common.base.Verify.verify; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static io.airlift.slice.SizeOf.SIZE_OF_DOUBLE; import static java.lang.Double.NaN; import static java.lang.Double.isNaN; @@ -200,7 +200,7 @@ private static Geometry readPolygon(SliceInput input, boolean multitype) if (multitype) { return GEOMETRY_FACTORY.createMultiPolygon(polygons.toArray(new Polygon[0])); } - return getOnlyElement(polygons); + return polygons.stream().collect(onlyElement()); } private static Geometry readGeometryCollection(BasicSliceInput input) diff --git a/presto-geospatial-toolkit/src/test/java/com/facebook/presto/geospatial/TestKdbTree.java b/presto-geospatial-toolkit/src/test/java/com/facebook/presto/geospatial/TestKdbTree.java index 75b5c77724cbb..491232d2e527b 100644 --- a/presto-geospatial-toolkit/src/test/java/com/facebook/presto/geospatial/TestKdbTree.java +++ b/presto-geospatial-toolkit/src/test/java/com/facebook/presto/geospatial/TestKdbTree.java @@ -15,13 +15,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 java.util.Map; import java.util.Set; import static com.facebook.presto.geospatial.KdbTree.buildKdbTree; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.lang.Double.NEGATIVE_INFINITY; import static java.lang.Double.POSITIVE_INFINITY; import static org.testng.Assert.assertEquals; @@ -69,7 +69,7 @@ private void testSinglePartition(double width, double height) assertEquals(tree.getLeaves().size(), 1); - Map.Entry entry = Iterables.getOnlyElement(tree.getLeaves().entrySet()); + Map.Entry entry = tree.getLeaves().entrySet().stream().collect(onlyElement()); assertEquals(entry.getKey().intValue(), 0); assertEquals(entry.getValue(), Rectangle.getUniverseRectangle()); } diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsClient.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsClient.java index 441237054faa0..be31ca870882a 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsClient.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsClient.java @@ -30,8 +30,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.UncheckedExecutionException; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.FileInputStream; import java.io.IOException; diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java index 3377d0a4e24ac..f7b2f695e7581 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java @@ -17,9 +17,8 @@ import com.facebook.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/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConnector.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConnector.java index f5855fc43d915..358faefcc66dc 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConnector.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConnector.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsMetadata.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsMetadata.java index 77efd180c6a86..c81b9d4fcbcc5 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsMetadata.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsMetadata.java @@ -29,8 +29,7 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsModule.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsModule.java index 9ddfb5036963c..f59e3c52c4d6d 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsModule.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsModule.java @@ -20,8 +20,7 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.airlift.json.JsonBinder.jsonBinder; diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsSplitManager.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsSplitManager.java index e458a2c60bfef..58da2d9249434 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsSplitManager.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsSplitManager.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.TableNotFoundException; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; diff --git a/presto-hana/src/main/java/com/facebook/presto/plugin/hana/HanaClient.java b/presto-hana/src/main/java/com/facebook/presto/plugin/hana/HanaClient.java index eb621be50a31e..16ca9804403e3 100644 --- a/presto-hana/src/main/java/com/facebook/presto/plugin/hana/HanaClient.java +++ b/presto-hana/src/main/java/com/facebook/presto/plugin/hana/HanaClient.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.google.common.base.Joiner; import com.sap.db.jdbc.Driver; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/presto-hdfs-core/src/main/java/com/facebook/presto/hive/BlockLocation.java b/presto-hdfs-core/src/main/java/com/facebook/presto/hive/BlockLocation.java index c3089d8b1fae9..7f96bd00a6fb8 100644 --- a/presto-hdfs-core/src/main/java/com/facebook/presto/hive/BlockLocation.java +++ b/presto-hdfs-core/src/main/java/com/facebook/presto/hive/BlockLocation.java @@ -17,10 +17,9 @@ import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.google.common.collect.ImmutableList; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.List; import java.util.Objects; diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java index 9a2ec46dd00f9..368d1bdf3c57f 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java @@ -18,10 +18,9 @@ import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationMode; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; import io.airlift.units.DataSize; - -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 static com.facebook.presto.spi.schedule.NodeSelectionStrategy.NO_PREFERENCE; import static io.airlift.units.DataSize.Unit.MEGABYTE; diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java index b67955d5b7024..a674afc2318f1 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java @@ -21,8 +21,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.ThreadLocalRandom; diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/MetadataUtils.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/MetadataUtils.java index 67e4c4201968c..947d4787bac7e 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/MetadataUtils.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/MetadataUtils.java @@ -29,8 +29,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.HashSet; import java.util.List; @@ -55,6 +54,7 @@ public final class MetadataUtils private static final String CATALOG_DB_THRIFT_NAME_MARKER = "@"; private static final String DB_EMPTY_MARKER = "!"; private static final String DEFAULT_DATABASE = "default"; + private MetadataUtils() {} public static Optional getDiscretePredicates(List partitionColumns, List partitions) diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/PartitionNameWithVersion.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/PartitionNameWithVersion.java index e86afe9064adc..6597d5f29e60a 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/PartitionNameWithVersion.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/PartitionNameWithVersion.java @@ -16,8 +16,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ComparisonChain; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Objects; import java.util.Optional; diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java index 29e835c7fd777..54e09b1ff6477 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java @@ -19,9 +19,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/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java index e66bc59b757b2..c5df5c18f72c7 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java @@ -17,9 +17,8 @@ import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.annotation.Nullable; -import javax.validation.constraints.AssertTrue; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.AssertTrue; import java.io.File; import java.util.Optional; diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/ForHiveFunction.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/ForHiveFunction.java index b3db7a981d638..3b8ffc28b6f69 100644 --- a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/ForHiveFunction.java +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/ForHiveFunction.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.functions; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/HiveFunctionNamespaceManager.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/HiveFunctionNamespaceManager.java index 3ec1ec255856b..1f38ea72e1663 100644 --- a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/HiveFunctionNamespaceManager.java +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/HiveFunctionNamespaceManager.java @@ -38,14 +38,13 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import org.apache.hadoop.hive.ql.exec.UDAF; import org.apache.hadoop.hive.ql.exec.UDF; import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFResolver; import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFResolver2; import org.apache.hadoop.hive.ql.udf.generic.GenericUDF; -import javax.inject.Inject; - import java.util.Collection; import java.util.List; import java.util.Objects; diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/StaticHiveFunctionRegistry.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/StaticHiveFunctionRegistry.java index 40018734b7b2d..0eae64f3c579c 100644 --- a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/StaticHiveFunctionRegistry.java +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/StaticHiveFunctionRegistry.java @@ -16,10 +16,9 @@ import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.spi.classloader.ThreadContextClassLoader; +import jakarta.inject.Inject; import org.apache.hadoop.hive.ql.parse.SemanticException; -import javax.inject.Inject; - import static com.facebook.presto.hive.functions.FunctionRegistry.getFunctionInfo; import static java.util.Objects.requireNonNull; diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/CompilerOperations.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/CompilerOperations.java index c4faeb7213442..4ec502a65e922 100644 --- a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/CompilerOperations.java +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/CompilerOperations.java @@ -14,8 +14,7 @@ package com.facebook.presto.hive.functions.gen; import com.facebook.presto.common.block.Block; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForCachingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForCachingHiveMetastore.java index b4cdb281658a8..bf677f6e33c81 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForCachingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForCachingHiveMetastore.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForMetastoreHdfsEnvironment.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForMetastoreHdfsEnvironment.java index 54be368395ee5..cbac7bddbff09 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForMetastoreHdfsEnvironment.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForMetastoreHdfsEnvironment.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForRecordingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForRecordingHiveMetastore.java index 3777fa7969377..a1f9b9d25bc74 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForRecordingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/ForRecordingHiveMetastore.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HdfsEnvironment.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HdfsEnvironment.java index 58301f0d1aa04..a1de65ea082fa 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HdfsEnvironment.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HdfsEnvironment.java @@ -17,13 +17,12 @@ import com.facebook.presto.hive.authentication.GenericExceptionAction; import com.facebook.presto.hive.authentication.HdfsAuthentication; import com.facebook.presto.hive.filesystem.ExtendedFileSystem; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.HadoopExtendedFileSystemCache; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.io.IOException; import static com.google.common.base.Preconditions.checkState; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveBasicStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveBasicStatistics.java index 4d8112fe73173..98f33b32283ad 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveBasicStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveBasicStatistics.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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveColumnConverterProvider.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveColumnConverterProvider.java index c9cca843ca11b..8395c812770ed 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveColumnConverterProvider.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveColumnConverterProvider.java @@ -14,8 +14,7 @@ package com.facebook.presto.hive; import com.facebook.presto.hive.metastore.HiveColumnConverter; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class HiveColumnConverterProvider implements ColumnConverterProvider diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java index 950e65202f3ea..59cfaf7d1c5f3 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java @@ -19,11 +19,10 @@ import com.google.common.net.HostAndPort; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -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.util.concurrent.TimeUnit; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java index 1c0df753f20d0..dd75f953c4d3a 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java @@ -20,10 +20,9 @@ import com.facebook.presto.spi.constraints.TableConstraint; import com.facebook.presto.spi.security.PrestoPrincipal; import com.facebook.presto.spi.statistics.ColumnStatisticType; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; -import javax.annotation.concurrent.ThreadSafe; - import java.util.List; import java.util.Map; import java.util.Set; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/BooleanStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/BooleanStatistics.java index bbd624698cdaa..4f1c5eb415a56 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/BooleanStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java index 5aa481580d087..bb1e7dc0c512b 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Column.java @@ -16,10 +16,9 @@ import com.facebook.presto.hive.HiveType; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.errorprone.annotations.Immutable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.concurrent.Immutable; - import java.util.Objects; import java.util.Optional; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Database.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Database.java index 2d751e714c694..ebb8e4764132a 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Database.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Database.java @@ -17,8 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.LinkedHashMap; import java.util.Map; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DateStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DateStatistics.java index 8b422ad4f0f85..d36cf226c2cb1 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DateStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DecimalStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DecimalStatistics.java index ada80c2c38944..b4d4b789146cb 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DecimalStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DoubleStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DoubleStatistics.java index c70ff272a93b8..a0a642a5ede3f 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/DoubleStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HiveColumnStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HiveColumnStatistics.java index df9fcf7ee7782..df477e9b07b49 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HiveColumnStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionMutator.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionMutator.java index e2efcd85113da..a9b38c6bf21ed 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionMutator.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionMutator.java @@ -15,10 +15,9 @@ import com.facebook.presto.hive.PartitionMutator; import com.facebook.presto.hive.metastore.Partition.Builder; +import jakarta.inject.Inject; import org.apache.hadoop.hive.metastore.api.Partition; -import javax.inject.Inject; - public class HivePartitionMutator implements PartitionMutator { diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionName.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionName.java index ebb348c736498..a7568a02cc352 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionName.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePartitionName.java @@ -17,8 +17,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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePrivilegeInfo.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePrivilegeInfo.java index ca5b5a95b7966..dac23a80d7fac 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePrivilegeInfo.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HivePrivilegeInfo.java @@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Objects; import java.util.Set; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HiveTableName.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HiveTableName.java index f80a945763f52..790b1dc1e71f4 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/HiveTableName.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java index a1327c0bc910d..c4b5fec6bc5cd 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java @@ -30,12 +30,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.SetMultimap; import com.google.common.util.concurrent.UncheckedExecutionException; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/IntegerStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/IntegerStatistics.java index 75b24ad200cae..7de33e1470bc5 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/IntegerStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InvalidateMetastoreCacheProcedure.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InvalidateMetastoreCacheProcedure.java index 29ee7a89a47db..d6ed9cbf4a9d9 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InvalidateMetastoreCacheProcedure.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InvalidateMetastoreCacheProcedure.java @@ -20,9 +20,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.facebook.presto.spi.procedure.Procedure.Argument; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; import java.util.List; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreConfig.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreConfig.java index 058b566682272..f4776d69c77dd 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreConfig.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.hive.metastore; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class MetastoreConfig { diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreUtil.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreUtil.java index 53ec58fc3547a..863522cae2b7a 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreUtil.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/MetastoreUtil.java @@ -69,6 +69,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Longs; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; @@ -80,8 +81,6 @@ import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import javax.annotation.Nullable; - import java.io.IOException; import java.math.BigInteger; import java.sql.Date; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Partition.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Partition.java index 40163d4bc302e..f2a805da02935 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Partition.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Partition.java @@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Arrays; import java.util.List; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionFilter.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionFilter.java index 94436f62fe65b..e3226b8bca417 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionFilter.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionFilter.java @@ -14,8 +14,7 @@ package com.facebook.presto.hive.metastore; import com.facebook.presto.common.predicate.Domain; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Map; import java.util.Objects; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionStatistics.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionStatistics.java index 69ad53e90a74b..b8fde0d6b640d 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionStatistics.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/PartitionStatistics.java @@ -18,8 +18,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Map; import java.util.Objects; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java index 993b7da5ef3bf..bfe2c6d252991 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java @@ -33,12 +33,11 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.errorprone.annotations.Immutable; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; -import javax.annotation.concurrent.Immutable; -import javax.inject.Inject; - import java.io.File; import java.io.IOException; import java.util.List; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java index d04d92e2210e9..632304295ed37 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java @@ -47,13 +47,12 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import javax.annotation.concurrent.GuardedBy; - import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SortingColumn.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SortingColumn.java index 717653db1a3ce..cbb62332c8ddc 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SortingColumn.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SortingColumn.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.PrestoException; 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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Storage.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Storage.java index bd5262bc36b90..693bc53bfa5fc 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Storage.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Storage.java @@ -17,8 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Map; import java.util.Objects; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/StorageFormat.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/StorageFormat.java index 024f643280367..d05c8e2f73379 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/StorageFormat.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/StorageFormat.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.PrestoException; 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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Table.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Table.java index 9f8ee10dba1dc..108dc0a0cc01f 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Table.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/Table.java @@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserDatabaseKey.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserDatabaseKey.java index c4835e81a1240..ca745dd5855fe 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserDatabaseKey.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserTableKey.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserTableKey.java index 2ddaa5c1cadf5..b4863926411ed 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserTableKey.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/UserTableKey.java @@ -16,8 +16,7 @@ import com.facebook.presto.spi.security.PrestoPrincipal; 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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java index 2b265384ebf7b..b9a67ffce0216 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java @@ -59,15 +59,14 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteStreams; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; +import jakarta.inject.Inject; 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.ThreadSafe; -import javax.inject.Inject; - import java.io.IOException; import java.io.OutputStream; import java.util.ArrayDeque; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastoreConfig.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastoreConfig.java index 31015aadac281..ee1e628a43a1b 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastoreConfig.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastoreConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class FileHiveMetastoreConfig { diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/ForGlueHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/ForGlueHiveMetastore.java index a0c0635db36a9..d56e29bcf4b8d 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/ForGlueHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/ForGlueHiveMetastore.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.metastore.glue; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueCatalogApiStats.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueCatalogApiStats.java index b1709c68465c1..c35b852c38554 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueCatalogApiStats.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueCatalogApiStats.java @@ -17,11 +17,10 @@ import com.amazonaws.handlers.AsyncHandler; import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; - import java.util.function.Supplier; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java index c9c2f502c3592..5a12978c21324 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java @@ -97,13 +97,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import io.airlift.units.Duration; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; import org.weakref.jmx.Flatten; import org.weakref.jmx.Managed; -import javax.annotation.Nullable; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastoreConfig.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastoreConfig.java index 53b3f0e5b0295..9c2869261b16e 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastoreConfig.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastoreConfig.java @@ -16,9 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; - -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import java.util.Optional; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java index 61c76f9e4cace..30c4d2353f4b6 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java @@ -45,10 +45,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.apache.hadoop.hive.metastore.api.FieldSchema; -import javax.inject.Inject; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreApiStats.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreApiStats.java index 88730f0ba0d04..c7e7ede3d7510 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreApiStats.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreApiStats.java @@ -15,14 +15,13 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; +import com.google.errorprone.annotations.ThreadSafe; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.thrift.TBase; import org.apache.thrift.TException; 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/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java index 19787c95fbad1..0ced2b8756a3b 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java @@ -20,9 +20,9 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.net.HostAndPort; import io.airlift.units.Duration; +import jakarta.inject.Inject; 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; @@ -77,10 +77,10 @@ public HiveMetastoreClientFactory( public HiveMetastoreClientFactory(MetastoreClientConfig metastoreClientConfig, ThriftHiveMetastoreConfig thriftHiveMetastoreConfig, HiveMetastoreAuthentication metastoreAuthentication, HiveCommonClientConfig hiveCommonClientConfig) { this(buildSslContext(thriftHiveMetastoreConfig.isTlsEnabled(), - Optional.ofNullable(thriftHiveMetastoreConfig.getKeystorePath()), - Optional.ofNullable(thriftHiveMetastoreConfig.getKeystorePassword()), - Optional.ofNullable(thriftHiveMetastoreConfig.getTruststorePath()), - Optional.ofNullable(thriftHiveMetastoreConfig.getTrustStorePassword())), + Optional.ofNullable(thriftHiveMetastoreConfig.getKeystorePath()), + Optional.ofNullable(thriftHiveMetastoreConfig.getKeystorePassword()), + Optional.ofNullable(thriftHiveMetastoreConfig.getTruststorePath()), + Optional.ofNullable(thriftHiveMetastoreConfig.getTrustStorePassword())), Optional.ofNullable(metastoreClientConfig.getMetastoreSocksProxy()), metastoreClientConfig.getMetastoreTimeout(), metastoreAuthentication, hiveCommonClientConfig.getCatalogName()); } @@ -93,6 +93,7 @@ public HiveMetastoreClient create(HostAndPort address, Optional token) /** * Reads the truststore and keystore and returns the SSLContext + * * @param tlsEnabled * @param keystorePath * @param keystorePassword @@ -101,10 +102,10 @@ public HiveMetastoreClient create(HostAndPort address, Optional token) * @return SSLContext */ private static Optional buildSslContext(boolean tlsEnabled, - Optional keystorePath, - Optional keystorePassword, - Optional truststorePath, - Optional trustStorePassword) + Optional keystorePath, + Optional keystorePassword, + Optional truststorePath, + Optional trustStorePassword) { if (!tlsEnabled || (!keystorePath.isPresent() && !truststorePath.isPresent())) { return Optional.empty(); @@ -163,6 +164,7 @@ private static Optional buildSslContext(boolean tlsEnabled, /** * Reads the truststore certificate and returns it + * * @param trustStorePath * @param trustStorePassword * @throws IOException @@ -195,10 +197,12 @@ private static KeyStore getTrustStore(File trustStorePath, Optional trus /** * Validate keystore certificate + * * @param keyStore * @throws GeneralSecurityException */ - private static void validateKeyStoreCertificates(KeyStore keyStore) throws GeneralSecurityException + private static void validateKeyStoreCertificates(KeyStore keyStore) + throws GeneralSecurityException { for (String alias : list(keyStore.aliases())) { if (!keyStore.isKeyEntry(alias)) { diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticHiveCluster.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticHiveCluster.java index 86a037f9644f2..139b9d6b771a1 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticHiveCluster.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticHiveCluster.java @@ -14,10 +14,9 @@ package com.facebook.presto.hive.metastore.thrift; import com.google.common.net.HostAndPort; +import jakarta.inject.Inject; import org.apache.thrift.TException; -import javax.inject.Inject; - import java.net.URI; import java.util.ArrayList; import java.util.Collections; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticMetastoreConfig.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticMetastoreConfig.java index f1f2f6d5d4394..94daf6fba5498 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticMetastoreConfig.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/StaticMetastoreConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.net.URI; import java.util.List; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftHiveMetastore.java index 24056038648c9..7df3f397e4cc2 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftHiveMetastore.java @@ -56,6 +56,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; @@ -93,9 +95,6 @@ import org.weakref.jmx.Flatten; import org.weakref.jmx.Managed; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; - import java.io.Closeable; import java.io.IOException; import java.net.InetAddress; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftMetastoreUtil.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftMetastoreUtil.java index 74858baba829c..4167f8ebeabe4 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftMetastoreUtil.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/ThriftMetastoreUtil.java @@ -43,6 +43,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; import com.google.common.primitives.Shorts; +import jakarta.annotation.Nullable; import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.api.BinaryColumnStatsData; import org.apache.hadoop.hive.metastore.api.BooleanColumnStatsData; @@ -64,8 +65,6 @@ import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; -import javax.annotation.Nullable; - import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; diff --git a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/InMemoryHiveMetastore.java b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/InMemoryHiveMetastore.java index 81bcf00059b8f..636e99b38196e 100644 --- a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/InMemoryHiveMetastore.java +++ b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/InMemoryHiveMetastore.java @@ -36,6 +36,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 org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.api.Database; @@ -44,8 +45,6 @@ import org.apache.hadoop.hive.metastore.api.PrincipalType; import org.apache.hadoop.hive.metastore.api.Table; -import javax.annotation.concurrent.GuardedBy; - import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java b/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java index 3b505c3739459..bd9a369b17607 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java @@ -26,12 +26,11 @@ import com.google.common.collect.ImmutableSet; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; import org.openjdk.jol.info.ClassLayout; import org.weakref.jmx.Managed; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ConcurrentLazyQueue.java b/presto-hive/src/main/java/com/facebook/presto/hive/ConcurrentLazyQueue.java index 05dd95d6d3824..9d7746b5a50d7 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ConcurrentLazyQueue.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ConcurrentLazyQueue.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.Iterator; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/CreateEmptyPartitionProcedure.java b/presto-hive/src/main/java/com/facebook/presto/hive/CreateEmptyPartitionProcedure.java index 7e967e2b97f26..1108425563fe6 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/CreateEmptyPartitionProcedure.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/CreateEmptyPartitionProcedure.java @@ -26,11 +26,10 @@ import com.facebook.presto.spi.procedure.Procedure.Argument; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slices; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.hadoop.hive.common.FileUtils; -import javax.inject.Inject; -import javax.inject.Provider; - import java.lang.invoke.MethodHandle; import java.util.List; import java.util.Objects; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/DirectoryListCacheInvalidationProcedure.java b/presto-hive/src/main/java/com/facebook/presto/hive/DirectoryListCacheInvalidationProcedure.java index 983cffbbb3b57..303e3badf61d0 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/DirectoryListCacheInvalidationProcedure.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/DirectoryListCacheInvalidationProcedure.java @@ -19,9 +19,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.facebook.presto.spi.procedure.Procedure.Argument; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ForCachingDirectoryLister.java b/presto-hive/src/main/java/com/facebook/presto/hive/ForCachingDirectoryLister.java index 94672ba011c2e..014968340b1af 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ForCachingDirectoryLister.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ForCachingDirectoryLister.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ForFileRename.java b/presto-hive/src/main/java/com/facebook/presto/hive/ForFileRename.java index 9c59f672fd861..988b7dec0e247 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ForFileRename.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ForFileRename.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ForHdfs.java b/presto-hive/src/main/java/com/facebook/presto/hive/ForHdfs.java index d0bfa7424abb2..c7d566138f51b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ForHdfs.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ForHdfs.java @@ -17,7 +17,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveClient.java b/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveClient.java index 6297c8ef5ff17..21329783da407 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveClient.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveClient.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveMetastore.java b/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveMetastore.java index b8a1b33d1a8df..ad698b62a4618 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveMetastore.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ForHiveMetastore.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ForZeroRowFileCreator.java b/presto-hive/src/main/java/com/facebook/presto/hive/ForZeroRowFileCreator.java index 8f27319c3c13f..5222f0675044c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ForZeroRowFileCreator.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ForZeroRowFileCreator.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/GenericHiveRecordCursorProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/GenericHiveRecordCursorProvider.java index 7edaba22e16b7..48613955a6ae4 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/GenericHiveRecordCursorProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/GenericHiveRecordCursorProvider.java @@ -19,14 +19,13 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.RecordCursor; +import jakarta.inject.Inject; 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.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java index 991b364614cd5..4e8a1dbc02766 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java @@ -19,13 +19,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.lib.input.LineRecordReader; import org.apache.hadoop.net.DNSToSwitchMapping; import org.apache.hadoop.net.SocksSocketFactory; -import javax.inject.Inject; import javax.net.SocketFactory; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveAnalyzeProperties.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveAnalyzeProperties.java index 6b759cac964e2..fbd32604a6070 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveAnalyzeProperties.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveAnalyzeProperties.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java index 49b154a3e743b..30ba86cf1ef31 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java @@ -26,13 +26,12 @@ import io.airlift.units.MaxDataSize; import io.airlift.units.MinDataSize; import io.airlift.units.MinDuration; +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.List; import java.util.TimeZone; import java.util.concurrent.TimeUnit; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientModule.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientModule.java index f5a84aad9cf55..7eb58d9bbd9fe 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientModule.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientModule.java @@ -84,10 +84,9 @@ import com.google.inject.Scopes; import com.google.inject.TypeLiteral; import com.google.inject.multibindings.Multibinder; +import jakarta.inject.Singleton; import org.weakref.jmx.MBeanExporter; -import javax.inject.Singleton; - import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveCoercionPolicy.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveCoercionPolicy.java index da9e8ec98c392..0594f71d3e69c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveCoercionPolicy.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveCoercionPolicy.java @@ -16,13 +16,12 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.common.type.VarcharType; +import jakarta.inject.Inject; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; import org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo; -import javax.inject.Inject; - import java.util.List; import static com.facebook.presto.hive.HiveType.HIVE_BYTE; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveEncryptionInformationProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveEncryptionInformationProvider.java index ab60903a16b76..b3e3ca4637ff4 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveEncryptionInformationProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveEncryptionInformationProvider.java @@ -19,8 +19,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveHdfsConfiguration.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveHdfsConfiguration.java index 67b4241d25ebd..8c0097ae0bdbf 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveHdfsConfiguration.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveHdfsConfiguration.java @@ -14,10 +14,9 @@ package com.facebook.presto.hive; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; -import javax.inject.Inject; - import java.net.URI; import java.util.Set; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveLocationService.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveLocationService.java index 2bddcbf2928da..bc854615d4d30 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveLocationService.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveLocationService.java @@ -20,10 +20,9 @@ import com.facebook.presto.hive.metastore.Table; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; +import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.util.Optional; import static com.facebook.presto.hive.HiveErrorCode.HIVE_PATH_ALREADY_EXISTS; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadataFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadataFactory.java index 7d004e3be40d1..78de6facb91f6 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadataFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadataFactory.java @@ -26,10 +26,9 @@ import com.facebook.presto.spi.plan.FilterStatsCalculatorService; import com.facebook.presto.spi.relation.RowExpressionService; import com.google.common.util.concurrent.ListeningExecutorService; +import jakarta.inject.Inject; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.util.function.Supplier; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java index 6f1b5b9ba8294..916abc4189f03 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java @@ -35,8 +35,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListeningExecutorService; import io.airlift.units.DataSize; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSource.java index 63c78ded9b53f..2a8ab38f2e422 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSource.java @@ -27,11 +27,10 @@ import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.Slices; import it.unimi.dsi.fastutil.ints.IntArrayList; +import jakarta.annotation.Nullable; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.joda.time.DateTimeZone; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Paths; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java index 85d00b8b9571c..359da2a4e1e5a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java @@ -46,12 +46,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java index 6fbe2472da620..fd8564919d30e 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionKey.java @@ -15,10 +15,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Objects; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionManager.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionManager.java index 72513642f3bda..0829404178f31 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionManager.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePartitionManager.java @@ -46,12 +46,11 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; +import jakarta.inject.Inject; import org.joda.time.DateTimeZone; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java index bb1b56b734c8b..55061af33aa4f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java @@ -20,10 +20,9 @@ import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.apache.parquet.column.ParquetProperties; -import javax.inject.Inject; - import java.util.List; import java.util.Optional; import java.util.OptionalInt; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java index 62e620bee3e2f..ba6820236a7c3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java @@ -58,6 +58,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe; import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; import org.apache.hudi.hadoop.HoodieParquetInputFormat; @@ -65,8 +66,6 @@ import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.inject.Inject; - import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java index 98843199442fb..031e82faf719b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java @@ -30,10 +30,9 @@ 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.units.DataSize; -import javax.annotation.concurrent.GuardedBy; - import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveStagingFileCommitter.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveStagingFileCommitter.java index ecc203a7ebde7..e53042ee7cef9 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveStagingFileCommitter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveStagingFileCommitter.java @@ -17,11 +17,10 @@ import com.facebook.presto.spi.ConnectorSession; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableProperties.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableProperties.java index 88b5d9bb88bf6..341aa78334380 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableProperties.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableProperties.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableWritabilityChecker.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableWritabilityChecker.java index c83b20b12e3c3..9c6b1fec98190 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableWritabilityChecker.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveTableWritabilityChecker.java @@ -16,8 +16,7 @@ import com.facebook.presto.hive.metastore.PrestoTableType; import com.facebook.presto.hive.metastore.Table; import com.facebook.presto.spi.PrestoException; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveTransactionManager.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveTransactionManager.java index 6b2c20871154d..90adfd6eb0144 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveTransactionManager.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveTransactionManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java index 040a60e4f327f..1f255ec03e01b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java @@ -53,6 +53,7 @@ import io.airlift.slice.Slice; import io.airlift.slice.SliceUtf8; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -91,8 +92,6 @@ import org.joda.time.format.DateTimePrinter; import org.joda.time.format.ISODateTimeFormat; -import javax.annotation.Nullable; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveZeroRowFileCreator.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveZeroRowFileCreator.java index 081551c7010f7..faaeb2cb9c500 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveZeroRowFileCreator.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveZeroRowFileCreator.java @@ -24,13 +24,12 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import io.airlift.slice.Slices; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; import org.apache.hadoop.mapred.JobConf; -import javax.inject.Inject; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Paths; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java b/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java index 2cbec5c1d85fc..2ecf44843cb17 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/InternalHiveSplit.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.hive.HiveSplit.BucketConversion; import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; @@ -20,8 +21,6 @@ import com.google.common.collect.ImmutableMap; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java index df2ae97535845..aead218edc002 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java @@ -20,8 +20,7 @@ import com.facebook.presto.orc.metadata.DwrfStripeCacheMode; import com.facebook.presto.orc.writer.StreamLayoutFactory; import io.airlift.units.DataSize; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.OptionalInt; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java index ba8f130569839..89d36f3cc44a3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java @@ -40,6 +40,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat; @@ -49,8 +50,6 @@ import org.weakref.jmx.Flatten; import org.weakref.jmx.Managed; -import javax.inject.Inject; - import java.io.IOException; import java.net.InetAddress; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriterFactory.java index 2d1a11d7e32fb..b453930934ea9 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/RcFileFileWriterFactory.java @@ -25,6 +25,7 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.io.RCFileOutputFormat; @@ -34,8 +35,6 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.IOException; import java.io.OutputStream; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/RebindSafeMBeanServer.java b/presto-hive/src/main/java/com/facebook/presto/hive/RebindSafeMBeanServer.java index 21abfc5d29566..c1af771e83253 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/RebindSafeMBeanServer.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/RebindSafeMBeanServer.java @@ -14,8 +14,8 @@ package com.facebook.presto.hive; import com.facebook.airlift.log.Logger; +import com.google.errorprone.annotations.ThreadSafe; -import javax.annotation.concurrent.ThreadSafe; import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/SyncPartitionMetadataProcedure.java b/presto-hive/src/main/java/com/facebook/presto/hive/SyncPartitionMetadataProcedure.java index 3bdbb0f0f7b8a..fbb5a382a1b65 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/SyncPartitionMetadataProcedure.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/SyncPartitionMetadataProcedure.java @@ -29,13 +29,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; +import jakarta.inject.Inject; +import jakarta.inject.Provider; 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; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/WriteCompletedEvent.java b/presto-hive/src/main/java/com/facebook/presto/hive/WriteCompletedEvent.java index ff5fcc933e3c0..7ce318af36cf6 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/WriteCompletedEvent.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/WriteCompletedEvent.java @@ -16,9 +16,8 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventField.EventFieldMapping; import com.facebook.airlift.event.client.EventType; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; +import jakarta.annotation.Nullable; import java.time.Instant; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/AuthenticationModules.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/AuthenticationModules.java index 32e1fca17ba91..239d89b94e17d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/AuthenticationModules.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/AuthenticationModules.java @@ -21,8 +21,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Singleton; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.presto.hive.authentication.KerberosHadoopAuthentication.createKerberosHadoopAuthentication; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/CachingKerberosHadoopAuthentication.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/CachingKerberosHadoopAuthentication.java index 424383c197ad4..baec2af035515 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/CachingKerberosHadoopAuthentication.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/CachingKerberosHadoopAuthentication.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.hive.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/presto-hive/src/main/java/com/facebook/presto/hive/authentication/DirectHdfsAuthentication.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/DirectHdfsAuthentication.java index 25f5a3c3efa87..6aec90dc9952d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/DirectHdfsAuthentication.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/DirectHdfsAuthentication.java @@ -14,8 +14,7 @@ package com.facebook.presto.hive.authentication; import com.facebook.presto.hive.ForHdfs; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.hive.authentication.UserGroupInformationUtils.executeActionInDoAs; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/HdfsKerberosConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/HdfsKerberosConfig.java index 02444edb614b3..a29f27afff4e0 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/HdfsKerberosConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/HdfsKerberosConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class HdfsKerberosConfig { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/ImpersonatingHdfsAuthentication.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/ImpersonatingHdfsAuthentication.java index af4d1bbd3e16f..cb60faac2f980 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/ImpersonatingHdfsAuthentication.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/ImpersonatingHdfsAuthentication.java @@ -14,10 +14,9 @@ package com.facebook.presto.hive.authentication; import com.facebook.presto.hive.ForHdfs; +import jakarta.inject.Inject; import org.apache.hadoop.security.UserGroupInformation; -import javax.inject.Inject; - import static com.facebook.presto.hive.authentication.UserGroupInformationUtils.executeActionInDoAs; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/KerberosHiveMetastoreAuthentication.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/KerberosHiveMetastoreAuthentication.java index 5d3d2840f11fb..6b75d8a08495a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/KerberosHiveMetastoreAuthentication.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/KerberosHiveMetastoreAuthentication.java @@ -17,6 +17,7 @@ import com.facebook.presto.hive.HiveClientConfig; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.hadoop.hive.metastore.security.DelegationTokenIdentifier; import org.apache.hadoop.hive.thrift.client.TUGIAssumingTransport; import org.apache.hadoop.security.SaslRpcServer; @@ -27,7 +28,6 @@ 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; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/MetastoreKerberosConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/MetastoreKerberosConfig.java index a78c835071ca1..06216824a5944 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/authentication/MetastoreKerberosConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/authentication/MetastoreKerberosConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class MetastoreKerberosConfig { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/cache/HiveCachingHdfsConfiguration.java b/presto-hive/src/main/java/com/facebook/presto/hive/cache/HiveCachingHdfsConfiguration.java index 937d2fa6887c3..7ceec635f68c3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/cache/HiveCachingHdfsConfiguration.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/cache/HiveCachingHdfsConfiguration.java @@ -24,12 +24,11 @@ import com.facebook.presto.hive.WrapperJobConf; import com.facebook.presto.hive.filesystem.ExtendedFileSystem; import com.facebook.presto.spi.PrestoException; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.io.IOException; import java.net.URI; import java.util.function.BiFunction; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfigurationInitializer.java b/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfigurationInitializer.java index ce75fee27b5ff..4285c5197ee96 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfigurationInitializer.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfigurationInitializer.java @@ -14,10 +14,9 @@ package com.facebook.presto.hive.gcs; import com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; -import javax.inject.Inject; - import static com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystemBase.AUTHENTICATION_PREFIX; import static com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystemConfiguration.AUTH_SERVICE_ACCOUNT_ENABLE; import static com.google.cloud.hadoop.util.AccessTokenProviderClassFromConfigFactory.ACCESS_TOKEN_PROVIDER_IMPL_SUFFIX; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java index 19ba823ef895a..30fc1dcc49438 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java @@ -30,10 +30,9 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.function.StandardFunctionResolution; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; -import javax.inject.Inject; - import java.util.List; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java index 7babcc020c82a..894acab035b44 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java @@ -35,11 +35,10 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.function.StandardFunctionResolution; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java index 124efccd8f3f3..045793f40320a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java @@ -38,11 +38,10 @@ import com.facebook.presto.spi.function.StandardFunctionResolution; import com.facebook.presto.spi.relation.RowExpression; import com.facebook.presto.spi.relation.RowExpressionService; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java index ab1533eac7d7f..ec21f884d6797 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java @@ -36,12 +36,11 @@ import com.facebook.presto.spi.function.StandardFunctionResolution; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcBatchPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcBatchPageSourceFactory.java index 0e3aef9254f71..3c92bf8efc405 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcBatchPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcBatchPageSourceFactory.java @@ -45,13 +45,12 @@ import com.facebook.presto.spi.function.StandardFunctionResolution; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java index 0fd0fc6244471..4e914c319aedf 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java @@ -69,14 +69,13 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/TupleDomainFilterCache.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/TupleDomainFilterCache.java index 2878071127c4a..665960d80abde 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/TupleDomainFilterCache.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/TupleDomainFilterCache.java @@ -19,11 +19,10 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import jakarta.annotation.Nullable; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.Nullable; - import static com.facebook.presto.common.predicate.TupleDomainFilterUtils.toFilter; import static java.lang.System.identityHashCode; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFilePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFilePageSourceFactory.java index 57eeb18676ae8..aac36611af58e 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFilePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFilePageSourceFactory.java @@ -26,13 +26,12 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.SchemaTableName; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Path; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java index 8381270ce2cc3..1ab143216fc32 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java @@ -36,12 +36,11 @@ import io.airlift.compress.lz4.Lz4Decompressor; import io.airlift.compress.snappy.SnappyCompressor; import io.airlift.compress.snappy.SnappyDecompressor; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetAggregatedPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetAggregatedPageSourceFactory.java index 05b3814e04a96..0a1a274d01d75 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetAggregatedPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetAggregatedPageSourceFactory.java @@ -28,14 +28,13 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.function.StandardFunctionResolution; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Path; import org.apache.parquet.crypto.InternalFileDecryptor; import org.apache.parquet.hadoop.metadata.ParquetMetadata; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetPageSourceFactory.java index 09da3a9d8e6b3..b7196dec561ea 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetPageSourceFactory.java @@ -45,6 +45,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Path; @@ -64,8 +65,6 @@ import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetSelectivePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetSelectivePageSourceFactory.java index 08922058d363b..450e80d3f3e83 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetSelectivePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/parquet/ParquetSelectivePageSourceFactory.java @@ -28,11 +28,10 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.relation.RowExpression; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java index e9106bd542fc8..e992d90577aed 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java @@ -40,6 +40,7 @@ import io.airlift.slice.Slices; import io.airlift.units.DataSize; import io.airlift.units.DataSize.Unit; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Path; @@ -47,8 +48,6 @@ import org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe; import org.joda.time.DateTimeZone; -import javax.inject.Inject; - import java.io.FileNotFoundException; import java.io.IOException; import java.util.Arrays; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java index 5c835615cf57e..b29a84d729932 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java @@ -21,9 +21,8 @@ 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.io.File; import java.util.concurrent.TimeUnit; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java index 37102d6be6e67..02c05b65fef16 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java @@ -27,11 +27,10 @@ import com.amazonaws.services.s3.AmazonS3Builder; import com.amazonaws.services.s3.AmazonS3Client; import com.facebook.presto.hive.HiveClientConfig; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; import org.apache.hadoop.conf.Configuration; -import javax.annotation.concurrent.GuardedBy; - import java.net.URI; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java index d68a21dd58045..eb9728949493f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java @@ -15,10 +15,9 @@ import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; -import javax.inject.Inject; - import java.io.File; public class PrestoS3ConfigurationUpdater diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/AWSS3SecurityMappingConfigurationProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/AWSS3SecurityMappingConfigurationProvider.java index a09e391377376..7bff58e38dd08 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/AWSS3SecurityMappingConfigurationProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/AWSS3SecurityMappingConfigurationProvider.java @@ -19,10 +19,9 @@ import com.facebook.presto.hive.aws.security.AWSSecurityMappings; import com.facebook.presto.hive.aws.security.AWSSecurityMappingsSupplier; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; -import javax.inject.Inject; - import java.net.URI; import java.util.Set; import java.util.function.Supplier; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/ForAWSS3DynamicConfigurationProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/ForAWSS3DynamicConfigurationProvider.java index 446032ade96c0..05311a04ac87e 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/ForAWSS3DynamicConfigurationProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/security/ForAWSS3DynamicConfigurationProvider.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.s3.security; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectRecordCursorProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectRecordCursorProvider.java index 4552e71944b71..1a3497fcf44e4 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectRecordCursorProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectRecordCursorProvider.java @@ -26,12 +26,11 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.RecordCursor; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; 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.List; import java.util.Optional; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/LegacyAccessControl.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/LegacyAccessControl.java index f1bcb53365847..b6f234d65c76a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/LegacyAccessControl.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/LegacyAccessControl.java @@ -30,8 +30,7 @@ import com.facebook.presto.spi.security.ViewExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/SecurityConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/SecurityConfig.java index 9e6ed10b97f61..959e6524c3856 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/SecurityConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/SecurityConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.hive.security; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class SecurityConfig { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/SqlStandardAccessControl.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/SqlStandardAccessControl.java index c5df30dd352c2..8291ec04bd0f2 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/SqlStandardAccessControl.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/SqlStandardAccessControl.java @@ -34,8 +34,7 @@ import com.facebook.presto.spi.security.ViewExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/ForRangerInfo.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/ForRangerInfo.java index 080910adc927f..0835fb4cbb13d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/ForRangerInfo.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/ForRangerInfo.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.security.ranger; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java index 36c83ff498061..2f4b71501647a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigSecuritySensitive; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.concurrent.TimeUnit; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasicAuthHttpRequestFilter.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasicAuthHttpRequestFilter.java index a25994fca0eea..0900067555013 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasicAuthHttpRequestFilter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasicAuthHttpRequestFilter.java @@ -16,8 +16,7 @@ import com.facebook.airlift.http.client.BasicAuthRequestFilter; import com.facebook.airlift.http.client.HttpRequestFilter; import com.facebook.airlift.http.client.Request; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/Users.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/Users.java index 45f85d8f141c1..83c08815ee832 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/Users.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/Users.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/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/VXUser.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/VXUser.java index c3a16c80cd4b6..9b235ec8d0e33 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/VXUser.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/VXUser.java @@ -17,8 +17,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/presto-hive/src/main/java/com/facebook/presto/hive/util/AsyncQueue.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/AsyncQueue.java index c02417b01c003..0d114d590cf14 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/AsyncQueue.java +++ b/presto-hive/src/main/java/com/facebook/presto/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/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java index 79fe3806192da..1fea385a98992 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java @@ -33,6 +33,7 @@ import com.facebook.presto.sql.gen.PageFunctionCompiler; import com.facebook.presto.testing.TestingSession; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.Immutable; import io.airlift.units.DataSize; import org.apache.parquet.column.ParquetProperties; import org.apache.parquet.hadoop.metadata.CompressionCodecName; @@ -58,8 +59,6 @@ import org.openjdk.jmh.runner.options.VerboseMode; import org.testng.annotations.Test; -import javax.annotation.concurrent.Immutable; - import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java index c6a35943a3a5e..1749893c25a22 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java @@ -17,11 +17,10 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.DataSize; - -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 static io.airlift.units.DataSize.Unit.MEGABYTE; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiMetadataFactory.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiMetadataFactory.java index 715337abe4964..e7536568a26fb 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiMetadataFactory.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiMetadataFactory.java @@ -20,8 +20,7 @@ import com.facebook.presto.hive.metastore.ExtendedHiveMetastore; import com.facebook.presto.hive.metastore.InMemoryCachingHiveMetastore; import com.facebook.presto.spi.connector.ConnectorMetadata; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiModule.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiModule.java index 84ed1d1b589e7..06271332a5974 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiModule.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiModule.java @@ -61,9 +61,9 @@ import com.google.inject.Provides; import com.google.inject.Scopes; import com.google.inject.multibindings.Multibinder; +import jakarta.inject.Singleton; import org.weakref.jmx.testing.TestingMBeanServer; -import javax.inject.Singleton; import javax.management.MBeanServer; import java.util.concurrent.ExecutorService; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPageSourceProvider.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPageSourceProvider.java index a67174d8419b3..d1212ab20194f 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPageSourceProvider.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPageSourceProvider.java @@ -33,11 +33,10 @@ import com.facebook.presto.spi.SplitContext; import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; -import javax.inject.Inject; - import java.time.ZoneId; import java.util.List; import java.util.Optional; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPartitionManager.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPartitionManager.java index b7f5b6ff3127a..ba80fd2f516c7 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPartitionManager.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiPartitionManager.java @@ -30,8 +30,7 @@ import com.google.common.base.Verify; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.ZoneId; import java.util.HashMap; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java index 74ee5db1a6ec3..a273c65f705d5 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSplitManager.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSplitManager.java index 06d44c75784f2..e1f38c291aa88 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSplitManager.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSplitManager.java @@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Streams; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hudi.common.config.HoodieMetadataConfig; @@ -45,8 +46,6 @@ import org.apache.hudi.common.table.view.HoodieTableFileSystemView; import org.apache.hudi.common.util.HoodieTimer; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiBackgroundSplitLoader.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiBackgroundSplitLoader.java index 2b165462fdafc..a184f49128fde 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiBackgroundSplitLoader.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiBackgroundSplitLoader.java @@ -14,7 +14,7 @@ package com.facebook.presto.hudi.split; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitAsyncQueue.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitAsyncQueue.java index 52d0da1af9b2f..52efd9d7a7597 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitAsyncQueue.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitAsyncQueue.java @@ -14,7 +14,7 @@ package com.facebook.presto.hudi.split; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitSource.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitSource.java index 6b7333e3d74ee..f5b2eacc99c4f 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitSource.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/ForHudiSplitSource.java @@ -14,7 +14,7 @@ package com.facebook.presto.hudi.split; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java index 688a57cff011e..2b63f666fd38d 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.iceberg; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.airlift.log.Logger; import com.facebook.presto.hive.HdfsContext; import com.facebook.presto.hive.HdfsEnvironment; @@ -33,6 +34,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Sets; +import jakarta.annotation.Nullable; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.mapred.FileInputFormat; import org.apache.hadoop.mapred.FileOutputFormat; @@ -48,9 +50,6 @@ import org.apache.iceberg.io.OutputFile; import org.apache.iceberg.util.Tasks; -import javax.annotation.Nullable; -import javax.annotation.concurrent.NotThreadSafe; - import java.io.FileNotFoundException; import java.util.HashMap; import java.util.Map; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergCommonModule.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergCommonModule.java index 129a3fda539f8..279bddf192d06 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergCommonModule.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergCommonModule.java @@ -91,10 +91,9 @@ import com.google.inject.Provides; import com.google.inject.Scopes; import com.google.inject.multibindings.Multibinder; +import jakarta.inject.Singleton; import org.weakref.jmx.MBeanExporter; -import javax.inject.Singleton; - import java.nio.ByteBuffer; import java.time.Duration; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java index d65c71df50b58..dd4cf09052d0b 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java @@ -21,14 +21,13 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; +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 org.apache.iceberg.hadoop.HadoopFileIO; -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 java.util.EnumSet; import java.util.List; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergFileWriterFactory.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergFileWriterFactory.java index 462deae4f146d..b61befce07a26 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergFileWriterFactory.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergFileWriterFactory.java @@ -33,6 +33,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; @@ -40,8 +41,6 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.types.Types; -import javax.inject.Inject; - import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadataFactory.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadataFactory.java index 7a7bc890edaad..df801b6da3c88 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadataFactory.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadataFactory.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.function.StandardFunctionResolution; import com.facebook.presto.spi.plan.FilterStatsCalculatorService; import com.facebook.presto.spi.relation.RowExpressionService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java index b04d677ce456c..60eec55366d51 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import static io.airlift.units.Duration.succinctDuration; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeCatalogFactory.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeCatalogFactory.java index 02f04f64f137b..26f4962334b83 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeCatalogFactory.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeCatalogFactory.java @@ -21,14 +21,13 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.UncheckedExecutionException; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.catalog.Catalog; import org.apache.iceberg.catalog.SupportsNamespaces; -import javax.inject.Inject; - import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadataFactory.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadataFactory.java index 44ddf1992a73e..59b203c623303 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadataFactory.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadataFactory.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.function.StandardFunctionResolution; import com.facebook.presto.spi.plan.FilterStatsCalculatorService; import com.facebook.presto.spi.relation.RowExpressionService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSinkProvider.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSinkProvider.java index 0852a9300a0d3..e8e8db1163aed 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSinkProvider.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSinkProvider.java @@ -25,13 +25,12 @@ import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; +import jakarta.inject.Inject; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.Table; import org.apache.iceberg.io.LocationProvider; -import javax.inject.Inject; - import java.util.Optional; import static com.facebook.presto.iceberg.IcebergUtil.getLocationProvider; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java index 07b4079ecf0d7..d87cf25507816 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java @@ -84,6 +84,7 @@ import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; @@ -109,8 +110,6 @@ import org.roaringbitmap.longlong.LongBitmapDataProvider; import org.roaringbitmap.longlong.Roaring64Bitmap; -import javax.inject.Inject; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java index 3052ba7f88351..b926a741bd727 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java @@ -26,10 +26,9 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.parquet.column.ParquetProperties; -import javax.inject.Inject; - import java.util.EnumSet; import java.util.List; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSplitManager.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSplitManager.java index 71bb8038639da..0ad3345b7ae9d 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSplitManager.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSplitManager.java @@ -25,6 +25,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import org.apache.iceberg.DeleteFile; import org.apache.iceberg.IncrementalChangelogScan; import org.apache.iceberg.Table; @@ -34,8 +35,6 @@ 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/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableProperties.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableProperties.java index 5d537100c5fef..a3ee811a33892 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableProperties.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableProperties.java @@ -22,11 +22,10 @@ import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.iceberg.RowLevelOperationMode; import org.apache.iceberg.TableProperties; -import javax.inject.Inject; - import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionFields.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionFields.java index 7668efea0f791..54c80aae8f772 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionFields.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionFields.java @@ -14,13 +14,12 @@ package com.facebook.presto.iceberg; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nullable; import org.apache.iceberg.PartitionField; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.expressions.Term; -import javax.annotation.Nullable; - import java.util.List; import java.util.Optional; import java.util.OptionalInt; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java index e24c0464fad35..1eba3d13e4389 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java @@ -21,11 +21,10 @@ import io.airlift.slice.Murmur3Hash32; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.apache.iceberg.PartitionField; import org.joda.time.DateTimeField; -import javax.annotation.Nullable; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.function.Function; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/SortParameters.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/SortParameters.java index 05377d8199a3e..dac3e27531d1d 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/SortParameters.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/SortParameters.java @@ -18,8 +18,7 @@ import com.facebook.presto.hive.OrcFileWriterFactory; import com.facebook.presto.hive.SortingFileWriterConfig; import com.facebook.presto.spi.PageSorter; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class SortParameters { diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/TableStatisticsMaker.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/TableStatisticsMaker.java index 6f416d2353b3b..e26a14339365c 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/TableStatisticsMaker.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/TableStatisticsMaker.java @@ -42,6 +42,7 @@ import com.google.common.collect.Maps; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.apache.datasketches.memory.Memory; import org.apache.datasketches.theta.CompactSketch; import org.apache.iceberg.ContentFile; @@ -69,8 +70,6 @@ import org.apache.iceberg.types.Types; import org.apache.iceberg.util.Pair; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/EqualityDeleteFilter.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/EqualityDeleteFilter.java index 3d2cd9a5b6bba..2441ba9fcea76 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/EqualityDeleteFilter.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/EqualityDeleteFilter.java @@ -17,13 +17,12 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.iceberg.IcebergColumnHandle; import com.facebook.presto.spi.ConnectorPageSource; +import jakarta.annotation.Nullable; import org.apache.iceberg.Schema; import org.apache.iceberg.StructLike; import org.apache.iceberg.util.StructLikeSet; import org.apache.iceberg.util.StructProjection; -import javax.annotation.Nullable; - import java.util.List; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/PositionDeleteFilter.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/PositionDeleteFilter.java index 99a28d016fdb0..bbe44a5367223 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/PositionDeleteFilter.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/delete/PositionDeleteFilter.java @@ -18,11 +18,10 @@ import com.facebook.presto.iceberg.IcebergColumnHandle; import com.facebook.presto.spi.ConnectorPageSource; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.roaringbitmap.longlong.ImmutableLongBitmapDataProvider; import org.roaringbitmap.longlong.LongBitmapDataProvider; -import javax.annotation.Nullable; - import java.util.List; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ApplyChangelogState.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ApplyChangelogState.java index 024088fe4292f..156833899a714 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ApplyChangelogState.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/function/changelog/ApplyChangelogState.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.function.AccumulatorState; import com.facebook.presto.spi.function.AccumulatorStateMetadata; import com.facebook.presto.spi.function.GroupedAccumulatorState; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/hive/IcebergFileHiveMetastore.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/hive/IcebergFileHiveMetastore.java index 1822a92b0bd19..8ba5f88cd8fbf 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/hive/IcebergFileHiveMetastore.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/hive/IcebergFileHiveMetastore.java @@ -19,13 +19,12 @@ import com.facebook.presto.hive.metastore.file.FileHiveMetastore; import com.facebook.presto.hive.metastore.file.FileHiveMetastoreConfig; import com.facebook.presto.spi.PrestoException; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; - import java.io.IOException; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieCatalogFactory.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieCatalogFactory.java index 90b332ce291e7..2b78675540635 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieCatalogFactory.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieCatalogFactory.java @@ -20,8 +20,7 @@ import com.facebook.presto.iceberg.IcebergNativeCatalogFactory; import com.facebook.presto.spi.ConnectorSession; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieConfig.java index 8e68bc5f5953b..13f8c021aa077 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/nessie/IcebergNessieConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java index afbc4793b48bc..e2e84f59f58c6 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java @@ -22,12 +22,11 @@ import com.facebook.presto.spi.classloader.ThreadContextClassLoader; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.iceberg.ExpireSnapshots; import org.apache.iceberg.Table; -import javax.inject.Inject; -import javax.inject.Provider; - import java.lang.invoke.MethodHandle; import java.util.List; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java index 96898ad485397..05e968b42eaaf 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java @@ -19,11 +19,10 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.iceberg.Table; -import javax.inject.Inject; -import javax.inject.Provider; - import java.lang.invoke.MethodHandle; import static com.facebook.presto.common.block.MethodHandleUtil.methodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java index 6779af23be3e8..c6eefd10c64f2 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java @@ -17,9 +17,8 @@ import com.facebook.presto.spi.classloader.ThreadContextClassLoader; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java index 28fc304ce8fdc..fb77b1263a75c 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java @@ -25,13 +25,12 @@ import com.facebook.presto.spi.classloader.ThreadContextClassLoader; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; +import jakarta.inject.Provider; 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.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java index cb3863c530ea0..1c8812f61c5fc 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java @@ -27,6 +27,8 @@ import com.facebook.presto.spi.procedure.Procedure.Argument; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocatedFileStatus; import org.apache.hadoop.fs.Path; @@ -39,9 +41,6 @@ import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; -import javax.inject.Inject; -import javax.inject.Provider; - import java.io.IOException; import java.lang.invoke.MethodHandle; import java.util.ArrayList; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java index df9feca8fc69e..ad52946b839c5 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java @@ -19,9 +19,8 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java index 4195e2ca099c8..2cd28239b8b01 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java @@ -21,9 +21,8 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java index 5359af02f44c0..70806fe4c5461 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java @@ -19,12 +19,11 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.iceberg.SnapshotRef; import org.apache.iceberg.Table; -import javax.inject.Inject; -import javax.inject.Provider; - import java.lang.invoke.MethodHandle; import static com.facebook.presto.common.block.MethodHandleUtil.methodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java index deb5dd961d066..e68a151b5627c 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java @@ -24,11 +24,10 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.iceberg.Table; -import javax.inject.Inject; -import javax.inject.Provider; - import java.lang.invoke.MethodHandle; import static com.facebook.presto.common.block.MethodHandleUtil.methodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java index 0ddc4fd2c98f4..8aa23bd603298 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java @@ -17,9 +17,8 @@ import com.facebook.presto.spi.classloader.ThreadContextClassLoader; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java index 898257e6b85b8..25c76b16fe3a1 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java @@ -21,9 +21,8 @@ import com.facebook.presto.spi.classloader.ThreadContextClassLoader; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestCatalogFactory.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestCatalogFactory.java index 0c588d71e2ef3..fd13589ea7440 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestCatalogFactory.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestCatalogFactory.java @@ -25,14 +25,13 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.UncheckedExecutionException; import io.jsonwebtoken.Jwts; +import jakarta.inject.Inject; import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.catalog.Catalog; import org.apache.iceberg.catalog.SessionCatalog.SessionContext; import org.apache.iceberg.rest.HTTPClient; import org.apache.iceberg.rest.RESTCatalog; -import javax.inject.Inject; - import java.util.Date; import java.util.Map; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestConfig.java index 613a48d02f13a..fed989889b475 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/rest/IcebergRestConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Optional; diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java index a874a42168c2b..1bc9de237b57a 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java @@ -125,7 +125,7 @@ private class RestHttpServerModule public void configure(Binder binder) { binder.bind(new TypeLiteral>() {}).annotatedWith(TheServlet.class).toInstance(ImmutableMap.of()); - binder.bind(javax.servlet.Servlet.class).annotatedWith(TheServlet.class).toInstance(new IcebergRestCatalogServlet(adapter)); + binder.bind(jakarta.servlet.Servlet.class).annotatedWith(TheServlet.class).toInstance(new IcebergRestCatalogServlet(adapter)); binder.bind(NodeInfo.class).toInstance(new NodeInfo("test")); } } diff --git a/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java b/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java index b783ab2d7dcf9..588f556065616 100644 --- a/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java +++ b/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java @@ -17,6 +17,9 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.MalformedJwtException; +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; @@ -27,10 +30,6 @@ import org.apache.iceberg.rest.responses.ErrorResponse; import org.apache.iceberg.util.Pair; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -42,8 +41,8 @@ import java.util.function.Function; import java.util.stream.Collectors; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static java.lang.String.format; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; /** * The IcebergRestCatalogServlet provides a servlet implementation used in combination with a diff --git a/presto-jdbc/src/main/java/com/facebook/presto/jdbc/WarningsManager.java b/presto-jdbc/src/main/java/com/facebook/presto/jdbc/WarningsManager.java index 2c2998a541073..bd7c3c5387b0f 100644 --- a/presto-jdbc/src/main/java/com/facebook/presto/jdbc/WarningsManager.java +++ b/presto-jdbc/src/main/java/com/facebook/presto/jdbc/WarningsManager.java @@ -15,9 +15,8 @@ import com.facebook.presto.spi.PrestoWarning; import com.facebook.presto.spi.WarningCode; - -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.sql.SQLWarning; import java.util.HashSet; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnector.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnector.java index 23b2594970ba3..01cba8e6b43a9 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnector.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnector.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.connector.Connector; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.spi.transaction.IsolationLevel.READ_COMMITTED; import static com.facebook.presto.spi.transaction.IsolationLevel.checkConnectorSupports; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java index d220c67c71484..ddaae1f234780 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java @@ -19,9 +19,8 @@ import com.google.common.collect.ImmutableSet; 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/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxHistoricalData.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxHistoricalData.java index 6ba56912c2fe8..cd4133214f95e 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxHistoricalData.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxHistoricalData.java @@ -15,8 +15,7 @@ import com.google.common.collect.EvictingQueue; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxMetadata.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxMetadata.java index d257c138e7a52..f1b958959b246 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxMetadata.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxMetadata.java @@ -33,8 +33,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Streams; +import jakarta.inject.Inject; -import javax.inject.Inject; import javax.management.JMException; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxPeriodicSampler.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxPeriodicSampler.java index a92b6e2604da6..7fe5cf29c8483 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxPeriodicSampler.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxPeriodicSampler.java @@ -16,9 +16,8 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.spi.SchemaTableName; import com.google.common.collect.ImmutableList; - -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxRecordSetProvider.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxRecordSetProvider.java index 9c820636012a7..551758b57c654 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxRecordSetProvider.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxRecordSetProvider.java @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; +import jakarta.inject.Inject; -import javax.inject.Inject; import javax.management.Attribute; import javax.management.JMException; import javax.management.MBeanServer; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxSplitManager.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxSplitManager.java index f5c3a62830cdf..51311dcaa81ec 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxSplitManager.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxSplitManager.java @@ -26,8 +26,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/util/RebindSafeMBeanServer.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/util/RebindSafeMBeanServer.java index 7579c1f0c9dbe..73dc0340a4343 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/util/RebindSafeMBeanServer.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/util/RebindSafeMBeanServer.java @@ -14,8 +14,8 @@ package com.facebook.presto.connector.jmx.util; import com.facebook.airlift.log.Logger; +import com.google.errorprone.annotations.ThreadSafe; -import javax.annotation.concurrent.ThreadSafe; import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnector.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnector.java index a835ec0559c4a..d9e7b2c7fe0c0 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnector.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnector.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.spi.transaction.IsolationLevel.READ_COMMITTED; import static com.facebook.presto.spi.transaction.IsolationLevel.checkConnectorSupports; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java index 877535076369e..a9889cbfe2aa0 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java @@ -21,8 +21,7 @@ import com.google.common.collect.ImmutableList; 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.List; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorModule.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorModule.java index c3cdce91edeeb..e4166096d49ea 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorModule.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorModule.java @@ -27,8 +27,7 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.function.Function; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaMetadata.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaMetadata.java index 842f54f7825aa..8792b566309bc 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaMetadata.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaMetadata.java @@ -37,8 +37,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaPageSinkProvider.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaPageSinkProvider.java index 738e7a4c521b8..a3fdc41935ae1 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaPageSinkProvider.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaPageSinkProvider.java @@ -26,8 +26,7 @@ import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.nio.file.Files; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaRecordSetProvider.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaRecordSetProvider.java index 0f0e57ff52ff5..7b4cd735a68eb 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaRecordSetProvider.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaRecordSetProvider.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSecurityConfig.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSecurityConfig.java index f2f57e8502482..c34e9ded30669 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSecurityConfig.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSecurityConfig.java @@ -15,10 +15,9 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import jakarta.validation.constraints.AssertTrue; import org.apache.kafka.common.security.auth.SecurityProtocol; -import javax.validation.constraints.AssertTrue; - import java.util.Optional; import static org.apache.kafka.common.security.auth.SecurityProtocol.SASL_PLAINTEXT; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSplitManager.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSplitManager.java index aaa5493d8179c..22265a7b277d4 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSplitManager.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaSplitManager.java @@ -27,14 +27,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.CharStreams; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndTimestamp; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; -import javax.inject.Inject; - import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaConsumerManager.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaConsumerManager.java index fcd12173fa569..8b4857b7a66dc 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaConsumerManager.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaConsumerManager.java @@ -14,10 +14,9 @@ package com.facebook.presto.kafka; import com.facebook.presto.spi.HostAddress; +import jakarta.inject.Inject; import org.apache.kafka.common.serialization.ByteBufferDeserializer; -import javax.inject.Inject; - import java.util.Properties; import static java.util.Objects.requireNonNull; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaProducerFactory.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaProducerFactory.java index 4e778c96febc6..7868bf9017dfd 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaProducerFactory.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/PlainTextKafkaProducerFactory.java @@ -14,8 +14,7 @@ package com.facebook.presto.kafka; import com.facebook.presto.spi.HostAddress; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.util.HashMap; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/SaslKafkaConsumerManager.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/SaslKafkaConsumerManager.java index 9d8fc8884b5ce..a5fa29e0c882a 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/SaslKafkaConsumerManager.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/SaslKafkaConsumerManager.java @@ -16,8 +16,7 @@ import com.facebook.presto.kafka.security.ForKafkaSasl; import com.facebook.presto.kafka.security.KafkaSaslConfig; import com.facebook.presto.spi.HostAddress; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Properties; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/DispatchingRowEncoderFactory.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/DispatchingRowEncoderFactory.java index 87a638bba0cf2..3ae76f7cd2dcd 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/DispatchingRowEncoderFactory.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/DispatchingRowEncoderFactory.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/json/JsonRowEncoderFactory.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/json/JsonRowEncoderFactory.java index 3c3f6833ec859..5403562816121 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/json/JsonRowEncoderFactory.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/encoder/json/JsonRowEncoderFactory.java @@ -18,8 +18,7 @@ import com.facebook.presto.kafka.encoder.RowEncoderFactory; import com.facebook.presto.spi.ConnectorSession; import com.fasterxml.jackson.databind.ObjectMapper; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java index 6f1779555d5fc..966f1f3cbb4d2 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java @@ -25,9 +25,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.io.File; import java.io.IOException; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplierConfig.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplierConfig.java index 123d1c5bd5a37..8041febb7bc4e 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplierConfig.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplierConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; import java.util.Set; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/security/KafkaSaslConfig.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/security/KafkaSaslConfig.java index 65519d8523437..f0a1943b20ea1 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/security/KafkaSaslConfig.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/security/KafkaSaslConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; import com.google.common.collect.ImmutableMap; - -import javax.validation.constraints.AssertTrue; +import jakarta.validation.constraints.AssertTrue; import java.util.Map; import java.util.Optional; diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/server/file/FileKafkaClusterMetadataSupplier.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/server/file/FileKafkaClusterMetadataSupplier.java index a6e979d14428e..afe1563b51a2b 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/server/file/FileKafkaClusterMetadataSupplier.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/server/file/FileKafkaClusterMetadataSupplier.java @@ -15,8 +15,7 @@ import com.facebook.presto.kafka.server.KafkaClusterMetadataSupplier; import com.facebook.presto.spi.HostAddress; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-kafka/src/test/java/com/facebook/presto/kafka/TestKafkaSecurityConfig.java b/presto-kafka/src/test/java/com/facebook/presto/kafka/TestKafkaSecurityConfig.java index fe4b08390a444..fba61d823f4b1 100644 --- a/presto-kafka/src/test/java/com/facebook/presto/kafka/TestKafkaSecurityConfig.java +++ b/presto-kafka/src/test/java/com/facebook/presto/kafka/TestKafkaSecurityConfig.java @@ -14,10 +14,9 @@ package com.facebook.presto.kafka; import com.google.common.collect.ImmutableMap; +import jakarta.validation.constraints.AssertTrue; import org.testng.annotations.Test; -import javax.validation.constraints.AssertTrue; - import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; diff --git a/presto-kafka/src/test/java/com/facebook/presto/kafka/security/TestKafkaSaslConfig.java b/presto-kafka/src/test/java/com/facebook/presto/kafka/security/TestKafkaSaslConfig.java index eb3a7e16c8afa..e603cd834fc79 100644 --- a/presto-kafka/src/test/java/com/facebook/presto/kafka/security/TestKafkaSaslConfig.java +++ b/presto-kafka/src/test/java/com/facebook/presto/kafka/security/TestKafkaSaslConfig.java @@ -15,10 +15,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import jakarta.validation.constraints.AssertTrue; import org.testng.annotations.Test; -import javax.validation.constraints.AssertTrue; - import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java index 887a18705c8ca..e3d4df557ee1e 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java @@ -19,9 +19,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; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduConnector.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduConnector.java index 7cdb99f0932c2..013c4b727cf21 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduConnector.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduConnector.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Set; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduMetadata.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduMetadata.java index 845e6e17fa8d7..77eccc43f7a09 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduMetadata.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduMetadata.java @@ -38,12 +38,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; +import jakarta.inject.Inject; import org.apache.kudu.ColumnSchema; import org.apache.kudu.Schema; import org.apache.kudu.client.KuduTable; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduModule.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduModule.java index bb91d80faa93f..64d93e26cd608 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduModule.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduModule.java @@ -29,10 +29,9 @@ import com.google.inject.Scopes; import com.google.inject.multibindings.Multibinder; import com.google.inject.multibindings.ProvidesIntoSet; +import jakarta.inject.Singleton; import org.apache.kudu.client.KuduClient; -import javax.inject.Singleton; - import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static java.util.Objects.requireNonNull; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduPageSinkProvider.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduPageSinkProvider.java index fbc740d6c8534..e5be921da2632 100644 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduPageSinkProvider.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduPageSinkProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduRecordSetProvider.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduRecordSetProvider.java index 56b25a9346dcb..44d6d0a9a4b6f 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduRecordSetProvider.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduRecordSetProvider.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.RecordSet; import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduSplitManager.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduSplitManager.java index bce8b6bdb898f..f488506705b0a 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduSplitManager.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduSplitManager.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.FixedSplitSource; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/procedures/RangePartitionProcedures.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/procedures/RangePartitionProcedures.java index c9638aa803ea3..4fa52348f09fb 100644 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/procedures/RangePartitionProcedures.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/procedures/RangePartitionProcedures.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.procedure.Procedure; import com.facebook.presto.spi.procedure.Procedure.Argument; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.lang.invoke.MethodHandle; diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/properties/KuduTableProperties.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/properties/KuduTableProperties.java index 90cc240590238..f9ee6f1ab6676 100644 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/properties/KuduTableProperties.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/properties/KuduTableProperties.java @@ -18,6 +18,7 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import org.apache.kudu.ColumnSchema; import org.apache.kudu.Schema; import org.apache.kudu.Type; @@ -30,8 +31,6 @@ import org.apache.kudu.shaded.com.google.common.base.Predicates; import org.apache.kudu.shaded.com.google.common.collect.Iterators; -import javax.inject.Inject; - import java.io.IOException; import java.math.BigDecimal; import java.time.Instant; diff --git a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsConnector.java b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsConnector.java index 61e2b12e54613..19ccd72c201ee 100644 --- a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsConnector.java +++ b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsConnector.java @@ -25,8 +25,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.function.Supplier; diff --git a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsMetadata.java b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsMetadata.java index a164da3b0aabb..9549708c317d9 100644 --- a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsMetadata.java +++ b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsMetadata.java @@ -34,8 +34,7 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.LinkedHashMap; import java.util.List; diff --git a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsRecordSetProvider.java b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsRecordSetProvider.java index 6cb0baf96e896..29daa9d45c46b 100644 --- a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsRecordSetProvider.java +++ b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsRecordSetProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.RecordSet; import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.function.Supplier; diff --git a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/api/LarkSheetsApiFactory.java b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/api/LarkSheetsApiFactory.java index 7fcdcc9fc7cda..2f98505a1e652 100644 --- a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/api/LarkSheetsApiFactory.java +++ b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/api/LarkSheetsApiFactory.java @@ -14,6 +14,7 @@ package com.facebook.presto.lark.sheets.api; import com.facebook.presto.lark.sheets.LarkSheetsConfig; +import com.google.errorprone.annotations.ThreadSafe; import com.larksuite.oapi.core.AppSettings; import com.larksuite.oapi.core.AppType; import com.larksuite.oapi.core.Config; @@ -21,9 +22,7 @@ import com.larksuite.oapi.core.Domain; import com.larksuite.oapi.service.drive_permission.v2.DrivePermissionService; import com.larksuite.oapi.service.sheets.v2.SheetsService; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.function.Supplier; diff --git a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileConnector.java b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileConnector.java index cf81f1549f2b3..0c416861b24e0 100644 --- a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileConnector.java +++ b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileConnector.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.spi.transaction.IsolationLevel.READ_COMMITTED; import static com.facebook.presto.spi.transaction.IsolationLevel.checkConnectorSupports; diff --git a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileMetadata.java b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileMetadata.java index 247b741e709d3..3db1028497578 100644 --- a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileMetadata.java +++ b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileMetadata.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileRecordSetProvider.java b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileRecordSetProvider.java index 75befa6235554..b40f06763306a 100644 --- a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileRecordSetProvider.java +++ b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileRecordSetProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileSplitManager.java b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileSplitManager.java index ec004022efd42..e18e7e2829a9f 100644 --- a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileSplitManager.java +++ b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileSplitManager.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.NodeManager; import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.stream.Collectors; diff --git a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileTables.java b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileTables.java index 438a2ce6f8fff..b429dc176dbb9 100644 --- a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileTables.java +++ b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileTables.java @@ -22,8 +22,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.UncheckedExecutionException; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ClientRequestFilterManager.java b/presto-main-base/src/main/java/com/facebook/presto/ClientRequestFilterManager.java index 79fb3a359f5c5..234f8d92710a1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ClientRequestFilterManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ClientRequestFilterManager.java @@ -18,9 +18,8 @@ import com.facebook.presto.spi.ClientRequestFilterFactory; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; - -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.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/GroupByHashPageIndexerFactory.java b/presto-main-base/src/main/java/com/facebook/presto/GroupByHashPageIndexerFactory.java index e135188ba3fe2..3a6c045fb1442 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/GroupByHashPageIndexerFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/GroupByHashPageIndexerFactory.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.PageIndexer; import com.facebook.presto.spi.PageIndexerFactory; import com.facebook.presto.sql.gen.JoinCompiler; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/PagesIndexPageSorter.java b/presto-main-base/src/main/java/com/facebook/presto/PagesIndexPageSorter.java index 7190d545e7fc1..4c01c2c1a95fb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/PagesIndexPageSorter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/PagesIndexPageSorter.java @@ -19,8 +19,7 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.operator.PagesIndex; import com.facebook.presto.spi.PageSorter; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java b/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java index ea7cabd00b832..723d90b17b2f0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java +++ b/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java @@ -51,8 +51,7 @@ import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Comparator; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/block/BlockJsonSerde.java b/presto-main-base/src/main/java/com/facebook/presto/block/BlockJsonSerde.java index 1f86629fad6da..b0e38237c213c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/block/BlockJsonSerde.java +++ b/presto-main-base/src/main/java/com/facebook/presto/block/BlockJsonSerde.java @@ -26,8 +26,7 @@ import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/catalogserver/CatalogServer.java b/presto-main-base/src/main/java/com/facebook/presto/catalogserver/CatalogServer.java index b4d5ae5759ac8..0dd4f8137ce82 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/catalogserver/CatalogServer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/catalogserver/CatalogServer.java @@ -29,8 +29,7 @@ import com.facebook.presto.transaction.TransactionManager; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RandomCatalogServerAddressSelector.java b/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RandomCatalogServerAddressSelector.java index f98d7a0a84e54..9dd1f0ae757e1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RandomCatalogServerAddressSelector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RandomCatalogServerAddressSelector.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.HostAddress; import com.google.common.annotations.VisibleForTesting; import com.google.common.net.HostAndPort; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RemoteMetadataManager.java b/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RemoteMetadataManager.java index b888ea547c736..6a7d166597061 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RemoteMetadataManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/catalogserver/RemoteMetadataManager.java @@ -33,8 +33,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/ConnectorManager.java b/presto-main-base/src/main/java/com/facebook/presto/connector/ConnectorManager.java index b1747993fe0fe..ac86c7e7c3c19 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/ConnectorManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/ConnectorManager.java @@ -69,11 +69,10 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.annotation.PreDestroy; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/AnalyzePropertiesSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/AnalyzePropertiesSystemTable.java index 6377ada289bc6..cbafed277479d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/AnalyzePropertiesSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/AnalyzePropertiesSystemTable.java @@ -15,8 +15,7 @@ import com.facebook.presto.metadata.Metadata; import com.facebook.presto.transaction.TransactionManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class AnalyzePropertiesSystemTable extends AbstractPropertiesSystemTable diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/CatalogSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/CatalogSystemTable.java index c604b2cfe9cec..19cbea31463fc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/CatalogSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/CatalogSystemTable.java @@ -26,8 +26,7 @@ import com.facebook.presto.spi.SystemTable; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.security.AccessControl; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/ColumnPropertiesSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/ColumnPropertiesSystemTable.java index cbec3f4c7ccea..44a9788a6d5e1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/ColumnPropertiesSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/ColumnPropertiesSystemTable.java @@ -15,8 +15,7 @@ import com.facebook.presto.metadata.Metadata; import com.facebook.presto.transaction.TransactionManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class ColumnPropertiesSystemTable extends AbstractPropertiesSystemTable diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/GlobalSystemConnectorFactory.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/GlobalSystemConnectorFactory.java index 07cd6ad48a90c..3d1c8e329188b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/GlobalSystemConnectorFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/GlobalSystemConnectorFactory.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorFactory; import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/KillQueryProcedure.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/KillQueryProcedure.java index d3eb3758223d4..e236e51c43b33 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/KillQueryProcedure.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/KillQueryProcedure.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.procedure.Procedure; import com.facebook.presto.spi.procedure.Procedure.Argument; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.lang.invoke.MethodHandle; import java.util.NoSuchElementException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/NodeSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/NodeSystemTable.java index 7495be91e69dc..9e989f6ada3ed 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/NodeSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/NodeSystemTable.java @@ -26,8 +26,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.SystemTable; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Locale; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java index dee2de8039720..828bb4e87e476 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java @@ -31,8 +31,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.NoSuchElementException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/SchemaPropertiesSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/SchemaPropertiesSystemTable.java index be9791fc718ca..b52c36a3f1cb6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/SchemaPropertiesSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/SchemaPropertiesSystemTable.java @@ -15,8 +15,7 @@ import com.facebook.presto.metadata.Metadata; import com.facebook.presto.transaction.TransactionManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class SchemaPropertiesSystemTable extends AbstractPropertiesSystemTable diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/SystemConnectorModule.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/SystemConnectorModule.java index 8afd2f7dadea8..19728ef156e78 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/SystemConnectorModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/SystemConnectorModule.java @@ -36,8 +36,7 @@ import com.google.inject.multibindings.Multibinder; import com.google.inject.multibindings.MultibindingsScanner; import com.google.inject.multibindings.ProvidesIntoSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class SystemConnectorModule implements Module diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TablePropertiesSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TablePropertiesSystemTable.java index 6df37eaf77504..637cfa56b51c2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TablePropertiesSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TablePropertiesSystemTable.java @@ -15,8 +15,7 @@ import com.facebook.presto.metadata.Metadata; import com.facebook.presto.transaction.TransactionManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class TablePropertiesSystemTable extends AbstractPropertiesSystemTable diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java index 6d50a6444b370..2c33f2f05581f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java @@ -29,8 +29,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.TimestampType.TIMESTAMP; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TransactionsSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TransactionsSystemTable.java index 83140c0ec7ff1..b2a7a80244da1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TransactionsSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TransactionsSystemTable.java @@ -31,8 +31,7 @@ import com.facebook.presto.transaction.TransactionInfo; import com.facebook.presto.transaction.TransactionManager; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/CatalogJdbcTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/CatalogJdbcTable.java index d61b245628b6c..c5103e4525149 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/CatalogJdbcTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/CatalogJdbcTable.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.security.AccessControl; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.common.type.VarcharType.createUnboundedVarcharType; import static com.facebook.presto.connector.system.SystemConnectorSessionUtil.toSession; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java index 1138d9746beab..1c4613a5af7a9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java @@ -32,8 +32,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.security.AccessControl; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.DatabaseMetaData; import java.sql.Types; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/SchemaJdbcTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/SchemaJdbcTable.java index bc3e77b066eb3..5d9212c8b863e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/SchemaJdbcTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/SchemaJdbcTable.java @@ -25,8 +25,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.security.AccessControl; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TableJdbcTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TableJdbcTable.java index e058ae6a10348..b425eb0b38704 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TableJdbcTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TableJdbcTable.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.security.AccessControl; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TypesJdbcTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TypesJdbcTable.java index 5e330237a5faa..bce7fe113c532 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TypesJdbcTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TypesJdbcTable.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.RecordCursor; import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.DatabaseMetaData; import java.sql.Types; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculator.java b/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculator.java index e681c26ce7f52..dce4afaf26b4e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculator.java @@ -16,10 +16,9 @@ import com.facebook.presto.Session; import com.facebook.presto.spi.plan.PlanNode; +import com.google.errorprone.annotations.ThreadSafe; import com.google.inject.BindingAnnotation; -import javax.annotation.concurrent.ThreadSafe; - import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorUsingExchanges.java b/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorUsingExchanges.java index 18c84c8ad9dac..5ec55e6734eca 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorUsingExchanges.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorUsingExchanges.java @@ -42,9 +42,8 @@ import com.facebook.presto.sql.planner.plan.SampleNode; import com.facebook.presto.sql.planner.plan.SequenceNode; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorWithEstimatedExchanges.java b/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorWithEstimatedExchanges.java index 16856a4755e18..ecf1b0b12aa0c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorWithEstimatedExchanges.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/CostCalculatorWithEstimatedExchanges.java @@ -28,9 +28,8 @@ import com.facebook.presto.sql.planner.iterative.rule.ReorderJoins; import com.facebook.presto.sql.planner.plan.InternalPlanVisitor; import com.facebook.presto.sql.planner.plan.SequenceNode; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/CostComparator.java b/presto-main-base/src/main/java/com/facebook/presto/cost/CostComparator.java index a394fdb3131cd..3dad25970abbd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/CostComparator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/CostComparator.java @@ -17,8 +17,7 @@ import com.facebook.presto.sql.analyzer.FeaturesConfig; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Ordering; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/FilterStatsCalculator.java b/presto-main-base/src/main/java/com/facebook/presto/cost/FilterStatsCalculator.java index 368c12d2df43c..d01c5b6ba68f2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/FilterStatsCalculator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/FilterStatsCalculator.java @@ -57,9 +57,8 @@ import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/HistoryBasedOptimizationConfig.java b/presto-main-base/src/main/java/com/facebook/presto/cost/HistoryBasedOptimizationConfig.java index 84dd8a0fe8353..f307eda8307d1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/HistoryBasedOptimizationConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/HistoryBasedOptimizationConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.presto.spi.function.Description; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; public class HistoryBasedOptimizationConfig { diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/ScalarStatsCalculator.java b/presto-main-base/src/main/java/com/facebook/presto/cost/ScalarStatsCalculator.java index a25351ca7a88a..14ecc0aa325b0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/ScalarStatsCalculator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/ScalarStatsCalculator.java @@ -51,8 +51,7 @@ import com.facebook.presto.sql.tree.SymbolReference; import com.facebook.presto.type.TypeUtils; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.OptionalDouble; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/StatsCalculatorModule.java b/presto-main-base/src/main/java/com/facebook/presto/cost/StatsCalculatorModule.java index 41716b3d1e687..fe16f607fd3d7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/StatsCalculatorModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/StatsCalculatorModule.java @@ -19,8 +19,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/TaskCountEstimator.java b/presto-main-base/src/main/java/com/facebook/presto/cost/TaskCountEstimator.java index 8e6228078068a..fab3516b7b857 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/TaskCountEstimator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/TaskCountEstimator.java @@ -17,8 +17,7 @@ import com.facebook.presto.execution.scheduler.NodeSchedulerConfig; import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.metadata.InternalNodeManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; import java.util.function.IntSupplier; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/CoordinatorLocation.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/CoordinatorLocation.java deleted file mode 100644 index 83c606210ce46..0000000000000 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/CoordinatorLocation.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 com.facebook.presto.dispatcher; - -import javax.ws.rs.core.UriInfo; - -import java.net.URI; - -public interface CoordinatorLocation -{ - URI getUri(UriInfo uriInfo, String xForwardedProto); -} diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchExecutor.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchExecutor.java index 5a3f7d1816d15..859994e2d9ffe 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchExecutor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchExecutor.java @@ -19,13 +19,12 @@ import com.google.common.io.Closer; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ListeningScheduledExecutorService; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadPoolExecutor; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java index 2b08af85aa5d9..d04774e82dae4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java @@ -22,7 +22,6 @@ public class DispatchInfo { - private final Optional coordinatorLocation; private final Optional failureInfo; private final Duration elapsedTime; private final Duration waitingForPrerequisitesTime; @@ -30,48 +29,40 @@ public class DispatchInfo public static DispatchInfo waitingForPrerequisites(Duration elapsedTime, Duration waitingForPrerequisitesTime) { - return new DispatchInfo(Optional.empty(), Optional.empty(), elapsedTime, waitingForPrerequisitesTime, Optional.empty()); + return new DispatchInfo(Optional.empty(), elapsedTime, waitingForPrerequisitesTime, Optional.empty()); } public static DispatchInfo queued(Duration elapsedTime, Duration waitingForPrerequisitesTime, Duration queuedTime) { requireNonNull(queuedTime, "queuedTime is null"); - return new DispatchInfo(Optional.empty(), Optional.empty(), elapsedTime, waitingForPrerequisitesTime, Optional.of(queuedTime)); + return new DispatchInfo(Optional.empty(), elapsedTime, waitingForPrerequisitesTime, Optional.of(queuedTime)); } - public static DispatchInfo dispatched(CoordinatorLocation coordinatorLocation, Duration elapsedTime, Duration waitingForPrerequisitesTime, Duration queuedTime) + public static DispatchInfo dispatched(Duration elapsedTime, Duration waitingForPrerequisitesTime, Duration queuedTime) { - requireNonNull(coordinatorLocation, "coordinatorLocation is null"); requireNonNull(queuedTime, "queuedTime is null"); - return new DispatchInfo(Optional.of(coordinatorLocation), Optional.empty(), elapsedTime, waitingForPrerequisitesTime, Optional.of(queuedTime)); + return new DispatchInfo(Optional.empty(), elapsedTime, waitingForPrerequisitesTime, Optional.of(queuedTime)); } public static DispatchInfo failed(ExecutionFailureInfo failureInfo, Duration elapsedTime, Duration waitingForPrerequisitesTime, Duration queuedTime) { requireNonNull(failureInfo, "coordinatorLocation is null"); requireNonNull(queuedTime, "queuedTime is null"); - return new DispatchInfo(Optional.empty(), Optional.of(failureInfo), elapsedTime, waitingForPrerequisitesTime, Optional.of(queuedTime)); + return new DispatchInfo(Optional.of(failureInfo), elapsedTime, waitingForPrerequisitesTime, Optional.of(queuedTime)); } private DispatchInfo( - Optional coordinatorLocation, Optional failureInfo, Duration elapsedTime, Duration waitingForPrerequisitesTime, Optional queuedTime) { - this.coordinatorLocation = requireNonNull(coordinatorLocation, "coordinatorLocation is null"); this.failureInfo = requireNonNull(failureInfo, "failureInfo is null"); this.elapsedTime = requireNonNull(elapsedTime, "elapsedTime is null"); this.waitingForPrerequisitesTime = requireNonNull(waitingForPrerequisitesTime, "waitingForPrerequisitesTime is null"); this.queuedTime = requireNonNull(queuedTime, "queuedTime is null"); } - public Optional getCoordinatorLocation() - { - return coordinatorLocation; - } - public Optional getFailureInfo() { return failureInfo; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchManager.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchManager.java index dd04dc1fb9ea3..25d923e3079a9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchManager.java @@ -41,13 +41,12 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.AbstractFuture; import com.google.common.util.concurrent.ListenableFuture; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.Flatten; import org.weakref.jmx.Managed; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import java.security.Principal; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedLocalDispatchQueryFactory.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedLocalDispatchQueryFactory.java index 0e518950e979d..4bb9ef56e66f6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedLocalDispatchQueryFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedLocalDispatchQueryFactory.java @@ -19,8 +19,7 @@ import com.facebook.presto.execution.LocationFactory; import com.facebook.presto.server.BasicQueryInfo; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; import java.util.concurrent.ExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/LocalCoordinatorLocation.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/LocalCoordinatorLocation.java deleted file mode 100644 index badc3c34bd41f..0000000000000 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/LocalCoordinatorLocation.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 com.facebook.presto.dispatcher; - -import javax.ws.rs.core.UriInfo; - -import java.net.URI; - -import static com.google.common.base.Strings.isNullOrEmpty; - -public class LocalCoordinatorLocation - implements CoordinatorLocation -{ - @Override - public URI getUri(UriInfo uriInfo, String xForwardedProto) - { - String scheme = isNullOrEmpty(xForwardedProto) ? uriInfo.getRequestUri().getScheme() : xForwardedProto; - return uriInfo.getRequestUriBuilder() - .scheme(scheme) - .replacePath("") - .replaceQuery("") - .build(); - } -} diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java index 73f35985a3a97..2fc557e3c7f0f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java @@ -74,8 +74,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java index c43f208028f94..bd3143ebabbd7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java @@ -20,8 +20,7 @@ import io.airlift.units.Duration; import io.airlift.units.MaxDataSize; import io.airlift.units.MinDataSize; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java index 8864a3da8a0fb..c4c7fad28d47c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java @@ -15,12 +15,11 @@ import com.facebook.presto.dispatcher.DispatchManager; import com.facebook.presto.server.BasicQueryInfo; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; - -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 jakarta.inject.Inject; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicLong; diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/SplitMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/event/SplitMonitor.java index 10db412e3bd72..4fcb2b9a10324 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/SplitMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/SplitMonitor.java @@ -22,9 +22,8 @@ import com.facebook.presto.spi.eventlistener.SplitStatistics; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.time.Duration; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/eventlistener/EventListenerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/eventlistener/EventListenerConfig.java index 1d248f56e59a0..5346f2f7f2334 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/eventlistener/EventListenerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/eventlistener/EventListenerConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.Config; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java index 93f8f47f582c3..40917e71fce62 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java @@ -37,8 +37,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; import io.airlift.units.Duration; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/AlterFunctionTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/AlterFunctionTask.java index 924ded74bf0da..1e3592edc089c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/AlterFunctionTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/AlterFunctionTask.java @@ -29,8 +29,7 @@ import com.facebook.presto.sql.tree.Parameter; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java index 6833912e31c18..d143b0beb77de 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java @@ -22,12 +22,11 @@ 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.units.Duration; - -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 jakarta.inject.Inject; import java.util.ArrayList; import java.util.HashSet; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateFunctionTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateFunctionTask.java index 318c8fed1246c..8ae5e5670f80c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateFunctionTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateFunctionTask.java @@ -38,8 +38,7 @@ import com.facebook.presto.sql.tree.RoutineBody; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateMaterializedViewTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateMaterializedViewTask.java index a17e67a0b7b97..b8cfa5943a6ce 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateMaterializedViewTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateMaterializedViewTask.java @@ -35,8 +35,7 @@ import com.facebook.presto.sql.tree.Parameter; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTypeTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTypeTask.java index 99dcf3a8682d3..ffd66102574be 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTypeTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTypeTask.java @@ -29,8 +29,7 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.collect.Streams; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateViewTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateViewTask.java index 0e2b650e08e4c..b972a6f1fdf12 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateViewTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateViewTask.java @@ -31,8 +31,7 @@ import com.facebook.presto.sql.tree.Statement; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/DDLDefinitionExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/DDLDefinitionExecution.java index aeefdd2d62693..e81322959b865 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/DDLDefinitionExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/DDLDefinitionExecution.java @@ -25,8 +25,7 @@ import com.facebook.presto.sql.tree.Statement; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java index 972c33ed69393..7a58f36900fd4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java @@ -29,8 +29,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.Duration; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/DropFunctionTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/DropFunctionTask.java index a4af6fe23ce28..e898c80dde890 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/DropFunctionTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/DropFunctionTask.java @@ -26,8 +26,7 @@ import com.facebook.presto.sql.tree.Parameter; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/EagerPlanValidationExecutionMBean.java b/presto-main-base/src/main/java/com/facebook/presto/execution/EagerPlanValidationExecutionMBean.java index ad77325e42635..bccf77145a24f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/EagerPlanValidationExecutionMBean.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/EagerPlanValidationExecutionMBean.java @@ -14,11 +14,10 @@ package com.facebook.presto.execution; import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/execution/ExecutionFailureInfo.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ExecutionFailureInfo.java index c9da4a4ba2196..760d8f14761f2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ExecutionFailureInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ExecutionFailureInfo.java @@ -25,9 +25,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/presto-main-base/src/main/java/com/facebook/presto/execution/ExplainAnalyzeContext.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ExplainAnalyzeContext.java index bdc1540f8c9f8..92502c7c733e9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ExplainAnalyzeContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ExplainAnalyzeContext.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/Failure.java b/presto-main-base/src/main/java/com/facebook/presto/execution/Failure.java index 3ef50d6dbde9b..a2ed242f52557 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/Failure.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/Failure.java @@ -14,8 +14,7 @@ package com.facebook.presto.execution; import com.facebook.presto.common.ErrorCode; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/ForEagerPlanValidation.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ForEagerPlanValidation.java index 5193341a73cc1..782ce58f6094e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ForEagerPlanValidation.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ForEagerPlanValidation.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/ForQueryExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ForQueryExecution.java index 3dc08c52fa808..0a8c738cb6aae 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ForQueryExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ForQueryExecution.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/ForTimeoutThread.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ForTimeoutThread.java index ae0a584e14e49..faea2557b0294 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ForTimeoutThread.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ForTimeoutThread.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/FutureStateChange.java b/presto-main-base/src/main/java/com/facebook/presto/execution/FutureStateChange.java index 1a3a3d75e69b4..28765f7d4fe23 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/FutureStateChange.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/FutureStateChange.java @@ -16,9 +16,8 @@ import com.google.common.collect.ImmutableSet; 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.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/Input.java b/presto-main-base/src/main/java/com/facebook/presto/execution/Input.java index 667fda883f366..4cb4511bee101 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/Input.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/Input.java @@ -18,8 +18,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/presto-main-base/src/main/java/com/facebook/presto/execution/NodeResourceStatusConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/NodeResourceStatusConfig.java index d58f0a0caa114..e7be9804fff31 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/NodeResourceStatusConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/NodeResourceStatusConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; public class NodeResourceStatusConfig { diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/NodeTaskMap.java b/presto-main-base/src/main/java/com/facebook/presto/execution/NodeTaskMap.java index ba015428bfe52..5213f35210c40 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/NodeTaskMap.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/NodeTaskMap.java @@ -18,9 +18,8 @@ import com.facebook.presto.util.FinalizerService; import com.google.common.collect.Sets; import com.google.common.util.concurrent.AtomicDouble; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/Output.java b/presto-main-base/src/main/java/com/facebook/presto/execution/Output.java index 74f633b871407..655e427b53a27 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/Output.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/Output.java @@ -17,8 +17,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/presto-main-base/src/main/java/com/facebook/presto/execution/PartialResultQueryManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/PartialResultQueryManager.java index 4409340deabfc..f125a9be24807 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/PartialResultQueryManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/PartialResultQueryManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.execution.scheduler.PartialResultQueryTaskTracker; import com.google.inject.Inject; - -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/PrepareTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/PrepareTask.java index c9efb3e866147..c434c553cc7c1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/PrepareTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/PrepareTask.java @@ -24,8 +24,7 @@ import com.facebook.presto.sql.tree.Statement; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecutionMBean.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecutionMBean.java index 3faa63f2c906d..b8b765a6bff57 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecutionMBean.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecutionMBean.java @@ -14,11 +14,10 @@ package com.facebook.presto.execution; import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/execution/QueryIdGenerator.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryIdGenerator.java index 425e1af8fd18a..ecd8f20d6c45d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryIdGenerator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryIdGenerator.java @@ -18,11 +18,10 @@ import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Chars; import com.google.common.util.concurrent.Uninterruptibles; +import com.google.errorprone.annotations.concurrent.GuardedBy; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import javax.annotation.concurrent.GuardedBy; - import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryInfo.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryInfo.java index 0a55cb79ea4a0..ab4c9e2139c30 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryInfo.java @@ -37,9 +37,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -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/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java index c7f91fb0b00ff..e62d189a79244 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java @@ -23,10 +23,9 @@ import io.airlift.units.Duration; import io.airlift.units.MinDataSize; 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerStats.java index d7cbcfdcb7d2f..79a7385a4e916 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerStats.java @@ -19,11 +19,10 @@ import com.facebook.presto.dispatcher.DispatchQuery; import com.facebook.presto.execution.StateMachine.StateChangeListener; import com.facebook.presto.server.BasicQueryInfo; +import com.google.errorprone.annotations.concurrent.GuardedBy; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.GuardedBy; - import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java index 95f1c8d739c40..1659ba6b100b2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.common.resourceGroups.QueryType; @@ -56,11 +57,9 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; - -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.net.URI; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java index a181a23086c45..6009cb2b5494c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java @@ -29,10 +29,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.HashSet; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java index f2fe8eb86673d..d88ecae6bb972 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java @@ -22,11 +22,10 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; 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.units.Duration; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.Collection; import java.util.NoSuchElementException; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SessionDefinitionExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SessionDefinitionExecution.java index 09a3bc4369fc6..c84b6d4c2718b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SessionDefinitionExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SessionDefinitionExecution.java @@ -25,8 +25,7 @@ import com.facebook.presto.sql.tree.Statement; import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java index 3c069390649e4..990a7a8cf08fd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.concurrent.NotThreadSafe; import io.airlift.units.Duration; -import javax.annotation.concurrent.NotThreadSafe; - import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static java.lang.Double.isFinite; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java index 97b72d979adc5..746ab2c90f94c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java @@ -66,10 +66,9 @@ import com.facebook.presto.sql.planner.sanity.PlanChecker; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java index 173dbbb32e919..d7e82ff936499 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java @@ -41,11 +41,10 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +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.net.URI; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTask.java index ac91b7958574a..b03c9ef04e3ef 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTask.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTask.java @@ -40,10 +40,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; -import javax.annotation.Nullable; - import java.net.URI; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java index 43885270d21a6..e0e21ee57b1fd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.airlift.concurrent.SetThreadName; import com.facebook.presto.event.SplitMonitor; import com.facebook.presto.execution.StateMachine.StateChangeListener; @@ -39,12 +40,10 @@ 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.units.Duration; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.NotThreadSafe; -import javax.annotation.concurrent.ThreadSafe; +import jakarta.annotation.Nullable; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java index d662157aa668d..49db6383b9a9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java @@ -52,18 +52,17 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; import io.airlift.units.Duration; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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.annotation.concurrent.GuardedBy; -import javax.inject.Inject; - import java.io.Closeable; import java.nio.file.Paths; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java index 5efb26a7957a9..fe56615dc5430 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java @@ -23,8 +23,7 @@ import com.facebook.presto.operator.TaskStats; import com.facebook.presto.util.Failures; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.HashSet; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java index 20435d2261cb0..721655049c312 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java @@ -23,10 +23,9 @@ 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.Duration; -import javax.annotation.concurrent.Immutable; - import java.util.List; import java.util.OptionalDouble; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StageInfo.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StageInfo.java index 2ac6e04f0de10..028ba2141aefb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StageInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StageInfo.java @@ -17,8 +17,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.net.URI; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StateMachine.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StateMachine.java index 559e245720291..49af8d9757002 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StateMachine.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StateMachine.java @@ -19,9 +19,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; 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 java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskInfo.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskInfo.java index 8dbde67913ac5..f0e9c48121915 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskInfo.java @@ -23,10 +23,9 @@ 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 org.joda.time.DateTime; -import javax.annotation.concurrent.Immutable; - import java.net.URI; import java.util.List; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagementExecutor.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagementExecutor.java index 876dce427deca..5cf865834d8cc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagementExecutor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagementExecutor.java @@ -14,11 +14,10 @@ package com.facebook.presto.execution; import com.facebook.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/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java index 347a78553ed4f..c3a57ec1498d6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java @@ -23,11 +23,10 @@ import io.airlift.units.Duration; import io.airlift.units.MaxDuration; import io.airlift.units.MinDuration; - -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.math.BigDecimal; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskStateMachine.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskStateMachine.java index 65d11fcc6d22f..3b74d8c06baa6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskStateMachine.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskStateMachine.java @@ -16,8 +16,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.execution.StateMachine.StateChangeListener; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskThresholdMemoryRevokingScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskThresholdMemoryRevokingScheduler.java index 2dd21f43c936a..9a549af356a4b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskThresholdMemoryRevokingScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskThresholdMemoryRevokingScheduler.java @@ -23,11 +23,10 @@ import com.facebook.presto.sql.analyzer.FeaturesConfig; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; - -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 jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ArbitraryOutputBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ArbitraryOutputBuffer.java index 7a4ec56b5626c..05c4ea7651f9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ArbitraryOutputBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ArbitraryOutputBuffer.java @@ -26,9 +26,8 @@ import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; 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 java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/BroadcastOutputBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/BroadcastOutputBuffer.java index 13b34ab20d553..467d61493bf98 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/BroadcastOutputBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/BroadcastOutputBuffer.java @@ -24,8 +24,7 @@ import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ClientBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ClientBuffer.java index 05804e4ff47c9..839caf2055c26 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ClientBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/ClientBuffer.java @@ -19,10 +19,9 @@ 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.Immutable; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.Immutable; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LazyOutputBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LazyOutputBuffer.java index 8ca9c2021b24b..9292064a85d07 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LazyOutputBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LazyOutputBuffer.java @@ -24,9 +24,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.HashSet; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LifespanSerializedPageTracker.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LifespanSerializedPageTracker.java index 99fbc224b9acc..7940b84ecf442 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LifespanSerializedPageTracker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/LifespanSerializedPageTracker.java @@ -15,8 +15,7 @@ import com.facebook.presto.execution.Lifespan; import com.facebook.presto.execution.buffer.SerializedPageReference.PagesReleasedListener; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Optional; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/OutputBufferMemoryManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/OutputBufferMemoryManager.java index 6028adbc55e80..4c5dab92763b7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/OutputBufferMemoryManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/OutputBufferMemoryManager.java @@ -18,10 +18,9 @@ import com.google.common.base.Suppliers; 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.Executor; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SerializedPageReference.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SerializedPageReference.java index 2bbe3427ecef7..1c8137815e6ac 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SerializedPageReference.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SerializedPageReference.java @@ -15,8 +15,7 @@ import com.facebook.presto.execution.Lifespan; import com.facebook.presto.spi.page.SerializedPage; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.List; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBuffer.java index c8a2b7637c25d..5b7de4725e2e9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBuffer.java @@ -33,12 +33,11 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.SettableFuture; +import com.google.errorprone.annotations.Immutable; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.slice.InputStreamSliceInput; import io.airlift.slice.SliceInput; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.Immutable; - import java.io.IOException; import java.util.ArrayDeque; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBufferFactory.java b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBufferFactory.java index 86c10ef0cf940..7ef22a83bb186 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBufferFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/buffer/SpoolingOutputBufferFactory.java @@ -24,9 +24,8 @@ import com.google.common.io.Closer; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/MultilevelSplitQueue.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/MultilevelSplitQueue.java index c6e550a91fec8..028e10f07a6d9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/MultilevelSplitQueue.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/MultilevelSplitQueue.java @@ -17,13 +17,12 @@ import com.facebook.presto.execution.TaskManagerConfig; 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 jakarta.inject.Inject; 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.ArrayList; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/Priority.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/Priority.java index 6bb3609a492fd..969bbfb92578f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/Priority.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/Priority.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution.executor; -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java index a2de9b34d1b58..3d109f52a15da 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java @@ -35,16 +35,15 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ComparisonChain; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java index 38f0847da414e..2e3190280ab06 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java @@ -16,11 +16,10 @@ import com.facebook.presto.execution.SplitConcurrencyController; import com.facebook.presto.execution.TaskId; 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 javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskPriorityTracker.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskPriorityTracker.java index d7ac789a179a4..c6a7c55f6bd9a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskPriorityTracker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskPriorityTracker.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution.executor; -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java index 571798230fbf6..d85c5a00818b7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java @@ -26,14 +26,13 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupState; import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; import io.airlift.units.Duration; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.Collection; import java.util.HashMap; import java.util.HashSet; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java index 96b7951e365ce..aae2a38a923e3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java @@ -35,17 +35,16 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.JmxException; import org.weakref.jmx.MBeanExporter; import org.weakref.jmx.Managed; import org.weakref.jmx.ObjectNames; -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/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/ResourceGroupManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/ResourceGroupManager.java index d3d97d118756b..8afd4cf95c569 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/ResourceGroupManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/ResourceGroupManager.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.facebook.presto.spi.resourceGroups.SelectionContext; import com.facebook.presto.spi.resourceGroups.SelectionCriteria; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.List; import java.util.concurrent.Executor; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/BroadcastOutputBufferManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/BroadcastOutputBufferManager.java index 92d390e09426d..4ea566158358c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/BroadcastOutputBufferManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/BroadcastOutputBufferManager.java @@ -15,9 +15,8 @@ import com.facebook.presto.execution.buffer.OutputBuffers; import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId; - -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.List; import java.util.function.Consumer; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/FixedSourcePartitionedScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/FixedSourcePartitionedScheduler.java index 9febc345114f2..4c6e35c5be943 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/FixedSourcePartitionedScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/FixedSourcePartitionedScheduler.java @@ -33,8 +33,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.ArrayList; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkTopology.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkTopology.java index 583d5d3207998..f0472f63686cc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkTopology.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkTopology.java @@ -14,8 +14,7 @@ package com.facebook.presto.execution.scheduler; import com.facebook.presto.spi.HostAddress; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java index 8c2ee85d75f9d..47d124d4bd086 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java @@ -43,9 +43,8 @@ import com.google.common.collect.Multimap; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.Duration; - -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerConfig.java index 1bc0af2e4cccb..eb3e20992edc6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerConfig.java @@ -17,9 +17,8 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; import com.facebook.airlift.configuration.LegacyConfig; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; @DefunctConfig({"node-scheduler.location-aware-scheduling-enabled", "node-scheduler.multiple-tasks-per-node-enabled"}) public class NodeSchedulerConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerExporter.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerExporter.java index d76c6bd4971e6..c9fdacd1709de 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerExporter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeSchedulerExporter.java @@ -14,14 +14,13 @@ package com.facebook.presto.execution.scheduler; import com.facebook.airlift.stats.CounterStat; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.JmxException; import org.weakref.jmx.MBeanExporter; import org.weakref.jmx.ObjectNames; -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/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PartitionedOutputBufferManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PartitionedOutputBufferManager.java index fc793e37837a1..fb9727eb6c3fc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PartitionedOutputBufferManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PartitionedOutputBufferManager.java @@ -17,8 +17,7 @@ import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId; import com.facebook.presto.spi.plan.PartitioningHandle; import com.google.common.collect.ImmutableMap; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java index 05c8d2789a6d9..90a5d961ffff5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution.scheduler; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.execution.SqlStageExecution; import com.facebook.presto.execution.StageExecutionState; import com.facebook.presto.spi.plan.JoinNode; @@ -36,8 +37,6 @@ import org.jgrapht.graph.DefaultEdge; import org.jgrapht.traverse.TopologicalOrderIterator; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledOutputBufferManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledOutputBufferManager.java index c158ae526b481..ac938f9cb2314 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledOutputBufferManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledOutputBufferManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.execution.buffer.OutputBuffers; import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.List; import java.util.function.Consumer; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecution.java index a829aa8542070..3241cb617b62f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecution.java @@ -15,8 +15,7 @@ import com.facebook.presto.execution.StageExecutionState; 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/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecutionFactory.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecutionFactory.java index 26b77ef163ca5..94f73801d04c5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecutionFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SectionExecutionFactory.java @@ -51,8 +51,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SplitSchedulerStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SplitSchedulerStats.java index 83b4bbaa8c69c..af137ef9c514d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SplitSchedulerStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SplitSchedulerStats.java @@ -16,11 +16,10 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.DistributionStat; import com.facebook.airlift.stats.TimeStat; +import com.google.errorprone.annotations.ThreadSafe; 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/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/DynamicLifespanScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/DynamicLifespanScheduler.java index e07610a509a25..41f1be5c02c5e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/DynamicLifespanScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/DynamicLifespanScheduler.java @@ -20,12 +20,11 @@ import com.facebook.presto.spi.connector.ConnectorPartitionHandle; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.SettableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import it.unimi.dsi.fastutil.ints.IntArrayFIFOQueue; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; -import javax.annotation.concurrent.GuardedBy; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/FixedLifespanScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/FixedLifespanScheduler.java index ba2f542e18903..ce0c6c6bd4a5b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/FixedLifespanScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/group/FixedLifespanScheduler.java @@ -20,14 +20,13 @@ import com.facebook.presto.spi.connector.ConnectorPartitionHandle; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.SettableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntListIterator; -import javax.annotation.concurrent.GuardedBy; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/NodeSelectionStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/NodeSelectionStats.java index a5fcc78a01ec5..4de5b91586be8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/NodeSelectionStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/NodeSelectionStats.java @@ -14,11 +14,10 @@ package com.facebook.presto.execution.scheduler.nodeSelection; import com.facebook.airlift.stats.CounterStat; +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; - @ThreadSafe public class NodeSelectionStats { diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/TopologyAwareNodeSelector.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/TopologyAwareNodeSelector.java index a4a351cd3f777..cd7e69c63f8f7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/TopologyAwareNodeSelector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/TopologyAwareNodeSelector.java @@ -37,8 +37,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.HashSet; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/warnings/DefaultWarningCollector.java b/presto-main-base/src/main/java/com/facebook/presto/execution/warnings/DefaultWarningCollector.java index f0ab689802a33..71f863dc69b04 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/warnings/DefaultWarningCollector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/warnings/DefaultWarningCollector.java @@ -21,9 +21,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; - -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.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/index/IndexHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/index/IndexHandleJacksonModule.java index 730b1869a471a..6536d9d63bf23 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/index/IndexHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/index/IndexHandleJacksonModule.java @@ -16,8 +16,7 @@ import com.facebook.presto.metadata.AbstractTypedJacksonModule; import com.facebook.presto.metadata.HandleResolver; import com.facebook.presto.spi.ConnectorIndexHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class IndexHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java b/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java index 74b0b2e3c71aa..64c3858729384 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java @@ -17,11 +17,10 @@ import com.facebook.presto.server.BasicQueryInfo; import com.facebook.presto.spi.QueryId; import com.google.common.collect.ImmutableSet; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.Map; import java.util.Map.Entry; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryPool.java b/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryPool.java index b192e320d88be..c7cb9ae504e6d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryPool.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryPool.java @@ -19,11 +19,10 @@ import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spi.memory.MemoryPoolInfo; import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; 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/presto-main-base/src/main/java/com/facebook/presto/memory/ForMemoryManager.java b/presto-main-base/src/main/java/com/facebook/presto/memory/ForMemoryManager.java index 469a13312882a..84dbe6115c5a7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/ForMemoryManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/ForMemoryManager.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.memory; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java b/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java index db836ab7fa3cc..235655c1b5493 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java @@ -19,8 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.units.DataSize; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManagerExporter.java b/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManagerExporter.java index d4c8c17ac9ddc..19ac4af1f36b6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManagerExporter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManagerExporter.java @@ -13,14 +13,13 @@ */ package com.facebook.presto.memory; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.JmxException; import org.weakref.jmx.MBeanExporter; import org.weakref.jmx.ObjectNames; -import javax.annotation.PreDestroy; -import javax.annotation.concurrent.GuardedBy; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/LowMemoryMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/memory/LowMemoryMonitor.java index 634e26648fb9f..67c942728e0f7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/LowMemoryMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/LowMemoryMonitor.java @@ -16,10 +16,9 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.execution.TaskManagerConfig; import com.facebook.presto.execution.executor.TaskExecutor; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java index 68a14787a8601..0e8dd09cb29dd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java @@ -19,8 +19,7 @@ import io.airlift.units.DataSize; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import static io.airlift.units.DataSize.Unit.GIGABYTE; import static io.airlift.units.DataSize.succinctBytes; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java index a3f18d8d03ffb..851149d7f0383 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java @@ -21,12 +21,11 @@ import com.google.common.annotations.VisibleForTesting; 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 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java b/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java index af4c8f187494c..c0ee34ba8dad9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.DataSize; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import static io.airlift.units.DataSize.Unit.BYTE; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java b/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java index 358fb55ccda4c..49b70b09a1693 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java @@ -30,11 +30,10 @@ 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.units.DataSize; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.Collection; import java.util.Comparator; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java b/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java index c868373c04506..46659e410d77a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.DataSize; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import static io.airlift.units.DataSize.Unit.BYTE; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java index 897f6657f4f3a..27faec86a4256 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java @@ -296,10 +296,9 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.util.concurrent.UncheckedExecutionException; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.slice.Slice; -import javax.annotation.concurrent.ThreadSafe; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/CatalogManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/CatalogManager.java index 4a4c34f3d5ffa..ade9364a7d42f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/CatalogManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/CatalogManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.ConnectorId; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/ColumnHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/ColumnHandleJacksonModule.java index a8375a2e90666..84db3f3344c81 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/ColumnHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/ColumnHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ColumnHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class ColumnHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/DelegatingMetadataManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/DelegatingMetadataManager.java index 9f003392ddcc9..d82aa9d6894ba 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/DelegatingMetadataManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/DelegatingMetadataManager.java @@ -46,8 +46,7 @@ import com.facebook.presto.spi.statistics.TableStatisticsMetadata; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/DeleteTableHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/DeleteTableHandleJacksonModule.java index 513348cf0fff4..09b71787994a5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/DeleteTableHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/DeleteTableHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ConnectorDeleteTableHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class DeleteTableHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/ForNodeManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/ForNodeManager.java index 345b9e4744066..13f3e92f77af3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/ForNodeManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/ForNodeManager.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.metadata; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java index 99a1aad32427a..343b4e94d1d9f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java @@ -72,12 +72,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.UncheckedExecutionException; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; - import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionHandleJacksonModule.java index f8a8a90053508..a87335daab43e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.function.FunctionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class FunctionHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/HandleResolver.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/HandleResolver.java index 001358271195a..30630f0a7bff7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/HandleResolver.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/HandleResolver.java @@ -29,8 +29,7 @@ import com.facebook.presto.spi.function.FunctionHandle; import com.facebook.presto.spi.function.FunctionHandleResolver; import com.facebook.presto.split.EmptySplitHandleResolver; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map.Entry; import java.util.Objects; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/InMemoryNodeManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/InMemoryNodeManager.java index d99d860f59aa8..69ed24cb1c5bd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/InMemoryNodeManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/InMemoryNodeManager.java @@ -21,9 +21,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; - -import javax.annotation.concurrent.GuardedBy; -import javax.inject.Inject; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.inject.Inject; import java.net.URI; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/InsertTableHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/InsertTableHandleJacksonModule.java index 6e6795ede2f56..6a83f7e1d2ef6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/InsertTableHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/InsertTableHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ConnectorInsertTableHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class InsertTableHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/MetadataManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/MetadataManager.java index 7fd91c0e3f7f9..b6a3a644a7f50 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/MetadataManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/MetadataManager.java @@ -88,8 +88,7 @@ import com.google.common.collect.Multimap; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/OutputTableHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/OutputTableHandleJacksonModule.java index ddd13969cd2bd..ad04c5b7e834d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/OutputTableHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/OutputTableHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ConnectorOutputTableHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class OutputTableHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/PartitioningHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/PartitioningHandleJacksonModule.java index 6331b837977f7..ca876d872ff32 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/PartitioningHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/PartitioningHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.connector.ConnectorPartitioningHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class PartitioningHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/ProcedureRegistry.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/ProcedureRegistry.java index 52f63cf7ff6da..c80f50f942cf9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/ProcedureRegistry.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/ProcedureRegistry.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.Maps; import com.google.common.primitives.Primitives; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/QualifiedTablePrefix.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/QualifiedTablePrefix.java index a2ad59983f016..3ebd8739be989 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/QualifiedTablePrefix.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/QualifiedTablePrefix.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.SchemaTablePrefix; 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/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyManager.java index 613340f849273..6dcd058e7e378 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyManager.java @@ -50,9 +50,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; - -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.io.File; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyProviderConfig.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyProviderConfig.java index 2464ab7d3becb..ebd765d9a99f8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyProviderConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/SessionPropertyProviderConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/SplitJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/SplitJacksonModule.java index 0caaff86c54b1..858f0a6c1fbbc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/SplitJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/SplitJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ConnectorSplit; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class SplitJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStore.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStore.java index db96e2877efed..ca50bb18e6e0b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStore.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStore.java @@ -19,8 +19,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStoreConfig.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStoreConfig.java index 32d125aa2e214..48cf865297c9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStoreConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticCatalogStoreConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.LegacyConfig; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStore.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStore.java index 85e2d1118734a..a1b7ae89f0033 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStore.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStore.java @@ -16,8 +16,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.spi.NodeManager; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStoreConfig.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStoreConfig.java index 3d7292e854f93..8ee29461b8ca0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStoreConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticFunctionNamespaceStoreConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStore.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStore.java index 9e62ec064550e..aefe38c7fea48 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStore.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStore.java @@ -15,8 +15,7 @@ import com.facebook.airlift.log.Logger; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStoreConfig.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStoreConfig.java index de29a50089b0b..c1b039a234c80 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStoreConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/StaticTypeManagerStoreConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/TableHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/TableHandleJacksonModule.java index 1a0fb2090ecb6..9981704af9fd9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/TableHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/TableHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ConnectorTableHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class TableHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/TableLayoutHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/TableLayoutHandleJacksonModule.java index 4d9e6aeea7d19..bfbced02d0c38 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/TableLayoutHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/TableLayoutHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.ConnectorTableLayoutHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class TableLayoutHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java index 011ed41bbde49..f75811f8c2af8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java @@ -19,10 +19,9 @@ 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 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/TransactionHandleJacksonModule.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/TransactionHandleJacksonModule.java index 08048a9bb405e..230d6be16a1b0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/TransactionHandleJacksonModule.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/TransactionHandleJacksonModule.java @@ -14,8 +14,7 @@ package com.facebook.presto.metadata; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class TransactionHandleJacksonModule extends AbstractTypedJacksonModule diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/CompletedWork.java b/presto-main-base/src/main/java/com/facebook/presto/operator/CompletedWork.java index 8b636096bd8e9..12b569c69954d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/CompletedWork.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/CompletedWork.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.operator; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java b/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java index 7dbc4e7485687..f73ec8babc8eb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java @@ -30,10 +30,9 @@ 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 io.airlift.units.Duration; -import javax.annotation.concurrent.GuardedBy; - import java.io.Closeable; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java index 77511c74e7da8..e202f6adb9f03 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java @@ -21,10 +21,9 @@ 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.Duration; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverYieldSignal.java b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverYieldSignal.java index e5a1bbadff17a..37b9c7d19e14d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverYieldSignal.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverYieldSignal.java @@ -14,9 +14,8 @@ package com.facebook.presto.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/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java index 1f0fd5e9dd5db..6d12a519295e8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java @@ -25,8 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.units.DataSize; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java index 6da865456582b..498b0c1bcd3bb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java @@ -22,12 +22,11 @@ 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.airlift.units.DataSize; import io.airlift.units.Duration; - -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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java index c80c7bbe3c4db..3dd337c2f5450 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java @@ -19,9 +19,8 @@ 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java index 764ebd727fe05..1429f99a4ea4a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java @@ -17,12 +17,11 @@ import com.facebook.presto.memory.context.LocalMemoryContext; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java b/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java index c900ba362f2b9..20cc390582e50 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java @@ -20,8 +20,7 @@ import io.airlift.units.Duration; import io.airlift.units.MinDataSize; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import java.net.URI; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheManager.java b/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheManager.java index 18a4e7d026d62..e04529f84fbb7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheManager.java @@ -28,10 +28,9 @@ import io.airlift.slice.InputStreamSliceInput; import io.airlift.slice.OutputStreamSliceOutput; import io.airlift.slice.SliceOutput; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; -import javax.inject.Inject; - import java.io.Closeable; import java.io.File; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ForExchange.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ForExchange.java index f49adfe1fd4ea..2adbe320d52f6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ForExchange.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ForExchange.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.operator; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ForScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ForScheduler.java index 7d33c10082c03..e04fe43abab9f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ForScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ForScheduler.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.operator; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java index 18c4767dc8fbf..8b181b6d667ac 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java @@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.Closer; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.ArrayDeque; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/InterpretedHashGenerator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/InterpretedHashGenerator.java index bd14aba4548dc..8efe28ce44c0f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/InterpretedHashGenerator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/InterpretedHashGenerator.java @@ -18,8 +18,7 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.operator.scalar.CombineHashFunction; import com.facebook.presto.type.TypeUtils; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinFilterFunction.java b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinFilterFunction.java index c41a5ebd4e171..d4b6995ccb401 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinFilterFunction.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinFilterFunction.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; -import javax.annotation.concurrent.NotThreadSafe; - @NotThreadSafe public interface JoinFilterFunction { diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java index 057dba50b07b2..d2eca91d09d88 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinHash.java @@ -15,10 +15,9 @@ import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Optional; import static java.lang.Math.toIntExact; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinProbe.java b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinProbe.java index 245176d8988e7..872e9a877a8f2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/JoinProbe.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/JoinProbe.java @@ -16,8 +16,7 @@ import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.google.common.primitives.Ints; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.OptionalInt; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperator.java index 276a0b428f760..9a9d8f86e13b9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperator.java @@ -26,8 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.Closer; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperators.java b/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperators.java index e3918b42be0fc..634bace39c159 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperators.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/LookupJoinOperators.java @@ -19,8 +19,7 @@ import com.facebook.presto.operator.JoinProbe.JoinProbeFactory; import com.facebook.presto.spi.plan.PlanNodeId; import com.facebook.presto.spiller.PartitioningSpillerFactory; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/LookupSource.java b/presto-main-base/src/main/java/com/facebook/presto/operator/LookupSource.java index b69281505fc05..68b50a826c56f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/LookupSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/LookupSource.java @@ -13,11 +13,10 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; -import javax.annotation.concurrent.NotThreadSafe; - import java.io.Closeable; @NotThreadSafe diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/MergeHashSort.java b/presto-main-base/src/main/java/com/facebook/presto/operator/MergeHashSort.java index 36c3c15738b14..31242de7480be 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/MergeHashSort.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/MergeHashSort.java @@ -18,8 +18,7 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.memory.context.AggregatedMemoryContext; import com.facebook.presto.util.MergeSortedPages.PageWithPosition; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.function.BiPredicate; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperationTimer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperationTimer.java index 45d76b26b3d97..d1bedb9a06b9b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperationTimer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperationTimer.java @@ -13,11 +13,10 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import com.sun.management.ThreadMXBean; -import javax.annotation.concurrent.NotThreadSafe; -import javax.annotation.concurrent.ThreadSafe; - import java.lang.management.ManagementFactory; import java.util.concurrent.atomic.AtomicLong; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java index df29b4f5e6dd5..d282f75d249b9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java @@ -28,10 +28,9 @@ import com.google.common.base.Suppliers; 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.HashSet; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java index 0208a2b10d49d..9d50ba23b177f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java @@ -21,10 +21,9 @@ import com.facebook.presto.util.Mergeable; 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.Nullable; -import javax.annotation.concurrent.Immutable; +import jakarta.annotation.Nullable; import java.util.HashSet; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OuterLookupSource.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OuterLookupSource.java index 884a8ff9548a0..00542ead8c7f4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OuterLookupSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OuterLookupSource.java @@ -13,12 +13,11 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; - -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.NotThreadSafe; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.function.Supplier; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java index b7b524608d843..c42e36fc9de59 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java @@ -23,14 +23,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.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.Nullable; import org.apache.http.client.utils.URIBuilder; -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.io.Closeable; import java.net.URI; import java.net.URISyntaxException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java index bd2f5ffbc817a..7fb65e5cd2855 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java @@ -39,10 +39,9 @@ import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.Swapper; import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import jakarta.inject.Inject; import org.openjdk.jol.info.ClassLayout; -import javax.inject.Inject; - import java.util.Arrays; import java.util.Iterator; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexFactory.java index 26efb15fae6c8..a48b3b2e3af88 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexFactory.java @@ -17,10 +17,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.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedConsumption.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedConsumption.java index 1461f74717fc6..cea9e48b17d39 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedConsumption.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/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/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSource.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSource.java index 847460adbe8e0..a58f19abebc71 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSource.java @@ -13,15 +13,14 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.type.Type; import com.facebook.presto.operator.exchange.LocalPartitionGenerator; import com.google.common.io.Closer; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.NotThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.annotation.Nullable; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java index 2143c3558ee4e..b8270e9028c90 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.type.Type; @@ -23,10 +24,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; - -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.Immutable; -import javax.annotation.concurrent.NotThreadSafe; +import com.google.errorprone.annotations.Immutable; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineContext.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineContext.java index 99851036dc02d..e7102570ad9d7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineContext.java @@ -26,8 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStats.java index 7ce7a45dedc0f..4ddd5fd1e19ec 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStats.java @@ -21,9 +21,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -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.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStatus.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStatus.java index 4f399b6f92ccb..9b2f68fb0fe47 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStatus.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStatus.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.operator; -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; @Immutable public final class PipelineStatus diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ReferenceCount.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ReferenceCount.java index d0168daf345fd..194e292672d1e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ReferenceCount.java +++ b/presto-main-base/src/main/java/com/facebook/presto/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/presto-main-base/src/main/java/com/facebook/presto/operator/SetBuilderOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/SetBuilderOperator.java index f6afd147f3748..4f6a75851e8f8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/SetBuilderOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/SetBuilderOperator.java @@ -22,9 +22,8 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.annotation.Nullable; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/SimpleArrayAllocator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/SimpleArrayAllocator.java index be53c2f7b953a..4c917044cf3ec 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/SimpleArrayAllocator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/SimpleArrayAllocator.java @@ -14,10 +14,9 @@ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.block.ArrayAllocator; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.ArrayDeque; import java.util.Deque; import java.util.IdentityHashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/SpatialJoinOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/SpatialJoinOperator.java index e8970ffd90105..e807d29416836 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/SpatialJoinOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/SpatialJoinOperator.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.plan.SpatialJoinNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/SpilledLookupSourceHandle.java b/presto-main-base/src/main/java/com/facebook/presto/operator/SpilledLookupSourceHandle.java index ea73e82b595a1..65dd66e037f72 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/SpilledLookupSourceHandle.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/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/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java index 13718af599599..922f582762b66 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java @@ -38,12 +38,11 @@ import com.google.common.collect.ListMultimap; 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.units.DataSize; import io.airlift.units.Duration; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskExchangeClientManager.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskExchangeClientManager.java index fb98c9d67890b..59608bcfdd94a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskExchangeClientManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskExchangeClientManager.java @@ -16,8 +16,7 @@ import com.facebook.presto.memory.context.LocalMemoryContext; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/UncheckedStackArrayAllocator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/UncheckedStackArrayAllocator.java index fa3a79a0e898d..ea965e784f917 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/UncheckedStackArrayAllocator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/UncheckedStackArrayAllocator.java @@ -14,10 +14,9 @@ package com.facebook.presto.operator; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.block.ArrayAllocator; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.Arrays; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/WindowInfo.java b/presto-main-base/src/main/java/com/facebook/presto/operator/WindowInfo.java index e1eaba05dc5b5..06e651dc96829 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/WindowInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/WindowInfo.java @@ -21,8 +21,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.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/WindowOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/WindowOperator.java index 6688002d64dfe..1a63ac5d89c7b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/WindowOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/WindowOperator.java @@ -36,8 +36,7 @@ import com.google.common.collect.PeekingIterator; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessor.java b/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessor.java index e7c40697dd442..5c1ab5431961f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessor.java @@ -15,8 +15,7 @@ import com.google.common.collect.Iterators; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Comparator; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessorUtils.java b/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessorUtils.java index 749472513db2a..ec4eed5c4cbc4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessorUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/WorkProcessorUtils.java @@ -18,8 +18,7 @@ import com.facebook.presto.operator.WorkProcessor.TransformationState; import com.google.common.collect.AbstractIterator; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Comparator; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AggregationFromAnnotationsParser.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AggregationFromAnnotationsParser.java index dfb1899359d12..0595a555c4efc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AggregationFromAnnotationsParser.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AggregationFromAnnotationsParser.java @@ -25,8 +25,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java index d83db731c3588..3fdd8bea2c9f8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java @@ -55,10 +55,9 @@ import com.google.common.primitives.Longs; import io.airlift.slice.Slice; import io.airlift.units.DataSize; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java index 891d538c9544f..2a82520a9a19a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/noisyaggregation/sketch/SfmSketch.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.aggregation.noisyaggregation.sketch; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import io.airlift.slice.BasicSliceInput; @@ -22,8 +23,6 @@ import io.airlift.slice.Slice; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.concurrent.NotThreadSafe; - import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/SkipAggregationBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/SkipAggregationBuilder.java index 28ef06478e558..6532b6d0df87e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/SkipAggregationBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/SkipAggregationBuilder.java @@ -28,8 +28,7 @@ import com.facebook.presto.spi.function.aggregation.GroupByIdBlock; import com.facebook.presto.spi.function.aggregation.GroupedAccumulator; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java index 8728f01f6b084..d2c7c63088f80 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/reservoirsample/ReservoirSample.java @@ -19,10 +19,9 @@ import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.Type; import io.airlift.slice.SizeOf; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.ArrayList; import java.util.Collections; import java.util.concurrent.ThreadLocalRandom; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java index 0aa8c20c7780e..dc1b0d2b3f3dc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java @@ -24,6 +24,7 @@ import com.facebook.presto.spi.function.AccumulatorStateMetadata; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.apache.datasketches.common.ArrayOfBooleansSerDe; import org.apache.datasketches.common.ArrayOfDoublesSerDe; import org.apache.datasketches.common.ArrayOfItemsSerDe; @@ -32,8 +33,6 @@ import org.apache.datasketches.kll.KllItemsSketch; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Comparator; import java.util.Map; import java.util.function.Function; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java index c6ac99e042149..1d73576e4bffd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/state/LongDecimalWithOverflowStateFactory.java @@ -17,10 +17,9 @@ import com.facebook.presto.common.array.ObjectBigArray; import com.facebook.presto.spi.function.AccumulatorStateFactory; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import static com.facebook.presto.common.type.UnscaledDecimal128Arithmetic.UNSCALED_DECIMAL_128_SLICE_LENGTH; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/annotations/FunctionsParserHelper.java b/presto-main-base/src/main/java/com/facebook/presto/operator/annotations/FunctionsParserHelper.java index 516fa0b58b258..60784f765b3ec 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/annotations/FunctionsParserHelper.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/annotations/FunctionsParserHelper.java @@ -31,8 +31,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java index e1b40098777b2..72b8d57dd5683 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java @@ -28,11 +28,10 @@ import com.facebook.presto.sql.planner.PartitioningProviderManager; import com.facebook.presto.sql.planner.SystemPartitioningHandle; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.io.Closeable; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeMemoryManager.java b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeMemoryManager.java index 5775dcac4d52a..66dcc97ed8946 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeMemoryManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/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/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSource.java b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSource.java index a66bef9f3e8de..3eb8535f2bb27 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSource.java @@ -18,10 +18,9 @@ import com.facebook.presto.operator.WorkProcessor.ProcessState; 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.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/PageReference.java b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/PageReference.java index a4698ef93818f..90c2a888d8ca5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/PageReference.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/PageReference.java @@ -14,8 +14,7 @@ package com.facebook.presto.operator.exchange; import com.facebook.presto.common.Page; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexJoinLookupStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexJoinLookupStats.java index 449dbbd2b6577..ac9d13c8d63fa 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexJoinLookupStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexJoinLookupStats.java @@ -14,11 +14,10 @@ package com.facebook.presto.operator.index; import com.facebook.airlift.stats.CounterStat; +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; - @ThreadSafe public class IndexJoinLookupStats { diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java index 498fe4a21029d..b4b0165f9579f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.index; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.type.Type; @@ -34,13 +35,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; 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 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSource.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSource.java index 746de5d912578..6c8ae8f70ecd1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSource.java @@ -13,12 +13,11 @@ */ package com.facebook.presto.operator.index; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.operator.LookupSource; -import javax.annotation.concurrent.NotThreadSafe; - import static com.facebook.presto.operator.index.IndexSnapshot.UNLOADED_INDEX_KEY; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshot.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshot.java index a8c302f708f2d..11c1c5474b093 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshot.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshot.java @@ -16,8 +16,7 @@ import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.operator.LookupSource; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/PageBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/PageBuffer.java index 1481689d2e85a..94be981ec5064 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/PageBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/PageBuffer.java @@ -17,8 +17,7 @@ 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.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.ArrayDeque; import java.util.Queue; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/PagesIndexBuilderOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/PagesIndexBuilderOperator.java index b06852b3be1f7..4837053199e64 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/PagesIndexBuilderOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/PagesIndexBuilderOperator.java @@ -19,8 +19,7 @@ import com.facebook.presto.operator.OperatorContext; import com.facebook.presto.operator.OperatorFactory; import com.facebook.presto.spi.plan.PlanNodeId; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/StreamingIndexedData.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/StreamingIndexedData.java index 6456a7a8e3474..cd173d38c5a76 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/StreamingIndexedData.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/StreamingIndexedData.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.index; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; @@ -21,8 +22,6 @@ import com.facebook.presto.operator.Driver; import com.google.common.collect.ImmutableList; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.List; import static com.google.common.base.Preconditions.checkArgument; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/UpdateRequest.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/UpdateRequest.java index 3df8c51ba63bf..b1797681b0455 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/UpdateRequest.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/UpdateRequest.java @@ -16,8 +16,7 @@ import com.facebook.airlift.concurrent.MoreFutures; import com.facebook.presto.common.Page; import com.google.common.util.concurrent.SettableFuture; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java b/presto-main-base/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java index 4b01efcba8d21..6a8f311b1714f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java @@ -22,8 +22,7 @@ import com.facebook.presto.operator.CompletedWork; import com.facebook.presto.operator.DriverYieldSignal; import com.facebook.presto.operator.Work; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java b/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java index 8d8e89deb1f75..17f3a6758c42f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/project/MergingPageOutput.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.project; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; @@ -20,11 +21,9 @@ import com.facebook.presto.common.type.Type; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/project/PageProcessor.java b/presto-main-base/src/main/java/com/facebook/presto/operator/project/PageProcessor.java index 929d9b0db8a85..736662d471eaf 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/project/PageProcessor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/project/PageProcessor.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.project; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.array.ReferenceCountMap; import com.facebook.presto.common.block.Block; @@ -29,8 +30,6 @@ import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.SizeOf; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/AbstractBlockEncodingBuffer.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/AbstractBlockEncodingBuffer.java index 068be8bfaf36a..f89e1093fcde4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/AbstractBlockEncodingBuffer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/AbstractBlockEncodingBuffer.java @@ -42,8 +42,7 @@ import com.facebook.presto.common.block.VariableWidthBlock; import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.SliceOutput; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java index 77605767e610f..1d110ba41861e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java @@ -52,10 +52,9 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.SliceOutput; import io.airlift.units.DataSize; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java index b249f76b8961b..0d4af067346f0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java @@ -36,8 +36,7 @@ import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/UrlFunctions.java b/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/UrlFunctions.java index ecdfb3a21cbf3..5f1d386b3b86c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/UrlFunctions.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/UrlFunctions.java @@ -26,8 +26,7 @@ import com.google.common.net.UrlEscapers; import io.airlift.slice.Slice; import io.airlift.slice.Slices; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestBlockBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestBlockBuilder.java index 416b244882048..575dc823f8077 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestBlockBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/unnest/UnnestBlockBuilder.java @@ -15,8 +15,7 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.DictionaryBlock; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static com.facebook.presto.operator.unnest.UnnestBlockBuilder.NullElementFinder.NULL_NOT_FOUND; import static com.google.common.base.Verify.verify; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterMemoryManagerService.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterMemoryManagerService.java index efa189e8d7afc..51eb8a89941b5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterMemoryManagerService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterMemoryManagerService.java @@ -20,10 +20,9 @@ import com.facebook.presto.spi.memory.MemoryPoolInfo; import com.facebook.presto.util.PeriodicTaskExecutor; import com.google.common.collect.ImmutableMap; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterQueryTrackerService.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterQueryTrackerService.java index 69650289b06dd..8e8fa9d4396b5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterQueryTrackerService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ClusterQueryTrackerService.java @@ -15,10 +15,9 @@ import com.facebook.drift.client.DriftClient; import com.facebook.presto.util.PeriodicTaskExecutor; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicInteger; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ForResourceManager.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ForResourceManager.java index 8cb358309e76f..c5ced1a63d381 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ForResourceManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ForResourceManager.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.resourcemanager; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RandomResourceManagerAddressSelector.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RandomResourceManagerAddressSelector.java index d924d16e74115..6a250e75d3ffa 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RandomResourceManagerAddressSelector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RandomResourceManagerAddressSelector.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.HostAddress; import com.google.common.annotations.VisibleForTesting; import com.google.common.net.HostAndPort; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java index 317482435717b..4380990db5928 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java @@ -15,6 +15,8 @@ import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.metadata.InternalNodeManager; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.grpc.GrpcConfigKeys; import org.apache.ratis.protocol.RaftGroup; @@ -25,9 +27,6 @@ import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.statemachine.impl.BaseStateMachine; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import java.io.File; import java.util.Collections; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java index 6ee9dac448107..89f32495ff2ce 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java @@ -31,10 +31,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; - -import javax.annotation.concurrent.GuardedBy; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java index 0a013130cff27..7bdd99105cec3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java index 37c6810e0bf06..377a8b3b225a3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java @@ -20,8 +20,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.Executor; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerServer.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerServer.java index 21b70e4a2bb9d..e08702ad1ca69 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerServer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerServer.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.memory.MemoryPoolId; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/security/AccessControlManager.java b/presto-main-base/src/main/java/com/facebook/presto/security/AccessControlManager.java index 5339741347541..f0fde936968db 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/security/AccessControlManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/security/AccessControlManager.java @@ -42,11 +42,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.inject.Inject; - import java.io.File; import java.security.Principal; import java.security.cert.X509Certificate; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/AsyncHttpExecutionMBean.java b/presto-main-base/src/main/java/com/facebook/presto/server/AsyncHttpExecutionMBean.java index fda3e1bbfd55f..e27d93edb97f6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/AsyncHttpExecutionMBean.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/AsyncHttpExecutionMBean.java @@ -14,11 +14,10 @@ package com.facebook.presto.server; import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryInfo.java b/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryInfo.java index 5615e99c8bbb6..e77f380aa880b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryInfo.java @@ -31,9 +31,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/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java b/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java index 296eb0ac91b86..8cafa1b8cbe1f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java @@ -21,12 +21,11 @@ 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 org.joda.time.DateTime; -import javax.annotation.concurrent.Immutable; - import java.util.OptionalDouble; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ExchangeExecutionMBean.java b/presto-main-base/src/main/java/com/facebook/presto/server/ExchangeExecutionMBean.java index a6e13e247d9bd..f85dc7ac47f44 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ExchangeExecutionMBean.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ExchangeExecutionMBean.java @@ -15,11 +15,10 @@ import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; import com.facebook.presto.operator.ForExchange; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/server/ForAsyncRpc.java b/presto-main-base/src/main/java/com/facebook/presto/server/ForAsyncRpc.java index ccc896f05ed46..cd4c4840ec67a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ForAsyncRpc.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ForAsyncRpc.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.server; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ForStatementResource.java b/presto-main-base/src/main/java/com/facebook/presto/server/ForStatementResource.java index eaac0cbd8f82a..cf39ad05b7132 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ForStatementResource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ForStatementResource.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.server; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ForWorkerInfo.java b/presto-main-base/src/main/java/com/facebook/presto/server/ForWorkerInfo.java index 1ce219599df7d..58d71f0067943 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ForWorkerInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ForWorkerInfo.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.server; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java b/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java index e73b745d32510..fee51abfb1a61 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java @@ -18,11 +18,10 @@ import com.facebook.presto.execution.QueryManager; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.execution.TaskManager; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; - -import javax.annotation.PreDestroy; -import javax.annotation.concurrent.GuardedBy; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.CountDownLatch; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java index d76ff77dd1a03..bc69b9c95f8bd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java @@ -18,9 +18,8 @@ import com.facebook.airlift.configuration.ConfigSecuritySensitive; import com.facebook.drift.transport.netty.codec.Protocol; import io.airlift.units.DataSize; - -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/presto-main-base/src/main/java/com/facebook/presto/server/NodeResourceStatus.java b/presto-main-base/src/main/java/com/facebook/presto/server/NodeResourceStatus.java index c53e79ce1d601..868b7df74137b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/NodeResourceStatus.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/NodeResourceStatus.java @@ -14,8 +14,7 @@ package com.facebook.presto.server; import com.facebook.presto.execution.ClusterSizeMonitor; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java index 0693d90bb9cc3..3dfe5202d05e6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java @@ -63,10 +63,9 @@ import com.facebook.presto.ttl.nodettlfetchermanagers.NodeTtlFetcherManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.resolver.ArtifactResolver; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java index e58ac4a0e6634..a985a4c3365ba 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java @@ -19,8 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import io.airlift.resolver.ArtifactResolver; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/QuerySessionSupplier.java b/presto-main-base/src/main/java/com/facebook/presto/server/QuerySessionSupplier.java index 9a9c23503c8e1..d79c6ce990881 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/QuerySessionSupplier.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/QuerySessionSupplier.java @@ -29,9 +29,8 @@ import com.facebook.presto.spi.security.Identity; import com.facebook.presto.sql.SqlEnvironmentConfig; import com.facebook.presto.transaction.TransactionManager; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.inject.Inject; import java.util.Locale; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java b/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java index 76a68eb88bd91..54639916273ad 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java @@ -22,8 +22,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import io.airlift.units.DataSize; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java index 30e9f0b506bce..58618e3ace2ed 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.presto.spi.NodePoolType; import io.airlift.units.Duration; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import static com.facebook.presto.spi.NodePoolType.DEFAULT; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/SessionContext.java b/presto-main-base/src/main/java/com/facebook/presto/server/SessionContext.java index d40bb15482377..09edafeb88769 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/SessionContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/SessionContext.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.session.ResourceEstimates; import com.facebook.presto.spi.tracing.Tracer; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.security.cert.X509Certificate; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/SessionPropertyDefaults.java b/presto-main-base/src/main/java/com/facebook/presto/server/SessionPropertyDefaults.java index aa6491b04e775..4725b173b031e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/SessionPropertyDefaults.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/SessionPropertyDefaults.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.session.SessionPropertyConfigurationManager.SystemSessionPropertyConfiguration; import com.facebook.presto.spi.session.SessionPropertyConfigurationManagerFactory; import com.google.common.annotations.VisibleForTesting; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/SimpleHttpResponseHandlerStats.java b/presto-main-base/src/main/java/com/facebook/presto/server/SimpleHttpResponseHandlerStats.java index 17f0ceeb0debc..77d39ca51ec56 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/SimpleHttpResponseHandlerStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/SimpleHttpResponseHandlerStats.java @@ -13,11 +13,10 @@ */ package com.facebook.presto.server; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; import org.weakref.jmx.Managed; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.concurrent.atomic.AtomicLong; public class SimpleHttpResponseHandlerStats diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/SqlInvokedFunctionCodec.java b/presto-main-base/src/main/java/com/facebook/presto/server/SqlInvokedFunctionCodec.java index 73262b328fed0..0e3660d58da6b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/SqlInvokedFunctionCodec.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/SqlInvokedFunctionCodec.java @@ -19,8 +19,7 @@ import com.facebook.drift.protocol.TProtocolReader; import com.facebook.drift.protocol.TProtocolWriter; import com.facebook.presto.spi.function.SqlInvokedFunction; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/StatementHttpExecutionMBean.java b/presto-main-base/src/main/java/com/facebook/presto/server/StatementHttpExecutionMBean.java index acd7acb1022a2..3e58651b08c24 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/StatementHttpExecutionMBean.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/StatementHttpExecutionMBean.java @@ -14,11 +14,10 @@ package com.facebook.presto.server; import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java b/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java index 7cfc2e0947e6f..775195d70114a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java @@ -25,11 +25,10 @@ import com.google.common.util.concurrent.RateLimiter; import com.google.inject.Inject; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.PreDestroy; - import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java b/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java index e8041bc14a7ba..99fea9da25c42 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java +++ b/presto-main-base/src/main/java/com/facebook/presto/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/presto-main-base/src/main/java/com/facebook/presto/server/security/PrestoAuthenticatorManager.java b/presto-main-base/src/main/java/com/facebook/presto/server/security/PrestoAuthenticatorManager.java index dcd60ae76c4d5..33f0644666c9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/security/PrestoAuthenticatorManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/security/PrestoAuthenticatorManager.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.security.PrestoAuthenticatorFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/security/SecurityConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/security/SecurityConfig.java index 9d2e74e939a0a..9ac1cb678ba29 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/security/SecurityConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/security/SecurityConfig.java @@ -18,8 +18,7 @@ import com.facebook.airlift.configuration.DefunctConfig; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftServerInfoService.java b/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftServerInfoService.java index a9abba86bc295..115473cea3d08 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftServerInfoService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftServerInfoService.java @@ -18,8 +18,7 @@ import com.facebook.presto.server.GracefulShutdownHandler; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.presto.spi.NodeState.ACTIVE; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java b/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java index 528f3795c5470..0697d33168a39 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java @@ -26,8 +26,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/FileHolder.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/FileHolder.java index 35e320a3e0d86..92ba407300a6b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/FileHolder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/FileHolder.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.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/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpiller.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpiller.java index f31eb09d1d89f..d833a75e37cd5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpiller.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpiller.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spiller; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.memory.context.LocalMemoryContext; import com.facebook.presto.operator.SpillContext; @@ -31,8 +32,6 @@ import io.airlift.slice.OutputStreamSliceOutput; import io.airlift.slice.SliceOutput; -import javax.annotation.concurrent.NotThreadSafe; - import java.io.Closeable; import java.io.IOException; import java.io.InputStream; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpillerFactory.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpillerFactory.java index 6d685b3cee0cf..dce184f249987 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpillerFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/FileSingleStreamSpillerFactory.java @@ -28,9 +28,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericPartitioningSpiller.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericPartitioningSpiller.java index 11f5a5d7a5ecb..c9388edae15c5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericPartitioningSpiller.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericPartitioningSpiller.java @@ -24,10 +24,9 @@ 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 it.unimi.dsi.fastutil.ints.IntArrayList; -import javax.annotation.concurrent.ThreadSafe; - import java.io.IOException; import java.util.HashSet; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericSpiller.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericSpiller.java index 4f1d8dec4b3c9..a33350e3a94a1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericSpiller.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/GenericSpiller.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spiller; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; import com.facebook.presto.memory.context.AggregatedMemoryContext; @@ -21,8 +22,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import javax.annotation.concurrent.NotThreadSafe; - import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalSpillContext.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalSpillContext.java index ab3d46528f9b5..80559fb73baff 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalSpillContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalSpillContext.java @@ -15,8 +15,7 @@ import com.facebook.presto.Session; import com.facebook.presto.operator.SpillContext; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import static com.google.common.base.Preconditions.checkState; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalTempStorage.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalTempStorage.java index 78db62b3c8f88..725e2f4e87916 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalTempStorage.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/LocalTempStorage.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.storage.TempStorageHandle; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.io.IOException; import java.io.InputStream; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java index 4c7816a428b07..41084358e0e9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.presto.CompressionCodec; import io.airlift.units.DataSize; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class NodeSpillConfig { diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java index 441f925075453..f5b73f102ac80 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java @@ -15,12 +15,11 @@ import com.facebook.presto.ExceededSpillLimitException; 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.facebook.presto.ExceededSpillLimitException.exceededLocalLimit; import static com.facebook.presto.operator.Operator.NOT_BLOCKED; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpiller.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpiller.java index 49634921a69fc..c26dc42454e84 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpiller.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpiller.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spiller; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.io.DataOutput; @@ -35,8 +36,6 @@ import com.google.common.util.concurrent.ListeningExecutorService; import io.airlift.slice.InputStreamSliceInput; -import javax.annotation.concurrent.NotThreadSafe; - import java.io.Closeable; import java.io.IOException; import java.io.InputStream; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpillerFactory.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpillerFactory.java index c5eceeb68203e..7f4266d79f4c9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpillerFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageSingleStreamSpillerFactory.java @@ -26,8 +26,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; - -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageStandaloneSpillerFactory.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageStandaloneSpillerFactory.java index fc13d4ebf45c0..b52fe088f43f4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageStandaloneSpillerFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/TempStorageStandaloneSpillerFactory.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.storage.TempStorage; import com.facebook.presto.sql.analyzer.FeaturesConfig; import com.facebook.presto.storage.TempStorageManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/split/CloseableSplitSourceProvider.java b/presto-main-base/src/main/java/com/facebook/presto/split/CloseableSplitSourceProvider.java index 69cf25fe60273..8bcd62f6006ef 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/split/CloseableSplitSourceProvider.java +++ b/presto-main-base/src/main/java/com/facebook/presto/split/CloseableSplitSourceProvider.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.TableHandle; import com.facebook.presto.spi.WarningCollector; import com.facebook.presto.spi.connector.ConnectorSplitManager.SplitSchedulingStrategy; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.io.Closeable; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/split/SampledSplitSource.java b/presto-main-base/src/main/java/com/facebook/presto/split/SampledSplitSource.java index 02c65e7198e6b..d83e3f0e47451 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/split/SampledSplitSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/split/SampledSplitSource.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.concurrent.ThreadLocalRandom; diff --git a/presto-main-base/src/main/java/com/facebook/presto/split/SplitManager.java b/presto-main-base/src/main/java/com/facebook/presto/split/SplitManager.java index adb189379ed36..8cd7efc5e2f9b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/split/SplitManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/split/SplitManager.java @@ -29,8 +29,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorSplitManager.SplitSchedulingContext; import com.facebook.presto.spi.connector.ConnectorSplitManager.SplitSchedulingStrategy; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/Serialization.java b/presto-main-base/src/main/java/com/facebook/presto/sql/Serialization.java index 85ef11e4cd0e0..0eac23cf5de94 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/Serialization.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/Serialization.java @@ -25,8 +25,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.KeyDeserializer; import com.fasterxml.jackson.databind.SerializerProvider; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/SqlEnvironmentConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/SqlEnvironmentConfig.java index bcb02475c52ba..04c2c1b4779f0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/SqlEnvironmentConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/SqlEnvironmentConfig.java @@ -16,9 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.presto.common.type.TimeZoneKey; - -import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java index aff01ca92ec18..edf2341a77817 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java @@ -68,8 +68,7 @@ import com.facebook.presto.sql.tree.WindowFrame; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AnalyzerProviderManager.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AnalyzerProviderManager.java index a7048b602b273..03dd11d355a0a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AnalyzerProviderManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/AnalyzerProviderManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.analyzer.AnalyzerProvider; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparerProvider.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparerProvider.java index ab0abef0c9dc8..3e1ea38e8f632 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparerProvider.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparerProvider.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.analyzer.QueryPreparer; import com.facebook.presto.spi.analyzer.QueryPreparerProvider; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java index 83eeabd307249..709942c436f34 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java @@ -119,8 +119,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import io.airlift.slice.SliceUtf8; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java index 923d7204ac4b6..99832665da022 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java @@ -27,12 +27,11 @@ import io.airlift.units.DataSize; import io.airlift.units.Duration; import io.airlift.units.MaxDataSize; - -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 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 java.nio.file.Path; import java.nio.file.Paths; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ForMetadataExtractor.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ForMetadataExtractor.java index 6a7811d1abf65..ec27269e42e4f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ForMetadataExtractor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ForMetadataExtractor.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.sql.analyzer; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FunctionsConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FunctionsConfig.java index 4e64a20d467dc..fbb20beccd208 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FunctionsConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FunctionsConfig.java @@ -19,8 +19,7 @@ import com.facebook.presto.operator.aggregation.histogram.HistogramGroupImplementation; import com.facebook.presto.operator.aggregation.multimapagg.MultimapAggGroupImplementation; import com.facebook.presto.spi.function.Description; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import static com.facebook.presto.metadata.BuiltInTypeAndFunctionNamespaceManager.JAVA_BUILTIN_NAMESPACE; import static com.facebook.presto.sql.analyzer.RegexLibrary.JONI; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/MetadataExtractorMBean.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/MetadataExtractorMBean.java index d668f854adf82..a6046231d2469 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/MetadataExtractorMBean.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/MetadataExtractorMBean.java @@ -14,11 +14,10 @@ package com.facebook.presto.sql.analyzer; import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; +import jakarta.inject.Inject; 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/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryExplainer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryExplainer.java index 8b3b8dd0740db..8edf6fcb57c0f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryExplainer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryExplainer.java @@ -39,8 +39,7 @@ import com.facebook.presto.sql.tree.Expression; import com.facebook.presto.sql.tree.Statement; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryPreparerProviderManager.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryPreparerProviderManager.java index 6cd80e0586539..3580cb0a27001 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryPreparerProviderManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/QueryPreparerProviderManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.analyzer.QueryPreparerProvider; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/RefreshMaterializedViewPredicateAnalyzer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/RefreshMaterializedViewPredicateAnalyzer.java index 13986ea999b84..4e6c3fb6cd3e4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/RefreshMaterializedViewPredicateAnalyzer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/RefreshMaterializedViewPredicateAnalyzer.java @@ -31,8 +31,7 @@ import com.facebook.presto.sql.tree.QualifiedName; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Map; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/expressions/ExpressionOptimizerManager.java b/presto-main-base/src/main/java/com/facebook/presto/sql/expressions/ExpressionOptimizerManager.java index 0d200e5555a92..937b43c361e63 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/expressions/ExpressionOptimizerManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/expressions/ExpressionOptimizerManager.java @@ -26,8 +26,7 @@ import com.facebook.presto.sql.relational.FunctionResolution; import com.facebook.presto.sql.relational.RowExpressionOptimizer; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java index 7005702dd9dfb..c46aa596b68ef 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java @@ -14,8 +14,7 @@ package com.facebook.presto.sql.gen; import com.facebook.presto.common.block.Block; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java index 4721e326daf8b..6cadc749f18b4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java @@ -32,11 +32,10 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.UncheckedExecutionException; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.inject.Inject; - import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java index 207a7fa9640fe..b75aafcfe2401 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinCompiler.java @@ -52,12 +52,11 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; +import jakarta.inject.Inject; import org.openjdk.jol.info.ClassLayout; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.inject.Inject; - import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java index 5a22fac20bfd4..7ddc1949a4977 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java @@ -42,11 +42,10 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/PageFunctionCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/PageFunctionCompiler.java index 3449873800675..ceb69b5dd388f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/PageFunctionCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/PageFunctionCompiler.java @@ -65,12 +65,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Primitives; import com.google.common.util.concurrent.UncheckedExecutionException; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; 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.HashSet; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/RowExpressionPredicateCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/RowExpressionPredicateCompiler.java index 08b29f520d636..d3099fee6a0e2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/RowExpressionPredicateCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/RowExpressionPredicateCompiler.java @@ -40,8 +40,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/CompilerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/CompilerConfig.java index 77348c13508f1..6269e8b9aa644 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/CompilerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/CompilerConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; import com.facebook.presto.spi.function.Description; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; @DefunctConfig("compiler.interpreter-enabled") public class CompilerConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ConnectorPlanOptimizerManager.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ConnectorPlanOptimizerManager.java index 7dfb48014de1c..4c31753341b6f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ConnectorPlanOptimizerManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ConnectorPlanOptimizerManager.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.connector.ConnectorPlanOptimizerProvider; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ExpressionDomainTranslator.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ExpressionDomainTranslator.java index 6e7f05434eda5..f8ed668cad493 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ExpressionDomainTranslator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/ExpressionDomainTranslator.java @@ -52,8 +52,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.PeekingIterator; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LazySplitSource.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LazySplitSource.java index 3200bfefbeb07..239b2e4a08953 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LazySplitSource.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LazySplitSource.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.split.SplitSource; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.function.Supplier; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalDynamicFiltersCollector.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalDynamicFiltersCollector.java index 8059775953aec..a3faae96afaef 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalDynamicFiltersCollector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalDynamicFiltersCollector.java @@ -15,9 +15,8 @@ import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.spi.relation.VariableReferenceExpression; - -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; @ThreadSafe public class LocalDynamicFiltersCollector diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java index 45d282b637501..a2e440031c145 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java @@ -233,8 +233,7 @@ import com.google.common.collect.SetMultimap; import com.google.common.primitives.Ints; import io.airlift.units.DataSize; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/NodePartitioningManager.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/NodePartitioningManager.java index 24e635bb7fe39..3de6783a91a41 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/NodePartitioningManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/NodePartitioningManager.java @@ -39,8 +39,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragment.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragment.java index 5e88d518a0cd0..31e9c2347ecd8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragment.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragment.java @@ -30,8 +30,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableSet; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java index 584a72a4a077f..07056c735f195 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java @@ -31,8 +31,7 @@ import com.facebook.presto.sql.planner.sanity.PlanChecker; import com.facebook.presto.sql.planner.sanity.PlanCheckerProviderManager; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java index 958375430b3c5..dd1bb55ef6741 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java @@ -193,12 +193,11 @@ import com.facebook.presto.sql.relational.FunctionResolution; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.MBeanExporter; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java index 3757f68ce7761..81e6e0bd1598d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java @@ -94,8 +94,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; import com.google.common.collect.UnmodifiableIterator; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/SubPlan.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/SubPlan.java index c7f30bbc2e549..775fa0cf225eb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/SubPlan.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/SubPlan.java @@ -17,8 +17,7 @@ import com.facebook.presto.sql.planner.plan.RemoteSourceNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multiset; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/Memo.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/Memo.java index c9a105cc31202..e782c2847c731 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/Memo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/Memo.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.plan.PlanNodeIdAllocator; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.HashSet; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/ActualProperties.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/ActualProperties.java index 9660296d02931..32fc8913fa12c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/ActualProperties.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/ActualProperties.java @@ -25,8 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Collection; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/OptimizerInformationCollector.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/OptimizerInformationCollector.java index 43d918a7ecc4a..a3487dec8b6a9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/OptimizerInformationCollector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/OptimizerInformationCollector.java @@ -15,9 +15,8 @@ import com.facebook.presto.spi.eventlistener.PlanOptimizerInformation; import com.google.common.collect.ImmutableList; - -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/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/PreferredProperties.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/PreferredProperties.java index c87de04c7487d..9348b29102d9c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/PreferredProperties.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/PreferredProperties.java @@ -20,8 +20,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Objects; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ApplyNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ApplyNode.java index 5d168fa6c7aeb..d2e67ca86d858 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ApplyNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ApplyNode.java @@ -21,8 +21,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.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/EnforceSingleRowNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/EnforceSingleRowNode.java index bcf0c3f13fd2a..33318f3cd0ffd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/EnforceSingleRowNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/EnforceSingleRowNode.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExchangeNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExchangeNode.java index ed2b2307dccbe..32ea16c500394 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExchangeNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExchangeNode.java @@ -24,8 +24,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.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExplainAnalyzeNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExplainAnalyzeNode.java index 26c3260154e01..a438fb48c3079 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExplainAnalyzeNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/ExplainAnalyzeNode.java @@ -22,8 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java index b77a1fd2e7194..0038b80d6da77 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java @@ -24,8 +24,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Collection; import java.util.HashSet; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/IndexJoinNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/IndexJoinNode.java index 69da435f11c65..ca2cbf0456ec3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/IndexJoinNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/IndexJoinNode.java @@ -22,8 +22,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.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/LateralJoinNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/LateralJoinNode.java index c9105843adbee..6163d6737d93c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/LateralJoinNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/LateralJoinNode.java @@ -21,8 +21,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.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/OffsetNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/OffsetNode.java index b785078b1497c..2d9a3060d27a1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/OffsetNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/OffsetNode.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RemoteSourceNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RemoteSourceNode.java index f5e980a4470b7..b9de1a0673733 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RemoteSourceNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RemoteSourceNode.java @@ -23,8 +23,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.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RowNumberNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RowNumberNode.java index 29b8781c7ad65..ec97ad42ee26c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RowNumberNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/RowNumberNode.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/SampleNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/SampleNode.java index 636754a57e372..ca75ac588d083 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/SampleNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/SampleNode.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/TopNRowNumberNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/TopNRowNumberNode.java index d7e66afb664e4..f5fc3bde590a6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/TopNRowNumberNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/TopNRowNumberNode.java @@ -23,8 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/UpdateNode.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/UpdateNode.java index 6f03a09111fc0..2494cd0547054 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/UpdateNode.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/plan/UpdateNode.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanChecker.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanChecker.java index 310a4bb09e0da..e8914dbbc331f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanChecker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanChecker.java @@ -23,8 +23,7 @@ import com.facebook.presto.sql.planner.PlanFragment; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Multimap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanCheckerProviderManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanCheckerProviderManagerConfig.java index d356f433d75ef..99d5a46e59126 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanCheckerProviderManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/sanity/PlanCheckerProviderManagerConfig.java @@ -15,8 +15,7 @@ package com.facebook.presto.sql.planner.sanity; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDeterminismEvaluator.java b/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDeterminismEvaluator.java index 7c55d7cb9af75..da485dd86f4fc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDeterminismEvaluator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDeterminismEvaluator.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.relation.RowExpressionVisitor; import com.facebook.presto.spi.relation.SpecialFormExpression; import com.facebook.presto.spi.relation.VariableReferenceExpression; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_MISSING; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDomainTranslator.java b/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDomainTranslator.java index 8b0561ff73074..028fccaebf8a4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDomainTranslator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/relational/RowExpressionDomainTranslator.java @@ -50,9 +50,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.PeekingIterator; - -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/storage/TempStorageManager.java b/presto-main-base/src/main/java/com/facebook/presto/storage/TempStorageManager.java index 5ad2b1f48ac52..5a11dc02fa4de 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/storage/TempStorageManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/storage/TempStorageManager.java @@ -27,8 +27,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/tdigest/Centroid.java b/presto-main-base/src/main/java/com/facebook/presto/tdigest/Centroid.java index 6849a1baa050a..66923132494dd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/tdigest/Centroid.java +++ b/presto-main-base/src/main/java/com/facebook/presto/tdigest/Centroid.java @@ -31,7 +31,7 @@ package com.facebook.presto.tdigest; -import javax.annotation.concurrent.NotThreadSafe; +import com.facebook.airlift.concurrent.NotThreadSafe; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; diff --git a/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java b/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java index 2b15d45500d86..80a750a887fee 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java +++ b/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigest.java @@ -31,6 +31,7 @@ package com.facebook.presto.tdigest; +import com.facebook.airlift.concurrent.NotThreadSafe; import io.airlift.slice.BasicSliceInput; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; @@ -38,8 +39,6 @@ import io.airlift.slice.SliceOutput; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.AbstractCollection; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingAccessControlManager.java b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingAccessControlManager.java index b295fd4836336..dd932e971e923 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingAccessControlManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingAccessControlManager.java @@ -26,8 +26,7 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.security.Principal; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingWarningCollector.java b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingWarningCollector.java index 3c265596ab512..729fdb60c21f8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingWarningCollector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingWarningCollector.java @@ -21,9 +21,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; - -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.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/presto-main-base/src/main/java/com/facebook/presto/tracing/TracerProviderManager.java b/presto-main-base/src/main/java/com/facebook/presto/tracing/TracerProviderManager.java index 6c1f35cd061fa..c63e95ffd3f9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/tracing/TracerProviderManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/tracing/TracerProviderManager.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.tracing.TracerProvider; import com.google.inject.Inject; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/transaction/ForTransactionManager.java b/presto-main-base/src/main/java/com/facebook/presto/transaction/ForTransactionManager.java index 7c1006f383081..bbf98f8cfa083 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/transaction/ForTransactionManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/transaction/ForTransactionManager.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.transaction; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java b/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java index b10b995c28d0c..e728ce8c5e9a3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java @@ -34,11 +34,10 @@ 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 io.airlift.units.Duration; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.HashMap; import java.util.Iterator; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java index 2b38c16ea4d1b..16eb34f95a790 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java @@ -19,9 +19,8 @@ import com.google.common.collect.ImmutableMap; 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.Map; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java b/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java index a716fc45095ee..00037ee368cd8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java @@ -29,12 +29,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import java.io.File; import java.time.Instant; import java.time.temporal.ChronoUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/type/TypeDeserializer.java b/presto-main-base/src/main/java/com/facebook/presto/type/TypeDeserializer.java index 5cf48f762ca70..af0701477dc2b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/type/TypeDeserializer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/type/TypeDeserializer.java @@ -17,8 +17,7 @@ import com.facebook.presto.common.type.TypeManager; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.common.type.TypeSignature.parseTypeSignature; import static com.google.common.base.Preconditions.checkArgument; diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/DateTimeUtils.java b/presto-main-base/src/main/java/com/facebook/presto/util/DateTimeUtils.java index a6b63679c2699..de8c0ff93da1c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/DateTimeUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/DateTimeUtils.java @@ -18,6 +18,7 @@ import com.facebook.presto.common.type.TimeZoneKey; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.sql.tree.IntervalLiteral.IntervalField; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.DurationFieldType; @@ -36,8 +37,6 @@ import org.joda.time.format.PeriodFormatterBuilder; import org.joda.time.format.PeriodParser; -import javax.annotation.Nullable; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/Failures.java b/presto-main-base/src/main/java/com/facebook/presto/util/Failures.java index 0d8ece16f113e..a6f768085c961 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/Failures.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/Failures.java @@ -31,8 +31,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import io.airlift.slice.SliceTooLargeException; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Collection; diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/FinalizerService.java b/presto-main-base/src/main/java/com/facebook/presto/util/FinalizerService.java index bfa8fd3b52a9f..9f93a18c44c02 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/FinalizerService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/FinalizerService.java @@ -15,11 +15,10 @@ import com.facebook.airlift.log.Logger; import com.google.common.collect.Sets; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -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.PostConstruct; +import jakarta.annotation.PreDestroy; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/GcStatusMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/util/GcStatusMonitor.java index 15d5083945470..ad88d3df9a7ee 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/GcStatusMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/GcStatusMonitor.java @@ -24,10 +24,10 @@ import com.facebook.presto.spi.QueryId; import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; import javax.management.JMException; import javax.management.Notification; import javax.management.NotificationListener; diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwo.java b/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwo.java index 7053ef6079df2..c739b6d6c0e77 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwo.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.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/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwoValidator.java b/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwoValidator.java index cdf6ad3f25a7b..cf35d387128f4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwoValidator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/PowerOfTwoValidator.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.util; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class PowerOfTwoValidator implements ConstraintValidator diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/QueryInfoUtils.java b/presto-main-base/src/main/java/com/facebook/presto/util/QueryInfoUtils.java index af834dedbb54e..61483a4c11091 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/QueryInfoUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/QueryInfoUtils.java @@ -13,8 +13,23 @@ */ package com.facebook.presto.util; +import com.facebook.presto.client.StageStats; +import com.facebook.presto.client.StatementStats; +import com.facebook.presto.execution.QueryInfo; +import com.facebook.presto.execution.QueryState; +import com.facebook.presto.execution.QueryStats; +import com.facebook.presto.execution.StageExecutionInfo; +import com.facebook.presto.execution.StageExecutionStats; +import com.facebook.presto.execution.StageInfo; +import com.facebook.presto.execution.TaskInfo; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; import io.airlift.slice.XxHash64; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import static java.lang.Long.toHexString; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; @@ -35,4 +50,89 @@ public static String computeQueryHash(String query) long queryHash = new XxHash64().update(queryBytes).hash(); return toHexString(queryHash); } + + public static StatementStats toStatementStats(QueryInfo queryInfo) + { + QueryStats queryStats = queryInfo.getQueryStats(); + StageInfo outputStage = queryInfo.getOutputStage().orElse(null); + + Set globalUniqueNodes = new HashSet<>(); + StageStats rootStageStats = toStageStats(outputStage, globalUniqueNodes); + + return StatementStats.builder() + .setState(queryInfo.getState().toString()) + .setWaitingForPrerequisites(queryInfo.getState() == QueryState.WAITING_FOR_PREREQUISITES) + .setQueued(queryInfo.getState() == QueryState.QUEUED) + .setScheduled(queryInfo.isScheduled()) + .setNodes(globalUniqueNodes.size()) + .setTotalSplits(queryStats.getTotalDrivers()) + .setQueuedSplits(queryStats.getQueuedDrivers()) + .setRunningSplits(queryStats.getRunningDrivers() + queryStats.getBlockedDrivers()) + .setCompletedSplits(queryStats.getCompletedDrivers()) + .setCpuTimeMillis(queryStats.getTotalCpuTime().toMillis()) + .setWallTimeMillis(queryStats.getTotalScheduledTime().toMillis()) + .setWaitingForPrerequisitesTimeMillis(queryStats.getWaitingForPrerequisitesTime().toMillis()) + .setQueuedTimeMillis(queryStats.getQueuedTime().toMillis()) + .setElapsedTimeMillis(queryStats.getElapsedTime().toMillis()) + .setProcessedRows(queryStats.getRawInputPositions()) + .setProcessedBytes(queryStats.getRawInputDataSize().toBytes()) + .setPeakMemoryBytes(queryStats.getPeakUserMemoryReservation().toBytes()) + .setPeakTotalMemoryBytes(queryStats.getPeakTotalMemoryReservation().toBytes()) + .setPeakTaskTotalMemoryBytes(queryStats.getPeakTaskTotalMemory().toBytes()) + .setSpilledBytes(queryStats.getSpilledDataSize().toBytes()) + .setRootStage(rootStageStats) + .setRuntimeStats(queryStats.getRuntimeStats()) + .build(); + } + + private static StageStats toStageStats(StageInfo stageInfo, Set globalUniqueNodeIds) + { + if (stageInfo == null) { + return null; + } + + StageExecutionInfo currentStageExecutionInfo = stageInfo.getLatestAttemptExecutionInfo(); + StageExecutionStats stageExecutionStats = currentStageExecutionInfo.getStats(); + + // Store current stage details into a builder + StageStats.Builder builder = StageStats.builder() + .setStageId(String.valueOf(stageInfo.getStageId().getId())) + .setState(currentStageExecutionInfo.getState().toString()) + .setDone(currentStageExecutionInfo.getState().isDone()) + .setTotalSplits(stageExecutionStats.getTotalDrivers()) + .setQueuedSplits(stageExecutionStats.getQueuedDrivers()) + .setRunningSplits(stageExecutionStats.getRunningDrivers() + stageExecutionStats.getBlockedDrivers()) + .setCompletedSplits(stageExecutionStats.getCompletedDrivers()) + .setCpuTimeMillis(stageExecutionStats.getTotalCpuTime().toMillis()) + .setWallTimeMillis(stageExecutionStats.getTotalScheduledTime().toMillis()) + .setProcessedRows(stageExecutionStats.getRawInputPositions()) + .setProcessedBytes(stageExecutionStats.getRawInputDataSizeInBytes()) + .setNodes(countStageAndAddGlobalUniqueNodes(currentStageExecutionInfo.getTasks(), globalUniqueNodeIds)); + + // Recurse into child stages to create their StageStats + List subStages = stageInfo.getSubStages(); + if (subStages.isEmpty()) { + builder.setSubStages(ImmutableList.of()); + } + else { + ImmutableList.Builder subStagesBuilder = ImmutableList.builderWithExpectedSize(subStages.size()); + for (StageInfo subStage : subStages) { + subStagesBuilder.add(toStageStats(subStage, globalUniqueNodeIds)); + } + builder.setSubStages(subStagesBuilder.build()); + } + + return builder.build(); + } + + private static int countStageAndAddGlobalUniqueNodes(List tasks, Set globalUniqueNodes) + { + Set stageUniqueNodes = Sets.newHashSetWithExpectedSize(tasks.size()); + for (TaskInfo task : tasks) { + String nodeId = task.getNodeId(); + stageUniqueNodes.add(nodeId); + globalUniqueNodes.add(nodeId); + } + return stageUniqueNodes.size(); + } } diff --git a/presto-main-base/src/main/java/com/facebook/presto/version/EmbedVersion.java b/presto-main-base/src/main/java/com/facebook/presto/version/EmbedVersion.java index 1cac4b65944f9..1da6886720210 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/version/EmbedVersion.java +++ b/presto-main-base/src/main/java/com/facebook/presto/version/EmbedVersion.java @@ -19,8 +19,7 @@ import com.facebook.presto.bytecode.Parameter; import com.facebook.presto.server.ServerConfig; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.lang.invoke.MethodHandle; import java.util.Objects; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java b/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java index c52b3276d1ae5..f010af56af61a 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java @@ -58,10 +58,9 @@ 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.units.DataSize; -import javax.annotation.concurrent.GuardedBy; - import java.net.URI; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java index 393d81be898e5..157e28ed46324 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java @@ -21,12 +21,11 @@ import com.facebook.presto.execution.buffer.SerializedPageReference.PagesReleasedListener; 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.Duration; import org.testng.annotations.Test; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/TestScalarValidation.java b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/TestScalarValidation.java index a12ef98cec3fb..e92c24af09b52 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/TestScalarValidation.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/TestScalarValidation.java @@ -23,10 +23,9 @@ import com.facebook.presto.spi.function.SqlNullable; import com.facebook.presto.spi.function.SqlType; import com.facebook.presto.spi.function.TypeParameter; +import jakarta.annotation.Nullable; import org.testng.annotations.Test; -import javax.annotation.Nullable; - @SuppressWarnings("UtilityClassWithoutPrivateConstructor") public class TestScalarValidation { diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java index 3aa238caf6381..2844f3436bf5d 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java @@ -52,12 +52,11 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; +import jakarta.inject.Singleton; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.inject.Singleton; - import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutorService; diff --git a/presto-main-base/src/test/java/com/facebook/presto/split/MockSplitSource.java b/presto-main-base/src/test/java/com/facebook/presto/split/MockSplitSource.java index 99a20ca970314..934257c7eedd7 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/split/MockSplitSource.java +++ b/presto-main-base/src/test/java/com/facebook/presto/split/MockSplitSource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.split; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.execution.Lifespan; import com.facebook.presto.metadata.Split; import com.facebook.presto.spi.ConnectorId; @@ -27,8 +28,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.Collections; import java.util.List; diff --git a/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java b/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java index 43c8a78e10979..184d305423448 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java +++ b/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java @@ -14,8 +14,7 @@ package com.facebook.presto.util; import io.airlift.units.MinDataSize; - -import javax.validation.Payload; +import jakarta.validation.Payload; import java.lang.annotation.Annotation; diff --git a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java index d740fbe1f8f0a..73f0478900107 100644 --- a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java +++ b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java @@ -253,7 +253,7 @@ public DispatchInfo getDispatchInfo() return DispatchInfo.failed(failureInfo, queryInfo.getQueryStats().getElapsedTime(), queryInfo.getQueryStats().getWaitingForPrerequisitesTime(), queryInfo.getQueryStats().getQueuedTime()); } if (dispatched) { - return DispatchInfo.dispatched(new LocalCoordinatorLocation(), queryInfo.getQueryStats().getElapsedTime(), queryInfo.getQueryStats().getWaitingForPrerequisitesTime(), queryInfo.getQueryStats().getQueuedTime()); + return DispatchInfo.dispatched(queryInfo.getQueryStats().getElapsedTime(), queryInfo.getQueryStats().getWaitingForPrerequisitesTime(), queryInfo.getQueryStats().getQueuedTime()); } if (queryInfo.getState() == QUEUED) { return DispatchInfo.queued(queryInfo.getQueryStats().getElapsedTime(), queryInfo.getQueryStats().getWaitingForPrerequisitesTime(), queryInfo.getQueryStats().getQueuedTime()); diff --git a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQueryFactory.java b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQueryFactory.java index b1340d306a82b..a5a4b671b10d4 100644 --- a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQueryFactory.java +++ b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQueryFactory.java @@ -36,8 +36,7 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; import java.util.function.Consumer; diff --git a/presto-main/src/main/java/com/facebook/presto/execution/MemoryRevokingScheduler.java b/presto-main/src/main/java/com/facebook/presto/execution/MemoryRevokingScheduler.java index fc28963d525ec..100da1a7bec06 100644 --- a/presto-main/src/main/java/com/facebook/presto/execution/MemoryRevokingScheduler.java +++ b/presto-main/src/main/java/com/facebook/presto/execution/MemoryRevokingScheduler.java @@ -29,10 +29,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java index 0ab7776c981ed..346e13e9d3e34 100644 --- a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java +++ b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java @@ -37,17 +37,16 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; - import java.util.List; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java b/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java index 4b349bdcfb25b..14a0a9f267413 100644 --- a/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java +++ b/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java @@ -17,11 +17,10 @@ import com.facebook.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.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.concurrent.TimeUnit; diff --git a/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java b/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java index eed134f386bd7..56a0fc2197904 100644 --- a/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java +++ b/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java @@ -32,17 +32,16 @@ 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 io.airlift.units.Duration; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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; diff --git a/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java b/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java index ebb98a92f22c7..df9c8008a6487 100644 --- a/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java @@ -45,16 +45,15 @@ import com.google.common.collect.Maps; import com.google.common.collect.Streams; import com.google.common.io.Closer; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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.Comparator; diff --git a/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java b/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java index 35558380087aa..d81139cfddf83 100644 --- a/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java @@ -27,10 +27,10 @@ import com.google.common.collect.ListMultimap; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; import javax.management.JMException; import javax.management.Notification; import javax.management.NotificationListener; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryResource.java b/presto-main/src/main/java/com/facebook/presto/memory/MemoryResource.java similarity index 86% rename from presto-main-base/src/main/java/com/facebook/presto/memory/MemoryResource.java rename to presto-main/src/main/java/com/facebook/presto/memory/MemoryResource.java index 3ee64e711a299..8b1b6f27e71ca 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryResource.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/MemoryResource.java @@ -15,24 +15,23 @@ import com.facebook.presto.execution.TaskManager; import com.facebook.presto.spi.memory.MemoryPoolInfo; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -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.core.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +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.core.Response; import static com.facebook.presto.PrestoMediaTypes.APPLICATION_JACKSON_SMILE; import static com.facebook.presto.memory.LocalMemoryManager.GENERAL_POOL; import static com.facebook.presto.memory.LocalMemoryManager.RESERVED_POOL; import static com.facebook.presto.server.security.RoleType.INTERNAL; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +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.Response.Status.NOT_FOUND; /** * Manages memory pools on this worker node diff --git a/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java b/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java index 7dc7de3f9c2f3..ca298046f1dfe 100644 --- a/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java @@ -26,10 +26,9 @@ import com.facebook.presto.server.smile.BaseResponse; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.errorprone.annotations.ThreadSafe; 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; diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/DiscoveryNodeManager.java b/presto-main/src/main/java/com/facebook/presto/metadata/DiscoveryNodeManager.java index 5174739471910..02fdf0efe62cf 100644 --- a/presto-main/src/main/java/com/facebook/presto/metadata/DiscoveryNodeManager.java +++ b/presto-main/src/main/java/com/facebook/presto/metadata/DiscoveryNodeManager.java @@ -40,14 +40,13 @@ 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 jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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; diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java b/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java index 82eedad9f0a6e..71682bc50af5c 100644 --- a/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java +++ b/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java @@ -21,10 +21,9 @@ import com.facebook.presto.spi.NodeState; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.errorprone.annotations.ThreadSafe; 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 com.google.common.net.MediaType.JSON_UTF_8; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; 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 HttpRemoteNodeState diff --git a/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java b/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java index 86eda2434c247..9e15dfa7594ce 100644 --- a/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java +++ b/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java @@ -26,12 +26,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.slice.InputStreamSliceInput; import io.airlift.slice.SliceInput; import io.airlift.units.DataSize; -import javax.annotation.concurrent.ThreadSafe; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java b/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java index d06004b3dd891..0ffde870cb6b8 100644 --- a/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java +++ b/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java @@ -22,10 +22,9 @@ import com.facebook.presto.server.thrift.ThriftTaskClient; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.DataSize; -import javax.annotation.concurrent.ThreadSafe; - import java.net.URI; import java.util.Optional; diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java index 6d158b610de20..4537a1bbf0865 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java @@ -23,14 +23,13 @@ import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spi.memory.MemoryPoolInfo; import io.airlift.units.Duration; - -import javax.annotation.security.RolesAllowed; -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 javax.ws.rs.core.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Map; import java.util.function.Supplier; diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryInfoResource.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryInfoResource.java index 92fea39a12802..7cfe73f592171 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryInfoResource.java @@ -26,22 +26,21 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -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.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.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +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.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.UriInfo; import java.io.IOException; import java.net.URI; @@ -56,8 +55,8 @@ import static com.facebook.airlift.http.client.Request.Builder.prepareGet; import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.facebook.presto.server.security.RoleType.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") @RolesAllowed({USER, ADMIN}) diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryResource.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryResource.java index e16df0c404ba8..d6e9d94c87143 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryResource.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedQueryResource.java @@ -18,23 +18,22 @@ import com.facebook.presto.spi.QueryId; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DELETE; -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.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.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DELETE; +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.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.UriInfo; import java.util.ArrayList; import java.util.Comparator; @@ -46,11 +45,11 @@ import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.facebook.presto.server.security.RoleType.USER; import static com.google.common.base.MoreObjects.firstNonNull; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; @Path("/v1/query") @RolesAllowed({USER, ADMIN}) diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedResourceGroupInfoResource.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedResourceGroupInfoResource.java index 46ec732b7e1bf..c4f017f2ad5cd 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedResourceGroupInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedResourceGroupInfoResource.java @@ -27,21 +27,20 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -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.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.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +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.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.io.IOException; import java.net.URI; @@ -57,8 +56,8 @@ import static com.facebook.airlift.http.client.Request.Builder.prepareGet; import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.google.common.base.Strings.isNullOrEmpty; +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/resourceGroupState") @RolesAllowed(ADMIN) diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedTaskInfoResource.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedTaskInfoResource.java index 23bcf0f8b8619..fe9cd102d5a33 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedTaskInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedTaskInfoResource.java @@ -16,29 +16,28 @@ import com.facebook.presto.execution.TaskId; import com.facebook.presto.server.BasicQueryInfo; import com.facebook.presto.spi.QueryId; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +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.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Optional; import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.facebook.presto.server.security.RoleType.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/taskInfo") @RolesAllowed({USER, ADMIN}) diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java similarity index 98% rename from presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java rename to presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java index 08b7ab06d82d4..c6c8c7622c3f8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java @@ -25,10 +25,9 @@ import com.facebook.presto.spi.QueryId; import com.facebook.presto.util.PeriodicTaskExecutor; import io.airlift.units.Duration; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java index d04197fc395c8..5162dc268a8a9 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java @@ -24,11 +24,10 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import io.airlift.units.Duration; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -48,14 +47,14 @@ import static com.google.common.net.HttpHeaders.USER_AGENT; import static com.google.common.net.HttpHeaders.X_FORWARDED_FOR; import static com.google.common.util.concurrent.Futures.transform; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.Response.Status.GATEWAY_TIMEOUT; +import static jakarta.ws.rs.core.Response.status; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.list; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.Response.Status.GATEWAY_TIMEOUT; -import static javax.ws.rs.core.Response.status; @SuppressWarnings("UnstableApiUsage") public class ResourceManagerProxy diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java b/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java similarity index 90% rename from presto-main-base/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java rename to presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java index 3e307e91152f8..47249f5c9b090 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java +++ b/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportForwardFilter.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.server; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.regex.Pattern; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java b/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java similarity index 95% rename from presto-main-base/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java rename to presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java index ba47ea184508c..874046df0974d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java +++ b/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java @@ -29,19 +29,18 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.util.Enumeration; import java.util.List; @@ -64,12 +63,12 @@ import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.util.concurrent.Futures.addCallback; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static java.lang.Long.parseLong; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; @RolesAllowed(INTERNAL) public class AsyncPageTransportServlet diff --git a/presto-main/src/main/java/com/facebook/presto/server/CatalogServerModule.java b/presto-main/src/main/java/com/facebook/presto/server/CatalogServerModule.java index 170617d2c00e7..3149443421ec5 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/CatalogServerModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/CatalogServerModule.java @@ -29,8 +29,7 @@ import com.google.inject.Binder; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java b/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java index b9e0d59afd52d..da78359f0bf83 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java @@ -29,22 +29,21 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import io.airlift.units.Duration; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -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.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +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.net.URI; import java.util.Iterator; @@ -59,10 +58,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Suppliers.memoizeWithExpiration; import static com.google.common.net.HttpHeaders.X_FORWARDED_PROTO; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; @Path("/v1/cluster") @RolesAllowed({ADMIN, USER}) diff --git a/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java b/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java index fcfcc2198b385..a90514beb8693 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java @@ -105,10 +105,9 @@ import com.google.inject.Scopes; import com.google.inject.multibindings.MapBinder; import io.airlift.units.Duration; - -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java b/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java index 6fc8b9efbd667..361249a6dbd33 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java +++ b/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java @@ -39,12 +39,11 @@ import com.google.common.collect.ImmutableSet; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -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.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -95,7 +94,7 @@ public final class HttpRequestSessionContext private static final Splitter DOT_SPLITTER = Splitter.on('.'); private static final JsonCodec SQL_FUNCTION_ID_JSON_CODEC = jsonCodec(SqlFunctionId.class); private static final JsonCodec SQL_INVOKED_FUNCTION_JSON_CODEC = jsonCodec(SqlInvokedFunction.class); - private static final String X509_ATTRIBUTE = "javax.servlet.request.X509Certificate"; + private static final String X509_ATTRIBUTE = "jakarta.servlet.request.X509Certificate"; private final String catalog; private final String schema; diff --git a/presto-main/src/main/java/com/facebook/presto/server/HttpServerModule.java b/presto-main/src/main/java/com/facebook/presto/server/HttpServerModule.java index fff5e5b2446f4..02a47b2ae0ec6 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/HttpServerModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/HttpServerModule.java @@ -31,9 +31,8 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.servlet.Filter; -import javax.servlet.Servlet; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; import java.util.List; import java.util.Set; diff --git a/presto-main/src/main/java/com/facebook/presto/server/InternalAuthenticationManager.java b/presto-main/src/main/java/com/facebook/presto/server/InternalAuthenticationManager.java index 9bbc42cc4613e..e98a24cf08a39 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/InternalAuthenticationManager.java +++ b/presto-main/src/main/java/com/facebook/presto/server/InternalAuthenticationManager.java @@ -22,9 +22,8 @@ import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; - -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; import java.security.Principal; import java.time.ZonedDateTime; diff --git a/presto-main/src/main/java/com/facebook/presto/server/NodeResource.java b/presto-main/src/main/java/com/facebook/presto/server/NodeResource.java index eb4546ba64d3e..08731cd4c0b1f 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/NodeResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/NodeResource.java @@ -15,11 +15,10 @@ import com.facebook.presto.failureDetector.HeartbeatFailureDetector; import com.google.common.collect.Maps; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.Collection; diff --git a/presto-main/src/main/java/com/facebook/presto/server/QueryResource.java b/presto-main/src/main/java/com/facebook/presto/server/QueryResource.java index 7ffdcdb8208a4..c9d6b272ed01e 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/QueryResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/QueryResource.java @@ -25,25 +25,24 @@ import com.facebook.presto.spi.QueryId; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +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.Status; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.ArrayList; @@ -65,13 +64,13 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.net.HttpHeaders.X_FORWARDED_PROTO; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.NO_CONTENT; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static java.lang.String.format; import static java.util.Comparator.comparing; import static java.util.Comparator.comparingInt; import static java.util.Objects.requireNonNull; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.NO_CONTENT; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; /** * Manage queries scheduled on this node diff --git a/presto-main/src/main/java/com/facebook/presto/server/QueryStateInfoResource.java b/presto-main/src/main/java/com/facebook/presto/server/QueryStateInfoResource.java index 128db56a4d89f..6cbf436f8f04b 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/QueryStateInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/QueryStateInfoResource.java @@ -23,24 +23,23 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.google.re2j.Pattern; import io.airlift.slice.Slices; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +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.UriInfo; import java.net.URI; import java.util.Arrays; @@ -59,11 +58,11 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.net.HttpHeaders.X_FORWARDED_PROTO; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; @Path("/v1/queryState") @RolesAllowed({ADMIN, USER}) diff --git a/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java b/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java index 961a39c209410..955cdf1fbf640 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java +++ b/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java @@ -23,10 +23,9 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; -import javax.annotation.concurrent.ThreadSafe; - import java.io.EOFException; import java.net.SocketException; import java.net.SocketTimeoutException; diff --git a/presto-main/src/main/java/com/facebook/presto/server/RequestHelpers.java b/presto-main/src/main/java/com/facebook/presto/server/RequestHelpers.java index 65e1165de99cc..61645ac8c65d3 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/RequestHelpers.java +++ b/presto-main/src/main/java/com/facebook/presto/server/RequestHelpers.java @@ -19,7 +19,7 @@ import static com.facebook.presto.PrestoMediaTypes.APPLICATION_JACKSON_SMILE; import static com.google.common.net.HttpHeaders.ACCEPT; import static com.google.common.net.MediaType.JSON_UTF_8; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; public class RequestHelpers { diff --git a/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java b/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java index 9df49004cd158..4d048bba33ec4 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java @@ -21,25 +21,24 @@ import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import io.airlift.units.Duration; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.Encoded; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.Encoded; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +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.UriInfo; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -60,11 +59,11 @@ import static com.google.common.base.Suppliers.memoizeWithExpiration; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.net.HttpHeaders.X_FORWARDED_PROTO; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; @Path("/v1/resourceGroupState") @RolesAllowed(ADMIN) diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java b/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java similarity index 90% rename from presto-main-base/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java rename to presto-main/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java index ec34f7d91bada..660429d1dc606 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerHeartbeatResource.java @@ -16,14 +16,13 @@ import com.facebook.presto.resourcemanager.ForResourceManager; import com.facebook.presto.resourcemanager.ResourceManagerClusterStateProvider; import com.google.common.util.concurrent.ListeningExecutorService; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; - +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/heartbeat") public class ResourceManagerHeartbeatResource diff --git a/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java b/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java index 553e7ea7c7dac..e965e82fa9551 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java @@ -40,8 +40,7 @@ import com.google.inject.Scopes; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.facebook.airlift.configuration.ConditionalModule.installModuleIf; import static com.facebook.airlift.discovery.client.DiscoveryBinder.discoveryBinder; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java b/presto-main/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java similarity index 96% rename from presto-main-base/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java rename to presto-main/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java index ef57b2ea1b8f7..65cf3233d16f3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java +++ b/presto-main/src/main/java/com/facebook/presto/server/SerializedPageWriteListener.java @@ -16,10 +16,9 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.spi.page.SerializedPage; import io.airlift.slice.SliceOutput; - -import javax.servlet.AsyncContext; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; import java.io.IOException; import java.util.ArrayDeque; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java b/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java index 6006b49f298b4..8974a5d4f1725 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java @@ -19,16 +19,15 @@ import com.facebook.presto.execution.resourceGroups.ResourceGroupManager; import com.facebook.presto.metadata.StaticCatalogStore; import com.facebook.presto.spi.NodeState; - -import javax.annotation.security.RolesAllowed; -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.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +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.Response; import java.util.Optional; @@ -40,11 +39,11 @@ import static com.facebook.presto.spi.NodeState.INACTIVE; import static com.facebook.presto.spi.NodeState.SHUTTING_DOWN; import static io.airlift.units.Duration.nanosSince; +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/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java b/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java index ac9445993bfe8..12a4363139ad5 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java @@ -244,11 +244,10 @@ import io.airlift.slice.Slice; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.annotation.PreDestroy; -import javax.inject.Singleton; -import javax.servlet.Filter; -import javax.servlet.Servlet; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Singleton; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/StageResource.java b/presto-main/src/main/java/com/facebook/presto/server/StageResource.java similarity index 88% rename from presto-main-base/src/main/java/com/facebook/presto/server/StageResource.java rename to presto-main/src/main/java/com/facebook/presto/server/StageResource.java index 2463f50fd1a3f..0944593bd189f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/StageResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/StageResource.java @@ -15,12 +15,11 @@ import com.facebook.presto.execution.QueryManager; import com.facebook.presto.execution.StageId; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import static com.facebook.presto.server.security.RoleType.USER; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/StatusResource.java b/presto-main/src/main/java/com/facebook/presto/server/StatusResource.java similarity index 92% rename from presto-main-base/src/main/java/com/facebook/presto/server/StatusResource.java rename to presto-main/src/main/java/com/facebook/presto/server/StatusResource.java index 241cfabaf09b2..84921c2203ba6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/StatusResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/StatusResource.java @@ -17,22 +17,21 @@ import com.facebook.presto.client.NodeVersion; import com.facebook.presto.memory.LocalMemoryManager; import com.sun.management.OperatingSystemMXBean; - -import javax.annotation.security.RolesAllowed; -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.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +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 com.facebook.presto.server.security.RoleType.INTERNAL; import static io.airlift.units.Duration.nanosSince; +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") @RolesAllowed(INTERNAL) diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/TaskExecutorResource.java b/presto-main/src/main/java/com/facebook/presto/server/TaskExecutorResource.java similarity index 86% rename from presto-main-base/src/main/java/com/facebook/presto/server/TaskExecutorResource.java rename to presto-main/src/main/java/com/facebook/presto/server/TaskExecutorResource.java index c82bc19941f3e..bac43cf00596a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/TaskExecutorResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/TaskExecutorResource.java @@ -14,13 +14,12 @@ package com.facebook.presto.server; import com.facebook.presto.execution.executor.TaskExecutor; - -import javax.annotation.security.RolesAllowed; -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.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import static com.facebook.presto.server.security.RoleType.ADMIN; import static java.util.Objects.requireNonNull; diff --git a/presto-main/src/main/java/com/facebook/presto/server/TaskInfoResource.java b/presto-main/src/main/java/com/facebook/presto/server/TaskInfoResource.java index ff6ca3990979c..7ee90d4386a08 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/TaskInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/TaskInfoResource.java @@ -23,32 +23,31 @@ import com.facebook.presto.resourcemanager.ResourceManagerProxy; import com.facebook.presto.spi.QueryId; import com.google.inject.Inject; - -import javax.annotation.security.RolesAllowed; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -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.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +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.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.net.UnknownHostException; import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +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/taskInfo") @RolesAllowed("ADMIN") diff --git a/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java b/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java index c34b6766e4fb1..78a0507c84910 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java @@ -30,26 +30,25 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.Duration; - -import javax.annotation.security.RolesAllowed; -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.HEAD; -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.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +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.Suspended; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.List; import java.util.concurrent.Executor; @@ -69,10 +68,10 @@ import static com.facebook.presto.util.TaskUtils.randomizeWaitTime; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; /** * Manages tasks on this worker node diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ThreadResource.java b/presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java similarity index 97% rename from presto-main-base/src/main/java/com/facebook/presto/server/ThreadResource.java rename to presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java index 38dd30ff0ff6e..8de7423dbbaa5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ThreadResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java @@ -20,12 +20,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; - -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +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/presto-main-base/src/main/java/com/facebook/presto/server/ThrowableMapper.java b/presto-main/src/main/java/com/facebook/presto/server/ThrowableMapper.java similarity index 81% rename from presto-main-base/src/main/java/com/facebook/presto/server/ThrowableMapper.java rename to presto-main/src/main/java/com/facebook/presto/server/ThrowableMapper.java index 02103191cab01..ba9c15f52ae1b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ThrowableMapper.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ThrowableMapper.java @@ -15,17 +15,16 @@ import com.facebook.airlift.log.Logger; import com.google.common.base.Throwables; +import jakarta.inject.Inject; +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 diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/WebUiResource.java b/presto-main/src/main/java/com/facebook/presto/server/WebUiResource.java similarity index 80% rename from presto-main-base/src/main/java/com/facebook/presto/server/WebUiResource.java rename to presto-main/src/main/java/com/facebook/presto/server/WebUiResource.java index c45774edc31e7..2eeb67b5f5d0b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/WebUiResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/WebUiResource.java @@ -13,18 +13,18 @@ */ package com.facebook.presto.server; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.net.HttpHeaders.X_FORWARDED_PROTO; -import static javax.ws.rs.core.Response.Status.MOVED_PERMANENTLY; +import static jakarta.ws.rs.core.Response.Status.MOVED_PERMANENTLY; @Path("/") @RolesAllowed(ADMIN) diff --git a/presto-main/src/main/java/com/facebook/presto/server/WorkerModule.java b/presto-main/src/main/java/com/facebook/presto/server/WorkerModule.java index 1227ebe411251..8b007302291a1 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/WorkerModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/WorkerModule.java @@ -26,8 +26,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.google.common.reflect.Reflection.newProxy; diff --git a/presto-main/src/main/java/com/facebook/presto/server/WorkerResource.java b/presto-main/src/main/java/com/facebook/presto/server/WorkerResource.java index 410150698ec01..63cfec0e0cbac 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/WorkerResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/WorkerResource.java @@ -19,14 +19,13 @@ import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.metadata.InternalNodeManager; import com.facebook.presto.spi.NodeState; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -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.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +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.Response; import java.io.IOException; import java.io.InputStream; @@ -36,10 +35,10 @@ import static com.facebook.airlift.http.client.Request.Builder.prepareGet; import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; +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("/v1/worker") @RolesAllowed(ADMIN) diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java similarity index 97% rename from presto-main-base/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java rename to presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java index afd9df076f520..fd3fe9253d849 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java @@ -18,9 +18,8 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.Optional; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java index 6b286492ffa0d..7f42f413140d9 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java @@ -24,26 +24,25 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +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.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 org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.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 static com.facebook.airlift.http.server.AsyncResponseHandler.bindAsyncResponse; import static com.facebook.presto.client.PrestoHeaders.PRESTO_PREFIX_URL; import static com.facebook.presto.server.protocol.QueryResourceUtil.abortIfPrefixUrlInvalid; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java index f57c29a223fb2..510f12a8aa71a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java @@ -18,11 +18,10 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.Optional; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalQueryProvider.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalQueryProvider.java index 1bbfbb6e7c12e..24c2987c74180 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalQueryProvider.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalQueryProvider.java @@ -24,13 +24,12 @@ import com.facebook.presto.server.ForStatementResource; import com.facebook.presto.spi.QueryId; import com.facebook.presto.transaction.TransactionManager; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.util.Map.Entry; import java.util.NoSuchElementException; @@ -40,10 +39,10 @@ import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; public class LocalQueryProvider { diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/Query.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java similarity index 98% rename from presto-main-base/src/main/java/com/facebook/presto/server/protocol/Query.java rename to presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java index d9c398636df14..b6b249fecdc1e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/Query.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java @@ -51,16 +51,15 @@ import com.google.common.collect.Lists; 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.DynamicSliceOutput; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -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.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Base64; @@ -85,10 +84,10 @@ import static com.facebook.presto.SystemSessionProperties.useHistoryBasedPlanStatisticsEnabled; import static com.facebook.presto.execution.QueryState.FAILED; import static com.facebook.presto.execution.QueryState.WAITING_FOR_PREREQUISITES; -import static com.facebook.presto.server.protocol.QueryResourceUtil.toStatementStats; import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; import static com.facebook.presto.spi.page.PagesSerdeUtil.writeSerializedPage; import static com.facebook.presto.util.Failures.toFailure; +import static com.facebook.presto.util.QueryInfoUtils.toStatementStats; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java similarity index 75% rename from presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java rename to presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java index 22b28b43c1e40..5c3601241ea24 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java @@ -18,32 +18,23 @@ import com.facebook.presto.client.Column; import com.facebook.presto.client.QueryError; import com.facebook.presto.client.QueryResults; -import com.facebook.presto.client.StageStats; import com.facebook.presto.client.StatementStats; import com.facebook.presto.common.type.NamedTypeSignature; import com.facebook.presto.common.type.ParameterKind; import com.facebook.presto.common.type.TypeSignature; import com.facebook.presto.common.type.TypeSignatureParameter; -import com.facebook.presto.execution.QueryInfo; import com.facebook.presto.execution.QueryState; -import com.facebook.presto.execution.QueryStats; -import com.facebook.presto.execution.StageExecutionInfo; -import com.facebook.presto.execution.StageExecutionStats; -import com.facebook.presto.execution.StageInfo; -import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.spi.QueryId; import com.facebook.presto.spi.function.SqlFunctionId; import com.facebook.presto.spi.function.SqlInvokedFunction; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; import io.airlift.units.Duration; - -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -53,7 +44,6 @@ import java.util.ArrayList; import java.util.Base64; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -83,12 +73,12 @@ import static com.facebook.presto.execution.QueryState.WAITING_FOR_PREREQUISITES; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static java.lang.String.format; import static java.util.Collections.unmodifiableList; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; public final class QueryResourceUtil { @@ -230,40 +220,6 @@ public static URI prependUri(URI backendUri, String xPrestoPrefixUrl) return backendUri; } - public static StatementStats toStatementStats(QueryInfo queryInfo) - { - QueryStats queryStats = queryInfo.getQueryStats(); - StageInfo outputStage = queryInfo.getOutputStage().orElse(null); - - Set globalUniqueNodes = new HashSet<>(); - StageStats rootStageStats = toStageStats(outputStage, globalUniqueNodes); - - return StatementStats.builder() - .setState(queryInfo.getState().toString()) - .setWaitingForPrerequisites(queryInfo.getState() == QueryState.WAITING_FOR_PREREQUISITES) - .setQueued(queryInfo.getState() == QueryState.QUEUED) - .setScheduled(queryInfo.isScheduled()) - .setNodes(globalUniqueNodes.size()) - .setTotalSplits(queryStats.getTotalDrivers()) - .setQueuedSplits(queryStats.getQueuedDrivers()) - .setRunningSplits(queryStats.getRunningDrivers() + queryStats.getBlockedDrivers()) - .setCompletedSplits(queryStats.getCompletedDrivers()) - .setCpuTimeMillis(queryStats.getTotalCpuTime().toMillis()) - .setWallTimeMillis(queryStats.getTotalScheduledTime().toMillis()) - .setWaitingForPrerequisitesTimeMillis(queryStats.getWaitingForPrerequisitesTime().toMillis()) - .setQueuedTimeMillis(queryStats.getQueuedTime().toMillis()) - .setElapsedTimeMillis(queryStats.getElapsedTime().toMillis()) - .setProcessedRows(queryStats.getRawInputPositions()) - .setProcessedBytes(queryStats.getRawInputDataSize().toBytes()) - .setPeakMemoryBytes(queryStats.getPeakUserMemoryReservation().toBytes()) - .setPeakTotalMemoryBytes(queryStats.getPeakTotalMemoryReservation().toBytes()) - .setPeakTaskTotalMemoryBytes(queryStats.getPeakTaskTotalMemory().toBytes()) - .setSpilledBytes(queryStats.getSpilledDataSize().toBytes()) - .setRootStage(rootStageStats) - .setRuntimeStats(queryStats.getRuntimeStats()) - .build(); - } - private static String urlEncode(String value) { try { @@ -274,57 +230,6 @@ private static String urlEncode(String value) } } - private static StageStats toStageStats(StageInfo stageInfo, Set globalUniqueNodeIds) - { - if (stageInfo == null) { - return null; - } - - StageExecutionInfo currentStageExecutionInfo = stageInfo.getLatestAttemptExecutionInfo(); - StageExecutionStats stageExecutionStats = currentStageExecutionInfo.getStats(); - - // Store current stage details into a builder - StageStats.Builder builder = StageStats.builder() - .setStageId(String.valueOf(stageInfo.getStageId().getId())) - .setState(currentStageExecutionInfo.getState().toString()) - .setDone(currentStageExecutionInfo.getState().isDone()) - .setTotalSplits(stageExecutionStats.getTotalDrivers()) - .setQueuedSplits(stageExecutionStats.getQueuedDrivers()) - .setRunningSplits(stageExecutionStats.getRunningDrivers() + stageExecutionStats.getBlockedDrivers()) - .setCompletedSplits(stageExecutionStats.getCompletedDrivers()) - .setCpuTimeMillis(stageExecutionStats.getTotalCpuTime().toMillis()) - .setWallTimeMillis(stageExecutionStats.getTotalScheduledTime().toMillis()) - .setProcessedRows(stageExecutionStats.getRawInputPositions()) - .setProcessedBytes(stageExecutionStats.getRawInputDataSizeInBytes()) - .setNodes(countStageAndAddGlobalUniqueNodes(currentStageExecutionInfo.getTasks(), globalUniqueNodeIds)); - - // Recurse into child stages to create their StageStats - List subStages = stageInfo.getSubStages(); - if (subStages.isEmpty()) { - builder.setSubStages(ImmutableList.of()); - } - else { - ImmutableList.Builder subStagesBuilder = ImmutableList.builderWithExpectedSize(subStages.size()); - for (StageInfo subStage : subStages) { - subStagesBuilder.add(toStageStats(subStage, globalUniqueNodeIds)); - } - builder.setSubStages(subStagesBuilder.build()); - } - - return builder.build(); - } - - private static int countStageAndAddGlobalUniqueNodes(List tasks, Set globalUniqueNodes) - { - Set stageUniqueNodes = Sets.newHashSetWithExpectedSize(tasks.size()); - for (TaskInfo task : tasks) { - String nodeId = task.getNodeId(); - stageUniqueNodes.add(nodeId); - globalUniqueNodes.add(nodeId); - } - return stageUniqueNodes.size(); - } - /** * Problem: As the type of data defined in QueryResult is `Iterable>`, * when jackson serialize a data with nested data structure in the response, the nested object won't diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java index d9cae4af1e380..63b6b2df7788c 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java @@ -33,35 +33,34 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +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.PUT; +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.CacheControl; +import jakarta.ws.rs.core.Context; +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.annotation.PreDestroy; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -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.PUT; -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.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; - import java.net.URI; import java.util.Map; import java.util.Map.Entry; @@ -93,6 +92,11 @@ import static com.google.common.util.concurrent.Futures.transformAsync; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static io.airlift.units.DataSize.Unit.MEGABYTE; +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.CONFLICT; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static java.lang.System.currentTimeMillis; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; @@ -100,11 +104,6 @@ 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.CONFLICT; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; @Path("/") @RolesAllowed(USER) @@ -194,8 +193,8 @@ public void stop() * @param statement The statement or sql query string submitted * @param xForwardedProto Forwarded protocol (http or https) * @param servletRequest The http request - * @param uriInfo {@link javax.ws.rs.core.UriInfo} - * @return {@link javax.ws.rs.core.Response} HTTP response code + * @param uriInfo {@link jakarta.ws.rs.core.UriInfo} + * @return {@link jakarta.ws.rs.core.Response} HTTP response code */ @POST @Path("/v1/statement") @@ -242,8 +241,8 @@ public Response postStatement( * @param slug Pre-minted slug to protect this query * @param xForwardedProto Forwarded protocol (http or https) * @param servletRequest The http request - * @param uriInfo {@link javax.ws.rs.core.UriInfo} - * @return {@link javax.ws.rs.core.Response} HTTP response code + * @param uriInfo {@link jakarta.ws.rs.core.UriInfo} + * @return {@link jakarta.ws.rs.core.Response} HTTP response code */ @PUT @Path("/v1/statement/{queryId}") @@ -287,8 +286,8 @@ public Response putStatement( * HTTP endpoint for re-processing a failed query * @param queryId Query Identifier of the query to be retried * @param xForwardedProto Forwarded protocol (http or https) - * @param uriInfo {@link javax.ws.rs.core.UriInfo} - * @return {@link javax.ws.rs.core.Response} HTTP response code + * @param uriInfo {@link jakarta.ws.rs.core.UriInfo} + * @return {@link jakarta.ws.rs.core.Response} HTTP response code */ @GET @Path("/v1/statement/queued/retry/{queryId}") @@ -341,7 +340,7 @@ public Response retryFailedQuery( * @param slug Unique security token generated for each query that controls access to that query's results * @param maxWait Time to wait for the query to be dispatched * @param xForwardedProto Forwarded protocol (http or https) - * @param uriInfo {@link javax.ws.rs.core.UriInfo} + * @param uriInfo {@link jakarta.ws.rs.core.UriInfo} * @param asyncResponse */ @GET @@ -388,7 +387,7 @@ public void getStatus( * @param queryId Query Identifier of query to be canceled * @param token Monotonically increasing token that identifies the next batch of query results * @param slug Unique security token generated for each query that controls access to that query's results - * @return {@link javax.ws.rs.core.Response} HTTP response code + * @return {@link jakarta.ws.rs.core.Response} HTTP response code */ @DELETE @Path("/v1/statement/queued/{queryId}/{token}") @@ -567,7 +566,7 @@ private ListenableFuture waitForDispatched() /** * Returns a placeholder for query results for the client to poll - * @param uriInfo {@link javax.ws.rs.core.UriInfo} + * @param uriInfo {@link jakarta.ws.rs.core.UriInfo} * @param xForwardedProto Forwarded protocol (http or https) * @return {@link com.facebook.presto.client.QueryResults} */ diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java index dea0a2b4839ef..5badbd9821202 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java @@ -37,10 +37,9 @@ 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.units.Duration; -import javax.annotation.concurrent.GuardedBy; - import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpLocationFactory.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpLocationFactory.java index ff80ac7a260b2..3efc20bfd99bb 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpLocationFactory.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpLocationFactory.java @@ -23,8 +23,7 @@ import com.facebook.presto.server.InternalCommunicationConfig; import com.facebook.presto.server.InternalCommunicationConfig.CommunicationProtocol; import com.facebook.presto.spi.QueryId; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; import java.util.OptionalInt; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java index 5f20bc0e1c055..587c503fa78ba 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java @@ -73,12 +73,11 @@ 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 com.sun.management.ThreadMXBean; import io.airlift.units.Duration; import it.unimi.dsi.fastutil.longs.LongArrayList; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; +import jakarta.annotation.Nullable; import java.lang.management.ManagementFactory; import java.net.URI; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java index daefdb64c225c..1bda3e2fd5b3e 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java @@ -52,12 +52,11 @@ import io.airlift.units.Duration; import io.netty.channel.EventLoop; import io.netty.util.concurrent.AbstractEventExecutorGroup; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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.concurrent.Executor; import java.util.concurrent.ExecutorService; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java index bd8f158d894bf..1976140762739 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java @@ -77,8 +77,7 @@ import io.airlift.units.DataSize; import io.airlift.units.Duration; import it.unimi.dsi.fastutil.longs.LongArrayList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.lang.management.ManagementFactory; import java.net.URI; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java index 09f2ccd150e84..89be82997a271 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java @@ -41,10 +41,9 @@ 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.units.Duration; -import javax.annotation.concurrent.GuardedBy; - import java.net.URI; import java.util.Optional; import java.util.concurrent.Executor; diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/AuthenticationFilter.java b/presto-main/src/main/java/com/facebook/presto/server/security/AuthenticationFilter.java index 6914f8d7b03f5..6e5907735c8a8 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/AuthenticationFilter.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/AuthenticationFilter.java @@ -24,17 +24,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.HttpHeaders; - -import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; @@ -52,10 +51,10 @@ import static com.google.common.io.ByteStreams.nullOutputStream; import static com.google.common.net.HttpHeaders.WWW_AUTHENTICATE; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static java.util.Collections.enumeration; import static java.util.Collections.list; import static java.util.Objects.requireNonNull; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; public class AuthenticationFilter implements Filter @@ -133,7 +132,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo // Clients should use the response body rather than the HTTP status // message (which does not exist with HTTP/2), but the status message // still needs to be sent for compatibility with existing clients. - response.setStatus(SC_UNAUTHORIZED, error); + response.setStatus(SC_UNAUTHORIZED); response.setContentType(PLAIN_TEXT_UTF_8.toString()); try (PrintWriter writer = response.getWriter()) { writer.write(error); diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/CustomPrestoAuthenticator.java b/presto-main/src/main/java/com/facebook/presto/server/security/CustomPrestoAuthenticator.java index ddaad5459974b..93ef5aa2e293a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/CustomPrestoAuthenticator.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/CustomPrestoAuthenticator.java @@ -16,9 +16,8 @@ import com.facebook.airlift.http.server.AuthenticationException; import com.facebook.airlift.http.server.Authenticator; import com.facebook.presto.spi.security.AccessDeniedException; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.List; diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/InternalAuthenticationFilter.java b/presto-main/src/main/java/com/facebook/presto/server/security/InternalAuthenticationFilter.java index fadb1b405a0fb..fa5d218f0e3cd 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/InternalAuthenticationFilter.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/InternalAuthenticationFilter.java @@ -14,15 +14,14 @@ package com.facebook.presto.server.security; import com.facebook.presto.server.InternalAuthenticationManager; - -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import java.lang.reflect.Method; import java.security.Principal; @@ -30,9 +29,9 @@ import java.util.Optional; import static com.facebook.presto.server.security.RoleType.INTERNAL; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.ResponseBuilder; import static java.util.Objects.requireNonNull; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static javax.ws.rs.core.Response.ResponseBuilder; @Provider public class InternalAuthenticationFilter diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenAuthenticator.java b/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenAuthenticator.java index a8a209762f81d..310e9f76fa684 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenAuthenticator.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenAuthenticator.java @@ -31,10 +31,10 @@ import io.jsonwebtoken.SigningKeyResolver; import io.jsonwebtoken.UnsupportedJwtException; import io.jsonwebtoken.jackson.io.JacksonDeserializer; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; import javax.crypto.spec.SecretKeySpec; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenConfig.java b/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenConfig.java index 1eaddacf1a1cb..1c6694e8a67e8 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenConfig.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/JsonWebTokenConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.server.security; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class JsonWebTokenConfig { diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/PasswordAuthenticator.java b/presto-main/src/main/java/com/facebook/presto/server/security/PasswordAuthenticator.java index eef467b893e2f..db680542a1408 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/PasswordAuthenticator.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/PasswordAuthenticator.java @@ -17,9 +17,8 @@ import com.facebook.airlift.http.server.Authenticator; import com.facebook.presto.spi.security.AccessDeniedException; import com.google.common.base.Splitter; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Base64; diff --git a/presto-main/src/main/java/com/facebook/presto/server/security/ServletSecurityUtils.java b/presto-main/src/main/java/com/facebook/presto/server/security/ServletSecurityUtils.java index 950f5a19d1ccc..f6c8ed6af3ae5 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/security/ServletSecurityUtils.java +++ b/presto-main/src/main/java/com/facebook/presto/server/security/ServletSecurityUtils.java @@ -14,8 +14,7 @@ package com.facebook.presto.server.security; import com.facebook.presto.spi.security.AuthorizedIdentity; - -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; diff --git a/presto-main/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java b/presto-main/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java index 0765fbbfd3836..1cb04591b15da 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java +++ b/presto-main/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java @@ -97,20 +97,19 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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; import com.google.inject.Scopes; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.weakref.jmx.guice.MBeanModule; -import javax.annotation.concurrent.GuardedBy; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - import java.io.Closeable; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-main/src/main/java/com/facebook/presto/server/thrift/ThriftTaskUpdateRequestBodyReader.java b/presto-main/src/main/java/com/facebook/presto/server/thrift/ThriftTaskUpdateRequestBodyReader.java index 9bfe517a4feef..142ef0349bc9e 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/thrift/ThriftTaskUpdateRequestBodyReader.java +++ b/presto-main/src/main/java/com/facebook/presto/server/thrift/ThriftTaskUpdateRequestBodyReader.java @@ -17,14 +17,13 @@ import com.facebook.drift.codec.ThriftCodec; import com.facebook.presto.server.TaskUpdateRequest; import com.google.common.io.ByteStreams; - -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; diff --git a/presto-main/src/test/java/com/facebook/presto/TestClientRequestFilterPlugin.java b/presto-main/src/test/java/com/facebook/presto/TestClientRequestFilterPlugin.java index 0f7fcf7501963..d073f8ed96fee 100644 --- a/presto-main/src/test/java/com/facebook/presto/TestClientRequestFilterPlugin.java +++ b/presto-main/src/test/java/com/facebook/presto/TestClientRequestFilterPlugin.java @@ -24,10 +24,9 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.security.Principal; import java.util.Collections; import java.util.List; diff --git a/presto-main/src/test/java/com/facebook/presto/failureDetector/TestHeartbeatFailureDetector.java b/presto-main/src/test/java/com/facebook/presto/failureDetector/TestHeartbeatFailureDetector.java index 3c07fc83cd5c5..88814b2bc2363 100644 --- a/presto-main/src/test/java/com/facebook/presto/failureDetector/TestHeartbeatFailureDetector.java +++ b/presto-main/src/test/java/com/facebook/presto/failureDetector/TestHeartbeatFailureDetector.java @@ -32,11 +32,10 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.testng.annotations.Test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; - import java.net.SocketTimeoutException; import java.net.URI; diff --git a/presto-main/src/test/java/com/facebook/presto/metadata/TestDiscoveryNodeManager.java b/presto-main/src/test/java/com/facebook/presto/metadata/TestDiscoveryNodeManager.java index b2ae47bdba249..d7cc63f94bb09 100644 --- a/presto-main/src/test/java/com/facebook/presto/metadata/TestDiscoveryNodeManager.java +++ b/presto-main/src/test/java/com/facebook/presto/metadata/TestDiscoveryNodeManager.java @@ -28,11 +28,10 @@ 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 org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import javax.annotation.concurrent.GuardedBy; - import java.net.URI; import java.util.List; import java.util.Optional; diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestingExchangeHttpClientHandler.java b/presto-main/src/test/java/com/facebook/presto/operator/TestingExchangeHttpClientHandler.java index 3636a68f77b26..5e10d115a3cef 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/TestingExchangeHttpClientHandler.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/TestingExchangeHttpClientHandler.java @@ -33,8 +33,8 @@ import static com.facebook.presto.client.PrestoHeaders.PRESTO_PAGE_TOKEN; import static com.facebook.presto.client.PrestoHeaders.PRESTO_TASK_INSTANCE_ID; import static com.facebook.presto.execution.buffer.TestingPagesSerdeFactory.testingPagesSerde; +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/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java b/presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java similarity index 100% rename from presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java rename to presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java b/presto-main/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java similarity index 79% rename from presto-main-base/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java rename to presto-main/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java index 1d0fee4e5a8ea..600dfea77e704 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java +++ b/presto-main/src/test/java/com/facebook/presto/server/MockContainerRequestContext.java @@ -14,15 +14,14 @@ package com.facebook.presto.server; import com.google.common.collect.ListMultimap; - -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; import java.io.InputStream; import java.net.URI; @@ -31,6 +30,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.function.Predicate; public class MockContainerRequestContext implements ContainerRequestContext @@ -50,6 +50,12 @@ public Object getProperty(String name) return null; } + @Override + public boolean hasProperty(String name) + { + return ContainerRequestContext.super.hasProperty(name); + } + @Override public Collection getPropertyNames() { @@ -105,6 +111,18 @@ public String getHeaderString(String name) return null; } + @Override + public boolean containsHeaderString(String s, String s1, Predicate predicate) + { + return headers.containsKey(s) && headers.get(s).stream().anyMatch(predicate); + } + + @Override + public boolean containsHeaderString(String name, Predicate valuePredicate) + { + return ContainerRequestContext.super.containsHeaderString(name, valuePredicate); + } + @Override public Date getDate() { diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java b/presto-main/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java similarity index 92% rename from presto-main-base/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java rename to presto-main/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java index 000eda9b853e0..b1fe03962f481 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java +++ b/presto-main/src/test/java/com/facebook/presto/server/MockHttpServletRequest.java @@ -16,20 +16,20 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ListMultimap; - -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; import java.io.BufferedReader; import java.security.Principal; @@ -226,12 +226,6 @@ public boolean isRequestedSessionIdFromURL() throw new UnsupportedOperationException(); } - @Override - public boolean isRequestedSessionIdFromUrl() - { - throw new UnsupportedOperationException(); - } - @Override public boolean authenticate(HttpServletResponse response) { @@ -257,7 +251,7 @@ public Collection getParts() } @Override - public Part getPart(String name) + public Part getPart(String s) { throw new UnsupportedOperationException(); } @@ -412,12 +406,6 @@ public RequestDispatcher getRequestDispatcher(String path) throw new UnsupportedOperationException(); } - @Override - public String getRealPath(String path) - { - throw new UnsupportedOperationException(); - } - @Override public int getRemotePort() { @@ -485,4 +473,22 @@ public DispatcherType getDispatcherType() { throw new UnsupportedOperationException(); } + + @Override + public String getRequestId() + { + throw new UnsupportedOperationException(); + } + + @Override + public String getProtocolRequestId() + { + throw new UnsupportedOperationException(); + } + + @Override + public ServletConnection getServletConnection() + { + throw new UnsupportedOperationException(); + } } diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestGenerateTokenFilter.java b/presto-main/src/test/java/com/facebook/presto/server/TestGenerateTokenFilter.java index efe96e18b25f7..a5c1098221ee2 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestGenerateTokenFilter.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestGenerateTokenFilter.java @@ -23,15 +23,14 @@ import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Module; +import jakarta.inject.Qualifier; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; 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 java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -44,8 +43,8 @@ import static com.facebook.airlift.jaxrs.JaxrsBinder.jaxrsBinder; import static com.facebook.airlift.testing.Assertions.assertInstanceOf; import static com.facebook.airlift.testing.Closeables.closeQuietly; +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.testng.Assert.assertEquals; @Test(singleThreaded = true) diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestHttpRequestSessionContext.java b/presto-main/src/test/java/com/facebook/presto/server/TestHttpRequestSessionContext.java index 221950a2de9d3..b771190025c8f 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestHttpRequestSessionContext.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestHttpRequestSessionContext.java @@ -28,11 +28,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; - import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.EnumSet; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestParseToJsonData.java b/presto-main/src/test/java/com/facebook/presto/server/TestParseToJsonData.java similarity index 100% rename from presto-main-base/src/test/java/com/facebook/presto/server/TestParseToJsonData.java rename to presto-main/src/test/java/com/facebook/presto/server/TestParseToJsonData.java diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestQuerySessionSupplier.java b/presto-main/src/test/java/com/facebook/presto/server/TestQuerySessionSupplier.java index 48f61396de1a9..bcde6328970ff 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestQuerySessionSupplier.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestQuerySessionSupplier.java @@ -29,10 +29,9 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.util.Locale; import static com.facebook.airlift.json.JsonCodec.jsonCodec; diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestServer.java b/presto-main/src/test/java/com/facebook/presto/server/TestServer.java index 45b913f62a199..5ba0d2433f330 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestServer.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestServer.java @@ -79,13 +79,13 @@ import static com.facebook.presto.server.TestHttpRequestSessionContext.urlEncode; import static com.facebook.presto.spi.StandardErrorCode.INCOMPATIBLE_CLIENT; import static com.facebook.presto.spi.page.PagesSerdeUtil.readSerializedPage; +import static jakarta.ws.rs.core.HttpHeaders.CACHE_CONTROL; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static java.lang.Integer.parseInt; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.ws.rs.core.HttpHeaders.CACHE_CONTROL; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestThreadResource.java b/presto-main/src/test/java/com/facebook/presto/server/TestThreadResource.java similarity index 100% rename from presto-main-base/src/test/java/com/facebook/presto/server/TestThreadResource.java rename to presto-main/src/test/java/com/facebook/presto/server/TestThreadResource.java diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java b/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java index 2ff77ebfefec2..053496185fbaf 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java @@ -54,12 +54,11 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; +import jakarta.inject.Singleton; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.inject.Singleton; - import java.util.List; import java.util.Optional; diff --git a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java index a5a5a1bf88a65..20240cb0e5e36 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java +++ b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java @@ -90,23 +90,22 @@ import com.google.inject.Scopes; import io.airlift.units.DataSize; import io.airlift.units.Duration; +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.testng.annotations.DataProvider; 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 java.lang.reflect.Method; import java.net.URI; import java.util.HashMap; diff --git a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java index e97cd8e37a2aa..46cce8fd10573 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java +++ b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java @@ -89,23 +89,22 @@ import com.google.inject.Scopes; import io.airlift.units.DataSize; import io.airlift.units.Duration; +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.testng.annotations.DataProvider; 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 java.lang.reflect.Method; import java.net.URI; import java.util.HashMap; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java b/presto-main/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java similarity index 99% rename from presto-main-base/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java rename to presto-main/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java index b48fb2ee539c8..f187c94954b5b 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java +++ b/presto-main/src/test/java/com/facebook/presto/server/security/TestCustomPrestoAuthenticator.java @@ -21,10 +21,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.security.Principal; import java.util.List; import java.util.Map; diff --git a/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java b/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java index a4f976269685c..0102cce8a1f95 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java +++ b/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java @@ -20,19 +20,18 @@ import com.google.common.hash.Hashing; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import jakarta.ws.rs.container.ResourceInfo; import org.testng.annotations.Test; -import javax.ws.rs.container.ResourceInfo; - import java.lang.reflect.Method; import java.time.ZonedDateTime; import java.util.Date; import java.util.Optional; import static com.facebook.presto.server.InternalAuthenticationManager.PRESTO_INTERNAL_BEARER; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/presto-main/src/test/java/com/facebook/presto/server/security/TestJsonWebTokenAuthenticator.java b/presto-main/src/test/java/com/facebook/presto/server/security/TestJsonWebTokenAuthenticator.java index 761ac37033c91..7f447c3a0ac66 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/security/TestJsonWebTokenAuthenticator.java +++ b/presto-main/src/test/java/com/facebook/presto/server/security/TestJsonWebTokenAuthenticator.java @@ -20,12 +20,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import io.jsonwebtoken.Jwts; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.io.IOException; import java.nio.file.Path; import java.security.Principal; diff --git a/presto-memory-context/src/main/java/com/facebook/presto/memory/context/AbstractAggregatedMemoryContext.java b/presto-memory-context/src/main/java/com/facebook/presto/memory/context/AbstractAggregatedMemoryContext.java index 4df13a7e2cf50..1a39c36a75741 100644 --- a/presto-memory-context/src/main/java/com/facebook/presto/memory/context/AbstractAggregatedMemoryContext.java +++ b/presto-memory-context/src/main/java/com/facebook/presto/memory/context/AbstractAggregatedMemoryContext.java @@ -15,10 +15,9 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; - -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 static com.google.common.base.MoreObjects.toStringHelper; import static java.lang.String.format; diff --git a/presto-memory-context/src/main/java/com/facebook/presto/memory/context/MemoryTrackingContext.java b/presto-memory-context/src/main/java/com/facebook/presto/memory/context/MemoryTrackingContext.java index b9f1256b57cf5..9ab8e257f222f 100644 --- a/presto-memory-context/src/main/java/com/facebook/presto/memory/context/MemoryTrackingContext.java +++ b/presto-memory-context/src/main/java/com/facebook/presto/memory/context/MemoryTrackingContext.java @@ -14,8 +14,7 @@ package com.facebook.presto.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/presto-memory-context/src/main/java/com/facebook/presto/memory/context/SimpleLocalMemoryContext.java b/presto-memory-context/src/main/java/com/facebook/presto/memory/context/SimpleLocalMemoryContext.java index 8a6d9d6d84d68..0878534936855 100644 --- a/presto-memory-context/src/main/java/com/facebook/presto/memory/context/SimpleLocalMemoryContext.java +++ b/presto-memory-context/src/main/java/com/facebook/presto/memory/context/SimpleLocalMemoryContext.java @@ -15,9 +15,8 @@ import com.google.common.util.concurrent.Futures; 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/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java index f9ad6dbefc3c2..1dc2f6fe492c5 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.DataSize; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class MemoryConfig { diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConnector.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConnector.java index a82851bbae1ed..f316bdf59766a 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConnector.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConnector.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; public class MemoryConnector implements Connector diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryMetadata.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryMetadata.java index 620f2da4aae29..82232eb153f70 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryMetadata.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryMetadata.java @@ -40,10 +40,9 @@ import com.facebook.presto.spi.statistics.ComputedStatistics; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.slice.Slice; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSinkProvider.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSinkProvider.java index 88215b0300253..24ecb8d8947d4 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSinkProvider.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSinkProvider.java @@ -26,8 +26,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collection; import java.util.concurrent.CompletableFuture; diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSourceProvider.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSourceProvider.java index ef69bad294cb8..8dbc30f4170e0 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSourceProvider.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPageSourceProvider.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.SplitContext; import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPagesStore.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPagesStore.java index 7876b66547e8d..17b1f40db3e44 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPagesStore.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryPagesStore.java @@ -17,10 +17,9 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemorySplitManager.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemorySplitManager.java index 32984dbc70b9f..f7a71959c33f9 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemorySplitManager.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemorySplitManager.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientConfig.java b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientConfig.java index ebbb1833b7f88..07987c290c365 100644 --- a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientConfig.java +++ b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientConfig.java @@ -21,10 +21,9 @@ import com.mongodb.ServerAddress; import com.mongodb.Tag; import com.mongodb.TagSet; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Arrays; import java.util.List; diff --git a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientModule.java b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientModule.java index 0043ffe230e16..63a879c7f50a9 100644 --- a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientModule.java +++ b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoClientModule.java @@ -20,8 +20,7 @@ import com.google.inject.Scopes; import com.mongodb.MongoClient; import com.mongodb.MongoClientOptions; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static java.util.Objects.requireNonNull; diff --git a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoConnector.java b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoConnector.java index b59394c81aa98..b21f6fdf4511c 100644 --- a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoConnector.java +++ b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoConnector.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSinkProvider.java b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSinkProvider.java index c2859865c5821..0cc77b794cb3a 100644 --- a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSinkProvider.java +++ b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSinkProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.PageSinkContext; import com.facebook.presto.spi.connector.ConnectorPageSinkProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; diff --git a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSourceProvider.java b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSourceProvider.java index 6e9754184d5b9..e4ef71ce59adf 100644 --- a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSourceProvider.java +++ b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoPageSourceProvider.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoSplitManager.java b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoSplitManager.java index ac8f76701a116..8012387ca9141 100644 --- a/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoSplitManager.java +++ b/presto-mongodb/src/main/java/com/facebook/presto/mongodb/MongoSplitManager.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClient.java b/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClient.java index 3277bc25221a2..419ddbeedad24 100644 --- a/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClient.java +++ b/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClient.java @@ -35,8 +35,7 @@ import com.google.common.collect.ImmutableSet; import com.mysql.cj.jdbc.JdbcStatement; import com.mysql.jdbc.Driver; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -74,9 +73,11 @@ public class MySqlClient /** * Error code corresponding to code thrown when a table already exists. * The code is derived from the MySQL documentation. + * * @see MySQL documentation */ private static final String SQL_STATE_ER_TABLE_EXISTS_ERROR = "42S01"; + @Inject public MySqlClient(JdbcConnectorId connectorId, BaseJdbcConfig config, MySqlConfig mySqlConfig) throws SQLException @@ -208,7 +209,8 @@ protected String toSqlType(Type type) } @Override - public PreparedStatement buildSql(ConnectorSession session, Connection connection, JdbcSplit split, List columnHandles) throws SQLException + public PreparedStatement buildSql(ConnectorSession session, Connection connection, JdbcSplit split, List columnHandles) + throws SQLException { Map columnExpressions = columnHandles.stream() .filter(handle -> handle.getJdbcTypeHandle().getJdbcTypeName().equalsIgnoreCase(GEOMETRY)) diff --git a/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java b/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java index 6425d3f57abc7..e2865b212c68a 100644 --- a/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java +++ b/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.Duration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import java.util.concurrent.TimeUnit; diff --git a/presto-native-execution/presto_cpp/presto_protocol/core/special/Distribution.java b/presto-native-execution/presto_cpp/presto_protocol/core/special/Distribution.java index fb8565c9d1c47..d04b4d343db7c 100644 --- a/presto-native-execution/presto_cpp/presto_protocol/core/special/Distribution.java +++ b/presto-native-execution/presto_cpp/presto_protocol/core/special/Distribution.java @@ -22,8 +22,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.concurrent.GuardedBy; + +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; @ThreadSafe diff --git a/presto-native-execution/src/checkstyle/presto-checks.xml b/presto-native-execution/src/checkstyle/presto-checks.xml index 96b8e427af01e..4b85729921537 100644 --- a/presto-native-execution/src/checkstyle/presto-checks.xml +++ b/presto-native-execution/src/checkstyle/presto-checks.xml @@ -85,7 +85,7 @@ - + diff --git a/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/functionNamespace/NativeFunctionNamespaceManager.java b/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/functionNamespace/NativeFunctionNamespaceManager.java index 214975bcfc536..11ef917f5522d 100644 --- a/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/functionNamespace/NativeFunctionNamespaceManager.java +++ b/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/functionNamespace/NativeFunctionNamespaceManager.java @@ -57,8 +57,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.UncheckedExecutionException; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/nativechecker/PlanConversionFailureInfo.java b/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/nativechecker/PlanConversionFailureInfo.java index a0be3a25cb8b3..c9d9e485f4067 100644 --- a/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/nativechecker/PlanConversionFailureInfo.java +++ b/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/nativechecker/PlanConversionFailureInfo.java @@ -17,9 +17,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/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleClient.java b/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleClient.java index b0ba97b8e6dfa..ec7cf855bd0b2 100644 --- a/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleClient.java +++ b/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleClient.java @@ -25,8 +25,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.SchemaTableName; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleConfig.java b/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleConfig.java index f651844a49dd3..925e4cfdc1848 100644 --- a/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleConfig.java +++ b/presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleConfig.java @@ -14,10 +14,9 @@ package com.facebook.presto.plugin.oracle; import com.facebook.airlift.configuration.Config; - -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/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java index f1ac0f465b71b..0935e2fb2661f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcOutputBuffer.java @@ -24,10 +24,9 @@ import io.airlift.compress.snappy.SnappyCompressor; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java index 92c5cc1f2d5aa..364d5f8f9933f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcSelectiveRecordReader.java @@ -44,11 +44,10 @@ import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.ArrayList; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java index 3a9db53789f18..b1fb7fe3ad46c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java @@ -56,11 +56,10 @@ import it.unimi.dsi.fastutil.ints.Int2LongMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.Closeable; import java.io.IOException; import java.util.ArrayList; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java index f82426f0358a7..616a2579a9450 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatistics.java @@ -15,10 +15,9 @@ import com.facebook.presto.orc.metadata.statistics.StatisticsHasher.Hashable; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Objects; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java index f0b21ca712f39..cdbd33496c8ee 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/AbstractLongSelectiveStreamReader.java @@ -20,10 +20,9 @@ import com.facebook.presto.common.block.LongArrayBlock; import com.facebook.presto.common.block.ShortArrayBlock; import com.facebook.presto.common.type.Type; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Optional; import static com.facebook.presto.common.array.Arrays.ensureCapacity; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java index 02b4d879fdca0..6b3e0f730b179 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanBatchStreamReader.java @@ -25,10 +25,9 @@ import com.facebook.presto.orc.stream.BooleanInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java index c2d0c9cca6530..21688f5db2b09 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanSelectiveStreamReader.java @@ -25,10 +25,9 @@ import com.facebook.presto.orc.stream.BooleanInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java index f70024711549c..db74427ea2a94 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteBatchStreamReader.java @@ -26,10 +26,9 @@ import com.facebook.presto.orc.stream.ByteInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java index 6ccf757ac6301..47b8c8e621d2a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteSelectiveStreamReader.java @@ -26,10 +26,9 @@ import com.facebook.presto.orc.stream.ByteInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java index 3a273885c96d2..a6a68e67cd227 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DecimalBatchStreamReader.java @@ -29,10 +29,9 @@ import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import static com.facebook.presto.common.type.UnscaledDecimal128Arithmetic.rescale; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java index 5e574baa57bf1..c9506616e212e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleBatchStreamReader.java @@ -25,10 +25,9 @@ import com.facebook.presto.orc.stream.DoubleInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import static com.facebook.presto.common.type.DoubleType.DOUBLE; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java index 23055227a48bd..96f8f6cfd8a10 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleSelectiveStreamReader.java @@ -26,10 +26,9 @@ import com.facebook.presto.orc.stream.DoubleInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java index f568bccbba086..85bfc7849a593 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatBatchStreamReader.java @@ -25,10 +25,9 @@ import com.facebook.presto.orc.stream.FloatInputStream; import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import static com.facebook.presto.common.type.RealType.REAL; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java index 1e719ca272498..6b0ed8beaf477 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListBatchStreamReader.java @@ -27,11 +27,10 @@ import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; import com.google.common.io.Closer; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java index 03fa6e3c98864..e2bac1a7f0a8d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListFilter.java @@ -18,10 +18,9 @@ import com.facebook.presto.common.predicate.TupleDomainFilter.NullsFilter; import com.facebook.presto.common.predicate.TupleDomainFilter.PositionalFilter; import com.facebook.presto.orc.StreamDescriptor; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Map; import java.util.function.Predicate; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java index 31504b638db2a..fc88391d5d1b5 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ListSelectiveStreamReader.java @@ -35,11 +35,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java index 4f89949600744..4405c095d129d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryBatchStreamReader.java @@ -30,10 +30,9 @@ import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java index 4d1708fdc108f..0427659cdb7a7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionarySelectiveStreamReader.java @@ -23,10 +23,9 @@ import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Arrays; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java index 61214a15597ef..a5194b7049264 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectBatchStreamReader.java @@ -32,10 +32,9 @@ import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; import java.util.function.LongFunction; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java index 06fc3a87dcdd7..316536b488206 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectSelectiveStreamReader.java @@ -23,10 +23,9 @@ import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import static com.facebook.presto.common.block.ClosingBlockLease.newLease; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java index fe206583217fe..2d7953ef4ac0c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongSelectiveStreamReader.java @@ -23,10 +23,9 @@ import com.facebook.presto.orc.metadata.ColumnEncoding; import com.facebook.presto.orc.stream.InputStreamSources; import com.google.common.io.Closer; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java index dfab6ff73a1c7..196e5013f2176 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectBatchStreamReader.java @@ -27,11 +27,10 @@ import com.facebook.presto.orc.stream.LongInputStream; import com.google.common.io.Closer; import it.unimi.dsi.fastutil.ints.IntArrayList; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java index fe30be34acf7d..101a3aeb7eabe 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapDirectSelectiveStreamReader.java @@ -38,11 +38,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java index 8a7101453407f..e467ec21fd568 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatBatchStreamReader.java @@ -37,11 +37,10 @@ import com.google.common.io.Closer; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.ArrayList; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java index ec40e08bd520d..ab2719e5ae555 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapFlatSelectiveStreamReader.java @@ -47,11 +47,10 @@ import io.airlift.slice.SizeOf; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java index 6364e05d90a5e..e547b566782b7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/MapSelectiveStreamReader.java @@ -25,11 +25,10 @@ import com.facebook.presto.orc.Stripe; import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; import com.facebook.presto.orc.stream.InputStreamSources; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SelectiveReaderContext.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SelectiveReaderContext.java index 8b764bf1131ed..f5a7ef1fdd0c7 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SelectiveReaderContext.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SelectiveReaderContext.java @@ -18,8 +18,7 @@ import com.facebook.presto.orc.OrcAggregatedMemoryContext; import com.facebook.presto.orc.StreamDescriptor; import com.facebook.presto.orc.stream.BooleanInputStream; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java index 8778bcc82ab72..1587df1d08929 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryBatchStreamReader.java @@ -27,10 +27,9 @@ import com.facebook.presto.orc.stream.LongInputStream; import com.facebook.presto.orc.stream.RowGroupDictionaryLengthInputStream; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Arrays; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java index 5143838a37a30..ff96fe90f7d65 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionarySelectiveReader.java @@ -33,10 +33,9 @@ import com.facebook.presto.orc.stream.RowGroupDictionaryLengthInputStream; import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Arrays; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java index e28b6bec25e25..bce6275a0e17c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectBatchStreamReader.java @@ -27,10 +27,9 @@ import com.facebook.presto.orc.stream.LongInputStream; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java index a531b389f4aec..00a3556d3e35a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectSelectiveStreamReader.java @@ -32,10 +32,9 @@ import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java index caf6f848cbfdd..ed7076ad1b634 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceSelectiveStreamReader.java @@ -27,10 +27,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.io.Closer; import io.airlift.slice.Slice; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java index e91ea0ac5c8fb..555b24cac7ef0 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructBatchStreamReader.java @@ -31,11 +31,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.io.Closer; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Arrays; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java index 69c052881e7c7..43c536cf84410 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java @@ -35,11 +35,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampBatchStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampBatchStreamReader.java index 463ef6c0d9c2c..4792574d1ff73 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampBatchStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampBatchStreamReader.java @@ -26,11 +26,10 @@ import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; +import jakarta.annotation.Nullable; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampSelectiveStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampSelectiveStreamReader.java index f727f9e68f3bb..9f8aaa31c41d3 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampSelectiveStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampSelectiveStreamReader.java @@ -27,12 +27,11 @@ import com.facebook.presto.orc.stream.InputStreamSource; import com.facebook.presto.orc.stream.InputStreamSources; import com.facebook.presto.orc.stream.LongInputStream; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.IOException; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/CheckpointInputStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/CheckpointInputStreamSource.java index 5ffc32db100e0..f6a2cc285ab4d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/CheckpointInputStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/CheckpointInputStreamSource.java @@ -14,8 +14,7 @@ package com.facebook.presto.orc.stream; import com.facebook.presto.orc.checkpoint.StreamCheckpoint; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/InputStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/InputStreamSource.java index b0148cde3fb81..f29a9caa0ae88 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/InputStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/InputStreamSource.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.orc.stream; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingInputStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingInputStreamSource.java index defd763b7ebb9..cede8d39ccbb4 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingInputStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingInputStreamSource.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.orc.stream; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java index 5245f4d74efb2..e7a791f190031 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/PresentOutputStream.java @@ -17,10 +17,9 @@ import com.facebook.presto.orc.DwrfDataEncryptor; import com.facebook.presto.orc.OrcOutputBuffer; import com.facebook.presto.orc.checkpoint.BooleanStreamCheckpoint; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/SharedBuffer.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/SharedBuffer.java index 678f92f7b6113..755eb7f165c36 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/SharedBuffer.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/SharedBuffer.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.orc.stream; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.orc.OrcLocalMemoryContext; -import javax.annotation.concurrent.NotThreadSafe; - import static java.util.Objects.requireNonNull; @NotThreadSafe diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/ValueInputStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ValueInputStreamSource.java index 3ebcf1c0f38ae..1d0940534efdc 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/ValueInputStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ValueInputStreamSource.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.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/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java index 405b714aa69f5..01bbdf8cb3c07 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/CompressionBufferPool.java @@ -13,10 +13,9 @@ */ package com.facebook.presto.orc.writer; +import com.facebook.airlift.concurrent.NotThreadSafe; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.concurrent.NotThreadSafe; - import static io.airlift.slice.SizeOf.sizeOf; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java index 289bd405b5aaf..2d1cceda6aa2d 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/DictionaryRowGroupBuilder.java @@ -14,10 +14,9 @@ package com.facebook.presto.orc.writer; import com.facebook.presto.orc.metadata.statistics.ColumnStatistics; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.util.Arrays; import static com.google.common.base.Preconditions.checkState; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java index 6aa01e2f3a4fa..d6701570e7234 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java @@ -36,6 +36,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.Immutable; import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -55,8 +56,6 @@ import org.openjdk.jmh.runner.options.VerboseMode; import org.testng.annotations.Test; -import javax.annotation.concurrent.Immutable; - import java.io.File; import java.io.IOException; import java.math.BigInteger; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/PrimitiveColumnWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/PrimitiveColumnWriter.java index 6904494d98f1b..1c28be16f9299 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/PrimitiveColumnWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/PrimitiveColumnWriter.java @@ -21,6 +21,7 @@ import com.facebook.presto.parquet.writer.valuewriter.PrimitiveValueWriter; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slices; +import jakarta.annotation.Nullable; import org.apache.parquet.bytes.BytesInput; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.Encoding; @@ -30,8 +31,6 @@ import org.apache.parquet.format.converter.ParquetMetadataConverter; import org.apache.parquet.hadoop.metadata.CompressionCodecName; -import javax.annotation.Nullable; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/valuewriter/UuidValuesWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/valuewriter/UuidValuesWriter.java index fb728004b245c..5ad6eb2f96709 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/valuewriter/UuidValuesWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/valuewriter/UuidValuesWriter.java @@ -13,13 +13,12 @@ */ package com.facebook.presto.parquet.writer.valuewriter; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.common.block.Block; import org.apache.parquet.column.values.ValuesWriter; import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.PrimitiveType; -import javax.annotation.concurrent.NotThreadSafe; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.function.Supplier; diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/ExpressionFormatter.java b/presto-parser/src/main/java/com/facebook/presto/sql/ExpressionFormatter.java index 29549470dae9e..e2e5ec7393ec2 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/ExpressionFormatter.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/ExpressionFormatter.java @@ -96,7 +96,7 @@ import static com.facebook.presto.sql.SqlFormatter.formatSql; import static com.facebook.presto.sql.tree.TableVersionExpression.TableVersionOperator.EQUAL; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.lang.String.format; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; @@ -759,7 +759,7 @@ static String formatGroupBy(List groupingElements, Optional columns = ((SimpleGroupBy) groupingElement).getExpressions(); if (columns.size() == 1) { - result = formatExpression(getOnlyElement(columns), parameters); + result = formatExpression(columns.stream().collect(onlyElement()), parameters); } else { result = formatGroupingSet(columns, parameters); diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java b/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java index 6c9c00aa4808b..ae8db5184f754 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java @@ -141,7 +141,7 @@ import static com.facebook.presto.sql.ExpressionFormatter.formatStringLiteral; import static com.facebook.presto.sql.tree.ConstraintSpecification.ConstraintType.UNIQUE; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.lang.String.format; import static java.util.stream.Collectors.joining; @@ -378,7 +378,7 @@ protected Void visitSelect(Select node, Integer indent) } else { builder.append(' '); - process(getOnlyElement(node.getSelectItems()), indent); + process(node.getSelectItems().stream().collect(onlyElement()), indent); } builder.append('\n'); diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/parser/AstBuilder.java b/presto-parser/src/main/java/com/facebook/presto/sql/parser/AstBuilder.java index f50326ec8d429..54bd52da69a3f 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/parser/AstBuilder.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/parser/AstBuilder.java @@ -218,7 +218,7 @@ import static com.facebook.presto.sql.tree.TableVersionExpression.timestampExpression; import static com.facebook.presto.sql.tree.TableVersionExpression.versionExpression; import static com.google.common.collect.ImmutableList.toImmutableList; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; @@ -1355,21 +1355,21 @@ public Node visitLogicalBinary(SqlBaseParser.LogicalBinaryContext context) if (operator.equals(LogicalBinaryExpression.Operator.OR) && (mixedAndOrOperatorParenthesisCheck(right, context.right, LogicalBinaryExpression.Operator.AND) || - mixedAndOrOperatorParenthesisCheck(left, context.left, LogicalBinaryExpression.Operator.AND))) { + mixedAndOrOperatorParenthesisCheck(left, context.left, LogicalBinaryExpression.Operator.AND))) { warningForMixedAndOr = true; } if (operator.equals(LogicalBinaryExpression.Operator.AND) && (mixedAndOrOperatorParenthesisCheck(right, context.right, LogicalBinaryExpression.Operator.OR) || - mixedAndOrOperatorParenthesisCheck(left, context.left, LogicalBinaryExpression.Operator.OR))) { + mixedAndOrOperatorParenthesisCheck(left, context.left, LogicalBinaryExpression.Operator.OR))) { warningForMixedAndOr = true; } if (warningForMixedAndOr) { warningConsumer.accept(new ParsingWarning( "The query contains OR and AND operators without proper parentheses. " - + "Make sure the operators are guarded by parentheses in order " - + "to fetch logically correct results.", + + "Make sure the operators are guarded by parentheses in order " + + "to fetch logically correct results.", context.getStart().getLine(), context.getStart().getCharPositionInLine())); } @@ -1893,7 +1893,7 @@ public Node visitFunctionCall(SqlBaseParser.FunctionCallContext context) check(!distinct, "DISTINCT not valid for 'try' function", context); check(!filter.isPresent(), "FILTER not valid for 'try' function", context); - return new TryExpression(getLocation(context), (Expression) visit(getOnlyElement(context.expression()))); + return new TryExpression(getLocation(context), (Expression) visit(context.expression().stream().collect(onlyElement()))); } if (name.toString().equalsIgnoreCase("$internal$bind")) { @@ -2767,7 +2767,7 @@ private boolean mixedAndOrOperatorParenthesisCheck(Expression expression, SqlBas if (((LogicalBinaryExpression) expression).getOperator().equals(operator)) { if (node.children.get(0) instanceof SqlBaseParser.ValueExpressionDefaultContext) { return !(((SqlBaseParser.PredicatedContext) node).valueExpression().getChild(0) instanceof - SqlBaseParser.ParenthesizedExpressionContext); + SqlBaseParser.ParenthesizedExpressionContext); } else { return true; diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/parser/RefreshableSqlBaseParserInitializer.java b/presto-parser/src/main/java/com/facebook/presto/sql/parser/RefreshableSqlBaseParserInitializer.java index d98103a305837..8caf39e75f13b 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/parser/RefreshableSqlBaseParserInitializer.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/parser/RefreshableSqlBaseParserInitializer.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.sql.parser; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/parser/SqlParser.java b/presto-parser/src/main/java/com/facebook/presto/sql/parser/SqlParser.java index a2967b74ccb61..b73d62d305524 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/parser/SqlParser.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/parser/SqlParser.java @@ -17,6 +17,7 @@ import com.facebook.presto.sql.tree.Node; import com.facebook.presto.sql.tree.Return; import com.facebook.presto.sql.tree.Statement; +import jakarta.inject.Inject; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonToken; @@ -33,8 +34,6 @@ import org.antlr.v4.runtime.misc.ParseCancellationException; import org.antlr.v4.runtime.tree.TerminalNode; -import javax.inject.Inject; - import java.util.Arrays; import java.util.EnumSet; import java.util.List; diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/testing/TreeAssertions.java b/presto-parser/src/main/java/com/facebook/presto/sql/testing/TreeAssertions.java index 0d0cd0a290a07..6f4d3f3c4e354 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/testing/TreeAssertions.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/testing/TreeAssertions.java @@ -21,8 +21,7 @@ import com.facebook.presto.sql.tree.Statement; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/AstVisitor.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/AstVisitor.java index 8f42707192a4a..f02b06ec24d30 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/tree/AstVisitor.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/tree/AstVisitor.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.sql.tree; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; public abstract class AstVisitor { diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/Extract.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/Extract.java index 57d335736b6c2..3dd9b30cf5144 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/tree/Extract.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/tree/Extract.java @@ -14,8 +14,7 @@ package com.facebook.presto.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/presto-parser/src/main/java/com/facebook/presto/sql/tree/QualifiedName.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/QualifiedName.java index 7ac1dc0cc7edf..299fb1ccfd08e 100644 --- a/presto-parser/src/main/java/com/facebook/presto/sql/tree/QualifiedName.java +++ b/presto-parser/src/main/java/com/facebook/presto/sql/tree/QualifiedName.java @@ -16,6 +16,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.google.common.collect.Streams; import java.util.List; import java.util.Optional; @@ -23,8 +24,7 @@ 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 com.google.common.collect.Iterables.isEmpty; +import static com.google.common.collect.Streams.stream; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; @@ -48,7 +48,7 @@ public static QualifiedName of(String name) public static QualifiedName of(Iterable originalParts) { requireNonNull(originalParts, "originalParts is null"); - checkArgument(!isEmpty(originalParts), "originalParts is empty"); + checkArgument(stream(originalParts).findAny().isPresent(), "originalParts is empty"); return new QualifiedName(ImmutableList.copyOf(originalParts)); } @@ -102,12 +102,12 @@ public boolean hasSuffix(QualifiedName suffix) public String getSuffix() { - return getLast(parts); + return Streams.findLast(parts.stream()).orElseThrow(() -> new IllegalStateException("No suffix found for " + this)); } public Identifier getOriginalSuffix() { - return getLast(originalParts); + return Streams.findLast(originalParts.stream()).orElseThrow(() -> new IllegalStateException("No original suffix found for " + this)); } @Override diff --git a/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileAuthenticator.java b/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileAuthenticator.java index 0ecb20759c016..6883f89c4924f 100644 --- a/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileAuthenticator.java +++ b/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileAuthenticator.java @@ -17,8 +17,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.spi.security.AccessDeniedException; import com.facebook.presto.spi.security.PasswordAuthenticator; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.FileNotFoundException; diff --git a/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java b/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java index da9cc401122a6..fc2c94f2c3eac 100644 --- a/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java +++ b/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java @@ -18,8 +18,7 @@ import com.facebook.airlift.configuration.ConfigSecuritySensitive; 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/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapAuthenticator.java b/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapAuthenticator.java index 8cad20a4aa75f..25b452e934798 100644 --- a/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapAuthenticator.java +++ b/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapAuthenticator.java @@ -23,8 +23,8 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.UncheckedExecutionException; +import jakarta.inject.Inject; -import javax.inject.Inject; import javax.naming.AuthenticationException; import javax.naming.NamingEnumeration; import javax.naming.NamingException; diff --git a/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java b/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java index e0e8ddf434a44..fe2280474d29f 100644 --- a/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java +++ b/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java @@ -16,9 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.Duration; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import java.util.concurrent.TimeUnit; diff --git a/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java b/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java index b73d9cbc279b4..4f92e9d30b410 100644 --- a/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java +++ b/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java @@ -16,11 +16,10 @@ import com.google.common.collect.ImmutableMap; import io.airlift.units.Duration; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.testng.annotations.Test; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/ForPinot.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/ForPinot.java index e570b18583727..0a7fa18e26db7 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/ForPinot.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/ForPinot.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.pinot; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotClusterInfoFetcher.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotClusterInfoFetcher.java index 79bf6af0422ec..16003b4e72b62 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotClusterInfoFetcher.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotClusterInfoFetcher.java @@ -34,10 +34,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; import com.google.common.net.HttpHeaders; +import jakarta.inject.Inject; import org.apache.pinot.spi.data.Schema; -import javax.inject.Inject; - import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java index 679bfd61c3713..c514877da4813 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java @@ -22,9 +22,8 @@ import io.airlift.units.DataSize; 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 java.util.List; import java.util.Map; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnection.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnection.java index 00c68d983ee6f..814cc534eb45f 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnection.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnection.java @@ -17,10 +17,9 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import jakarta.inject.Inject; import org.apache.pinot.spi.data.Schema; -import javax.inject.Inject; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnector.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnector.java index bdd8f6d7fa186..e0a4f1a242e61 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnector.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConnector.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Set; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetadata.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetadata.java index 81107f4408b3f..6dd350c8e7491 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetadata.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetadata.java @@ -29,8 +29,7 @@ import com.facebook.presto.spi.connector.ConnectorMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetrics.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetrics.java index 54ded495fb423..e570725b768f7 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetrics.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetrics.java @@ -15,11 +15,10 @@ import com.facebook.airlift.http.client.Request; import com.facebook.airlift.http.client.StringResponseHandler.StringResponse; +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; - import java.util.concurrent.TimeUnit; import static java.util.Locale.ENGLISH; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetricsStats.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetricsStats.java index 842dc11ee0b1f..c7dd6d408934a 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetricsStats.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotMetricsStats.java @@ -17,11 +17,10 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.DistributionStat; import com.facebook.airlift.stats.TimeStat; +import com.google.errorprone.annotations.ThreadSafe; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; - import java.util.concurrent.TimeUnit; import static com.facebook.presto.pinot.PinotUtils.isValidPinotHttpResponseCode; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java index 950955ca1b1b4..112daf04cac43 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java @@ -25,8 +25,7 @@ import com.google.inject.Scopes; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.Executor; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java index 81ae13ae533f0..68a55af824233 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java @@ -26,11 +26,10 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; +import jakarta.inject.Inject; import org.apache.pinot.common.config.GrpcConfig; import org.apache.pinot.connector.presto.grpc.PinotStreamingQueryClient; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPlanOptimizer.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPlanOptimizer.java index 0e437490b26e2..d0cb7d3d3a0e6 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPlanOptimizer.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPlanOptimizer.java @@ -35,8 +35,7 @@ import com.facebook.presto.spi.relation.RowExpression; import com.facebook.presto.spi.relation.VariableReferenceExpression; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSessionProperties.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSessionProperties.java index 4971ad29c7983..614ee9bc647de 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSessionProperties.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSessionProperties.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSplitManager.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSplitManager.java index 8e0e22f35b3ed..4cf58a4572720 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSplitManager.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSplitManager.java @@ -26,10 +26,9 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.Iterables; +import jakarta.inject.Inject; 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/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/RebindSafeMBeanServer.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/RebindSafeMBeanServer.java index 1b7f8b8312660..37e63d2ee8e3f 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/RebindSafeMBeanServer.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/RebindSafeMBeanServer.java @@ -27,7 +27,8 @@ */ package com.facebook.presto.pinot; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; + import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotBrokerAuthenticationProvider.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotBrokerAuthenticationProvider.java index d34918c835f6d..ef812d5ca1dfd 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotBrokerAuthenticationProvider.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotBrokerAuthenticationProvider.java @@ -18,8 +18,7 @@ import com.facebook.presto.pinot.auth.none.PinotEmptyAuthenticationProvider; import com.facebook.presto.pinot.auth.password.PinotPasswordAuthenticationProvider; import com.facebook.presto.spi.ConnectorSession; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotControllerAuthenticationProvider.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotControllerAuthenticationProvider.java index 7b580e674e539..b8d1ead122968 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotControllerAuthenticationProvider.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/auth/PinotControllerAuthenticationProvider.java @@ -18,8 +18,7 @@ import com.facebook.presto.pinot.auth.none.PinotEmptyAuthenticationProvider; import com.facebook.presto.pinot.auth.password.PinotPasswordAuthenticationProvider; import com.facebook.presto.spi.ConnectorSession; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/query/PinotQueryGenerator.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/query/PinotQueryGenerator.java index 03986f5ed99c5..d3f15c3d948c9 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/query/PinotQueryGenerator.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/query/PinotQueryGenerator.java @@ -48,8 +48,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.HashSet; diff --git a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java index 1e88676691c1e..613f5cb886307 100644 --- a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java +++ b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java @@ -20,13 +20,11 @@ import com.facebook.presto.client.StatementClient; import com.facebook.presto.sql.parser.SqlParserOptions; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; +import jakarta.inject.Inject; import okhttp3.OkHttpClient; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.inject.Inject; - import java.net.URI; import java.security.Principal; import java.util.List; diff --git a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginScheduler.java b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginScheduler.java index c128a5807af9f..c8981a89fb8f0 100644 --- a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginScheduler.java +++ b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginScheduler.java @@ -15,8 +15,7 @@ import com.facebook.presto.spi.router.RouterRequestInfo; import com.facebook.presto.spi.router.Scheduler; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; import java.util.List; diff --git a/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerRouterPlugin.java b/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerRouterPlugin.java index f3535ab574b51..7f7894c0d8aa7 100644 --- a/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerRouterPlugin.java +++ b/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerRouterPlugin.java @@ -24,11 +24,10 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ListMultimap; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.net.URI; import java.util.Enumeration; import java.util.List; @@ -117,7 +116,7 @@ public void testPlanCheckerPluginWithNativeCompatibleQueries() PRESTO_SCHEMA, "tiny"), "SELECT lower(comment) from region")); assertTrue(target.isPresent()); - assertEquals(target.get(), planCheckerRouterConfig.getNativeRouterURI()); + assertEquals(target.orElseThrow(), planCheckerRouterConfig.getNativeRouterURI()); } @Test @@ -137,7 +136,7 @@ public void testPlanCheckerPluginWithNativeIncompatibleQueries() PRESTO_SCHEMA, "tiny"), "SELECT x AS y FROM (values (1,2), (2,3)) t(x, y) GROUP BY x ORDER BY apply(x, x -> -x) + 2*x")); assertTrue(target.isPresent()); - assertEquals(target.get(), planCheckerRouterConfig.getJavaRouterURI()); + assertEquals(target.orElseThrow(), planCheckerRouterConfig.getJavaRouterURI()); } private static RouterRequestInfo getMockRouterRequestInfo(ListMultimap headers, String query) diff --git a/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControl.java b/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControl.java index 2c7ea13f1806c..eabe1f548cd4a 100644 --- a/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControl.java +++ b/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControl.java @@ -28,8 +28,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.nio.file.Paths; import java.util.List; diff --git a/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java b/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java index b65e4f1461b15..c83d1a2d250c7 100644 --- a/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java +++ b/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class FileBasedAccessControlConfig { diff --git a/presto-postgresql/src/main/java/com/facebook/presto/plugin/postgresql/PostgreSqlClient.java b/presto-postgresql/src/main/java/com/facebook/presto/plugin/postgresql/PostgreSqlClient.java index 8de1c4ade3e84..db4b90cc89c14 100644 --- a/presto-postgresql/src/main/java/com/facebook/presto/plugin/postgresql/PostgreSqlClient.java +++ b/presto-postgresql/src/main/java/com/facebook/presto/plugin/postgresql/PostgreSqlClient.java @@ -39,10 +39,9 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; +import jakarta.inject.Inject; import org.postgresql.Driver; -import javax.inject.Inject; - import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/HivePartitioningTest.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/HivePartitioningTest.java index 83eca0a2edcbe..c3b14540c3308 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/HivePartitioningTest.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/HivePartitioningTest.java @@ -18,8 +18,7 @@ import io.prestodb.tempto.BeforeTestWithContext; import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.query.QueryResult; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.SQLException; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHivePartitionsTable.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHivePartitionsTable.java index 6e6f7085b5075..21a466c4cc49a 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHivePartitionsTable.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHivePartitionsTable.java @@ -24,10 +24,9 @@ import io.prestodb.tempto.fulfillment.table.hive.HiveDataSource; import io.prestodb.tempto.fulfillment.table.hive.HiveTableDefinition; import io.prestodb.tempto.query.QueryResult; +import jakarta.inject.Inject; import org.testng.annotations.Test; -import javax.inject.Inject; - import java.math.RoundingMode; import java.util.Optional; import java.util.stream.IntStream; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTableListCaching.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTableListCaching.java index 87dc3f996e52f..68a77f6dac68a 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTableListCaching.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTableListCaching.java @@ -20,10 +20,9 @@ import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.hadoop.hdfs.HdfsClient; import io.prestodb.tempto.query.QueryResult; +import jakarta.inject.Inject; import org.testng.annotations.Test; -import javax.inject.Inject; - import java.io.IOException; import static com.facebook.presto.tests.TestGroups.HIVE_LIST_CACHING; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTables.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTables.java index 6baaf6a7f0482..ba8253a0fccad 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTables.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSymlinkTables.java @@ -17,10 +17,9 @@ import com.google.inject.name.Named; import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.hadoop.hdfs.HdfsClient; +import jakarta.inject.Inject; import org.testng.annotations.Test; -import javax.inject.Inject; - import java.io.IOException; import static com.facebook.presto.tests.TestGroups.HIVE_SYMLINK_TABLE; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSyncPartitionMetadata.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSyncPartitionMetadata.java index 0ca528574a4e3..1705d6f60b062 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSyncPartitionMetadata.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestSyncPartitionMetadata.java @@ -20,10 +20,9 @@ import io.prestodb.tempto.hadoop.hdfs.HdfsClient; import io.prestodb.tempto.internal.hadoop.hdfs.HdfsDataSourceWriter; import io.prestodb.tempto.query.QueryResult; +import jakarta.inject.Inject; import org.testng.annotations.Test; -import javax.inject.Inject; - import static com.facebook.presto.tests.TestGroups.HIVE_PARTITIONING; import static com.facebook.presto.tests.TestGroups.SMOKE; import static io.prestodb.tempto.assertions.QueryAssert.Row.row; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/JdbcTests.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/JdbcTests.java index 7c9d155100336..06f66deb6fd2c 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/JdbcTests.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/JdbcTests.java @@ -23,11 +23,10 @@ import io.prestodb.tempto.configuration.Configuration; import io.prestodb.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableNationTable; import io.prestodb.tempto.query.QueryResult; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.testng.annotations.Test; -import javax.inject.Inject; -import javax.inject.Named; - import java.math.BigDecimal; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/querystats/QueryStatsClientModuleProvider.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/querystats/QueryStatsClientModuleProvider.java index 1b3080b0e7adb..a6e956ca6a129 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/querystats/QueryStatsClientModuleProvider.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/querystats/QueryStatsClientModuleProvider.java @@ -25,8 +25,7 @@ import io.prestodb.tempto.configuration.Configuration; import io.prestodb.tempto.initialization.AutoModuleProvider; import io.prestodb.tempto.initialization.SuiteModuleProvider; - -import javax.inject.Named; +import jakarta.inject.Named; import java.net.URI; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java index 555e5aba9e789..034bcea21b93f 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java @@ -23,11 +23,11 @@ import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import javax.inject.Inject; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClock.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClock.java index 98ea48e48dca7..28b148d125076 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClock.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClock.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.plugin.prometheus; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.Clock; import java.time.Instant; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnector.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnector.java index 91849fac3c25f..4a2ee5584b30c 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnector.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnector.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java index 5d270812380f5..0b96e62038135 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java @@ -21,9 +21,8 @@ import com.google.inject.spi.Message; 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/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusMetadata.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusMetadata.java index 9b2993f3076bb..bb223c7836421 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusMetadata.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusMetadata.java @@ -29,8 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusModule.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusModule.java index 5e2ac1feec63b..a62005ea4f822 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusModule.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusModule.java @@ -20,8 +20,7 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusRecordSetProvider.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusRecordSetProvider.java index c1131dcf3b1af..bc3fdd4f955e1 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusRecordSetProvider.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusRecordSetProvider.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java index 2aa8137fb9c33..052682e62ee74 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java @@ -30,8 +30,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusHttpServer.java b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusHttpServer.java index ca9da295c3f6d..bb2c831a9f2cc 100644 --- a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusHttpServer.java +++ b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusHttpServer.java @@ -25,11 +25,10 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.TypeLiteral; - -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/presto-proxy/src/main/java/com/facebook/presto/proxy/ForProxy.java b/presto-proxy/src/main/java/com/facebook/presto/proxy/ForProxy.java index 092f2716bba88..c43c60fb61bf5 100644 --- a/presto-proxy/src/main/java/com/facebook/presto/proxy/ForProxy.java +++ b/presto-proxy/src/main/java/com/facebook/presto/proxy/ForProxy.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.proxy; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-proxy/src/main/java/com/facebook/presto/proxy/JsonWebTokenHandler.java b/presto-proxy/src/main/java/com/facebook/presto/proxy/JsonWebTokenHandler.java index dd1b7a4333cfe..9bc70c00cb2ec 100644 --- a/presto-proxy/src/main/java/com/facebook/presto/proxy/JsonWebTokenHandler.java +++ b/presto-proxy/src/main/java/com/facebook/presto/proxy/JsonWebTokenHandler.java @@ -17,8 +17,7 @@ import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; diff --git a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java index 787bfe3083512..cd967f66e83d1 100644 --- a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java +++ b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import io.airlift.units.Duration; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; import java.net.URI; diff --git a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java index b4afa536eccb8..f5d96f67886c1 100644 --- a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java +++ b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java @@ -26,25 +26,24 @@ import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.Duration; - -import javax.annotation.PreDestroy; -import javax.annotation.security.PermitAll; -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.annotation.security.PermitAll; +import jakarta.inject.Inject; +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; @@ -74,6 +73,11 @@ import static com.google.common.net.HttpHeaders.USER_AGENT; import static com.google.common.net.HttpHeaders.X_FORWARDED_FOR; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; +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,11 +85,6 @@ import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newCachedThreadPool; -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("/") @PermitAll diff --git a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java index f31417618fba2..2a2bc70ceebbb 100644 --- a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java +++ b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java @@ -23,10 +23,9 @@ import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; import io.airlift.units.DataSize; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; -import javax.annotation.Nullable; - import java.io.Closeable; import java.io.IOException; import java.util.List; diff --git a/presto-record-decoder/src/main/java/com/facebook/presto/decoder/DispatchingRowDecoderFactory.java b/presto-record-decoder/src/main/java/com/facebook/presto/decoder/DispatchingRowDecoderFactory.java index 784e8d03ddca1..ae138aade71ca 100644 --- a/presto-record-decoder/src/main/java/com/facebook/presto/decoder/DispatchingRowDecoderFactory.java +++ b/presto-record-decoder/src/main/java/com/facebook/presto/decoder/DispatchingRowDecoderFactory.java @@ -14,8 +14,7 @@ package com.facebook.presto.decoder; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Set; diff --git a/presto-record-decoder/src/main/java/com/facebook/presto/decoder/json/JsonRowDecoderFactory.java b/presto-record-decoder/src/main/java/com/facebook/presto/decoder/json/JsonRowDecoderFactory.java index 66d774f5408a9..d288e5716a05c 100644 --- a/presto-record-decoder/src/main/java/com/facebook/presto/decoder/json/JsonRowDecoderFactory.java +++ b/presto-record-decoder/src/main/java/com/facebook/presto/decoder/json/JsonRowDecoderFactory.java @@ -18,8 +18,7 @@ import com.facebook.presto.decoder.RowDecoderFactory; import com.facebook.presto.spi.PrestoException; import com.fasterxml.jackson.databind.ObjectMapper; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Optional; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnector.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnector.java index f6b941e536c49..7c9b4059c8120 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnector.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnector.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.presto.spi.transaction.IsolationLevel.READ_COMMITTED; import static com.facebook.presto.spi.transaction.IsolationLevel.checkConnectorSupports; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java index 3cc9ba25b9bd4..e9f171e666bfe 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java @@ -20,9 +20,8 @@ import com.google.common.collect.ImmutableSet; import io.airlift.units.Duration; 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.io.File; import java.util.Set; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorModule.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorModule.java index 14c41477ccf15..d67da64ff6821 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorModule.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorModule.java @@ -20,8 +20,7 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.airlift.json.JsonBinder.jsonBinder; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisJedisManager.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisJedisManager.java index 5a45ea35d6c5e..5351a94b05154 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisJedisManager.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisJedisManager.java @@ -19,11 +19,11 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; -import javax.annotation.PreDestroy; -import javax.inject.Inject; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; @@ -111,6 +111,7 @@ private JedisPool createJedisPool(HostAddress host) return buildJedisPool(host, isTlsEnabled, sslContext); } + /** * Creates SSLContext initialized with the given truststore. */ @@ -141,6 +142,7 @@ private JedisPoolConfig createJedisPoolConfig() config.setMaxTotal(JEDIS_MAX_IDLE_CONNECTIONS); return config; } + /** * Loads the truststore containing Redis server certificate. * Returns null if truststore path is not configured. diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisMetadata.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisMetadata.java index 9b88039f75385..acb4fef35a7e8 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisMetadata.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisMetadata.java @@ -32,8 +32,7 @@ import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.LinkedHashSet; import java.util.List; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisRecordSetProvider.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisRecordSetProvider.java index f56ee5a459945..badafa7176f33 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisRecordSetProvider.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisRecordSetProvider.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.connector.ConnectorRecordSetProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisSplitManager.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisSplitManager.java index c335cb8432440..574a8e905988b 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisSplitManager.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisSplitManager.java @@ -22,10 +22,9 @@ import com.facebook.presto.spi.connector.ConnectorSplitManager; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import redis.clients.jedis.Jedis; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisTableDescriptionSupplier.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisTableDescriptionSupplier.java index fae42d034c3eb..45f8192e168f6 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisTableDescriptionSupplier.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisTableDescriptionSupplier.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; diff --git a/presto-redshift/src/main/java/com/facebook/presto/plugin/redshift/RedshiftClient.java b/presto-redshift/src/main/java/com/facebook/presto/plugin/redshift/RedshiftClient.java index a46f13ecabc52..663f5e47322e1 100644 --- a/presto-redshift/src/main/java/com/facebook/presto/plugin/redshift/RedshiftClient.java +++ b/presto-redshift/src/main/java/com/facebook/presto/plugin/redshift/RedshiftClient.java @@ -24,8 +24,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.SchemaTableName; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java index c5778377f388f..91052dc8ed71c 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java @@ -20,11 +20,10 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupConfigurationManager; import com.facebook.presto.spi.resourceGroups.SelectionContext; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.DataSize; import io.airlift.units.Duration; -import javax.annotation.concurrent.GuardedBy; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfig.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfig.java index c1107a9533237..b91585726e0c0 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfig.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.resourceGroups; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class FileResourceGroupConfig { diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java index bcb1ab079f012..f50c6f901a529 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java @@ -24,8 +24,7 @@ import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; import com.google.common.annotations.VisibleForTesting; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ForEnvironment.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ForEnvironment.java index d89cbf5cc17ce..1886b2da16e30 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ForEnvironment.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ForEnvironment.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.resourceGroups.db; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java index 22ff3f03cbebc..f822ca74d7b5d 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java @@ -14,12 +14,11 @@ package com.facebook.presto.resourceGroups.db; import com.mysql.cj.jdbc.MysqlDataSource; +import jakarta.inject.Inject; +import jakarta.inject.Provider; 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 MysqlDaoProvider diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java index 8f44f5c24b199..904471e0cb985 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java @@ -30,15 +30,14 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; 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.HashMap; import java.util.HashSet; import java.util.LinkedList; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java index ba4558da04cef..ec7260e4eb5f4 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java @@ -13,13 +13,12 @@ */ package com.facebook.presto.resourceGroups.db; +import jakarta.inject.Inject; +import jakarta.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/presto-router/src/main/java/com/facebook/presto/router/RouterConfig.java b/presto-router/src/main/java/com/facebook/presto/router/RouterConfig.java index 8fb1ece7388b1..e94dfa34f0e48 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/RouterConfig.java +++ b/presto-router/src/main/java/com/facebook/presto/router/RouterConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.router; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class RouterConfig { diff --git a/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java b/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java index 9dd97cd349599..465b0e9684667 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java +++ b/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java @@ -26,10 +26,9 @@ import com.facebook.presto.spi.security.PasswordAuthenticatorFactory; import com.facebook.presto.spi.security.PrestoAuthenticatorFactory; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.resolver.ArtifactResolver; - -import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.ArrayList; diff --git a/presto-router/src/main/java/com/facebook/presto/router/RouterResource.java b/presto-router/src/main/java/com/facebook/presto/router/RouterResource.java index 89f76cc681139..a37a6c5c40f1e 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/RouterResource.java +++ b/presto-router/src/main/java/com/facebook/presto/router/RouterResource.java @@ -18,27 +18,26 @@ import com.facebook.presto.router.cluster.ClusterManager; import com.facebook.presto.router.cluster.RequestInfo; import com.google.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; - import java.io.IOException; import java.net.URI; import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; +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 java.util.Objects.requireNonNull; -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; @Path("/") public class RouterResource diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java index 003499ac36c37..60775a50b049f 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java @@ -31,11 +31,10 @@ import com.google.common.collect.Maps; import com.sun.nio.file.SensitivityWatchEventModifier; import io.airlift.units.Duration; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.Managed; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import java.io.IOException; import java.net.URI; import java.nio.file.ClosedWatchServiceException; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterStatusResource.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterStatusResource.java index 1d75efa8658da..2a44d1d75cac0 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterStatusResource.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterStatusResource.java @@ -15,25 +15,24 @@ import com.facebook.airlift.node.NodeInfo; import com.facebook.presto.client.ServerInfo; +import com.facebook.presto.router.cluster.ClusterManager.ClusterStatusTracker; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; +import com.google.errorprone.annotations.Immutable; import com.google.inject.Inject; - -import javax.annotation.concurrent.Immutable; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import java.net.URI; import java.util.List; import java.util.Optional; import static com.facebook.presto.client.NodeVersion.UNKNOWN; -import static com.facebook.presto.router.cluster.ClusterManager.ClusterStatusTracker; +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("/") public class ClusterStatusResource diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/ForClusterInfoTracker.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/ForClusterInfoTracker.java index f25e7f0c07465..6c904e1336138 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/ForClusterInfoTracker.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/ForClusterInfoTracker.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.router.cluster; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/ForQueryInfoTracker.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/ForQueryInfoTracker.java index 10e477beb3b7d..614e4b8272379 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/ForQueryInfoTracker.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/ForQueryInfoTracker.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.router.cluster; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteInfoFactory.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteInfoFactory.java index afe375b39e3b3..bbf6d6256af25 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteInfoFactory.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteInfoFactory.java @@ -15,8 +15,7 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.presto.router.RouterConfig; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteQueryInfo.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteQueryInfo.java index 813ff3805e61b..1ab7435406ae0 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteQueryInfo.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteQueryInfo.java @@ -20,8 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.io.IOException; import java.net.URI; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java index c7d56467843a0..d99d314e2da82 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java @@ -24,11 +24,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; -import com.google.inject.Inject; +import com.google.errorprone.annotations.ThreadSafe; import io.airlift.units.Duration; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.ThreadSafe; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import java.net.URI; import java.nio.file.Paths; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/RequestInfo.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/RequestInfo.java index a887be938cfb6..7e85e0b5bbfee 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/RequestInfo.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/RequestInfo.java @@ -17,8 +17,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Enumeration; import java.util.List; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryCpuPredictor.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryCpuPredictor.java index 10137a75db0ae..322a7b20611eb 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryCpuPredictor.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryCpuPredictor.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.router.predictor; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryMemoryPredictor.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryMemoryPredictor.java index f16b792602c00..be7921de88551 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryMemoryPredictor.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/ForQueryMemoryPredictor.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.router.predictor; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/PredictorManager.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/PredictorManager.java index b3863b22b6df7..3bb96d358ccdf 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/PredictorManager.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/PredictorManager.java @@ -17,8 +17,7 @@ import com.facebook.presto.router.RouterConfig; import com.facebook.presto.router.spec.RouterSpec; import com.facebook.presto.spi.PrestoException; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; import java.nio.file.Paths; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQuery.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQuery.java index ec31d614114ef..65b8eee057a61 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQuery.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQuery.java @@ -19,8 +19,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; import com.fasterxml.jackson.databind.JsonNode; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.net.URI; import java.util.HashMap; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryCpu.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryCpu.java index 5d764cfdaae06..5b224e5996b0b 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryCpu.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryCpu.java @@ -17,8 +17,7 @@ import com.facebook.airlift.log.Logger; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.net.URI; import java.util.Map; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryFactory.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryFactory.java index de0190f5b8410..638c901b47f49 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryFactory.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryFactory.java @@ -14,8 +14,7 @@ package com.facebook.presto.router.predictor; import com.facebook.airlift.http.client.HttpClient; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; diff --git a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryMemory.java b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryMemory.java index 02f957cbe5468..c0697f6d24264 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryMemory.java +++ b/presto-router/src/main/java/com/facebook/presto/router/predictor/RemoteQueryMemory.java @@ -17,8 +17,7 @@ import com.facebook.airlift.log.Logger; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.net.URI; import java.util.Map; diff --git a/presto-router/src/main/java/com/facebook/presto/router/scheduler/RoundRobinScheduler.java b/presto-router/src/main/java/com/facebook/presto/router/scheduler/RoundRobinScheduler.java index cac0ffe247fab..8b5196005c2a6 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/scheduler/RoundRobinScheduler.java +++ b/presto-router/src/main/java/com/facebook/presto/router/scheduler/RoundRobinScheduler.java @@ -16,8 +16,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.spi.router.RouterRequestInfo; import com.facebook.presto.spi.router.Scheduler; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.net.URI; import java.util.HashMap; diff --git a/presto-router/src/test/java/com/facebook/presto/router/TestHealthChecks.java b/presto-router/src/test/java/com/facebook/presto/router/TestHealthChecks.java index 401671e57a8f3..60abb17a1a804 100644 --- a/presto-router/src/test/java/com/facebook/presto/router/TestHealthChecks.java +++ b/presto-router/src/test/java/com/facebook/presto/router/TestHealthChecks.java @@ -31,12 +31,11 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.io.File; import java.net.URI; import java.time.Instant; diff --git a/presto-router/src/test/java/com/facebook/presto/router/TestRouterAuthentication.java b/presto-router/src/test/java/com/facebook/presto/router/TestRouterAuthentication.java index 5f9a8b19a7f6f..a77fa6fb4573f 100644 --- a/presto-router/src/test/java/com/facebook/presto/router/TestRouterAuthentication.java +++ b/presto-router/src/test/java/com/facebook/presto/router/TestRouterAuthentication.java @@ -36,13 +36,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.ByteStreams; import com.google.inject.Injector; +import jakarta.ws.rs.core.UriBuilder; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import javax.ws.rs.core.UriBuilder; - import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/presto-router/src/test/java/com/facebook/presto/router/TestSelectors.java b/presto-router/src/test/java/com/facebook/presto/router/TestSelectors.java index 738e0caa638fd..19edfe80bc6b4 100644 --- a/presto-router/src/test/java/com/facebook/presto/router/TestSelectors.java +++ b/presto-router/src/test/java/com/facebook/presto/router/TestSelectors.java @@ -36,13 +36,12 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; import com.google.inject.Module; +import jakarta.servlet.http.HttpServletRequest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; - import java.io.File; import java.io.FileOutputStream; import java.net.URI; diff --git a/presto-server/NOTICE b/presto-server/NOTICE index 6182bbb1148d3..bbc88f9a0b348 100644 --- a/presto-server/NOTICE +++ b/presto-server/NOTICE @@ -125,7 +125,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: Apache Avro, Apache BVal, Apache Commons BeanUtils Core, Apache Commons CLI, Apache Commons Codec, Apache Commons Configuration, Apache Commons IO, Apache Commons Lang, Apache Commons Logging, Apache Hadoop, Apache Hive, Apache HttpClient, Apache Maven, Apache Thrift, Apache XBean, Bean Validation API, Code Generation Library, Guava, Jackson, Jetty, Joda time, Log4j Implemented Over SLF4J, Ning Asynchronous Http Client, Plexus, Tableau Web Data Connector, airlift, airlift resolver, airlift slice, fastutil, jDBI, javax.inject, jmxutils, jQuery, opencsv, snappy, vis.js. +The following software may be included in this product: Apache Avro, Apache BVal, Apache Commons BeanUtils Core, Apache Commons CLI, Apache Commons Codec, Apache Commons Configuration, Apache Commons IO, Apache Commons Lang, Apache Commons Logging, Apache Hadoop, Apache Hive, Apache HttpClient, Apache Maven, Apache Thrift, Apache XBean, Bean Validation API, Code Generation Library, Guava, Jackson, Jetty, Joda time, Log4j Implemented Over SLF4J, Ning Asynchronous Http Client, Plexus, Tableau Web Data Connector, airlift, airlift resolver, airlift slice, fastutil, jDBI, jakarta.inject, jmxutils, jQuery, opencsv, snappy, vis.js. This software contains the following license and notice below: diff --git a/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManager.java b/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManager.java index d6402324050bf..9904baad66869 100644 --- a/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManager.java +++ b/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManager.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; import com.google.common.collect.ImmutableMap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManagerConfig.java b/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManagerConfig.java index 67b1c656ee81b..b1e72bed0aedd 100644 --- a/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManagerConfig.java +++ b/presto-session-property-managers/src/main/java/com/facebook/presto/session/FileSessionPropertyManagerConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.session; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-singlestore/src/main/java/com/facebook/presto/plugin/singlestore/SingleStoreClient.java b/presto-singlestore/src/main/java/com/facebook/presto/plugin/singlestore/SingleStoreClient.java index 679bbb09f50a6..2e8c4d2290973 100644 --- a/presto-singlestore/src/main/java/com/facebook/presto/plugin/singlestore/SingleStoreClient.java +++ b/presto-singlestore/src/main/java/com/facebook/presto/plugin/singlestore/SingleStoreClient.java @@ -28,8 +28,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.google.common.collect.ImmutableSet; import com.singlestore.jdbc.Driver; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java index e00cbbd0f7e85..89a5d481ccfaf 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java @@ -20,11 +20,10 @@ import com.google.common.collect.ImmutableMap; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -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.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkModule.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkModule.java index f02df01d7b2cd..955e59ebc9f1b 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkModule.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkModule.java @@ -219,10 +219,10 @@ import com.google.inject.Scopes; import com.google.inject.TypeLiteral; import com.google.inject.multibindings.MapBinder; +import jakarta.inject.Singleton; import org.weakref.jmx.MBeanExporter; import org.weakref.jmx.testing.TestingMBeanServer; -import javax.inject.Singleton; import javax.management.MBeanServer; import java.util.Optional; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java index f2447eb455e2d..1d603b8599c6a 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java @@ -111,6 +111,7 @@ import com.google.common.collect.ListMultimap; import com.google.common.io.BaseEncoding; import io.airlift.units.Duration; +import jakarta.inject.Inject; import org.apache.spark.SparkContext; import org.apache.spark.SparkException; import org.apache.spark.api.java.JavaFutureAction; @@ -118,8 +119,6 @@ import org.apache.spark.util.CollectionAccumulator; import scala.Option; -import javax.inject.Inject; - import java.net.URI; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -139,7 +138,6 @@ import static com.facebook.presto.execution.QueryState.FAILED; import static com.facebook.presto.execution.QueryState.PLANNING; import static com.facebook.presto.execution.StageInfo.getAllStages; -import static com.facebook.presto.server.protocol.QueryResourceUtil.toStatementStats; import static com.facebook.presto.spark.PrestoSparkSessionProperties.isAdaptiveQueryExecutionEnabled; import static com.facebook.presto.spark.SparkErrorCode.MALFORMED_QUERY_FILE; import static com.facebook.presto.spark.util.PrestoSparkExecutionUtils.getExecutionSettings; @@ -150,6 +148,7 @@ import static com.facebook.presto.spi.StandardErrorCode.INVALID_SESSION_PROPERTY; import static com.facebook.presto.util.AnalyzerUtil.createAnalyzerOptions; import static com.facebook.presto.util.Failures.toFailure; +import static com.facebook.presto.util.QueryInfoUtils.toStatementStats; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Ticker.systemTicker; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkService.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkService.java index 418d8dc7225f0..4a2fabe1cebd9 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkService.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkService.java @@ -19,8 +19,7 @@ import com.facebook.presto.spark.classloader_interface.IPrestoSparkTaskExecutorFactory; import com.facebook.presto.spark.execution.task.PrestoSparkNativeTaskExecutorFactory; import com.facebook.presto.spark.execution.task.PrestoSparkTaskExecutorFactory; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionContext.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionContext.java index 49ac83c213b9d..faf74891bfdba 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionContext.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionContext.java @@ -27,8 +27,7 @@ import com.facebook.presto.spi.tracing.Tracer; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Map; import java.util.Optional; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java index 41707774f216f..d3fec9dcda2c7 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java @@ -19,8 +19,7 @@ import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java index 00bdfa5351895..1277bc07dd24c 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java @@ -19,9 +19,8 @@ import com.facebook.presto.spiller.NodeSpillConfig; import com.facebook.presto.sql.analyzer.JavaFeaturesConfig; import com.google.common.collect.Streams; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/accesscontrol/PrestoSparkAccessControlChecker.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/accesscontrol/PrestoSparkAccessControlChecker.java index bcdd19d3a07bc..73348d97ae40f 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/accesscontrol/PrestoSparkAccessControlChecker.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/accesscontrol/PrestoSparkAccessControlChecker.java @@ -22,8 +22,7 @@ import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer; import com.facebook.presto.sql.analyzer.QueryExplainer; import com.facebook.presto.sql.parser.SqlParser; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java index 46d422c62b469..25614f514a323 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java @@ -89,6 +89,7 @@ import com.google.common.collect.ComparisonChain; 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.airlift.units.Duration; import org.apache.spark.MapOutputStatistics; @@ -104,8 +105,6 @@ import org.apache.spark.util.CollectionAccumulator; import scala.Tuple2; -import javax.annotation.concurrent.GuardedBy; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkDiskPageInput.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkDiskPageInput.java index 3b622f5eb1644..379d61b192832 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkDiskPageInput.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkDiskPageInput.java @@ -27,10 +27,9 @@ import com.facebook.presto.spi.storage.TempStorage; import com.facebook.presto.spi.storage.TempStorageHandle; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.slice.InputStreamSliceInput; -import javax.annotation.concurrent.GuardedBy; - import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkExecutionExceptionFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkExecutionExceptionFactory.java index 5fe032de512b1..68c177d89f7d5 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkExecutionExceptionFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkExecutionExceptionFactory.java @@ -20,10 +20,9 @@ import com.facebook.presto.spark.classloader_interface.PrestoSparkExecutionException; import com.facebook.presto.spark.classloader_interface.PrestoSparkNonRetryableExecutionException; import com.facebook.presto.spark.classloader_interface.PrestoSparkRetryableExecutionException; +import jakarta.inject.Inject; import org.apache.spark.SparkException; -import javax.inject.Inject; - import java.util.Base64; import java.util.Optional; import java.util.regex.Matcher; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkOutputBuffer.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkOutputBuffer.java index 4cd40e0a65597..a94e068f50b62 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkOutputBuffer.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkOutputBuffer.java @@ -15,8 +15,7 @@ import com.facebook.presto.execution.buffer.OutputBufferMemoryManager; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.ArrayDeque; import java.util.Queue; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkPageInput.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkPageInput.java index 1b5efff60ef9f..220cc68232f67 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkPageInput.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkPageInput.java @@ -15,9 +15,8 @@ import com.facebook.presto.common.Page; import com.facebook.presto.operator.UpdateMemory; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; +import jakarta.annotation.Nullable; /** * Implementation of this interface is expected to be thread safe diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java index e1a30ec5b5c1b..265be96ffe60d 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowBatch.java @@ -18,11 +18,10 @@ import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.SliceOutput; +import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; import scala.Tuple2; -import javax.annotation.Nullable; - import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkSerializedPageInput.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkSerializedPageInput.java index a72ebbe316a6b..cfa507aca0722 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkSerializedPageInput.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkSerializedPageInput.java @@ -17,8 +17,7 @@ import com.facebook.presto.operator.UpdateMemory; import com.facebook.presto.spark.classloader_interface.PrestoSparkSerializedPage; import com.facebook.presto.spi.page.PagesSerde; - -import javax.annotation.concurrent.GuardedBy; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.Iterator; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionNodeConfig.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionNodeConfig.java index 4ae880fae695a..62fa65616b285 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionNodeConfig.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionNodeConfig.java @@ -15,8 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.google.common.collect.ImmutableMap; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/shuffle/PrestoSparkShufflePageInput.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/shuffle/PrestoSparkShufflePageInput.java index 091557b652f63..12859656ff3c3 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/shuffle/PrestoSparkShufflePageInput.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/shuffle/PrestoSparkShufflePageInput.java @@ -23,6 +23,7 @@ import com.facebook.presto.spark.classloader_interface.PrestoSparkShuffleStats; import com.facebook.presto.spark.execution.PrestoSparkPageInput; import com.google.common.collect.ImmutableList; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.slice.BasicSliceInput; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.SliceOutput; @@ -30,8 +31,6 @@ import scala.Tuple2; import scala.collection.Iterator; -import javax.annotation.concurrent.GuardedBy; - import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java index 26ecc79195412..51e92b1e52010 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java @@ -42,10 +42,9 @@ 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.units.Duration; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java index ae3575c80e485..bbf32a748e31a 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java @@ -109,14 +109,13 @@ import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.spark.broadcast.Broadcast; import org.apache.spark.util.CollectionAccumulator; import scala.Tuple2; import scala.collection.AbstractIterator; import scala.collection.Iterator; -import javax.inject.Inject; - import java.io.IOException; import java.io.UncheckedIOException; import java.net.URI; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodePartitioningManager.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodePartitioningManager.java index 3cc19ad158952..bd5eecd7b8cec 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodePartitioningManager.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodePartitioningManager.java @@ -24,8 +24,7 @@ import com.facebook.presto.sql.planner.NodePartitionMap; import com.facebook.presto.sql.planner.NodePartitioningManager; import com.facebook.presto.sql.planner.PartitioningProviderManager; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/IterativePlanFragmenter.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/IterativePlanFragmenter.java index 76a8390363c9f..cce0a36deb0da 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/IterativePlanFragmenter.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/IterativePlanFragmenter.java @@ -27,6 +27,7 @@ */ package com.facebook.presto.spark.planner; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.presto.Session; import com.facebook.presto.cost.StatsAndCosts; import com.facebook.presto.execution.QueryManagerConfig; @@ -52,8 +53,6 @@ import com.facebook.presto.sql.planner.sanity.PlanChecker; import com.google.common.collect.ImmutableList; -import javax.annotation.concurrent.NotThreadSafe; - import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkPlanFragmenter.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkPlanFragmenter.java index b1faf7c686592..166126677453b 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkPlanFragmenter.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkPlanFragmenter.java @@ -20,8 +20,7 @@ import com.facebook.presto.sql.planner.Plan; import com.facebook.presto.sql.planner.PlanFragmenter; import com.facebook.presto.sql.planner.SubPlan; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkQueryPlanner.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkQueryPlanner.java index f6626c4c3d0a4..3f69b0af46196 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkQueryPlanner.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkQueryPlanner.java @@ -47,10 +47,9 @@ import com.facebook.presto.sql.planner.sanity.PlanChecker; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.spark.SparkContext; -import javax.inject.Inject; - import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java index 7990d4ca83496..e685260861d1d 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java @@ -55,6 +55,7 @@ import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; import io.airlift.units.DataSize; +import jakarta.inject.Inject; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.broadcast.Broadcast; @@ -62,8 +63,6 @@ import org.apache.spark.util.CollectionAccumulator; import scala.Tuple2; -import javax.inject.Inject; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkStatsCalculatorModule.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkStatsCalculatorModule.java index b2471077841e6..849f159a1e8bb 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkStatsCalculatorModule.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkStatsCalculatorModule.java @@ -26,8 +26,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; import static com.facebook.presto.cost.StatsCalculatorModule.createComposableStatsCalculator; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/optimizers/AdaptivePlanOptimizers.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/optimizers/AdaptivePlanOptimizers.java index 03f708a061fe9..fe7da3b81e667 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/optimizers/AdaptivePlanOptimizers.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/optimizers/AdaptivePlanOptimizers.java @@ -24,12 +24,11 @@ import com.facebook.presto.sql.planner.optimizations.PlanOptimizer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.weakref.jmx.MBeanExporter; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import java.util.List; /** diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkFailureUtils.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkFailureUtils.java index 9ece36cbaa263..987d3d792c97f 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkFailureUtils.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkFailureUtils.java @@ -20,8 +20,7 @@ import com.facebook.presto.spark.classloader_interface.PrestoSparkFailure; import com.facebook.presto.spi.ErrorCause; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-spark-common/src/main/java/com/facebook/presto/spark/PrestoSparkQueryStatusInfo.java b/presto-spark-common/src/main/java/com/facebook/presto/spark/PrestoSparkQueryStatusInfo.java index 0362ebde4c1e8..3eb7a459d4d53 100644 --- a/presto-spark-common/src/main/java/com/facebook/presto/spark/PrestoSparkQueryStatusInfo.java +++ b/presto-spark-common/src/main/java/com/facebook/presto/spark/PrestoSparkQueryStatusInfo.java @@ -20,8 +20,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.Optional; diff --git a/presto-spark-launcher/src/main/java/com/facebook/presto/spark/launcher/PrestoSparkLauncherCommand.java b/presto-spark-launcher/src/main/java/com/facebook/presto/spark/launcher/PrestoSparkLauncherCommand.java index 2748dcf919630..49390907461dc 100644 --- a/presto-spark-launcher/src/main/java/com/facebook/presto/spark/launcher/PrestoSparkLauncherCommand.java +++ b/presto-spark-launcher/src/main/java/com/facebook/presto/spark/launcher/PrestoSparkLauncherCommand.java @@ -18,11 +18,10 @@ import com.google.common.collect.ImmutableSet; import io.airlift.airline.Command; import io.airlift.airline.HelpOption; +import jakarta.inject.Inject; import org.apache.spark.SparkConf; import org.apache.spark.SparkContext; -import javax.inject.Inject; - import java.io.File; import java.util.Map; import java.util.Optional; diff --git a/presto-spark-package/NOTICE b/presto-spark-package/NOTICE index 6182bbb1148d3..bbc88f9a0b348 100644 --- a/presto-spark-package/NOTICE +++ b/presto-spark-package/NOTICE @@ -125,7 +125,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: Apache Avro, Apache BVal, Apache Commons BeanUtils Core, Apache Commons CLI, Apache Commons Codec, Apache Commons Configuration, Apache Commons IO, Apache Commons Lang, Apache Commons Logging, Apache Hadoop, Apache Hive, Apache HttpClient, Apache Maven, Apache Thrift, Apache XBean, Bean Validation API, Code Generation Library, Guava, Jackson, Jetty, Joda time, Log4j Implemented Over SLF4J, Ning Asynchronous Http Client, Plexus, Tableau Web Data Connector, airlift, airlift resolver, airlift slice, fastutil, jDBI, javax.inject, jmxutils, jQuery, opencsv, snappy, vis.js. +The following software may be included in this product: Apache Avro, Apache BVal, Apache Commons BeanUtils Core, Apache Commons CLI, Apache Commons Codec, Apache Commons Configuration, Apache Commons IO, Apache Commons Lang, Apache Commons Logging, Apache Hadoop, Apache Hive, Apache HttpClient, Apache Maven, Apache Thrift, Apache XBean, Bean Validation API, Code Generation Library, Guava, Jackson, Jetty, Joda time, Log4j Implemented Over SLF4J, Ning Asynchronous Http Client, Plexus, Tableau Web Data Connector, airlift, airlift resolver, airlift slice, fastutil, jDBI, jakarta.inject, jmxutils, jQuery, opencsv, snappy, vis.js. This software contains the following license and notice below: diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java index 8c330f6d0b706..e3d5c89f97db8 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java @@ -15,11 +15,10 @@ import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.spi.plan.PlanNodeId; +import com.google.errorprone.annotations.Immutable; import io.airlift.units.DataSize; import io.airlift.units.Duration; -import javax.annotation.concurrent.Immutable; - import java.util.Optional; import static java.util.Objects.requireNonNull; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/function/TypeVariableConstraint.java b/presto-spi/src/main/java/com/facebook/presto/spi/function/TypeVariableConstraint.java index 4eb17c63e3e57..897a000cf0a4d 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/function/TypeVariableConstraint.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/function/TypeVariableConstraint.java @@ -20,8 +20,7 @@ import com.facebook.presto.common.type.TypeUtils; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/page/PagesSerde.java b/presto-spi/src/main/java/com/facebook/presto/spi/page/PagesSerde.java index 8541426d79ec8..ee123b0c894c2 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/page/PagesSerde.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/page/PagesSerde.java @@ -21,8 +21,6 @@ import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; -import javax.annotation.concurrent.NotThreadSafe; - import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.Optional; @@ -38,7 +36,6 @@ import static java.util.Objects.requireNonNull; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; -@NotThreadSafe public class PagesSerde { private static final double MINIMUM_COMPRESSION_RATIO = 0.9; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/AggregationNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/AggregationNode.java index ed1921115faf7..6b0c763315b35 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/AggregationNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/AggregationNode.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.Collections; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteConsumerNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteConsumerNode.java index 9a6b18bbe6e30..3d6e663ef55ee 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteConsumerNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteConsumerNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.Collections; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteProducerNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteProducerNode.java index 8de077a21fe20..78409ba4236cd 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteProducerNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteProducerNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteReferenceNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteReferenceNode.java index 58b241db1bc09..5c3d61dc02f83 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteReferenceNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/CteReferenceNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/DataOrganizationSpecification.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/DataOrganizationSpecification.java index 30588227f76cf..cdb97c19645d7 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/DataOrganizationSpecification.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/DataOrganizationSpecification.java @@ -16,8 +16,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/DeleteNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/DeleteNode.java index ead4407389a21..8100732ec7881 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/DeleteNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/DeleteNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.Collections; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/DistinctLimitNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/DistinctLimitNode.java index aaca923d528f1..bf3484d479edd 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/DistinctLimitNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/DistinctLimitNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.Collections; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/ExceptNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/ExceptNode.java index f75d5ff212471..705cae6f94a1d 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/ExceptNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/ExceptNode.java @@ -16,8 +16,7 @@ import com.facebook.presto.spi.SourceLocation; import com.facebook.presto.spi.relation.VariableReferenceExpression; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Map; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/FilterNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/FilterNode.java index 3039f19d5bc27..ff776ec6854a0 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/FilterNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/FilterNode.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Objects; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/IntersectNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/IntersectNode.java index 6d1b74f3ff54f..b0e507f7f2f5e 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/IntersectNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/IntersectNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Map; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/JoinNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/JoinNode.java index 65281b99a3540..6f209a628be77 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/JoinNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/JoinNode.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.Arrays; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/LimitNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/LimitNode.java index dda14428bd7d4..ba2bc0b2f8fe1 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/LimitNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/LimitNode.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/MarkDistinctNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/MarkDistinctNode.java index f5b9459d24a48..03e0f5fa4e3d9 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/MarkDistinctNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/MarkDistinctNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.Collections; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/MergeJoinNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/MergeJoinNode.java index 1e5da4cb92d6c..44eed8e134ff0 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/MergeJoinNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/MergeJoinNode.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/MetadataDeleteNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/MetadataDeleteNode.java index 7d970515197ae..213e109003c3b 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/MetadataDeleteNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/MetadataDeleteNode.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.Collections; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/Ordering.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/Ordering.java index e9daf4cf3b3cb..833ac10242b9e 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/Ordering.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/Ordering.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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/presto-spi/src/main/java/com/facebook/presto/spi/plan/OutputNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/OutputNode.java index b7dde09a9bb9b..1114d5cf52e63 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/OutputNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/OutputNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.Collections; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/Partitioning.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/Partitioning.java index f8b3ea457eccf..9843c7a952478 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/Partitioning.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/Partitioning.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.Collection; import java.util.Collections; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanFragmentId.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanFragmentId.java index 76cf480e27156..8fc674bd4d74f 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanFragmentId.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/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/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanNodeId.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanNodeId.java index 84f238d1a071b..b5343d210fdc1 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanNodeId.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/PlanNodeId.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; 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/presto-spi/src/main/java/com/facebook/presto/spi/plan/ProjectNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/ProjectNode.java index bb69c80730d59..b94d95e66ccfb 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/ProjectNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/ProjectNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Objects; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/SemiJoinNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/SemiJoinNode.java index 6a52fd8e2cd0f..1b580f3d5b04c 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/SemiJoinNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/SemiJoinNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/SetOperationNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/SetOperationNode.java index f661144978190..b50366b60202b 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/SetOperationNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/SetOperationNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.Collection; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/SpatialJoinNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/SpatialJoinNode.java index 0bc7201eba230..5d0873b4a21e1 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/SpatialJoinNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/SpatialJoinNode.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.LinkedHashSet; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableFinishNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableFinishNode.java index 281c6dec7c148..13457d7774f57 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableFinishNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableFinishNode.java @@ -18,8 +18,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Collections; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableScanNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableScanNode.java index ef6567103f544..52cd7edbbaf48 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableScanNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableScanNode.java @@ -21,9 +21,8 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.HashMap; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableWriterNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableWriterNode.java index 579727c61c2f3..f5cd4aed80915 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableWriterNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TableWriterNode.java @@ -24,8 +24,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.ArrayList; import java.util.Collections; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TopNNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TopNNode.java index 8b121bd94ad89..4392124956001 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/TopNNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/TopNNode.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnionNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnionNode.java index e053a8634ff40..51643c13f9e6d 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnionNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnionNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.List; import java.util.Map; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnnestNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnnestNode.java index 8b031a9c77b0f..f5d11fa4232bb 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnnestNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/UnnestNode.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.LinkedHashMap; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/ValuesNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/ValuesNode.java index 51138bb59ac9c..51a7d36da51a0 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/ValuesNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/ValuesNode.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/plan/WindowNode.java b/presto-spi/src/main/java/com/facebook/presto/spi/plan/WindowNode.java index a9d958b34ca14..eacaf7503ba53 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/plan/WindowNode.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/plan/WindowNode.java @@ -19,8 +19,7 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; 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.ArrayList; import java.util.HashSet; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/procedure/Procedure.java b/presto-spi/src/main/java/com/facebook/presto/spi/procedure/Procedure.java index 658fff68b9314..557336ae95a4c 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/procedure/Procedure.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/procedure/Procedure.java @@ -15,8 +15,7 @@ import com.facebook.presto.common.type.TypeSignature; import com.facebook.presto.spi.ConnectorSession; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.lang.invoke.MethodHandle; import java.util.ArrayList; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/relation/CallExpression.java b/presto-spi/src/main/java/com/facebook/presto/spi/relation/CallExpression.java index 83588f58c6ee1..639edde563325 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/relation/CallExpression.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/relation/CallExpression.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.function.FunctionHandle; 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.ArrayList; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/relation/ConstantExpression.java b/presto-spi/src/main/java/com/facebook/presto/spi/relation/ConstantExpression.java index 27166edecc534..21217f9e233dc 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/relation/ConstantExpression.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/relation/ConstantExpression.java @@ -20,8 +20,7 @@ import com.facebook.presto.spi.SourceLocation; 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.List; import java.util.Objects; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/relation/InputReferenceExpression.java b/presto-spi/src/main/java/com/facebook/presto/spi/relation/InputReferenceExpression.java index 619b91a9451dd..123547ab9a888 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/relation/InputReferenceExpression.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/relation/InputReferenceExpression.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.SourceLocation; 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.List; import java.util.Objects; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/relation/LambdaDefinitionExpression.java b/presto-spi/src/main/java/com/facebook/presto/spi/relation/LambdaDefinitionExpression.java index b0810ee267d7b..4ffbac3992799 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/relation/LambdaDefinitionExpression.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/relation/LambdaDefinitionExpression.java @@ -19,11 +19,10 @@ import com.facebook.presto.spi.SourceLocation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.errorprone.annotations.Immutable; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import javax.annotation.concurrent.Immutable; - import java.util.ArrayList; import java.util.Base64; import java.util.HashMap; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/relation/SpecialFormExpression.java b/presto-spi/src/main/java/com/facebook/presto/spi/relation/SpecialFormExpression.java index 717b95f50794b..8a24ad0fa84a5 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/relation/SpecialFormExpression.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/relation/SpecialFormExpression.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.SourceLocation; 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.Arrays; import java.util.List; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/relation/VariableReferenceExpression.java b/presto-spi/src/main/java/com/facebook/presto/spi/relation/VariableReferenceExpression.java index 0341c790c0e25..604b72d467b3a 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/relation/VariableReferenceExpression.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/relation/VariableReferenceExpression.java @@ -17,8 +17,7 @@ import com.facebook.presto.spi.SourceLocation; 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.List; import java.util.Objects; diff --git a/presto-sqlserver/src/main/java/com/facebook/presto/plugin/sqlserver/SqlServerClient.java b/presto-sqlserver/src/main/java/com/facebook/presto/plugin/sqlserver/SqlServerClient.java index 1c3d9071b3862..3afd3e08c1939 100644 --- a/presto-sqlserver/src/main/java/com/facebook/presto/plugin/sqlserver/SqlServerClient.java +++ b/presto-sqlserver/src/main/java/com/facebook/presto/plugin/sqlserver/SqlServerClient.java @@ -25,8 +25,7 @@ import com.facebook.presto.spi.SchemaTableName; import com.google.common.base.Joiner; import com.microsoft.sqlserver.jdbc.SQLServerDriver; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Connection; import java.sql.SQLException; diff --git a/presto-testing-server-launcher/src/main/java/com/facebook/presto/server/testing/TestingPrestoServerLauncher.java b/presto-testing-server-launcher/src/main/java/com/facebook/presto/server/testing/TestingPrestoServerLauncher.java index bcc68a629b6ab..eac28ac9c0bd5 100644 --- a/presto-testing-server-launcher/src/main/java/com/facebook/presto/server/testing/TestingPrestoServerLauncher.java +++ b/presto-testing-server-launcher/src/main/java/com/facebook/presto/server/testing/TestingPrestoServerLauncher.java @@ -19,8 +19,7 @@ import io.airlift.airline.Help; import io.airlift.airline.HelpOption; import io.airlift.airline.model.CommandMetadata; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static io.airlift.airline.SingleCommand.singleCommand; diff --git a/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java b/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java index df9f6319b8f6e..8c1475a495f99 100644 --- a/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java +++ b/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.units.Duration; import org.testng.IClassListener; import org.testng.IExecutionListener; @@ -23,8 +24,6 @@ import org.testng.ITestClass; import org.testng.ITestResult; -import javax.annotation.concurrent.GuardedBy; - import java.lang.management.ThreadInfo; import java.util.Arrays; import java.util.Map; diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java b/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java index 3cef6184aed45..8430cea7d87e9 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java @@ -19,13 +19,12 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.TypeLiteral; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Provider; - import java.sql.DriverManager; import static com.facebook.presto.functionNamespace.mysql.MySqlConnectionModule.createJdbi; diff --git a/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java b/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java index 4bf0a681e79a2..c4b4c242cb12a 100644 --- a/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java +++ b/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java @@ -38,12 +38,11 @@ import com.google.inject.Key; import io.airlift.units.DataSize; import io.airlift.units.Duration; +import jakarta.ws.rs.core.Response.Status; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import javax.ws.rs.core.Response.Status; - import java.io.IOException; import java.util.Map; import java.util.Optional; @@ -72,10 +71,10 @@ import static com.facebook.presto.spi.StandardErrorCode.MISSING_RESOURCE_GROUP_SELECTOR; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.utils.ResourceUtils.getResourceFilePath; +import static jakarta.ws.rs.core.Response.Status.fromStatusCode; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.Objects.requireNonNull; -import static javax.ws.rs.core.Response.Status.fromStatusCode; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; diff --git a/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/db/H2ResourceGroupsModule.java b/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/db/H2ResourceGroupsModule.java index 2b2dbd0ec8d6d..f5061481220e9 100644 --- a/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/db/H2ResourceGroupsModule.java +++ b/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/db/H2ResourceGroupsModule.java @@ -24,8 +24,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; diff --git a/presto-tests/src/test/java/com/facebook/presto/server/TestAsyncPageTransportServlet.java b/presto-tests/src/test/java/com/facebook/presto/server/TestAsyncPageTransportServlet.java index aa567502bd7fc..ee6703cb80a36 100644 --- a/presto-tests/src/test/java/com/facebook/presto/server/TestAsyncPageTransportServlet.java +++ b/presto-tests/src/test/java/com/facebook/presto/server/TestAsyncPageTransportServlet.java @@ -18,12 +18,11 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ListMultimap; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import static org.testng.Assert.assertEquals; diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestRestSqlFunctionExecutor.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestRestSqlFunctionExecutor.java index 445d5ca31836c..883c61c723406 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestRestSqlFunctionExecutor.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestRestSqlFunctionExecutor.java @@ -55,18 +55,17 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriBuilder; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriBuilder; - import java.math.BigDecimal; import java.net.URI; import java.util.ArrayList; diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java index 3232ed6a29656..f488700639cfb 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java @@ -21,17 +21,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import javax.ws.rs.core.Response; - import java.util.Map; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static java.util.concurrent.Executors.newCachedThreadPool; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; import static org.testng.Assert.assertEquals; public class TestServerInfoResource diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftColumnMetadata.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftColumnMetadata.java index c2e4d343979d4..a73514b34f723 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftColumnMetadata.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftColumnMetadata.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.spi.ColumnMetadata; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableColumnSet.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableColumnSet.java index 823a790d120e5..1104a71cb665b 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableColumnSet.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableColumnSet.java @@ -16,8 +16,7 @@ import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; import java.util.Set; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableSchemaName.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableSchemaName.java index 097e00f9c4df3..a910a3d9b2453 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableSchemaName.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableSchemaName.java @@ -16,8 +16,7 @@ import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableTableMetadata.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableTableMetadata.java index 3b460eee09f97..d1e661884563b 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableTableMetadata.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableTableMetadata.java @@ -16,8 +16,7 @@ import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableToken.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableToken.java index 8a862f7135a44..8980130c42af7 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableToken.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftNullableToken.java @@ -16,8 +16,7 @@ import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftPageResult.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftPageResult.java index c16b0a5e3da7c..e7d6406c01e72 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftPageResult.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftPageResult.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.RecordSet; import com.facebook.presto.thrift.api.datatypes.PrestoThriftBlock; import com.google.common.collect.ImmutableList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftSplitBatch.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftSplitBatch.java index 76fb592b19440..77c2e638d09d7 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftSplitBatch.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftSplitBatch.java @@ -16,8 +16,7 @@ import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTableMetadata.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTableMetadata.java index 4288a091d5e64..1e821614796cc 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTableMetadata.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTableMetadata.java @@ -16,8 +16,7 @@ import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTupleDomain.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTupleDomain.java index 4821329f2ab8f..791ae14780ce8 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTupleDomain.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/connector/PrestoThriftTupleDomain.java @@ -17,8 +17,7 @@ import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.google.common.collect.ImmutableSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Map; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigint.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigint.java index 1a86d92dc54c8..e7329da382cc8 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigint.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigint.java @@ -20,8 +20,7 @@ import com.facebook.presto.common.block.LongArrayBlock; import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.RecordSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigintArray.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigintArray.java index 4d8662cf3c444..4d70dbdae0274 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigintArray.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBigintArray.java @@ -21,8 +21,7 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.LongArrayBlock; import com.facebook.presto.common.type.Type; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBlock.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBlock.java index eaab3496ac236..14c990992a4d2 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBlock.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBlock.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.RecordCursor; import com.facebook.presto.spi.RecordSet; import io.airlift.slice.Slice; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; @@ -42,7 +41,7 @@ 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.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; @ThriftStruct public final class PrestoThriftBlock @@ -278,7 +277,7 @@ public static PrestoThriftBlock fromBlock(Block block, Type type) case HYPER_LOG_LOG: return PrestoThriftHyperLogLog.fromBlock(block); case ARRAY: - Type elementType = getOnlyElement(type.getTypeParameters()); + Type elementType = type.getTypeParameters().stream().collect(onlyElement()); if (BigintType.BIGINT.equals(elementType)) { return PrestoThriftBigintArray.fromBlock(block); } diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBoolean.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBoolean.java index fbebc34a30294..ae9669476c6ab 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBoolean.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftBoolean.java @@ -19,8 +19,7 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.ByteArrayBlock; import com.facebook.presto.common.type.Type; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDate.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDate.java index 890c0750ac6d7..0ec1eac34e70c 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDate.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDate.java @@ -20,8 +20,7 @@ import com.facebook.presto.common.block.IntArrayBlock; import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.RecordSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDouble.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDouble.java index f83e7c809fc5f..9e03aeea64194 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDouble.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftDouble.java @@ -19,8 +19,7 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.LongArrayBlock; import com.facebook.presto.common.type.Type; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftHyperLogLog.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftHyperLogLog.java index 2b90ee0842f83..5e10acaed96d5 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftHyperLogLog.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftHyperLogLog.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftInteger.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftInteger.java index 3ef7085d12a30..fa3b8840e4d13 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftInteger.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftInteger.java @@ -20,8 +20,7 @@ import com.facebook.presto.common.block.IntArrayBlock; import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.RecordSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftJson.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftJson.java index 19903600beb15..44605c42d35e8 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftJson.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftJson.java @@ -18,8 +18,7 @@ import com.facebook.drift.annotations.ThriftStruct; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftTimestamp.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftTimestamp.java index 2c909b828495c..df507e0059e66 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftTimestamp.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftTimestamp.java @@ -20,8 +20,7 @@ import com.facebook.presto.common.block.LongArrayBlock; import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.RecordSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftVarchar.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftVarchar.java index 530a73f75dd6e..f1f57c117ce94 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftVarchar.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/PrestoThriftVarchar.java @@ -19,8 +19,7 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.VarcharType; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/SliceData.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/SliceData.java index c2af554f67a45..37ce84ac9160f 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/SliceData.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/datatypes/SliceData.java @@ -18,8 +18,7 @@ import com.facebook.presto.common.type.Type; 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.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/ThriftUdfPage.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/ThriftUdfPage.java index 95420ea4a895c..03a3edff04fc3 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/ThriftUdfPage.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/ThriftUdfPage.java @@ -17,8 +17,7 @@ import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.facebook.presto.spi.page.SerializedPage; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/UdfExecutionFailureInfo.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/UdfExecutionFailureInfo.java index 02cd112565a15..644a9d5c81bfb 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/UdfExecutionFailureInfo.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/udf/UdfExecutionFailureInfo.java @@ -17,9 +17,8 @@ import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; 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; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftRangeValueSet.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftRangeValueSet.java index 20b0f29ae0ab6..cad2d28e3a477 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftRangeValueSet.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftRangeValueSet.java @@ -23,8 +23,7 @@ import com.facebook.presto.common.predicate.Range; import com.facebook.presto.common.predicate.SortedRangeSet; import com.facebook.presto.thrift.api.datatypes.PrestoThriftBlock; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftValueSet.java b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftValueSet.java index 34c6452e299f1..7291d3210433d 100644 --- a/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftValueSet.java +++ b/presto-thrift-api/src/main/java/com/facebook/presto/thrift/api/valuesets/PrestoThriftValueSet.java @@ -20,8 +20,7 @@ import com.facebook.presto.common.predicate.EquatableValueSet; import com.facebook.presto.common.predicate.SortedRangeSet; import com.facebook.presto.common.predicate.ValueSet; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftColumnHandle.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftColumnHandle.java index cc447c13003d3..471d1ae1026ad 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftColumnHandle.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftColumnHandle.java @@ -18,8 +18,7 @@ import com.facebook.presto.spi.ColumnMetadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnector.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnector.java index a038917341ef0..501e7740e7434 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnector.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnector.java @@ -23,8 +23,7 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java index a77e0a6905eb3..afb8b0fe57f9c 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/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/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexPageSource.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexPageSource.java index f43e6768fd207..2431f18806ae5 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexPageSource.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexPageSource.java @@ -29,8 +29,7 @@ import com.facebook.presto.thrift.api.connector.PrestoThriftTupleDomain; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexProvider.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexProvider.java index 08a5ef2366f86..19f44975b6458 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexProvider.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftIndexProvider.java @@ -21,8 +21,7 @@ import com.facebook.presto.spi.connector.ConnectorIndexProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.thrift.api.connector.PrestoThriftService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java index 58d8e7df21851..2abbf4d455b32 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java @@ -43,8 +43,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftModule.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftModule.java index 737ea657c5210..e3adec3f84b80 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftModule.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftModule.java @@ -23,8 +23,7 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; - -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.util.Optional; import java.util.concurrent.Executor; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftPageSourceProvider.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftPageSourceProvider.java index 4ce8f18f7d058..c532c8937a386 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftPageSourceProvider.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftPageSourceProvider.java @@ -22,8 +22,7 @@ import com.facebook.presto.spi.connector.ConnectorPageSourceProvider; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.thrift.api.connector.PrestoThriftService; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSessionProperties.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSessionProperties.java index 127afdde2209a..4f7658013297a 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSessionProperties.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSessionProperties.java @@ -16,8 +16,7 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSplitManager.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSplitManager.java index df17f88705add..a202db6575584 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSplitManager.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftSplitManager.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.connector.thrift; +import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.drift.client.DriftClient; import com.facebook.presto.spi.ColumnHandle; import com.facebook.presto.spi.ConnectorSession; @@ -34,9 +35,7 @@ import com.facebook.presto.thrift.api.connector.PrestoThriftTupleDomain; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; - -import javax.annotation.concurrent.NotThreadSafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/annotations/ForMetadataRefresh.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/annotations/ForMetadataRefresh.java index b2fff95db23a6..7ae61a09490b7 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/annotations/ForMetadataRefresh.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/annotations/ForMetadataRefresh.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.connector.thrift.annotations; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java index 6073b79444491..bcb2e6c06a2a9 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java @@ -16,15 +16,19 @@ import com.facebook.drift.client.address.AddressSelector; import com.facebook.drift.client.address.SimpleAddressSelector; import com.facebook.drift.client.address.SimpleAddressSelectorConfig; -import com.facebook.drift.client.guice.AbstractAnnotatedProvider; import com.facebook.drift.client.guice.AddressSelectorBinder; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.lang.annotation.Annotation; +import java.util.Objects; import static com.facebook.airlift.configuration.ConfigBinder.configBinder; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; public class ExtendedSimpleAddressSelectorBinder implements AddressSelectorBinder @@ -44,8 +48,54 @@ public void bind(Binder binder, Annotation annotation, String prefix) .toProvider(new ExtendedSimpleAddressSelectorProvider(annotation)); } + private abstract static class AbstractAnnotatedProvider + implements Provider + { + private final Annotation annotation; + private Injector injector; + + protected AbstractAnnotatedProvider(Annotation annotation) + { + this.annotation = requireNonNull(annotation, "annotation is null"); + } + + @Inject + public final void setInjector(Injector injector) + { + this.injector = injector; + } + + @Override + public final T get() + { + checkState(injector != null, "injector was not set"); + return get(injector, annotation); + } + + protected abstract T get(Injector injector, Annotation annotation); + + @Override + public final boolean equals(Object obj) + { + if (this == obj) { + return true; + } + if ((obj == null) || (getClass() != obj.getClass())) { + return false; + } + AbstractAnnotatedProvider other = (AbstractAnnotatedProvider) obj; + return Objects.equals(this.annotation, other.annotation); + } + + @Override + public final int hashCode() + { + return Objects.hash(annotation); + } + } + private static class ExtendedSimpleAddressSelectorProvider - extends AbstractAnnotatedProvider> + extends ExtendedSimpleAddressSelectorBinder.AbstractAnnotatedProvider> { public ExtendedSimpleAddressSelectorProvider(Annotation annotation) { diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/util/RebindSafeMBeanServer.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/util/RebindSafeMBeanServer.java index 1708349f9b35d..be2e9f01fb5a3 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/util/RebindSafeMBeanServer.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/util/RebindSafeMBeanServer.java @@ -14,8 +14,8 @@ package com.facebook.presto.connector.thrift.util; import com.facebook.airlift.log.Logger; +import com.google.errorprone.annotations.ThreadSafe; -import javax.annotation.concurrent.ThreadSafe; import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; diff --git a/presto-thrift-testing-server/src/main/java/com/facebook/presto/connector/thrift/server/ThriftTpchService.java b/presto-thrift-testing-server/src/main/java/com/facebook/presto/connector/thrift/server/ThriftTpchService.java index 6a616d2ec667f..c7fe7afaca9ae 100644 --- a/presto-thrift-testing-server/src/main/java/com/facebook/presto/connector/thrift/server/ThriftTpchService.java +++ b/presto-thrift-testing-server/src/main/java/com/facebook/presto/connector/thrift/server/ThriftTpchService.java @@ -41,9 +41,8 @@ import io.airlift.tpch.TpchColumn; import io.airlift.tpch.TpchEntity; import io.airlift.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/presto-tpcds/src/main/java/com/facebook/presto/tpcds/statistics/TableStatisticsDataRepository.java b/presto-tpcds/src/main/java/com/facebook/presto/tpcds/statistics/TableStatisticsDataRepository.java index 7897ade12855d..ffc91883eda52 100644 --- a/presto-tpcds/src/main/java/com/facebook/presto/tpcds/statistics/TableStatisticsDataRepository.java +++ b/presto-tpcds/src/main/java/com/facebook/presto/tpcds/statistics/TableStatisticsDataRepository.java @@ -18,12 +18,14 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.teradata.tpcds.Table; +import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.net.URL; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.util.Optional; import static java.lang.String.format; @@ -58,7 +60,7 @@ private void writeStatistics(Path path, TableStatisticsData tableStatisticsData) objectMapper .writerWithDefaultPrettyPrinter() .writeValue(file, tableStatisticsData); - try (FileWriter fileWriter = new FileWriter(file, true)) { + try (BufferedWriter fileWriter = Files.newBufferedWriter(file.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE)) { fileWriter.append('\n'); } } diff --git a/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/StatisticsEstimator.java b/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/StatisticsEstimator.java index 1f9da7c94d8ee..c51c8265cff9f 100644 --- a/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/StatisticsEstimator.java +++ b/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/StatisticsEstimator.java @@ -26,7 +26,7 @@ import static com.facebook.presto.tpch.util.Types.checkType; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableMap.toImmutableMap; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; public class StatisticsEstimator { @@ -48,7 +48,7 @@ else if (columnValuesRestrictions.values().stream().allMatch(List::isEmpty)) { } else { checkArgument(columnValuesRestrictions.size() <= 1, "Can only estimate stats when at most one column has value restrictions"); - TpchColumn partitionColumn = getOnlyElement(columnValuesRestrictions.keySet()); + TpchColumn partitionColumn = columnValuesRestrictions.keySet().stream().collect(onlyElement()); List partitionValues = columnValuesRestrictions.get(partitionColumn); TableStatisticsData result = zeroStatistics(tpchTable); for (Object partitionValue : partitionValues) { diff --git a/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/TableStatisticsDataRepository.java b/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/TableStatisticsDataRepository.java index e4bbfcb7daf24..7b1d04070722a 100644 --- a/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/TableStatisticsDataRepository.java +++ b/presto-tpch/src/main/java/com/facebook/presto/tpch/statistics/TableStatisticsDataRepository.java @@ -17,12 +17,14 @@ import io.airlift.tpch.TpchColumn; import io.airlift.tpch.TpchTable; +import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.net.URL; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.util.Optional; import static com.facebook.presto.tpch.util.Optionals.withBoth; @@ -58,7 +60,7 @@ private void writeStatistics(Path path, TableStatisticsData tableStatisticsData) objectMapper .writerWithDefaultPrettyPrinter() .writeValue(file, tableStatisticsData); - try (FileWriter fileWriter = new FileWriter(file, true)) { + try (BufferedWriter fileWriter = Files.newBufferedWriter(file.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE)) { fileWriter.append('\n'); } } diff --git a/presto-tpch/src/test/java/com/facebook/presto/tpch/TestTpchMetadata.java b/presto-tpch/src/test/java/com/facebook/presto/tpch/TestTpchMetadata.java index b662520a9abd3..d6875ae59f612 100644 --- a/presto-tpch/src/test/java/com/facebook/presto/tpch/TestTpchMetadata.java +++ b/presto-tpch/src/test/java/com/facebook/presto/tpch/TestTpchMetadata.java @@ -46,7 +46,7 @@ import static com.facebook.presto.spi.Constraint.alwaysTrue; import static com.facebook.presto.tpch.TpchMetadata.getPrestoType; import static com.facebook.presto.tpch.util.PredicateUtils.filterOutColumnFromPredicate; -import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.MoreCollectors.onlyElement; import static io.airlift.slice.Slices.utf8Slice; import static io.airlift.tpch.CustomerColumn.MARKET_SEGMENT; import static io.airlift.tpch.CustomerColumn.NAME; @@ -389,8 +389,9 @@ private static TupleDomain fixedValueTupleDomain(TpchMetadata tpch private static ConnectorTableLayoutResult getTableOnlyLayout(TpchMetadata tpchMetadata, ConnectorSession session, ConnectorTableHandle tableHandle, Constraint constraint) { - List tableLayouts = tpchMetadata.getTableLayouts(session, tableHandle, constraint, Optional.empty()); - return getOnlyElement(tableLayouts); + return tpchMetadata.getTableLayouts(session, tableHandle, constraint, Optional.empty()) + .stream() + .collect(onlyElement()); } private ColumnStatistics noColumnStatistics() diff --git a/presto-verifier/NOTICE b/presto-verifier/NOTICE index 6182bbb1148d3..bbc88f9a0b348 100644 --- a/presto-verifier/NOTICE +++ b/presto-verifier/NOTICE @@ -125,7 +125,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: Apache Avro, Apache BVal, Apache Commons BeanUtils Core, Apache Commons CLI, Apache Commons Codec, Apache Commons Configuration, Apache Commons IO, Apache Commons Lang, Apache Commons Logging, Apache Hadoop, Apache Hive, Apache HttpClient, Apache Maven, Apache Thrift, Apache XBean, Bean Validation API, Code Generation Library, Guava, Jackson, Jetty, Joda time, Log4j Implemented Over SLF4J, Ning Asynchronous Http Client, Plexus, Tableau Web Data Connector, airlift, airlift resolver, airlift slice, fastutil, jDBI, javax.inject, jmxutils, jQuery, opencsv, snappy, vis.js. +The following software may be included in this product: Apache Avro, Apache BVal, Apache Commons BeanUtils Core, Apache Commons CLI, Apache Commons Codec, Apache Commons Configuration, Apache Commons IO, Apache Commons Lang, Apache Commons Logging, Apache Hadoop, Apache Hive, Apache HttpClient, Apache Maven, Apache Thrift, Apache XBean, Bean Validation API, Code Generation Library, Guava, Jackson, Jetty, Joda time, Log4j Implemented Over SLF4J, Ning Asynchronous Http Client, Plexus, Tableau Web Data Connector, airlift, airlift resolver, airlift slice, fastutil, jDBI, jakarta.inject, jmxutils, jQuery, opencsv, snappy, vis.js. This software contains the following license and notice below: diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForControl.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForControl.java index ab3321a97af55..0878e73777593 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForControl.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForControl.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.annotation; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForHelper.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForHelper.java index 3390f762fcd9f..e4aa4766a97c5 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForHelper.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForHelper.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.annotation; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForTest.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForTest.java index 9a82aa905cc8f..90b928c073c38 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForTest.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/annotation/ForTest.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.annotation; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnChecksum.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnChecksum.java index 9688f7e24abac..f667111bb8b84 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnChecksum.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnChecksum.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.checksum; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnValidator.java index ff09cb9e4f639..3bcda054df9d9 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ArrayColumnValidator.java @@ -31,8 +31,7 @@ import com.facebook.presto.verifier.framework.Column; import com.facebook.presto.verifier.framework.VerifierConfig; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java index 2caa6c5f86d66..fa959b3c5701d 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java @@ -30,9 +30,8 @@ import com.facebook.presto.verifier.framework.Column; import com.facebook.presto.verifier.framework.Column.Category; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnChecksum.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnChecksum.java index 972006a955660..441375c2704f5 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnChecksum.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnChecksum.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.checksum; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnValidator.java index 5da029146ded0..7e13f91c2f1cf 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/FloatingPointColumnValidator.java @@ -23,8 +23,7 @@ import com.facebook.presto.verifier.framework.Column; import com.facebook.presto.verifier.framework.VerifierConfig; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnChecksum.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnChecksum.java index 2bf19ee608d33..64cd2ca5cfeec 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnChecksum.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnChecksum.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.checksum; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnValidator.java index 73d238dcceaa1..c689605f9ed26 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/MapColumnValidator.java @@ -26,8 +26,7 @@ import com.facebook.presto.verifier.framework.Column; import com.facebook.presto.verifier.framework.VerifierConfig; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java index 0ab3a33aac103..29a3d0bfc21de 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java @@ -22,9 +22,8 @@ import com.facebook.presto.sql.tree.SubscriptExpression; import com.facebook.presto.verifier.framework.Column; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnChecksum.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnChecksum.java index dbffd4ed68619..c07bc7df1bbfc 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnChecksum.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnChecksum.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.checksum; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.Objects; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnValidator.java index 0a4fab18a545d..1087b0ded9600 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/SimpleColumnValidator.java @@ -23,8 +23,7 @@ import com.facebook.presto.verifier.framework.Column; import com.facebook.presto.verifier.framework.VerifierConfig; import com.google.common.collect.ImmutableList; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisDetails.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisDetails.java index 10d118b09b450..962109c936721 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisDetails.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisDetails.java @@ -19,8 +19,7 @@ import com.facebook.presto.verifier.framework.LimitQueryDeterminismAnalysis; import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.ArrayList; import java.util.List; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisRun.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisRun.java index 42f8598a94438..52667ad447b25 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisRun.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/DeterminismAnalysisRun.java @@ -16,8 +16,7 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventType; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/HumanReadableEventClient.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/HumanReadableEventClient.java index 143784556b8a0..f7e988e77ea6e 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/HumanReadableEventClient.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/HumanReadableEventClient.java @@ -15,8 +15,7 @@ import com.facebook.airlift.event.client.AbstractEventClient; import com.facebook.presto.verifier.framework.VerifierConfig; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.FileNotFoundException; import java.io.PrintStream; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/JsonEventClient.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/JsonEventClient.java index ec0d69bb3b9f8..e2111b4d2d7a0 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/JsonEventClient.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/JsonEventClient.java @@ -18,8 +18,7 @@ import com.facebook.presto.verifier.framework.VerifierConfig; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryFailure.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryFailure.java index 15d0ee017e58c..e4cbc6116c9a1 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryFailure.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryFailure.java @@ -17,8 +17,7 @@ import com.facebook.airlift.event.client.EventType; import com.facebook.presto.common.ErrorType; import com.facebook.presto.verifier.framework.QueryStage; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java index 6929cca10cbbb..fbcba95ffea11 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java @@ -19,10 +19,9 @@ import com.facebook.presto.verifier.prestoaction.QueryActionStats; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.Immutable; import io.airlift.units.Duration; -import javax.annotation.concurrent.Immutable; - import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/VerifierQueryEvent.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/VerifierQueryEvent.java index ef27432a7d725..c019d6f9745bd 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/VerifierQueryEvent.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/VerifierQueryEvent.java @@ -18,8 +18,7 @@ import com.facebook.presto.verifier.framework.SkippedReason; import com.facebook.presto.verifier.framework.SourceQuery; import com.google.common.collect.ImmutableList; - -import javax.annotation.concurrent.Immutable; +import com.google.errorprone.annotations.Immutable; import java.util.List; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/DeterminismAnalyzerConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/DeterminismAnalyzerConfig.java index a9c78eadda074..1a13eada91591 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/DeterminismAnalyzerConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/DeterminismAnalyzerConfig.java @@ -18,9 +18,8 @@ import com.facebook.airlift.configuration.LegacyConfig; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.util.Set; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/QueryConfigurationOverridesConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/QueryConfigurationOverridesConfig.java index 6ded9f9da6044..ad99eb99745aa 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/QueryConfigurationOverridesConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/QueryConfigurationOverridesConfig.java @@ -20,8 +20,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.IOException; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationFactory.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationFactory.java index aaaa24a7a73cf..c59521d1ca2c4 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationFactory.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationFactory.java @@ -27,8 +27,7 @@ import com.facebook.presto.verifier.source.SnapshotQueryConsumer; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ThreadFactoryBuilder; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java index 8d4bd1806e87b..2912959124121 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java @@ -46,10 +46,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import java.io.Closeable; import java.io.IOException; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierConfig.java index 9bd8790fd61bb..41b3a41aed9b0 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierConfig.java @@ -20,9 +20,8 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; - -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.Set; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java index 256978486920b..d9c7dad6501f7 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java @@ -52,9 +52,8 @@ import com.google.inject.Scopes; import com.google.inject.TypeLiteral; import com.google.inject.multibindings.MapBinder; - -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/DefaultClientInfoFactory.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/DefaultClientInfoFactory.java index e32a9f6eec55e..014f2d7a80b52 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/DefaultClientInfoFactory.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/DefaultClientInfoFactory.java @@ -16,8 +16,7 @@ import com.facebook.presto.verifier.framework.QueryStage; import com.facebook.presto.verifier.framework.VerificationContext; import com.facebook.presto.verifier.framework.VerifierConfig; - -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.requireNonNull; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcUrlSelector.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcUrlSelector.java index c885bd668f53c..81c461facedc4 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcUrlSelector.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcUrlSelector.java @@ -14,8 +14,7 @@ package com.facebook.presto.verifier.prestoaction; import com.google.common.collect.Iterators; - -import javax.annotation.concurrent.ThreadSafe; +import com.google.errorprone.annotations.ThreadSafe; import java.util.Iterator; import java.util.List; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java index 8a285c0dbc4f7..2978a1d7974cb 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java @@ -22,10 +22,9 @@ import com.google.common.collect.ImmutableMap; 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.io.IOException; import java.util.List; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java index 6691c843da4a9..84082e80a8e51 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java @@ -16,8 +16,7 @@ import com.facebook.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.MINUTES; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java index c582b04c8d466..6f529c0481c80 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java @@ -25,8 +25,7 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; - -import javax.inject.Provider; +import jakarta.inject.Provider; import java.lang.annotation.Annotation; import java.util.Set; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/ClusterSizeFetcher.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/ClusterSizeFetcher.java index 504e394d0492b..230bf9c90c7e2 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/ClusterSizeFetcher.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/ClusterSizeFetcher.java @@ -33,10 +33,10 @@ import static com.facebook.airlift.http.client.StringResponseHandler.createStringResponseHandler; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; 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 javax.ws.rs.core.Response.Status.OK; public class ClusterSizeFetcher implements ClusterSizeSupplier diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/FailureResolverManagerFactory.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/FailureResolverManagerFactory.java index 795ffecd89944..2b934ea06a3b5 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/FailureResolverManagerFactory.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/FailureResolverManagerFactory.java @@ -14,8 +14,7 @@ package com.facebook.presto.verifier.resolver; import com.google.common.collect.ImmutableSet; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/IgnoredFunctionsMismatchResolver.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/IgnoredFunctionsMismatchResolver.java index 45c354875309f..250f170f58053 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/IgnoredFunctionsMismatchResolver.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/IgnoredFunctionsMismatchResolver.java @@ -21,8 +21,7 @@ import com.facebook.presto.sql.tree.QualifiedName; import com.facebook.presto.verifier.framework.DataMatchResult; import com.facebook.presto.verifier.framework.QueryBundle; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Arrays; import java.util.HashSet; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java index e87ba5f0d1f4d..6ccf5103c32c5 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java @@ -30,8 +30,7 @@ import com.facebook.presto.verifier.prestoaction.PrestoAction; import com.google.common.collect.ImmutableSet; import io.airlift.units.Duration; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java index ea7bf741ff508..78d147256f987 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForClusterConnection.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForClusterConnection.java index 5c922f34ad972..17f56f95ab5d5 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForClusterConnection.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForClusterConnection.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.retry; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForPresto.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForPresto.java index 6435485a72dfe..10f301361098b 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForPresto.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/ForPresto.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.verifier.retry; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java index c6b8ae3161c64..030e2b92759ff 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java @@ -16,8 +16,7 @@ import com.facebook.airlift.configuration.Config; import io.airlift.units.Duration; import io.airlift.units.MinDuration; - -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/QueryRewriteConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/QueryRewriteConfig.java index 6da35271b73df..54766a0283899 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/QueryRewriteConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/QueryRewriteConfig.java @@ -20,8 +20,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.IOException; import java.util.Arrays; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/VerificationQueryRewriterFactory.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/VerificationQueryRewriterFactory.java index 19a2ca0d353e7..45545dca1ed8e 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/VerificationQueryRewriterFactory.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/rewrite/VerificationQueryRewriterFactory.java @@ -30,8 +30,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java index 80978c1b12f4a..1a5ddf922472f 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java @@ -14,11 +14,10 @@ package com.facebook.presto.verifier.source; import com.facebook.presto.verifier.framework.SnapshotQuery; +import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; -import javax.inject.Provider; - import static java.util.Objects.requireNonNull; public abstract class AbstractJdbiSnapshotQueryConsumer diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java index 1a642f8085063..f5211aa7c0cd6 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java @@ -16,11 +16,10 @@ import com.facebook.presto.verifier.framework.SnapshotQuery; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; -import javax.inject.Provider; - import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java index d7f719ab16f28..06d631dd41218 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java @@ -15,11 +15,10 @@ import com.facebook.presto.verifier.framework.SourceQuery; import com.google.common.collect.ImmutableList; +import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; -import javax.inject.Provider; - import java.util.List; import static java.util.Objects.requireNonNull; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQueryConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQueryConfig.java index df7029a6411b5..533eb70300cb3 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQueryConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQueryConfig.java @@ -17,8 +17,7 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQuerySupplier.java index 94a89eebe5a92..648b81cdb64e0 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MySqlSourceQuerySupplier.java @@ -13,11 +13,10 @@ */ package com.facebook.presto.verifier.source; +import jakarta.inject.Inject; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; -import javax.inject.Inject; - import java.sql.DriverManager; public class MySqlSourceQuerySupplier diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQueryConsumer.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQueryConsumer.java index 4e234c49a3794..37f258ab89979 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQueryConsumer.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQueryConsumer.java @@ -13,11 +13,10 @@ */ package com.facebook.presto.verifier.source; +import jakarta.inject.Inject; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; -import javax.inject.Inject; - import java.sql.DriverManager; public class MysqlSnapshotQueryConsumer diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQuerySupplier.java index 59d53b4b2f585..f903a60d9df65 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/MysqlSnapshotQuerySupplier.java @@ -13,11 +13,10 @@ */ package com.facebook.presto.verifier.source; +import jakarta.inject.Inject; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; -import javax.inject.Inject; - import java.sql.DriverManager; public class MysqlSnapshotQuerySupplier diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQueryConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQueryConfig.java index b4bb268a1ac8b..4506ab26ec849 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQueryConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQueryConfig.java @@ -14,8 +14,7 @@ package com.facebook.presto.verifier.source; import com.facebook.airlift.configuration.Config; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Optional; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQuerySupplier.java index dbccf93b04992..23a26b9aa7d8c 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/PrestoQuerySourceQuerySupplier.java @@ -21,8 +21,7 @@ import com.facebook.presto.verifier.prestoaction.PrestoAction; import com.facebook.presto.verifier.prestoaction.PrestoAction.ResultSetConverter; import com.facebook.presto.verifier.prestoaction.PrestoActionFactory; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java index 03887dc993522..58ac2834cc556 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java @@ -38,12 +38,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.units.Duration; +import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; -import javax.inject.Provider; - import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisPlanStatisticsProvider.java b/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisPlanStatisticsProvider.java index 4cab9980d0ba9..04645f41f3e47 100644 --- a/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisPlanStatisticsProvider.java +++ b/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisPlanStatisticsProvider.java @@ -22,8 +22,7 @@ import io.lettuce.core.LettuceFutures; import io.lettuce.core.RedisFuture; import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; - -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.Duration; import java.util.ArrayList; diff --git a/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisProviderApiStats.java b/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisProviderApiStats.java index 83f58d3995392..99802157aad02 100644 --- a/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisProviderApiStats.java +++ b/redis-hbo-provider/src/main/java/com/facebook/presto/statistic/RedisProviderApiStats.java @@ -16,12 +16,11 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; +import com.google.errorprone.annotations.ThreadSafe; import io.lettuce.core.RedisException; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; -import javax.annotation.concurrent.ThreadSafe; - import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; From 36330fee4d9264a88cad6f1f424a6e6ce98c523f Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Tue, 29 Apr 2025 10:39:15 -0700 Subject: [PATCH 04/27] Migrate from com.facebook.drift to com.facebook.airlift.drift --- pom.xml | 20 ++++++------- presto-accumulo/pom.xml | 2 +- presto-atop/pom.xml | 2 +- presto-blackhole/pom.xml | 2 +- presto-cache/pom.xml | 2 +- presto-cassandra/pom.xml | 2 +- presto-clickhouse/pom.xml | 2 +- presto-client/pom.xml | 8 +++--- presto-common/pom.xml | 6 ++-- presto-delta/pom.xml | 2 +- presto-docs/pom.xml | 2 +- presto-druid/pom.xml | 2 +- presto-elasticsearch/pom.xml | 2 +- presto-example-http/pom.xml | 2 +- presto-function-namespace-managers/pom.xml | 8 +++--- presto-hana/pom.xml | 2 +- presto-hdfs-core/pom.xml | 6 ++-- presto-hive-common/pom.xml | 4 +-- presto-hive-function-namespace/pom.xml | 2 +- presto-hive-hadoop2/pom.xml | 2 +- presto-hive/pom.xml | 6 ++-- presto-hudi/pom.xml | 2 +- presto-i18n-functions/pom.xml | 2 +- presto-iceberg/pom.xml | 2 +- presto-jmx/pom.xml | 2 +- presto-kafka/pom.xml | 2 +- presto-kudu/pom.xml | 2 +- presto-local-file/pom.xml | 2 +- presto-main-base/pom.xml | 28 ++++++++++++------- .../block/BenchmarkThriftUdfPageSerDe.java | 3 +- .../server/TestThriftTaskIntegration.java | 3 +- presto-main/pom.xml | 23 +++++++++------ .../TestThriftServerInfoIntegration.java | 3 +- presto-memory/pom.xml | 2 +- presto-ml/pom.xml | 2 +- presto-mongodb/pom.xml | 2 +- presto-mysql/pom.xml | 2 +- presto-native-sidecar-plugin/pom.xml | 2 +- presto-open-telemetry/pom.xml | 2 +- presto-oracle/pom.xml | 2 +- presto-password-authenticators/pom.xml | 2 +- presto-pinot-toolkit/pom.xml | 2 +- presto-pinot/pom.xml | 2 +- presto-postgresql/pom.xml | 2 +- presto-prometheus/pom.xml | 2 +- presto-redshift/pom.xml | 2 +- presto-resource-group-managers/pom.xml | 2 +- presto-singlestore/pom.xml | 2 +- presto-spi/pom.xml | 2 +- presto-sqlserver/pom.xml | 2 +- presto-teradata-functions/pom.xml | 2 +- presto-tests/pom.xml | 6 ++-- presto-thrift-api/pom.xml | 4 +-- presto-thrift-connector/pom.xml | 18 ++++++------ presto-thrift-spec/pom.xml | 2 +- presto-thrift-testing-server/pom.xml | 4 +-- presto-thrift-testing-udf-server/pom.xml | 4 +-- presto-tpcds/pom.xml | 2 +- presto-tpch/pom.xml | 2 +- redis-hbo-provider/pom.xml | 6 ++-- 60 files changed, 130 insertions(+), 114 deletions(-) diff --git a/pom.xml b/pom.xml index c022ddc14ed8f..3399f77598b15 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 4.12.0 3.4.0 19.3.0.0 - 1.46 + ${dep.airlift.version} 2.13.1 @@ -1270,49 +1270,49 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-client ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-codec ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-protocol ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-server ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-transport-spi ${dep.drift.version} - com.facebook.drift + com.facebook.airlift.drift drift-codec-utils ${dep.drift.version} @@ -2660,7 +2660,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-maven-plugin ${dep.drift.version} diff --git a/presto-accumulo/pom.xml b/presto-accumulo/pom.xml index 7ca67f0fcc31c..969ed25cf9d94 100644 --- a/presto-accumulo/pom.xml +++ b/presto-accumulo/pom.xml @@ -269,7 +269,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-atop/pom.xml b/presto-atop/pom.xml index 090ef5a080c6a..27c3dc9cecead 100644 --- a/presto-atop/pom.xml +++ b/presto-atop/pom.xml @@ -100,7 +100,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-blackhole/pom.xml b/presto-blackhole/pom.xml index 3456907d014ed..e43d72932fadc 100644 --- a/presto-blackhole/pom.xml +++ b/presto-blackhole/pom.xml @@ -49,7 +49,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-cache/pom.xml b/presto-cache/pom.xml index 27c3bfce92b5e..d8600fb3c2ffa 100644 --- a/presto-cache/pom.xml +++ b/presto-cache/pom.xml @@ -119,7 +119,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-cassandra/pom.xml b/presto-cassandra/pom.xml index dec62cf156764..9da39489bea15 100644 --- a/presto-cassandra/pom.xml +++ b/presto-cassandra/pom.xml @@ -102,7 +102,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-clickhouse/pom.xml b/presto-clickhouse/pom.xml index 6d514cdc46263..aabafb40f0d31 100644 --- a/presto-clickhouse/pom.xml +++ b/presto-clickhouse/pom.xml @@ -79,7 +79,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-client/pom.xml b/presto-client/pom.xml index f40350d6428d3..7a9dbf3395b4d 100644 --- a/presto-client/pom.xml +++ b/presto-client/pom.xml @@ -66,7 +66,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api @@ -125,19 +125,19 @@ - com.facebook.drift + com.facebook.airlift.drift drift-protocol test - com.facebook.drift + com.facebook.airlift.drift drift-codec test - com.facebook.drift + com.facebook.airlift.drift drift-codec-utils test diff --git a/presto-common/pom.xml b/presto-common/pom.xml index db1bd56ab10c9..9ab578e4edba6 100644 --- a/presto-common/pom.xml +++ b/presto-common/pom.xml @@ -34,7 +34,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api @@ -117,13 +117,13 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec test - com.facebook.drift + com.facebook.airlift.drift drift-protocol test diff --git a/presto-delta/pom.xml b/presto-delta/pom.xml index 73a41cbc3a9e4..17bf1b14107af 100644 --- a/presto-delta/pom.xml +++ b/presto-delta/pom.xml @@ -154,7 +154,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-docs/pom.xml b/presto-docs/pom.xml index 2ee36b2cdfbb1..28c7ba95ccb8e 100644 --- a/presto-docs/pom.xml +++ b/presto-docs/pom.xml @@ -36,7 +36,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-maven-plugin diff --git a/presto-druid/pom.xml b/presto-druid/pom.xml index 1757ede51b953..654cbdbf778d0 100644 --- a/presto-druid/pom.xml +++ b/presto-druid/pom.xml @@ -267,7 +267,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-elasticsearch/pom.xml b/presto-elasticsearch/pom.xml index 44f3ad380cb76..47c3638645551 100644 --- a/presto-elasticsearch/pom.xml +++ b/presto-elasticsearch/pom.xml @@ -192,7 +192,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-example-http/pom.xml b/presto-example-http/pom.xml index 50a592d15d9be..82f0de2e472c6 100644 --- a/presto-example-http/pom.xml +++ b/presto-example-http/pom.xml @@ -76,7 +76,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-function-namespace-managers/pom.xml b/presto-function-namespace-managers/pom.xml index 6b363a5caeb1a..8dcb2d7427c9e 100644 --- a/presto-function-namespace-managers/pom.xml +++ b/presto-function-namespace-managers/pom.xml @@ -53,18 +53,18 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided - com.facebook.drift + com.facebook.airlift.drift drift-client - com.facebook.drift + com.facebook.airlift.drift drift-transport-spi @@ -173,7 +173,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty diff --git a/presto-hana/pom.xml b/presto-hana/pom.xml index 58b29dbc5c586..06f4b518ffd98 100644 --- a/presto-hana/pom.xml +++ b/presto-hana/pom.xml @@ -67,7 +67,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-hdfs-core/pom.xml b/presto-hdfs-core/pom.xml index 71d9da6d8714f..30a6c04f9cde5 100644 --- a/presto-hdfs-core/pom.xml +++ b/presto-hdfs-core/pom.xml @@ -61,7 +61,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api @@ -79,13 +79,13 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec test - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty test diff --git a/presto-hive-common/pom.xml b/presto-hive-common/pom.xml index 8e1c1ba1105cc..d6fee2871d55a 100644 --- a/presto-hive-common/pom.xml +++ b/presto-hive-common/pom.xml @@ -116,13 +116,13 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec test - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty test diff --git a/presto-hive-function-namespace/pom.xml b/presto-hive-function-namespace/pom.xml index 52f25606701a9..bfe07d31c7410 100644 --- a/presto-hive-function-namespace/pom.xml +++ b/presto-hive-function-namespace/pom.xml @@ -78,7 +78,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-hive-hadoop2/pom.xml b/presto-hive-hadoop2/pom.xml index 332c82c74f16a..146bd8307341a 100644 --- a/presto-hive-hadoop2/pom.xml +++ b/presto-hive-hadoop2/pom.xml @@ -79,7 +79,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml index a33c7ba8feea9..42cefd00eb0f9 100644 --- a/presto-hive/pom.xml +++ b/presto-hive/pom.xml @@ -35,17 +35,17 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec - com.facebook.drift + com.facebook.airlift.drift drift-codec-utils - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty diff --git a/presto-hudi/pom.xml b/presto-hudi/pom.xml index e832bcfec555d..f57d049b2bfeb 100644 --- a/presto-hudi/pom.xml +++ b/presto-hudi/pom.xml @@ -227,7 +227,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-i18n-functions/pom.xml b/presto-i18n-functions/pom.xml index eef390397a4dd..43e4721654619 100644 --- a/presto-i18n-functions/pom.xml +++ b/presto-i18n-functions/pom.xml @@ -41,7 +41,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml index 992ff10c2c146..6524a62aaace1 100644 --- a/presto-iceberg/pom.xml +++ b/presto-iceberg/pom.xml @@ -201,7 +201,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-jmx/pom.xml b/presto-jmx/pom.xml index 2d0df3c89c552..8233d3cc7e38e 100644 --- a/presto-jmx/pom.xml +++ b/presto-jmx/pom.xml @@ -87,7 +87,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-kafka/pom.xml b/presto-kafka/pom.xml index c155aee0a14b3..220ca0321f00b 100644 --- a/presto-kafka/pom.xml +++ b/presto-kafka/pom.xml @@ -131,7 +131,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-kudu/pom.xml b/presto-kudu/pom.xml index 5a07ab7950e1e..eef4a5dc5f462 100644 --- a/presto-kudu/pom.xml +++ b/presto-kudu/pom.xml @@ -99,7 +99,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-local-file/pom.xml b/presto-local-file/pom.xml index ff2b8910559b4..960a76014eb2f 100644 --- a/presto-local-file/pom.xml +++ b/presto-local-file/pom.xml @@ -62,7 +62,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-main-base/pom.xml b/presto-main-base/pom.xml index 77a9b41b76829..3f8b319edc03e 100644 --- a/presto-main-base/pom.xml +++ b/presto-main-base/pom.xml @@ -149,44 +149,48 @@ - com.facebook.drift + com.facebook.airlift.drift drift-server test - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty - com.facebook.drift + io.netty + netty-buffer + + + + com.facebook.airlift.drift drift-transport-spi - compile - com.facebook.drift + com.facebook.airlift.drift drift-client - com.facebook.drift + com.facebook.airlift.drift drift-protocol - com.facebook.drift + com.facebook.airlift.drift drift-codec - com.facebook.drift + com.facebook.airlift.drift drift-api - com.facebook.drift + com.facebook.airlift.drift drift-codec-utils runtime @@ -525,7 +529,11 @@ com.facebook.presto:presto-ui:jar - com.facebook.drift:drift-transport-spi + + com.facebook.airlift.drift:drift-transport-spi + + io.netty:netty-buffer + diff --git a/presto-main-base/src/test/java/com/facebook/presto/block/BenchmarkThriftUdfPageSerDe.java b/presto-main-base/src/test/java/com/facebook/presto/block/BenchmarkThriftUdfPageSerDe.java index 4c121eebca2c6..0a5d228e7542b 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/block/BenchmarkThriftUdfPageSerDe.java +++ b/presto-main-base/src/test/java/com/facebook/presto/block/BenchmarkThriftUdfPageSerDe.java @@ -69,6 +69,7 @@ import static com.facebook.presto.thrift.api.udf.ThriftUdfPage.prestoPage; import static com.facebook.presto.thrift.api.udf.ThriftUdfPage.thriftPage; import static com.google.inject.Scopes.SINGLETON; +import static io.netty.buffer.ByteBufAllocator.DEFAULT; import static org.testng.Assert.assertTrue; @State(Scope.Thread) @@ -123,7 +124,7 @@ public void setup() server = injector.getInstance(DriftServer.class); ThriftCodecManager codecManager = new ThriftCodecManager(); Closer closer = Closer.create(); - MethodInvokerFactory methodInvokerFactory = closer.register(createStaticDriftNettyMethodInvokerFactory(new DriftNettyClientConfig())); + MethodInvokerFactory methodInvokerFactory = closer.register(createStaticDriftNettyMethodInvokerFactory(new DriftNettyClientConfig(), DEFAULT)); DriftClientFactory clientFactory = new DriftClientFactory( codecManager, methodInvokerFactory, diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java index 2844f3436bf5d..64009fd931cc6 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestThriftTaskIntegration.java @@ -67,6 +67,7 @@ import static com.facebook.drift.server.guice.DriftServerBinder.driftServerBinder; import static com.facebook.drift.transport.netty.client.DriftNettyMethodInvokerFactory.createStaticDriftNettyMethodInvokerFactory; import static com.facebook.presto.execution.buffer.BufferResult.emptyResults; +import static io.netty.buffer.ByteBufAllocator.DEFAULT; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; @@ -108,7 +109,7 @@ public void testServer() AddressSelector addressSelector = new SimpleAddressSelector( ImmutableSet.of(HostAndPort.fromParts("localhost", thriftServerPort)), true); - try (DriftNettyMethodInvokerFactory invokerFactory = createStaticDriftNettyMethodInvokerFactory(new DriftNettyClientConfig())) { + try (DriftNettyMethodInvokerFactory invokerFactory = createStaticDriftNettyMethodInvokerFactory(new DriftNettyClientConfig(), DEFAULT)) { DriftClientFactory clientFactory = new DriftClientFactory(new ThriftCodecManager(), invokerFactory, addressSelector, NORMAL_RESULT); ThriftTaskClient client = clientFactory.createDriftClient(ThriftTaskClient.class).get(); diff --git a/presto-main/pom.xml b/presto-main/pom.xml index 8d7d3340be675..fefcbf837fca1 100644 --- a/presto-main/pom.xml +++ b/presto-main/pom.xml @@ -73,17 +73,17 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec-utils - com.facebook.drift + com.facebook.airlift.drift drift-server - com.facebook.drift + com.facebook.airlift.drift drift-transport-spi @@ -143,7 +143,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec @@ -155,15 +155,19 @@ error_prone_annotations - com.facebook.drift + com.facebook.airlift.drift drift-client - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty - com.facebook.drift + io.netty + netty-buffer + + + com.facebook.airlift.drift drift-api @@ -195,7 +199,7 @@ presto-client - com.facebook.drift + com.facebook.airlift.drift drift-protocol @@ -429,7 +433,8 @@ - com.facebook.drift:drift-protocol + com.facebook.airlift.drift:drift-protocol + io.netty:netty-buffer diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java b/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java index 053496185fbaf..462667c59d8b6 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestThriftServerInfoIntegration.java @@ -67,6 +67,7 @@ import static com.facebook.drift.server.guice.DriftServerBinder.driftServerBinder; import static com.facebook.drift.transport.netty.client.DriftNettyMethodInvokerFactory.createStaticDriftNettyMethodInvokerFactory; import static com.facebook.presto.spi.NodeState.ACTIVE; +import static io.netty.buffer.ByteBufAllocator.DEFAULT; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -107,7 +108,7 @@ public void testServer() AddressSelector addressSelector = new SimpleAddressSelector( ImmutableSet.of(HostAndPort.fromParts("localhost", thriftServerPort)), true); - try (DriftNettyMethodInvokerFactory invokerFactory = createStaticDriftNettyMethodInvokerFactory(new DriftNettyClientConfig())) { + try (DriftNettyMethodInvokerFactory invokerFactory = createStaticDriftNettyMethodInvokerFactory(new DriftNettyClientConfig(), DEFAULT)) { DriftClientFactory clientFactory = new DriftClientFactory(new ThriftCodecManager(), invokerFactory, addressSelector, NORMAL_RESULT); ThriftServerInfoClient client = clientFactory.createDriftClient(ThriftServerInfoClient.class).get(); diff --git a/presto-memory/pom.xml b/presto-memory/pom.xml index 2a9cfb8accaea..3be78246c3bbb 100644 --- a/presto-memory/pom.xml +++ b/presto-memory/pom.xml @@ -73,7 +73,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-ml/pom.xml b/presto-ml/pom.xml index 020207909097d..018c069f9cf9b 100644 --- a/presto-ml/pom.xml +++ b/presto-ml/pom.xml @@ -66,7 +66,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-mongodb/pom.xml b/presto-mongodb/pom.xml index e33898baff2bf..39fb4b954cd42 100644 --- a/presto-mongodb/pom.xml +++ b/presto-mongodb/pom.xml @@ -101,7 +101,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-mysql/pom.xml b/presto-mysql/pom.xml index 3877888401a9f..b2579d59b17dc 100644 --- a/presto-mysql/pom.xml +++ b/presto-mysql/pom.xml @@ -78,7 +78,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-native-sidecar-plugin/pom.xml b/presto-native-sidecar-plugin/pom.xml index ad44f717b165e..06e49dccc2aeb 100644 --- a/presto-native-sidecar-plugin/pom.xml +++ b/presto-native-sidecar-plugin/pom.xml @@ -106,7 +106,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-open-telemetry/pom.xml b/presto-open-telemetry/pom.xml index b8e4f6605c537..8ecfae1cb738b 100644 --- a/presto-open-telemetry/pom.xml +++ b/presto-open-telemetry/pom.xml @@ -82,7 +82,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-oracle/pom.xml b/presto-oracle/pom.xml index 11b0aec3d8eb5..79de1d457b662 100644 --- a/presto-oracle/pom.xml +++ b/presto-oracle/pom.xml @@ -79,7 +79,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-password-authenticators/pom.xml b/presto-password-authenticators/pom.xml index a3a5e274332bd..2e1995f91f2e1 100644 --- a/presto-password-authenticators/pom.xml +++ b/presto-password-authenticators/pom.xml @@ -79,7 +79,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-pinot-toolkit/pom.xml b/presto-pinot-toolkit/pom.xml index ac413d2a30a8b..93c53e09ccaf9 100644 --- a/presto-pinot-toolkit/pom.xml +++ b/presto-pinot-toolkit/pom.xml @@ -537,7 +537,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-pinot/pom.xml b/presto-pinot/pom.xml index f4a9fa91b305f..d9222168ef66e 100644 --- a/presto-pinot/pom.xml +++ b/presto-pinot/pom.xml @@ -67,7 +67,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-postgresql/pom.xml b/presto-postgresql/pom.xml index 217f6a54096b8..fadfb4d97c122 100644 --- a/presto-postgresql/pom.xml +++ b/presto-postgresql/pom.xml @@ -77,7 +77,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-prometheus/pom.xml b/presto-prometheus/pom.xml index fce2f24835f54..adbc66605135b 100644 --- a/presto-prometheus/pom.xml +++ b/presto-prometheus/pom.xml @@ -132,7 +132,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-redshift/pom.xml b/presto-redshift/pom.xml index 905ed33b7ee8a..5277cc233da3b 100644 --- a/presto-redshift/pom.xml +++ b/presto-redshift/pom.xml @@ -70,7 +70,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-resource-group-managers/pom.xml b/presto-resource-group-managers/pom.xml index 30d090d532be9..ab99b06d93b04 100644 --- a/presto-resource-group-managers/pom.xml +++ b/presto-resource-group-managers/pom.xml @@ -58,7 +58,7 @@ stats - com.facebook.drift + com.facebook.airlift.drift drift-api diff --git a/presto-singlestore/pom.xml b/presto-singlestore/pom.xml index e1cddd1595eb9..877761ea5e506 100644 --- a/presto-singlestore/pom.xml +++ b/presto-singlestore/pom.xml @@ -68,7 +68,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-spi/pom.xml b/presto-spi/pom.xml index 6e0b110b4fa65..21ea78b6564ae 100644 --- a/presto-spi/pom.xml +++ b/presto-spi/pom.xml @@ -24,7 +24,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api diff --git a/presto-sqlserver/pom.xml b/presto-sqlserver/pom.xml index c6f546061fa68..005fe199a64aa 100644 --- a/presto-sqlserver/pom.xml +++ b/presto-sqlserver/pom.xml @@ -78,7 +78,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-teradata-functions/pom.xml b/presto-teradata-functions/pom.xml index 6914c07b5af50..845c741f745bf 100644 --- a/presto-teradata-functions/pom.xml +++ b/presto-teradata-functions/pom.xml @@ -51,7 +51,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-tests/pom.xml b/presto-tests/pom.xml index d287fef506e72..131e274010735 100644 --- a/presto-tests/pom.xml +++ b/presto-tests/pom.xml @@ -244,12 +244,12 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty @@ -445,7 +445,7 @@ com.facebook.presto:presto-memory-context com.facebook.airlift:concurrent com.facebook.presto:presto-function-namespace-managers-common - com.facebook.drift:drift-codec + com.facebook.airlift.drift:drift-codec com.facebook.airlift:jaxrs diff --git a/presto-thrift-api/pom.xml b/presto-thrift-api/pom.xml index 564867bcb455a..043db712f30eb 100644 --- a/presto-thrift-api/pom.xml +++ b/presto-thrift-api/pom.xml @@ -36,7 +36,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api @@ -89,7 +89,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-javadoc ${dep.drift.version} diff --git a/presto-thrift-connector/pom.xml b/presto-thrift-connector/pom.xml index a5bf5af2d211a..980f161b1d895 100644 --- a/presto-thrift-connector/pom.xml +++ b/presto-thrift-connector/pom.xml @@ -24,27 +24,27 @@ - com.facebook.drift + com.facebook.airlift.drift drift-client - com.facebook.drift + com.facebook.airlift.drift drift-transport-spi - com.facebook.drift + com.facebook.airlift.drift drift-codec - com.facebook.drift + com.facebook.airlift.drift drift-protocol - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty @@ -130,7 +130,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided @@ -179,7 +179,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-server test @@ -216,8 +216,8 @@ maven-dependency-plugin - com.facebook.drift:drift-transport-spi - com.facebook.drift:drift-codec + com.facebook.airlift.drift:drift-transport-spi + com.facebook.airlift.drift:drift-codec diff --git a/presto-thrift-spec/pom.xml b/presto-thrift-spec/pom.xml index a403c718fbf18..a9989c90c48fd 100644 --- a/presto-thrift-spec/pom.xml +++ b/presto-thrift-spec/pom.xml @@ -40,7 +40,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-maven-plugin diff --git a/presto-thrift-testing-server/pom.xml b/presto-thrift-testing-server/pom.xml index 0402d2aac0f83..05afb8b65205a 100644 --- a/presto-thrift-testing-server/pom.xml +++ b/presto-thrift-testing-server/pom.xml @@ -25,12 +25,12 @@ - com.facebook.drift + com.facebook.airlift.drift drift-server - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty diff --git a/presto-thrift-testing-udf-server/pom.xml b/presto-thrift-testing-udf-server/pom.xml index 115950c2be050..28e89423f8ff8 100644 --- a/presto-thrift-testing-udf-server/pom.xml +++ b/presto-thrift-testing-udf-server/pom.xml @@ -29,12 +29,12 @@ - com.facebook.drift + com.facebook.airlift.drift drift-server - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty diff --git a/presto-tpcds/pom.xml b/presto-tpcds/pom.xml index 51c63044324c2..897a7f2a5ad24 100644 --- a/presto-tpcds/pom.xml +++ b/presto-tpcds/pom.xml @@ -66,7 +66,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-tpch/pom.xml b/presto-tpch/pom.xml index 50cf8b98e881c..b1c9a6690d0aa 100644 --- a/presto-tpch/pom.xml +++ b/presto-tpch/pom.xml @@ -42,7 +42,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/redis-hbo-provider/pom.xml b/redis-hbo-provider/pom.xml index b094e648fbbbe..19fa46419463f 100644 --- a/redis-hbo-provider/pom.xml +++ b/redis-hbo-provider/pom.xml @@ -82,7 +82,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-transport-netty @@ -101,12 +101,12 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec - com.facebook.drift + com.facebook.airlift.drift drift-api provided From 43dbdf4e0d4bf504a745f99415a4d5250c275b17 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 23 Apr 2025 17:19:51 -0700 Subject: [PATCH 05/27] Migrate from io.airlift:units to com.facebook.airlift:units --- pom.xml | 4 +- presto-accumulo/pom.xml | 2 +- .../presto/accumulo/conf/AccumuloConfig.java | 2 +- .../conf/AccumuloSessionProperties.java | 2 +- .../index/ColumnCardinalityCache.java | 2 +- .../presto/accumulo/index/IndexLookup.java | 2 +- .../presto/accumulo/AccumuloQueryRunner.java | 2 +- presto-atop/pom.xml | 2 +- .../presto/atop/AtopConnectorConfig.java | 4 +- .../presto/atop/AtopProcessFactory.java | 2 +- .../presto/atop/TestAtopConnectorConfig.java | 2 +- presto-base-jdbc/pom.xml | 2 +- .../presto/plugin/jdbc/BaseJdbcConfig.java | 4 +- .../plugin/jdbc/JdbcMetadataConfig.java | 4 +- .../plugin/jdbc/TestBaseJdbcConfig.java | 2 +- .../plugin/jdbc/TestJdbcMetadataConfig.java | 2 +- .../presto/plugin/jdbc/TestingDatabase.java | 2 +- presto-benchmark-driver/pom.xml | 2 +- .../driver/BenchmarkDriverOptions.java | 2 +- .../driver/BenchmarkQueryResult.java | 2 +- .../driver/BenchmarkQueryRunner.java | 2 +- presto-benchmark-runner/pom.xml | 2 +- .../benchmark/event/BenchmarkQueryEvent.java | 2 +- .../prestoaction/JdbcPrestoAction.java | 2 +- .../prestoaction/PrestoClusterConfig.java | 4 +- .../presto/benchmark/retry/RetryConfig.java | 4 +- .../presto/benchmark/retry/RetryDriver.java | 2 +- .../prestoaction/TestPrestoClusterConfig.java | 2 +- .../benchmark/retry/TestRetryConfig.java | 2 +- .../benchmark/retry/TestRetryDriver.java | 2 +- presto-benchmark/pom.xml | 2 +- .../presto/benchmark/AbstractBenchmark.java | 6 +-- .../benchmark/AbstractOperatorBenchmark.java | 8 +-- .../presto/benchmark/FormatUtils.java | 6 +-- .../presto/benchmark/HandTpchQuery1.java | 4 +- .../presto/benchmark/HandTpchQuery6.java | 4 +- .../benchmark/HashAggregationBenchmark.java | 4 +- .../benchmark/PredicateFilterBenchmark.java | 4 +- .../benchmark/MemoryLocalQueryRunner.java | 4 +- presto-bigquery/pom.xml | 2 +- presto-blackhole/pom.xml | 2 +- .../plugin/blackhole/BlackHoleConnector.java | 2 +- .../blackhole/BlackHoleInsertTableHandle.java | 2 +- .../plugin/blackhole/BlackHoleMetadata.java | 2 +- .../blackhole/BlackHoleOutputTableHandle.java | 2 +- .../plugin/blackhole/BlackHolePageSink.java | 2 +- .../plugin/blackhole/BlackHolePageSource.java | 2 +- .../plugin/blackhole/BlackHoleSplit.java | 2 +- .../blackhole/BlackHoleTableHandle.java | 2 +- .../blackhole/BlackHoleTableLayoutHandle.java | 2 +- .../blackhole/TestBlackHoleMetadata.java | 2 +- presto-cache/pom.xml | 2 +- .../facebook/presto/cache/CacheConfig.java | 2 +- .../cache/alluxio/AlluxioCacheConfig.java | 6 +-- .../cache/filemerge/FileMergeCacheConfig.java | 8 +-- .../filemerge/FileMergeCacheManager.java | 4 +- .../presto/cache/TestCacheConfig.java | 2 +- .../cache/alluxio/TestAlluxioCacheConfig.java | 8 +-- .../alluxio/TestAlluxioCachingFileSystem.java | 6 +-- .../filemerge/TestFileMergeCacheConfig.java | 8 +-- .../filemerge/TestFileMergeCacheManager.java | 6 +-- presto-cassandra/pom.xml | 2 +- .../cassandra/CassandraClientConfig.java | 6 +-- .../cassandra/NativeCassandraSession.java | 2 +- .../presto/cassandra/CassandraServer.java | 2 +- .../cassandra/TestCassandraClientConfig.java | 2 +- .../TestCassandraIntegrationSmokeTest.java | 2 +- presto-cli/pom.xml | 2 +- .../facebook/presto/cli/ClientOptions.java | 2 +- .../java/com/facebook/presto/cli/Console.java | 2 +- .../com/facebook/presto/cli/FormatUtils.java | 6 +-- .../facebook/presto/cli/OutputHandler.java | 4 +- .../presto/cli/QueryPreprocessor.java | 2 +- .../facebook/presto/cli/StatusPrinter.java | 12 ++--- .../facebook/presto/cli/AbstractCliTest.java | 2 +- .../facebook/presto/cli/TestFormatUtils.java | 2 +- presto-clickhouse/pom.xml | 2 +- .../plugin/clickhouse/ClickHouseConfig.java | 4 +- .../clickhouse/TestClickHouseConfig.java | 2 +- presto-client/pom.xml | 2 +- .../facebook/presto/client/ClientSession.java | 2 +- .../facebook/presto/client/ServerInfo.java | 2 +- .../facebook/presto/client/SpnegoHandler.java | 2 +- .../presto/client/StatementClientV1.java | 2 +- .../presto/client/TestServerInfo.java | 2 +- presto-cluster-ttl-providers/pom.xml | 2 +- presto-delta/pom.xml | 2 +- presto-druid/pom.xml | 2 +- .../facebook/presto/druid/DruidClient.java | 2 +- .../facebook/presto/druid/DruidConfig.java | 4 +- .../presto/druid/TestDruidConfig.java | 2 +- presto-elasticsearch/pom.xml | 2 +- .../elasticsearch/ElasticsearchConfig.java | 4 +- .../client/ElasticsearchClient.java | 2 +- .../ElasticsearchQueryRunner.java | 2 +- .../TestElasticsearchConfig.java | 2 +- presto-example-http/pom.xml | 2 +- .../pom.xml | 2 +- ...InvokedFunctionNamespaceManagerConfig.java | 4 +- ...estSqlInvokedFunctionNamespaceManager.java | 2 +- ...InvokedFunctionNamespaceManagerConfig.java | 2 +- presto-function-namespace-managers/pom.xml | 2 +- .../presto/server/FunctionPluginManager.java | 2 +- presto-google-sheets/pom.xml | 2 +- .../presto/google/sheets/SheetsConfig.java | 4 +- .../google/sheets/TestSheetsConfig.java | 2 +- presto-hana/pom.xml | 2 +- presto-hdfs-core/pom.xml | 2 +- .../com/facebook/presto/hive/CacheQuota.java | 2 +- .../presto/hive/CacheQuotaRequirement.java | 2 +- .../presto/hive/TestHiveFileInfo.java | 4 +- presto-hive-common/pom.xml | 2 +- .../presto/hive/HiveCommonClientConfig.java | 4 +- .../hive/HiveCommonSessionProperties.java | 2 +- .../presto/hive/SortingFileWriterConfig.java | 8 +-- .../security/AWSSecurityMappingConfig.java | 4 +- .../security/AWSSecurityMappingsSupplier.java | 2 +- .../hive/TestHiveCommonClientConfig.java | 4 +- .../presto/hive/TestHiveFileInfo.java | 4 +- .../TestAWSSecurityMappingConfig.java | 2 +- presto-hive-function-namespace/pom.xml | 2 +- presto-hive-hadoop2/pom.xml | 2 +- ...leSystemS3SelectCsvPushdownWithSplits.java | 4 +- ...eSystemS3SelectJsonPushdownWithSplits.java | 4 +- presto-hive-metastore/pom.xml | 2 +- .../presto/hive/HiveStorageFormat.java | 4 +- .../presto/hive/MetastoreClientConfig.java | 4 +- .../com/facebook/presto/hive/RetryDriver.java | 2 +- .../hive/aws/AbstractSdkMetricsCollector.java | 2 +- .../AbstractCachingHiveMetastore.java | 2 +- .../hive/metastore/ExtendedHiveMetastore.java | 2 +- .../InMemoryCachingHiveMetastore.java | 2 +- .../metastore/RecordingHiveMetastore.java | 2 +- .../SemiTransactionalHiveMetastore.java | 2 +- .../metastore/file/FileHiveMetastore.java | 2 +- .../metastore/glue/GlueHiveMetastore.java | 2 +- .../metastore/glue/GlueMetastoreStats.java | 2 +- .../thrift/BridgingHiveMetastore.java | 2 +- .../hive/metastore/thrift/HiveMetastore.java | 2 +- .../thrift/HiveMetastoreClientFactory.java | 2 +- .../metastore/TestMetastoreClientConfig.java | 2 +- .../metastore/TestRecordingHiveMetastore.java | 2 +- .../metastore/UnimplementedHiveMetastore.java | 2 +- .../MockHiveMetastoreClientFactory.java | 2 +- .../thrift/TestStaticHiveCluster.java | 2 +- presto-hive/pom.xml | 2 +- .../presto/hive/CachingDirectoryLister.java | 4 +- .../hive/HdfsConfigurationInitializer.java | 2 +- .../presto/hive/HiveClientConfig.java | 16 +++--- .../presto/hive/HivePageSinkProvider.java | 2 +- .../presto/hive/HivePageSourceProvider.java | 2 +- .../presto/hive/HiveSessionProperties.java | 4 +- .../presto/hive/HiveSplitManager.java | 2 +- .../facebook/presto/hive/HiveSplitSource.java | 4 +- .../presto/hive/HiveWriterFactory.java | 2 +- .../presto/hive/OrcFileWriterConfig.java | 2 +- .../presto/hive/ParquetFileWriterConfig.java | 4 +- .../presto/hive/RecordFileWriter.java | 2 +- .../presto/hive/SortingFileWriter.java | 4 +- .../presto/hive/SortingFileWriterFactory.java | 2 +- .../presto/hive/gcs/HiveGcsConfig.java | 2 +- .../presto/hive/orc/HdfsOrcDataSource.java | 2 +- .../orc/OrcAggregatedPageSourceFactory.java | 2 +- .../hive/orc/OrcPageSourceFactoryUtils.java | 2 +- .../orc/OrcSelectivePageSourceFactory.java | 2 +- .../presto/hive/pagefile/PageFileWriter.java | 2 +- .../presto/hive/pagefile/PageWriter.java | 2 +- .../presto/hive/rcfile/RcFilePageSource.java | 2 +- .../hive/rcfile/RcFilePageSourceFactory.java | 4 +- .../facebook/presto/hive/s3/HiveS3Config.java | 10 ++-- .../presto/hive/s3/PrestoS3ClientFactory.java | 2 +- .../hive/s3/PrestoS3ConfigurationUpdater.java | 4 +- .../presto/hive/s3/PrestoS3FileSystem.java | 6 +-- .../s3/PrestoS3FileSystemMetricCollector.java | 2 +- .../hive/s3/PrestoS3FileSystemStats.java | 2 +- .../s3select/S3SelectLineRecordReader.java | 2 +- .../RangerBasedAccessControlConfig.java | 4 +- .../hive/util/InternalHiveSplitFactory.java | 2 +- .../util/SizeBasedSplitWeightProvider.java | 2 +- .../facebook/presto/hive/util/SortBuffer.java | 2 +- .../presto/hive/util/TempFileReader.java | 4 +- .../presto/hive/util/TempFileWriter.java | 6 +-- .../presto/hive/AbstractTestHiveClient.java | 8 +-- .../hive/TestBackgroundHiveSplitLoader.java | 10 ++-- .../presto/hive/TestHiveClientConfig.java | 12 ++--- .../hive/TestHivePageSourceProvider.java | 2 +- .../hive/TestHiveRecoverableExecution.java | 2 +- .../presto/hive/TestHiveSplitSource.java | 8 +-- .../TestOrcBatchPageSourceMemoryTracking.java | 4 +- .../presto/hive/TestOrcFileWriter.java | 4 +- .../presto/hive/TestOrcFileWriterConfig.java | 8 +-- .../hive/TestParquetFileWriterConfig.java | 6 +-- .../hive/TestSortingFileWriterConfig.java | 6 +-- .../hive/TestStoragePartitionLoader.java | 8 +-- .../presto/hive/benchmark/FileFormat.java | 2 +- .../benchmark/HiveFileFormatBenchmark.java | 4 +- .../TestInMemoryCachingHiveMetastore.java | 2 +- .../parquet/AbstractTestParquetReader.java | 6 +-- .../parquet/BenchmarkParquetPageSource.java | 4 +- .../presto/hive/parquet/ParquetTester.java | 4 +- .../TestParquetReaderMemoryTracking.java | 4 +- .../presto/hive/s3/TestHiveS3Config.java | 6 +-- .../TestRangerBasedAccessControlConfig.java | 2 +- .../TestParquetQuickStatsBuilder.java | 2 +- .../statistics/TestQuickStatsProvider.java | 2 +- .../TestSizeBasedSplitWeightProvider.java | 2 +- presto-hudi/pom.xml | 2 +- .../com/facebook/presto/hudi/HudiConfig.java | 4 +- .../presto/hudi/HudiSessionProperties.java | 2 +- .../split/HudiPartitionSplitGenerator.java | 2 +- .../split/SizeBasedSplitWeightProvider.java | 2 +- .../facebook/presto/hudi/TestHudiConfig.java | 4 +- .../TestSizeBasedSplitWeightProvider.java | 4 +- presto-i18n-functions/pom.xml | 2 +- presto-iceberg/pom.xml | 2 +- .../presto/iceberg/IcebergConfig.java | 6 +-- .../IcebergHiveTableOperationsConfig.java | 6 +-- .../iceberg/IcebergPageSourceProvider.java | 2 +- .../iceberg/IcebergSessionProperties.java | 2 +- .../facebook/presto/iceberg/IcebergUtil.java | 4 +- .../presto/iceberg/TestIcebergConfig.java | 4 +- .../presto/iceberg/TestIcebergFileWriter.java | 2 +- .../iceberg/TestIcebergSystemTables.java | 2 +- .../hive/TestHiveTableOperationsConfig.java | 2 +- .../nessie/TestIcebergSystemTablesNessie.java | 2 +- presto-jdbc/pom.xml | 2 +- .../presto/jdbc/PrestoConnection.java | 2 +- .../presto/jdbc/TestPrestoDriver.java | 4 +- .../presto/jdbc/TestQueryExecutor.java | 2 +- presto-jmx/pom.xml | 2 +- .../connector/jmx/JmxConnectorConfig.java | 4 +- .../connector/jmx/TestJmxConnectorConfig.java | 2 +- .../connector/jmx/TestJmxSplitManager.java | 2 +- presto-kafka/pom.xml | 2 +- .../presto/kafka/KafkaConnectorConfig.java | 4 +- .../presto/kafka/KafkaQueryRunner.java | 2 +- presto-kudu/pom.xml | 2 +- .../presto/kudu/KuduClientConfig.java | 6 +-- presto-lark-sheets/pom.xml | 2 +- presto-local-file/pom.xml | 2 +- presto-main-base/pom.xml | 2 +- .../presto/ExceededCpuLimitException.java | 2 +- ...ededIntermediateWrittenBytesException.java | 2 +- .../presto/ExceededMemoryLimitException.java | 2 +- .../ExceededOutputSizeLimitException.java | 2 +- .../presto/ExceededScanLimitException.java | 2 +- .../presto/ExceededSpillLimitException.java | 2 +- .../java/com/facebook/presto/Session.java | 4 +- .../presto/SystemSessionProperties.java | 4 +- .../connector/system/QuerySystemTable.java | 2 +- .../connector/system/TaskSystemTable.java | 4 +- .../presto/cost/FragmentStatsProvider.java | 2 +- .../presto/dispatcher/DispatchInfo.java | 2 +- .../dispatcher/FailedDispatchQuery.java | 2 +- .../facebook/presto/event/QueryMonitor.java | 2 +- .../presto/event/QueryMonitorConfig.java | 10 ++-- .../presto/event/QueryProgressMonitor.java | 2 +- .../AccessControlCheckerExecution.java | 2 +- .../execution/BasicStageExecutionStats.java | 4 +- .../presto/execution/ClusterSizeMonitor.java | 2 +- .../execution/DataDefinitionExecution.java | 2 +- .../execution/ManagedQueryExecution.java | 2 +- .../presto/execution/QueryExecution.java | 2 +- .../facebook/presto/execution/QueryLimit.java | 2 +- .../presto/execution/QueryManagerConfig.java | 12 ++--- .../presto/execution/QueryStateMachine.java | 2 +- .../presto/execution/QueryStateTimer.java | 4 +- .../facebook/presto/execution/QueryStats.java | 8 +-- .../presto/execution/QueryTracker.java | 2 +- .../execution/SplitConcurrencyController.java | 2 +- .../presto/execution/SplitRunner.java | 2 +- .../presto/execution/SqlQueryExecution.java | 2 +- .../presto/execution/SqlStageExecution.java | 2 +- .../presto/execution/SqlTaskExecution.java | 2 +- .../presto/execution/SqlTaskManager.java | 4 +- .../presto/execution/StageExecutionInfo.java | 2 +- .../execution/StageExecutionStateMachine.java | 2 +- .../presto/execution/StageExecutionStats.java | 2 +- .../presto/execution/TaskManagerConfig.java | 10 ++-- .../presto/execution/TimeoutThread.java | 2 +- .../executor/PrioritizedSplitRunner.java | 2 +- .../execution/executor/TaskExecutor.java | 2 +- .../presto/execution/executor/TaskHandle.java | 2 +- .../resourceGroups/InternalResourceGroup.java | 6 +-- .../InternalResourceGroupManager.java | 2 +- .../scheduler/NetworkLocationCache.java | 2 +- .../execution/scheduler/NodeScheduler.java | 2 +- .../scheduler/ScaledWriterScheduler.java | 2 +- .../scheduler/SqlQueryScheduler.java | 2 +- .../scheduler/SqlQuerySchedulerInterface.java | 2 +- .../nodeSelection/SimpleTtlNodeSelector.java | 2 +- .../SimpleTtlNodeSelectorConfig.java | 2 +- .../memory/ClusterMemoryLeakDetector.java | 2 +- .../presto/memory/LocalMemoryManager.java | 4 +- .../facebook/presto/memory/MemoryInfo.java | 2 +- .../presto/memory/MemoryManagerConfig.java | 10 ++-- .../facebook/presto/memory/MemoryPool.java | 2 +- .../presto/memory/NodeMemoryConfig.java | 4 +- .../facebook/presto/memory/QueryContext.java | 6 +-- .../memory/ReservedSystemMemoryConfig.java | 4 +- .../metadata/ThriftRemoteNodeState.java | 4 +- .../com/facebook/presto/operator/Driver.java | 2 +- .../presto/operator/DriverContext.java | 4 +- .../facebook/presto/operator/DriverStats.java | 2 +- .../operator/DynamicFilterSourceOperator.java | 2 +- .../presto/operator/ExchangeClient.java | 6 +-- .../presto/operator/ExchangeClientConfig.java | 12 ++--- .../operator/ExchangeClientFactory.java | 6 +-- .../FileFragmentResultCacheConfig.java | 12 ++--- .../operator/FilterAndProjectOperator.java | 2 +- .../operator/HashAggregationOperator.java | 4 +- .../presto/operator/HashBuilderOperator.java | 2 +- .../presto/operator/NestedLoopJoinPages.java | 2 +- .../operator/NestedLoopJoinPagesBuilder.java | 4 +- .../presto/operator/OperatorContext.java | 2 +- .../OperatorMemoryReservationSummary.java | 2 +- .../presto/operator/OperatorStats.java | 4 +- .../presto/operator/PageBufferClient.java | 4 +- .../facebook/presto/operator/PagesHash.java | 4 +- .../facebook/presto/operator/PagesIndex.java | 4 +- .../operator/PagesSpatialIndexSupplier.java | 4 +- .../presto/operator/RpcShuffleClient.java | 2 +- .../ScanFilterAndProjectOperator.java | 2 +- .../presto/operator/TableFinishInfo.java | 6 +-- .../presto/operator/TableFinishOperator.java | 2 +- .../presto/operator/TableWriterMergeInfo.java | 2 +- .../operator/TableWriterMergeOperator.java | 2 +- .../presto/operator/TableWriterOperator.java | 4 +- .../facebook/presto/operator/TaskContext.java | 8 +-- .../TaskMemoryReservationSummary.java | 2 +- .../GenericAccumulatorFactory.java | 2 +- .../presto/operator/aggregation/TypedSet.java | 4 +- .../InMemoryHashAggregationBuilder.java | 2 +- .../MergingHashAggregationBuilder.java | 2 +- .../SpillableHashAggregationBuilder.java | 2 +- .../partial/PartialAggregationController.java | 2 +- .../operator/exchange/LocalExchange.java | 2 +- .../index/DynamicTupleFilterFactory.java | 4 +- .../presto/operator/index/IndexLoader.java | 4 +- .../index/IndexLookupSourceFactory.java | 4 +- .../operator/index/IndexSnapshotBuilder.java | 2 +- .../OptimizedPartitionedOutputOperator.java | 2 +- .../PartitionedOutputOperator.java | 2 +- .../operator/scalar/DateTimeFunctions.java | 2 +- .../AggregatedResourceGroupInfoBuilder.java | 2 +- .../ResourceManagerClusterStateProvider.java | 2 +- .../ResourceManagerConfig.java | 4 +- .../ResourceManagerResourceGroupService.java | 2 +- .../FileBasedSystemAccessControl.java | 2 +- .../presto/server/BasicQueryStats.java | 6 +-- .../presto/server/DataSizeSerializer.java | 2 +- .../presto/server/DurationSerializer.java | 2 +- .../server/GracefulShutdownHandler.java | 2 +- .../server/InternalCommunicationConfig.java | 4 +- .../facebook/presto/server/NodeStatus.java | 2 +- .../presto/server/PluginManagerUtil.java | 2 +- .../presto/server/ResourceGroupInfo.java | 2 +- .../facebook/presto/server/ServerConfig.java | 2 +- .../protocol/QueryBlockingRateLimiter.java | 2 +- .../server/protocol/RetryCircuitBreaker.java | 2 +- .../presto/server/remotetask/Backoff.java | 2 +- .../server/thrift/ThriftTaskService.java | 2 +- .../JavaWorkerSessionPropertyProvider.java | 2 +- .../presto/spiller/NodeSpillConfig.java | 2 +- .../presto/spiller/SpillSpaceTracker.java | 4 +- .../presto/sql/analyzer/FeaturesConfig.java | 10 ++-- .../sql/analyzer/JavaFeaturesConfig.java | 4 +- .../presto/sql/gen/ExpressionProfiler.java | 2 +- .../sql/planner/LocalExecutionPlanner.java | 4 +- .../planner/iterative/IterativeOptimizer.java | 2 +- ...wPartialAggregationOverGroupIdRuleSet.java | 2 +- .../rule/DetermineJoinDistributionType.java | 2 +- .../DetermineSemiJoinDistributionType.java | 2 +- .../iterative/rule/JoinSwappingUtils.java | 2 +- .../HashCollisionPlanNodeStats.java | 4 +- .../planner/planPrinter/PlanNodeStats.java | 6 +-- .../planPrinter/PlanNodeStatsSummarizer.java | 6 +-- .../sql/planner/planPrinter/PlanPrinter.java | 4 +- .../planPrinter/PlanRepresentation.java | 2 +- .../sql/planner/planPrinter/TextRenderer.java | 2 +- .../planPrinter/WindowPlanNodeStats.java | 4 +- .../presto/testing/LocalQueryRunner.java | 2 +- .../presto/testing/TestingTaskContext.java | 6 +-- .../InMemoryTransactionManager.java | 2 +- .../presto/transaction/TransactionInfo.java | 2 +- .../transaction/TransactionManagerConfig.java | 4 +- .../ConfidenceBasedNodeTtlFetcherManager.java | 2 +- .../NodeTtlFetcherManagerConfig.java | 2 +- .../com/facebook/presto/util/TaskUtils.java | 2 +- .../presto/event/TestQueryMonitorConfig.java | 6 +-- .../execution/MockManagedQueryExecution.java | 6 +-- .../presto/execution/MockQueryExecution.java | 4 +- .../execution/MockRemoteTaskFactory.java | 6 +-- .../execution/TestClusterSizeMonitor.java | 2 +- .../presto/execution/TestNodeScheduler.java | 4 +- .../presto/execution/TestQueryLimit.java | 8 +-- .../execution/TestQueryManagerConfig.java | 10 ++-- .../execution/TestQueryStateMachine.java | 2 +- .../presto/execution/TestQueryStats.java | 6 +-- .../execution/TestQueryTrackerQueuedTime.java | 4 +- .../TestSplitConcurrencyController.java | 2 +- .../execution/TestSqlTaskExecution.java | 8 +-- .../presto/execution/TestSqlTaskManager.java | 6 +-- .../execution/TestStageExecutionStats.java | 2 +- .../execution/TestStartTransactionTask.java | 2 +- .../execution/TestTaskManagerConfig.java | 12 ++--- .../TestThriftResourceGroupInfo.java | 2 +- .../execution/buffer/BufferTestUtils.java | 6 +-- .../buffer/TestArbitraryOutputBuffer.java | 6 +-- .../buffer/TestBroadcastOutputBuffer.java | 4 +- .../execution/buffer/TestClientBuffer.java | 2 +- .../buffer/TestPartitionedOutputBuffer.java | 4 +- .../buffer/TestSpoolingOutputBuffer.java | 4 +- .../execution/executor/TestTaskExecutor.java | 2 +- .../BenchmarkResourceGroup.java | 4 +- .../resourceGroups/TestResourceGroups.java | 10 ++-- .../TestSimpleTtlNodeSelector.java | 2 +- .../TestSimpleTtlNodeSelectorConfig.java | 2 +- .../memory/LowMemoryKillerTestingUtils.java | 4 +- .../presto/memory/TestLocalMemoryManager.java | 4 +- .../memory/TestMemoryManagerConfig.java | 6 +-- .../presto/memory/TestMemoryPools.java | 8 +-- .../presto/memory/TestMemoryTracking.java | 4 +- .../presto/memory/TestNodeMemoryConfig.java | 6 +-- .../presto/memory/TestQueryContext.java | 6 +-- .../TestReservedSystemMemoryConfig.java | 6 +-- .../memory/TestSystemMemoryBlocking.java | 4 +- .../BenchmarkDynamicFilterSourceOperator.java | 4 +- ...kHashAndSegmentedAggregationOperators.java | 8 +-- ...kHashAndStreamingAggregationOperators.java | 8 +-- .../BenchmarkHashBuildAndJoinOperators.java | 4 +- .../operator/BenchmarkUnnestOperator.java | 4 +- .../operator/BenchmarkWindowOperator.java | 4 +- .../operator/GroupByHashYieldAssertion.java | 6 +-- .../presto/operator/OperatorAssertion.java | 2 +- .../facebook/presto/operator/TestDriver.java | 2 +- .../presto/operator/TestDriverStats.java | 2 +- .../TestDynamicFilterSourceOperator.java | 4 +- .../operator/TestExchangeClientConfig.java | 10 ++-- .../TestFileFragmentResultCacheConfig.java | 8 +-- .../TestFileFragmentResultCacheManager.java | 2 +- .../TestFilterAndProjectOperator.java | 6 +-- .../operator/TestHashAggregationOperator.java | 12 ++--- ...ionOperatorInSegmentedAggregationMode.java | 6 +-- .../presto/operator/TestHashJoinOperator.java | 6 +-- .../operator/TestHashSemiJoinOperator.java | 4 +- .../operator/TestOperatorAssertion.java | 2 +- .../presto/operator/TestOperatorStats.java | 2 +- .../presto/operator/TestOrderByOperator.java | 6 +-- .../TestPartitionedOutputOperator.java | 8 +-- .../TestScanFilterAndProjectOperator.java | 6 +-- .../presto/operator/TestTopNOperator.java | 4 +- .../operator/TestTopNRowNumberOperator.java | 2 +- .../presto/operator/TestWindowOperator.java | 6 +-- .../operator/exchange/TestLocalExchange.java | 4 +- .../operator/project/TestPageProcessor.java | 2 +- .../BenchmarkPartitionedOutputOperator.java | 8 +-- ...estOptimizedPartitionedOutputOperator.java | 10 ++-- .../scalar/BenchmarkDateTimeFunctions.java | 2 +- .../operator/scalar/FunctionAssertions.java | 4 +- ...stResourceManagerClusterStateProvider.java | 8 +-- .../TestResourceManagerConfig.java | 2 +- .../presto/server/TestBasicQueryInfo.java | 4 +- .../TestInternalCommunicationConfig.java | 4 +- .../presto/server/TestQueryStateInfo.java | 6 +-- .../presto/server/TestServerConfig.java | 2 +- .../presto/server/remotetask/TestBackoff.java | 2 +- .../presto/spiller/TestNodeSpillConfig.java | 8 +-- .../presto/spiller/TestSpillSpaceTracker.java | 4 +- .../sql/analyzer/TestFeaturesConfig.java | 10 ++-- .../sql/analyzer/TestJavaFeaturesConfig.java | 2 +- .../sql/gen/TestExpressionCompiler.java | 2 +- ...wPartialAggregationOverGroupIdRuleSet.java | 6 +-- .../planner/planPrinter/TestPlanPrinter.java | 2 +- .../transaction/TestTransactionManager.java | 2 +- .../TestTransactionManagerConfig.java | 2 +- .../ttl/TestNodeTtlFetcherManagerConfig.java | 2 +- .../facebook/presto/util/MockPowerOfTwo.java | 2 +- presto-main/pom.xml | 2 +- .../presto/dispatcher/LocalDispatchQuery.java | 2 +- .../presto/execution/SqlQueryManager.java | 6 +-- .../FailureDetectorConfig.java | 4 +- .../HeartbeatFailureDetector.java | 2 +- .../presto/memory/ClusterMemoryManager.java | 8 +-- .../presto/memory/HighMemoryTaskKiller.java | 4 +- .../presto/memory/RemoteNodeMemory.java | 4 +- .../presto/metadata/HttpRemoteNodeState.java | 4 +- .../presto/operator/HttpRpcShuffleClient.java | 2 +- .../operator/ThriftRpcShuffleClient.java | 2 +- .../DistributedClusterStatsResource.java | 2 +- .../ResourceManagerClusterStatusSender.java | 2 +- .../resourcemanager/ResourceManagerProxy.java | 2 +- .../server/AsyncPageTransportServlet.java | 4 +- .../presto/server/ClusterStatsResource.java | 2 +- .../presto/server/CoordinatorModule.java | 2 +- .../server/HttpRequestSessionContext.java | 4 +- .../presto/server/RequestErrorTracker.java | 2 +- .../ResourceGroupStateInfoResource.java | 2 +- .../presto/server/ResourceManagerModule.java | 4 +- .../presto/server/ServerInfoResource.java | 2 +- .../presto/server/ServerMainModule.java | 6 +-- .../presto/server/StatusResource.java | 2 +- .../facebook/presto/server/TaskResource.java | 2 +- .../ExecutingQueryResponseProvider.java | 4 +- .../protocol/ExecutingStatementResource.java | 6 +-- .../LocalExecutingQueryResponseProvider.java | 4 +- .../presto/server/protocol/Query.java | 4 +- .../server/protocol/QueryResourceUtil.java | 2 +- .../protocol/QueuedStatementResource.java | 6 +-- .../ContinuousTaskStatusFetcher.java | 4 +- ...tinuousTaskStatusFetcherWithEventLoop.java | 4 +- .../server/remotetask/HttpRemoteTask.java | 2 +- .../remotetask/HttpRemoteTaskFactory.java | 2 +- .../HttpRemoteTaskWithEventLoop.java | 4 +- .../server/remotetask/TaskInfoFetcher.java | 4 +- .../TaskInfoFetcherWithEventLoop.java | 4 +- .../dispatcher/TestLocalDispatchQuery.java | 2 +- .../TestEventListenerManager.java | 10 ++-- .../presto/execution/TestSqlTask.java | 6 +-- .../memory/TestHighMemoryTaskKiller.java | 6 +-- .../MockExchangeRequestProcessor.java | 2 +- .../presto/operator/TestExchangeClient.java | 8 +-- .../presto/operator/TestExchangeOperator.java | 6 +-- .../presto/operator/TestPageBufferClient.java | 6 +-- ...estResourceManagerClusterStatusSender.java | 6 +-- .../server/TestFailureDetectorConfig.java | 2 +- .../server/remotetask/TestHttpRemoteTask.java | 4 +- .../TestHttpRemoteTaskWithEventLoop.java | 4 +- presto-memory-context/pom.xml | 2 +- .../memory/context/TestMemoryContexts.java | 4 +- presto-memory/pom.xml | 2 +- .../presto/plugin/memory/MemoryConfig.java | 2 +- .../plugin/memory/TestMemoryPagesStore.java | 2 +- .../plugin/memory/TestMemoryWorkerCrash.java | 4 +- presto-ml/pom.xml | 2 +- presto-mongodb/pom.xml | 2 +- presto-mysql/pom.xml | 2 +- .../presto/plugin/mysql/MySqlConfig.java | 2 +- .../presto/plugin/mysql/TestMySqlConfig.java | 2 +- .../mysql/TestMySqlDistributedQueries.java | 2 +- .../mysql/TestMySqlIntegrationSmokeTest.java | 2 +- .../plugin/mysql/TestMySqlTypeMapping.java | 2 +- presto-native-sidecar-plugin/pom.xml | 2 +- .../sidecar/TestNativeSidecarPlugin.java | 4 +- presto-node-ttl-fetchers/pom.xml | 2 +- presto-open-telemetry/pom.xml | 2 +- presto-oracle/pom.xml | 2 +- presto-orc/pom.xml | 2 +- .../presto/orc/AbstractOrcDataSource.java | 2 +- .../presto/orc/AbstractOrcRecordReader.java | 2 +- .../presto/orc/ColumnWriterOptions.java | 4 +- .../orc/DefaultOrcWriterFlushPolicy.java | 4 +- .../orc/DictionaryCompressionOptimizer.java | 4 +- .../presto/orc/DwrfStripeCacheOptions.java | 2 +- .../presto/orc/FileOrcDataSource.java | 2 +- .../presto/orc/OrcDataSourceUtils.java | 2 +- .../facebook/presto/orc/OrcDecompressor.java | 4 +- .../com/facebook/presto/orc/OrcReader.java | 2 +- .../facebook/presto/orc/OrcReaderOptions.java | 4 +- .../presto/orc/OrcRecordReaderOptions.java | 2 +- .../com/facebook/presto/orc/OrcWriter.java | 4 +- .../facebook/presto/orc/OrcWriterOptions.java | 8 +-- .../presto/orc/cache/OrcCacheConfig.java | 12 ++--- .../orc/metadata/DwrfStripeCacheWriter.java | 2 +- .../orc/metadata/OrcMetadataReader.java | 4 +- .../writer/SliceDictionaryColumnWriter.java | 4 +- .../orc/AbstractTestDwrfStripeCaching.java | 4 +- .../presto/orc/AbstractTestOrcReader.java | 6 +-- .../orc/BenchmarkBatchStreamReaders.java | 4 +- .../BenchmarkBatchStreamReadersWithZstd.java | 4 +- .../presto/orc/BenchmarkDictionaryWriter.java | 4 +- .../orc/BenchmarkSelectiveStreamReaders.java | 4 +- .../presto/orc/OrcReaderTestingUtils.java | 4 +- .../com/facebook/presto/orc/OrcTester.java | 8 +-- .../presto/orc/TestCachingOrcDataSource.java | 6 +-- .../presto/orc/TestColumnStatistics.java | 4 +- .../presto/orc/TestColumnWriterOptions.java | 2 +- .../facebook/presto/orc/TestDecryption.java | 4 +- .../orc/TestDefaultOrcWriterFlushPolicy.java | 4 +- .../orc/TestDictionaryColumnWriter.java | 4 +- .../TestDictionaryCompressionOptimizer.java | 4 +- .../orc/TestDwrfStripeCacheOptions.java | 4 +- .../orc/TestLongDictionaryProvider.java | 4 +- .../orc/TestMapFlatBatchStreamReader.java | 4 +- .../presto/orc/TestOrcCacheConfig.java | 10 ++-- .../presto/orc/TestOrcDataSourceUtils.java | 6 +-- .../presto/orc/TestOrcFileIntrospection.java | 4 +- .../com/facebook/presto/orc/TestOrcLz4.java | 4 +- .../presto/orc/TestOrcOutputBuffer.java | 6 +-- .../orc/TestOrcReaderDwrfStripeCaching.java | 4 +- .../presto/orc/TestOrcReaderPositions.java | 4 +- .../TestOrcRecordReaderDwrfStripeCaching.java | 4 +- .../facebook/presto/orc/TestOrcWriter.java | 4 +- .../presto/orc/TestOrcWriterOptions.java | 8 +-- .../presto/orc/TestReadBloomFilter.java | 4 +- .../orc/TestStorageOrcFileTailSource.java | 4 +- .../facebook/presto/orc/TestStreamLayout.java | 4 +- .../orc/TestStructBatchStreamReader.java | 4 +- .../presto/orc/TestZstdJniDecompression.java | 2 +- .../orc/metadata/TestDwrfMetadataReader.java | 4 +- .../orc/reader/TestMaxSliceReadSize.java | 6 +-- .../orc/stream/AbstractTestValueStream.java | 4 +- .../orc/stream/TestBooleanOutputStream.java | 4 +- .../TestSliceDictionaryColumnWriter.java | 6 +-- .../orc/writer/TestWriterBlockRawSize.java | 6 +-- presto-parquet/pom.xml | 2 +- .../parquet/cache/ParquetCacheConfig.java | 10 ++-- .../presto/parquet/reader/ParquetReader.java | 2 +- .../presto/parquet/writer/ParquetWriter.java | 2 +- .../parquet/writer/ParquetWriterOptions.java | 2 +- .../parquet/BenchmarkParquetReader.java | 4 +- .../presto/parquet/ParquetTestUtils.java | 6 +-- .../BenchmarkDecimalColumnBatchReader.java | 4 +- .../presto/parquet/reader/TestEncryption.java | 2 +- .../parquet/reader/TestLargeRowGroup.java | 2 +- .../parquet/writer/TestParquetWriter.java | 4 +- presto-password-authenticators/pom.xml | 2 +- .../presto/password/file/FileConfig.java | 4 +- .../presto/password/ldap/LdapConfig.java | 2 +- .../presto/password/file/TestFileConfig.java | 2 +- .../presto/password/ldap/TestLdapConfig.java | 2 +- presto-pinot-toolkit/pom.xml | 2 +- .../facebook/presto/pinot/PinotConfig.java | 8 +-- .../facebook/presto/pinot/PinotModule.java | 6 +-- .../pinot/TestPinotClusterInfoFetcher.java | 2 +- .../presto/pinot/TestPinotConfig.java | 2 +- presto-pinot/pom.xml | 2 +- presto-plan-checker-router-plugin/pom.xml | 4 +- .../scheduler/HttpRequestSessionContext.java | 16 +++--- .../PlanCheckerRouterPluginConfig.java | 4 +- .../PlanCheckerRouterPluginPrestoClient.java | 1 + ...PlanCheckerProviderRouterPluginConfig.java | 2 +- presto-plugin-toolkit/pom.xml | 2 +- .../FileBasedAccessControlConfig.java | 4 +- .../TestFileBasedAccessControlConfig.java | 2 +- presto-postgresql/pom.xml | 2 +- presto-product-tests/pom.xml | 2 +- .../TestInsertIntoCassandraTable.java | 2 +- .../presto/tests/cassandra/TestSelect.java | 2 +- .../tests/hive/TestHiveStorageFormats.java | 2 +- .../presto/tests/utils/QueryAssertions.java | 4 +- presto-prometheus/pom.xml | 2 +- .../prometheus/PrometheusConnectorConfig.java | 4 +- .../prometheus/PrometheusSplitManager.java | 2 +- .../prometheus/PrometheusQueryRunner.java | 2 +- .../TestPrometheusConnectorConfig.java | 2 +- .../prometheus/TestPrometheusSplit.java | 54 +++++++++---------- presto-proxy/pom.xml | 2 +- .../facebook/presto/proxy/ProxyConfig.java | 2 +- .../facebook/presto/proxy/ProxyResource.java | 2 +- .../presto/proxy/TestProxyConfig.java | 2 +- presto-rcfile/pom.xml | 2 +- .../facebook/presto/rcfile/RcFileReader.java | 4 +- .../facebook/presto/rcfile/RcFileWriter.java | 6 +-- .../facebook/presto/rcfile/RcFileTester.java | 8 +-- .../presto/rcfile/TestRcFileReaderManual.java | 4 +- presto-redis/pom.xml | 2 +- .../presto/redis/RedisConnectorConfig.java | 4 +- .../presto/redis/RedisQueryRunner.java | 2 +- presto-redshift/pom.xml | 2 +- presto-resource-group-managers/pom.xml | 2 +- .../AbstractResourceConfigurationManager.java | 6 +-- ...FileResourceGroupConfigurationManager.java | 2 +- .../presto/resourceGroups/ManagerSpec.java | 2 +- .../resourceGroups/ResourceGroupSpec.java | 4 +- .../SelectorResourceEstimate.java | 4 +- .../db/DbManagerSpecProvider.java | 2 +- .../db/DbSourceExactMatchSelector.java | 2 +- .../db/ResourceGroupGlobalProperties.java | 2 +- .../db/ResourceGroupSpecBuilder.java | 4 +- .../ReloadingResourceGroupConfig.java | 4 +- ...dingResourceGroupConfigurationManager.java | 4 +- ...FileResourceGroupConfigurationManager.java | 6 +-- .../resourceGroups/TestStaticSelector.java | 4 +- .../resourceGroups/TestingResourceGroup.java | 4 +- .../db/TestResourceGroupsDao.java | 4 +- .../TestReloadingResourceGroupConfig.java | 2 +- ...dingResourceGroupConfigurationManager.java | 6 +-- presto-router/pom.xml | 2 +- .../facebook/presto/router/RouterModule.java | 2 +- .../presto/router/cluster/ClusterManager.java | 2 +- .../presto/router/cluster/RemoteState.java | 4 +- .../router/cluster/RemoteStateConfig.java | 5 +- presto-session-property-managers/pom.xml | 2 +- presto-singlestore/pom.xml | 2 +- presto-spark-base/pom.xml | 2 +- .../presto/spark/PrestoSparkConfig.java | 10 ++-- ...toSparkMemoryBasedBroadcastDependency.java | 4 +- ...estoSparkNativeStorageBasedDependency.java | 4 +- ...PrestoSparkPhysicalResourceCalculator.java | 4 +- .../PrestoSparkQueryExecutionFactory.java | 2 +- .../PrestoSparkServiceWaitTimeMetrics.java | 2 +- .../spark/PrestoSparkSessionProperties.java | 4 +- .../PrestoSparkSettingsRequirements.java | 2 +- ...oSparkStorageBasedBroadcastDependency.java | 4 +- ...stoSparkTestingServiceWaitTimeMetrics.java | 2 +- .../AbstractPrestoSparkQueryExecution.java | 6 +-- .../PrestoSparkAdaptiveQueryExecution.java | 2 +- .../PrestoSparkRowOutputOperator.java | 2 +- .../PrestoSparkStaticQueryExecution.java | 2 +- .../NativeExecutionConnectorConfig.java | 2 +- .../property/NativeExecutionSystemConfig.java | 2 +- .../task/PrestoSparkTaskExecution.java | 2 +- .../task/PrestoSparkTaskExecutorFactory.java | 6 +-- .../spark/node/PrestoSparkNodeScheduler.java | 2 +- .../spark/planner/PrestoSparkRddFactory.java | 2 +- .../presto/spark/util/PrestoSparkUtils.java | 2 +- .../presto/spark/PrestoSparkQueryRunner.java | 2 +- .../presto/spark/TestPrestoSparkConfig.java | 10 ++-- .../spark/TestPrestoSparkQueryRunner.java | 2 +- .../TestNativeExecutionSystemConfig.java | 6 +-- ...arkPhysicalResourceAllocationStrategy.java | 2 +- ...oSparkSourceDistributionSplitAssigner.java | 4 +- .../task/TestPrestoSparkTaskExecution.java | 4 +- presto-spark-classloader-interface/pom.xml | 2 +- .../PrestoSparkBootstrapTimer.java | 4 +- presto-spark-testing/pom.xml | 2 +- ...estoSparkLauncherIntegrationSmokeTest.java | 2 +- presto-spi/pom.xml | 2 +- .../spi/eventlistener/OperatorStatistics.java | 4 +- .../spi/eventlistener/StageStatistics.java | 4 +- .../spi/resourceGroups/ResourceGroup.java | 4 +- .../ResourceGroupQueryLimits.java | 5 +- .../presto/spi/session/PropertyMetadata.java | 4 +- .../presto/spi/session/ResourceEstimates.java | 4 +- .../presto/spi/ttl/NodeTtlFetcher.java | 2 +- presto-sqlserver/pom.xml | 2 +- presto-teradata-functions/pom.xml | 2 +- presto-testng-services/pom.xml | 2 +- .../services/LogTestDurationListener.java | 4 +- presto-tests/pom.xml | 2 +- .../tests/AbstractTestDistributedQueries.java | 4 +- .../tests/AbstractTestQueryFramework.java | 2 +- .../tests/AbstractTestingPrestoClient.java | 2 +- .../presto/tests/DistributedQueryRunner.java | 4 +- .../presto/tests/QueryAssertions.java | 4 +- .../presto/execution/TestFinalQueryInfo.java | 2 +- .../TestMemoryRevokingScheduler.java | 10 ++-- .../facebook/presto/execution/TestQueues.java | 4 +- .../TestResourceGroupIntegration.java | 2 +- .../memory/TestClusterMemoryLeakDetector.java | 4 +- .../presto/tests/TestBlackHoleSmoke.java | 2 +- .../presto/tests/TestQueryManager.java | 4 +- .../presto/tests/TestQuerySpillLimits.java | 2 +- presto-thrift-connector/pom.xml | 2 +- .../thrift/ThriftConnectorConfig.java | 8 +-- .../connector/thrift/ThriftMetadata.java | 2 +- .../thrift/TestThriftConnectorConfig.java | 4 +- presto-verifier/pom.xml | 2 +- .../presto/verifier/event/QueryInfo.java | 2 +- .../prestoaction/JdbcPrestoAction.java | 2 +- .../prestoaction/JdbcPrestoActionFactory.java | 2 +- .../prestoaction/PrestoActionConfig.java | 4 +- .../prestoaction/QueryActionUtil.java | 2 +- .../prestoaction/QueryActionsConfig.java | 4 +- .../TooManyOpenPartitionsFailureResolver.java | 2 +- ...nyOpenPartitionsFailureResolverConfig.java | 4 +- .../presto/verifier/retry/RetryConfig.java | 4 +- .../presto/verifier/retry/RetryDriver.java | 2 +- .../presto/verifier/VerifierTestUtil.java | 2 +- .../prestoaction/TestPrestoActionConfig.java | 2 +- .../prestoaction/TestQueryActionsConfig.java | 2 +- ...nyOpenPartitionsFailureResolverConfig.java | 2 +- .../verifier/retry/TestRetryConfig.java | 2 +- .../verifier/retry/TestRetryDriver.java | 2 +- redis-hbo-provider/pom.xml | 2 +- 766 files changed, 1348 insertions(+), 1351 deletions(-) diff --git a/pom.xml b/pom.xml index 3399f77598b15..90d5debd388e1 100644 --- a/pom.xml +++ b/pom.xml @@ -1156,9 +1156,9 @@ - io.airlift + com.facebook.airlift units - 1.3 + ${dep.airlift.version} diff --git a/presto-accumulo/pom.xml b/presto-accumulo/pom.xml index 969ed25cf9d94..895dc8791e3fc 100644 --- a/presto-accumulo/pom.xml +++ b/presto-accumulo/pom.xml @@ -287,7 +287,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java index b911138c582ad..64027249f3ae1 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloConfig.java @@ -16,7 +16,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java index cbf11223a6c25..a8dcab13cb72c 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/conf/AccumuloSessionProperties.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.accumulo.conf; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java index 08614330e51c6..7a46d56fcc77f 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/ColumnCardinalityCache.java @@ -15,6 +15,7 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.accumulo.conf.AccumuloConfig; import com.facebook.presto.accumulo.model.AccumuloColumnConstraint; import com.facebook.presto.spi.PrestoException; @@ -27,7 +28,6 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.apache.accumulo.core.client.BatchScanner; diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java index 92186f3980971..5fad5fffd64ca 100644 --- a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java +++ b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/index/IndexLookup.java @@ -15,6 +15,7 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.accumulo.model.AccumuloColumnConstraint; import com.facebook.presto.accumulo.model.TabletSplitMetadata; import com.facebook.presto.accumulo.serializers.AccumuloRowSerializer; @@ -24,7 +25,6 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.apache.accumulo.core.client.BatchScanner; diff --git a/presto-accumulo/src/test/java/com/facebook/presto/accumulo/AccumuloQueryRunner.java b/presto-accumulo/src/test/java/com/facebook/presto/accumulo/AccumuloQueryRunner.java index f2d068f7944e0..998540e132658 100644 --- a/presto-accumulo/src/test/java/com/facebook/presto/accumulo/AccumuloQueryRunner.java +++ b/presto-accumulo/src/test/java/com/facebook/presto/accumulo/AccumuloQueryRunner.java @@ -29,10 +29,10 @@ import java.util.Map; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-atop/pom.xml b/presto-atop/pom.xml index 27c3dc9cecead..cb49e43388321 100644 --- a/presto-atop/pom.xml +++ b/presto-atop/pom.xml @@ -112,7 +112,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java index a5e11a9de768e..bc8d957f2dcfd 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopConnectorConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java index fecf2fea94adf..0fe8dfc4182c3 100644 --- a/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java +++ b/presto-atop/src/main/java/com/facebook/presto/atop/AtopProcessFactory.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.atop; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.PrestoException; import com.google.common.util.concurrent.SimpleTimeLimiter; import com.google.common.util.concurrent.TimeLimiter; import com.google.common.util.concurrent.UncheckedTimeoutException; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-atop/src/test/java/com/facebook/presto/atop/TestAtopConnectorConfig.java b/presto-atop/src/test/java/com/facebook/presto/atop/TestAtopConnectorConfig.java index a7b439df37a27..bd1dfbe27bc1c 100644 --- a/presto-atop/src/test/java/com/facebook/presto/atop/TestAtopConnectorConfig.java +++ b/presto-atop/src/test/java/com/facebook/presto/atop/TestAtopConnectorConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.atop; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-base-jdbc/pom.xml b/presto-base-jdbc/pom.xml index 9d0acdcd740cf..18aa5a31370bb 100644 --- a/presto-base-jdbc/pom.xml +++ b/presto-base-jdbc/pom.xml @@ -38,7 +38,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java index b5d390944a317..000dcbdf199d0 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java @@ -16,13 +16,13 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.inject.ConfigurationException; import com.google.inject.spi.Message; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.annotation.Nullable; import jakarta.annotation.PostConstruct; import jakarta.validation.constraints.NotNull; diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java index 6749dd05b4de8..63db7581ca0a1 100644 --- a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java +++ b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadataConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestBaseJdbcConfig.java b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestBaseJdbcConfig.java index eaa75b44295be..0f95e7f41c614 100644 --- a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestBaseJdbcConfig.java +++ b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestBaseJdbcConfig.java @@ -14,9 +14,9 @@ package com.facebook.presto.plugin.jdbc; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; import com.google.inject.ConfigurationException; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestJdbcMetadataConfig.java b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestJdbcMetadataConfig.java index 6477239814c8a..24e066d92e2ec 100644 --- a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestJdbcMetadataConfig.java +++ b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestJdbcMetadataConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.plugin.jdbc; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestingDatabase.java b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestingDatabase.java index a62440a630436..46fb38385f8c9 100644 --- a/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestingDatabase.java +++ b/presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestingDatabase.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.plugin.jdbc; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.ConnectorSplitSource; import com.facebook.presto.spi.SchemaTableName; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.h2.Driver; import java.sql.Connection; diff --git a/presto-benchmark-driver/pom.xml b/presto-benchmark-driver/pom.xml index cd6001fb40c48..2360c65070342 100644 --- a/presto-benchmark-driver/pom.xml +++ b/presto-benchmark-driver/pom.xml @@ -44,7 +44,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkDriverOptions.java b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkDriverOptions.java index 08e3b79b6b3a6..d2fb1da39fe8f 100644 --- a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkDriverOptions.java +++ b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkDriverOptions.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.benchmark.driver; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ClientSession; 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.airline.Option; -import io.airlift.units.Duration; import java.net.URI; import java.net.URISyntaxException; diff --git a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryResult.java b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryResult.java index ca4b7e818b275..db8e509b5afb9 100644 --- a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryResult.java +++ b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryResult.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.benchmark.driver; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.Optional; diff --git a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryRunner.java b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryRunner.java index 2f478e4388280..6d2a69d2dc954 100644 --- a/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryRunner.java +++ b/presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryRunner.java @@ -20,6 +20,7 @@ import com.facebook.airlift.http.client.JsonResponseHandler; import com.facebook.airlift.http.client.Request; import com.facebook.airlift.http.client.jetty.JettyHttpClient; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ClientSession; import com.facebook.presto.client.QueryData; import com.facebook.presto.client.QueryError; @@ -27,7 +28,6 @@ import com.facebook.presto.client.StatementStats; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; -import io.airlift.units.Duration; import okhttp3.OkHttpClient; import java.io.Closeable; diff --git a/presto-benchmark-runner/pom.xml b/presto-benchmark-runner/pom.xml index d03bd7ce80c72..254707e085710 100644 --- a/presto-benchmark-runner/pom.xml +++ b/presto-benchmark-runner/pom.xml @@ -54,7 +54,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java index 18d8fb36f8191..e61429c4090b8 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/event/BenchmarkQueryEvent.java @@ -15,9 +15,9 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventType; +import com.facebook.airlift.units.Duration; import com.facebook.presto.jdbc.QueryStats; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import java.util.Optional; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/JdbcPrestoAction.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/JdbcPrestoAction.java index 77757a73c94e1..13ebfdb560b04 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/JdbcPrestoAction.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/JdbcPrestoAction.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.benchmark.prestoaction; +import com.facebook.airlift.units.Duration; import com.facebook.presto.benchmark.framework.BenchmarkQuery; import com.facebook.presto.benchmark.framework.QueryException; import com.facebook.presto.benchmark.framework.QueryResult; @@ -24,7 +25,6 @@ import com.facebook.presto.sql.tree.Statement; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import java.sql.DriverManager; import java.sql.ResultSet; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java index 0bd05244e5b54..27fc3c691f224 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/prestoaction/PrestoClusterConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.benchmark.prestoaction; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java index 19acbaf585fda..173e127ad3c05 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.benchmark.retry; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryDriver.java b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryDriver.java index 2dade9dc55073..bd7d4633c3dc0 100644 --- a/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryDriver.java +++ b/presto-benchmark-runner/src/main/java/com/facebook/presto/benchmark/retry/RetryDriver.java @@ -14,8 +14,8 @@ package com.facebook.presto.benchmark.retry; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.benchmark.framework.QueryException; -import io.airlift.units.Duration; import java.util.concurrent.ThreadLocalRandom; import java.util.function.Predicate; diff --git a/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/prestoaction/TestPrestoClusterConfig.java b/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/prestoaction/TestPrestoClusterConfig.java index 1fc7079aac156..8edd893be3c8b 100644 --- a/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/prestoaction/TestPrestoClusterConfig.java +++ b/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/prestoaction/TestPrestoClusterConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.benchmark.prestoaction; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryConfig.java b/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryConfig.java index 9c65f19514241..3ce8d38368f4d 100644 --- a/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryConfig.java +++ b/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.benchmark.retry; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryDriver.java b/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryDriver.java index ddd11b71d633c..4c5eb1d4e15ce 100644 --- a/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryDriver.java +++ b/presto-benchmark-runner/src/test/java/com/facebook/presto/benchmark/retry/TestRetryDriver.java @@ -14,8 +14,8 @@ package com.facebook.presto.benchmark.retry; import com.facebook.airlift.log.Logging; +import com.facebook.airlift.units.Duration; import com.facebook.presto.benchmark.framework.QueryException; -import io.airlift.units.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-benchmark/pom.xml b/presto-benchmark/pom.xml index 7aaf635ca82a0..43cbb2a1eb326 100644 --- a/presto-benchmark/pom.xml +++ b/presto-benchmark/pom.xml @@ -63,7 +63,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java index 4cb2f78cdc051..e1c6d43d82dcb 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractBenchmark.java @@ -13,18 +13,18 @@ */ package com.facebook.presto.benchmark; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import jakarta.annotation.Nullable; import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.benchmark.FormatUtils.formatCount; import static com.facebook.presto.benchmark.FormatUtils.formatCountRate; import static com.facebook.presto.benchmark.FormatUtils.formatDataRate; import static com.facebook.presto.benchmark.FormatUtils.formatDataSize; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractOperatorBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractOperatorBenchmark.java index e7462a95b2054..dd2fae3546b79 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractOperatorBenchmark.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractOperatorBenchmark.java @@ -15,6 +15,7 @@ import com.facebook.airlift.stats.CpuTimer; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.common.predicate.TupleDomain; @@ -57,7 +58,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.Arrays; @@ -68,6 +68,9 @@ import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; import static com.facebook.airlift.stats.CpuTimer.CpuDuration; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SystemSessionProperties.getFilterAndProjectMinOutputPageRowCount; import static com.facebook.presto.SystemSessionProperties.getFilterAndProjectMinOutputPageSize; import static com.facebook.presto.common.type.BigintType.BIGINT; @@ -80,9 +83,6 @@ 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.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/FormatUtils.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/FormatUtils.java index 752bec0a15dc7..5f1035262b5b6 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/FormatUtils.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/FormatUtils.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.benchmark; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import java.math.RoundingMode; import java.text.DecimalFormat; -import static io.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java index 1f9697e301041..22d3e69a02066 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.benchmark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.benchmark.HandTpchQuery1.TpchQuery1Operator.TpchQuery1OperatorFactory; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; @@ -31,11 +32,11 @@ import com.facebook.presto.util.DateTimeUtils; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.DateType.DATE; @@ -44,7 +45,6 @@ import static com.facebook.presto.operator.aggregation.GenericAccumulatorFactory.generateAccumulatorFactory; import static com.facebook.presto.sql.analyzer.TypeSignatureProvider.fromTypes; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; public class HandTpchQuery1 diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery6.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery6.java index 22d7863794023..2982320011e6b 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery6.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery6.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.benchmark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.function.SqlFunctionProperties; @@ -32,12 +33,12 @@ import com.facebook.presto.testing.LocalQueryRunner; import com.facebook.presto.util.DateTimeUtils; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; import java.util.function.Supplier; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.DateType.DATE; @@ -46,7 +47,6 @@ import static com.facebook.presto.sql.analyzer.TypeSignatureProvider.fromTypes; import static com.facebook.presto.sql.relational.Expressions.field; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.BYTE; public class HandTpchQuery6 extends AbstractSimpleOperatorBenchmark diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java index a1445e1205946..19f1d43a5d5c8 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.benchmark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.type.Type; import com.facebook.presto.metadata.FunctionAndTypeManager; import com.facebook.presto.operator.HashAggregationOperator.HashAggregationOperatorFactory; @@ -23,16 +24,15 @@ import com.facebook.presto.testing.LocalQueryRunner; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner; import static com.facebook.presto.common.type.DoubleType.DOUBLE; import static com.facebook.presto.operator.aggregation.GenericAccumulatorFactory.generateAccumulatorFactory; import static com.facebook.presto.sql.analyzer.TypeSignatureProvider.fromTypes; -import static io.airlift.units.DataSize.Unit.MEGABYTE; public class HashAggregationBenchmark extends AbstractSimpleOperatorBenchmark diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/PredicateFilterBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/PredicateFilterBenchmark.java index d24f92f3d4aba..a41a43a23df9d 100644 --- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/PredicateFilterBenchmark.java +++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/PredicateFilterBenchmark.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.benchmark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.metadata.Metadata; import com.facebook.presto.operator.FilterAndProjectOperator; import com.facebook.presto.operator.OperatorFactory; @@ -23,12 +24,12 @@ import com.facebook.presto.sql.gen.PageFunctionCompiler; import com.facebook.presto.testing.LocalQueryRunner; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; import java.util.function.Supplier; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner; import static com.facebook.presto.common.function.OperatorType.GREATER_THAN_OR_EQUAL; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; @@ -37,7 +38,6 @@ import static com.facebook.presto.sql.relational.Expressions.call; import static com.facebook.presto.sql.relational.Expressions.constant; import static com.facebook.presto.sql.relational.Expressions.field; -import static io.airlift.units.DataSize.Unit.BYTE; public class PredicateFilterBenchmark extends AbstractSimpleOperatorBenchmark diff --git a/presto-benchmark/src/test/java/com/facebook/presto/benchmark/MemoryLocalQueryRunner.java b/presto-benchmark/src/test/java/com/facebook/presto/benchmark/MemoryLocalQueryRunner.java index aa52d3f28d7cf..3bcc983759952 100644 --- a/presto-benchmark/src/test/java/com/facebook/presto/benchmark/MemoryLocalQueryRunner.java +++ b/presto-benchmark/src/test/java/com/facebook/presto/benchmark/MemoryLocalQueryRunner.java @@ -14,6 +14,7 @@ package com.facebook.presto.benchmark; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.QualifiedObjectName; @@ -36,7 +37,6 @@ import com.facebook.presto.tpch.TpchConnectorFactory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.intellij.lang.annotations.Language; import java.util.List; @@ -44,8 +44,8 @@ import java.util.Optional; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static org.testng.Assert.assertTrue; public class MemoryLocalQueryRunner diff --git a/presto-bigquery/pom.xml b/presto-bigquery/pom.xml index 0608bcfbb386d..e8dd0450eb689 100644 --- a/presto-bigquery/pom.xml +++ b/presto-bigquery/pom.xml @@ -287,7 +287,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-blackhole/pom.xml b/presto-blackhole/pom.xml index e43d72932fadc..f0561fec998af 100644 --- a/presto-blackhole/pom.xml +++ b/presto-blackhole/pom.xml @@ -61,7 +61,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleConnector.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleConnector.java index eb9bd54b12548..f5c3b08be741d 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleConnector.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleConnector.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.common.type.TypeSignatureParameter; import com.facebook.presto.spi.connector.Connector; @@ -25,7 +26,6 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleInsertTableHandle.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleInsertTableHandle.java index c09634aef0d66..6d241d1e216c8 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleInsertTableHandle.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleInsertTableHandle.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorInsertTableHandle; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleMetadata.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleMetadata.java index 4c0495ca4a5c1..97ea968c5bbdc 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleMetadata.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleMetadata.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ColumnHandle; import com.facebook.presto.spi.ColumnMetadata; import com.facebook.presto.spi.ConnectorInsertTableHandle; @@ -36,7 +37,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.airlift.slice.Slice; -import io.airlift.units.Duration; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleOutputTableHandle.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleOutputTableHandle.java index 202bda6cd5a63..041d6537766ac 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleOutputTableHandle.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleOutputTableHandle.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorOutputTableHandle; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSink.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSink.java index 7052af20ff47a..662c8bca593e0 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSink.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSink.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.spi.ConnectorPageSink; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListeningScheduledExecutorService; import io.airlift.slice.Slice; -import io.airlift.units.Duration; import java.util.Collection; import java.util.concurrent.CompletableFuture; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSource.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSource.java index 836a15ae8d500..f0c35add5670e 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSource.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSource.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.spi.ConnectorPageSource; import com.google.common.util.concurrent.ListeningScheduledExecutorService; -import io.airlift.units.Duration; import java.util.concurrent.CompletableFuture; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleSplit.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleSplit.java index 92a126d8b10a8..869f0f69c76e5 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleSplit.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleSplit.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorSplit; import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.NodeProvider; @@ -20,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.List; import java.util.Objects; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableHandle.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableHandle.java index efa144a8aae4b..4e58106c30932 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableHandle.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableHandle.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorTableHandle; import com.facebook.presto.spi.ConnectorTableMetadata; import com.facebook.presto.spi.SchemaTableName; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import java.util.List; import java.util.Objects; diff --git a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableLayoutHandle.java b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableLayoutHandle.java index 4c6366db788bb..ae944d7b2d413 100644 --- a/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableLayoutHandle.java +++ b/presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHoleTableLayoutHandle.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorTableLayoutHandle; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import java.util.Objects; diff --git a/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java b/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java index 09529dc14c7a4..2c1439f61c12b 100644 --- a/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java +++ b/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.plugin.blackhole; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.ConnectorOutputTableHandle; import com.facebook.presto.spi.ConnectorTableMetadata; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.SchemaTableName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.List; diff --git a/presto-cache/pom.xml b/presto-cache/pom.xml index d8600fb3c2ffa..0fa9de3fc4121 100644 --- a/presto-cache/pom.xml +++ b/presto-cache/pom.xml @@ -131,7 +131,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java b/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java index c783a7bbe0d8c..abbbc81c3d1bd 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/CacheConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.CacheQuotaScope; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import java.net.URI; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCacheConfig.java b/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCacheConfig.java index a9b02ffe0e6b7..4a44b7b82e89f 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCacheConfig.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/AlluxioCacheConfig.java @@ -15,10 +15,10 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; -import static io.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java index aecc66ca70919..f487022e90ab2 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheConfig.java @@ -15,12 +15,12 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; -import static io.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.TimeUnit.DAYS; public class FileMergeCacheConfig diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java index b747788531014..bb99d84098ee2 100644 --- a/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java +++ b/presto-cache/src/main/java/com/facebook/presto/cache/filemerge/FileMergeCacheManager.java @@ -15,6 +15,7 @@ import alluxio.collections.ConcurrentHashSet; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.cache.CacheManager; import com.facebook.presto.cache.CacheResult; @@ -31,7 +32,6 @@ import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; @@ -58,10 +58,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterators.getOnlyElement; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.StrictMath.toIntExact; import static java.nio.file.StandardOpenOption.APPEND; import static java.nio.file.StandardOpenOption.CREATE_NEW; diff --git a/presto-cache/src/test/java/com/facebook/presto/cache/TestCacheConfig.java b/presto-cache/src/test/java/com/facebook/presto/cache/TestCacheConfig.java index 11312cf785a67..ae0fd164f52af 100644 --- a/presto-cache/src/test/java/com/facebook/presto/cache/TestCacheConfig.java +++ b/presto-cache/src/test/java/com/facebook/presto/cache/TestCacheConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.cache; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.net.URI; diff --git a/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCacheConfig.java b/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCacheConfig.java index 863320a4e3a96..2b030285e8cc3 100644 --- a/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCacheConfig.java +++ b/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCacheConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.cache.alluxio; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; @@ -23,8 +23,8 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCachingFileSystem.java b/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCachingFileSystem.java index 23230af340be8..cbe2b4b41cc57 100644 --- a/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCachingFileSystem.java +++ b/presto-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCachingFileSystem.java @@ -17,11 +17,11 @@ import alluxio.metrics.MetricKey; import alluxio.metrics.MetricsSystem; import alluxio.util.io.FileUtils; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.hive.CacheQuota; import com.facebook.presto.hive.HiveFileContext; import com.facebook.presto.hive.filesystem.ExtendedFileSystem; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -48,14 +48,14 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.cache.CacheType.ALLUXIO; import static com.facebook.presto.cache.TestingCacheUtils.stressTest; import static com.facebook.presto.cache.TestingCacheUtils.validateBuffer; import static com.facebook.presto.hive.CacheQuota.NO_CACHE_CONSTRAINTS; import static com.facebook.presto.hive.CacheQuotaScope.TABLE; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.nio.file.Files.createTempDirectory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheConfig.java b/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheConfig.java index a6d8257783eba..d63432b905e7b 100644 --- a/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheConfig.java +++ b/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.cache.filemerge; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; @@ -23,8 +23,8 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheManager.java b/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheManager.java index 29d52b90b0fbd..d3c37cb9df433 100644 --- a/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheManager.java +++ b/presto-cache/src/test/java/com/facebook/presto/cache/filemerge/TestFileMergeCacheManager.java @@ -13,14 +13,14 @@ */ package com.facebook.presto.cache.filemerge; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.cache.CacheManager; import com.facebook.presto.cache.CacheStats; import com.facebook.presto.cache.FileReadRequest; import com.facebook.presto.hive.CacheQuota; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.hadoop.fs.Path; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -38,12 +38,12 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.cache.TestingCacheUtils.stressTest; import static com.facebook.presto.cache.TestingCacheUtils.validateBuffer; import static com.facebook.presto.hive.CacheQuota.NO_CACHE_CONSTRAINTS; import static com.google.common.base.Preconditions.checkState; import static io.airlift.slice.Slices.wrappedBuffer; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.nio.file.Files.createTempDirectory; import static java.nio.file.StandardOpenOption.CREATE_NEW; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-cassandra/pom.xml b/presto-cassandra/pom.xml index 9da39489bea15..377564d5d2187 100644 --- a/presto-cassandra/pom.xml +++ b/presto-cassandra/pom.xml @@ -114,7 +114,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java index afce6e2b697b8..19562f0b16b50 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientConfig.java @@ -20,11 +20,11 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; import com.facebook.airlift.configuration.DefunctConfig; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MaxDuration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; -import io.airlift.units.MaxDuration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java index ffcedff1f6e60..57c11cdc3fe1e 100644 --- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java +++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java @@ -39,6 +39,7 @@ import com.datastax.driver.core.querybuilder.Select; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.cassandra.util.CassandraCqlUtils; import com.facebook.presto.common.predicate.NullableValue; import com.facebook.presto.common.predicate.TupleDomain; @@ -57,7 +58,6 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.util.concurrent.UncheckedExecutionException; -import io.airlift.units.Duration; import java.nio.Buffer; import java.nio.ByteBuffer; diff --git a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/CassandraServer.java b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/CassandraServer.java index 5e01a4301d4ff..9a8413a8f740d 100644 --- a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/CassandraServer.java +++ b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/CassandraServer.java @@ -19,9 +19,9 @@ import com.datastax.driver.core.Row; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableList; import com.google.common.io.Resources; -import io.airlift.units.Duration; import org.testcontainers.containers.GenericContainer; import java.io.Closeable; diff --git a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraClientConfig.java b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraClientConfig.java index 7b6ec6e476abb..013a17a82083d 100644 --- a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraClientConfig.java +++ b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraClientConfig.java @@ -16,8 +16,8 @@ import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.SocketOptions; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java index f84c6dc80c5d2..7e829d51e98be 100644 --- a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java +++ b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.cassandra; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.type.Type; import com.facebook.presto.testing.MaterializedResult; @@ -20,7 +21,6 @@ import com.facebook.presto.testing.QueryRunner; import com.facebook.presto.tests.AbstractTestIntegrationSmokeTest; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-cli/pom.xml b/presto-cli/pom.xml index 190615e4bfd5c..153fa1752bfc0 100644 --- a/presto-cli/pom.xml +++ b/presto-cli/pom.xml @@ -58,7 +58,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/ClientOptions.java b/presto-cli/src/main/java/com/facebook/presto/cli/ClientOptions.java index 6a05483e1e511..f3f15e9324953 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/ClientOptions.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/ClientOptions.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.cli; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ClientSession; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CharMatcher; @@ -21,7 +22,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.net.HostAndPort; import io.airlift.airline.Option; -import io.airlift.units.Duration; import java.net.URI; import java.net.URISyntaxException; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/Console.java b/presto-cli/src/main/java/com/facebook/presto/cli/Console.java index ca4a11927aeb1..95a0dc76d4078 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/Console.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/Console.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logging; import com.facebook.airlift.log.LoggingConfiguration; +import com.facebook.airlift.units.Duration; import com.facebook.presto.cli.ClientOptions.OutputFormat; import com.facebook.presto.client.ClientSession; import com.facebook.presto.spi.security.SelectedRole; @@ -25,7 +26,6 @@ import com.google.common.io.Files; import io.airlift.airline.Command; import io.airlift.airline.HelpOption; -import io.airlift.units.Duration; import jakarta.inject.Inject; import jline.console.history.FileHistory; import jline.console.history.History; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/FormatUtils.java b/presto-cli/src/main/java/com/facebook/presto/cli/FormatUtils.java index 877c9dfa30722..6a06a7b9c6f9f 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/FormatUtils.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/FormatUtils.java @@ -13,16 +13,16 @@ */ package com.facebook.presto.cli; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.math.RoundingMode; import java.text.DecimalFormat; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.repeat; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.String.format; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/OutputHandler.java b/presto-cli/src/main/java/com/facebook/presto/cli/OutputHandler.java index 81f41ce32be9f..6985c0741d19c 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/OutputHandler.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/OutputHandler.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.cli; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.StatementClient; -import io.airlift.units.Duration; import java.io.Closeable; import java.io.IOException; @@ -22,7 +22,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import static io.airlift.units.Duration.nanosSince; +import static com.facebook.airlift.units.Duration.nanosSince; import static java.util.Collections.unmodifiableList; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/QueryPreprocessor.java b/presto-cli/src/main/java/com/facebook/presto/cli/QueryPreprocessor.java index cf6adcd1028ee..286892cc6e659 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/QueryPreprocessor.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/QueryPreprocessor.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.cli; +import com.facebook.airlift.units.Duration; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.io.CharStreams; -import io.airlift.units.Duration; import sun.misc.Signal; import sun.misc.SignalHandler; diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/StatusPrinter.java b/presto-cli/src/main/java/com/facebook/presto/cli/StatusPrinter.java index f18ac4088868f..4368e0cc4dfdd 100644 --- a/presto-cli/src/main/java/com/facebook/presto/cli/StatusPrinter.java +++ b/presto-cli/src/main/java/com/facebook/presto/cli/StatusPrinter.java @@ -14,6 +14,8 @@ package com.facebook.presto.cli; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.QueryStatusInfo; import com.facebook.presto.client.StageStats; import com.facebook.presto.client.StatementClient; @@ -22,8 +24,6 @@ import com.facebook.presto.common.RuntimeUnit; import com.google.common.base.Strings; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.io.PrintStream; import java.util.Comparator; @@ -32,6 +32,10 @@ import java.util.OptionalInt; import java.util.concurrent.atomic.AtomicInteger; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.Duration.nanosSince; +import static com.facebook.airlift.units.Duration.succinctDuration; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.cli.FormatUtils.formatCount; import static com.facebook.presto.cli.FormatUtils.formatCountRate; import static com.facebook.presto.cli.FormatUtils.formatDataRate; @@ -41,10 +45,6 @@ import static com.facebook.presto.cli.FormatUtils.pluralize; import static com.facebook.presto.cli.KeyReader.readKey; import static com.google.common.base.Verify.verify; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.Duration.nanosSince; -import static io.airlift.units.Duration.succinctDuration; -import static io.airlift.units.Duration.succinctNanos; import static java.lang.Character.toUpperCase; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/presto-cli/src/test/java/com/facebook/presto/cli/AbstractCliTest.java b/presto-cli/src/test/java/com/facebook/presto/cli/AbstractCliTest.java index eb2267e1bd797..97e8804910d04 100644 --- a/presto-cli/src/test/java/com/facebook/presto/cli/AbstractCliTest.java +++ b/presto-cli/src/test/java/com/facebook/presto/cli/AbstractCliTest.java @@ -14,6 +14,7 @@ package com.facebook.presto.cli; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ClientSession; import com.facebook.presto.client.Column; import com.facebook.presto.client.QueryResults; @@ -22,7 +23,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import okhttp3.Headers; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; diff --git a/presto-cli/src/test/java/com/facebook/presto/cli/TestFormatUtils.java b/presto-cli/src/test/java/com/facebook/presto/cli/TestFormatUtils.java index 16b642071781f..2c38bb3d4ca90 100644 --- a/presto-cli/src/test/java/com/facebook/presto/cli/TestFormatUtils.java +++ b/presto-cli/src/test/java/com/facebook/presto/cli/TestFormatUtils.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.cli; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import org.testng.annotations.Test; import java.util.concurrent.TimeUnit; diff --git a/presto-clickhouse/pom.xml b/presto-clickhouse/pom.xml index aabafb40f0d31..88d0aff77b058 100644 --- a/presto-clickhouse/pom.xml +++ b/presto-clickhouse/pom.xml @@ -91,7 +91,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java index 9d36f775a6214..818740de36813 100755 --- a/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java +++ b/presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConfig.java @@ -16,8 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; diff --git a/presto-clickhouse/src/test/java/com/facebook/presto/plugin/clickhouse/TestClickHouseConfig.java b/presto-clickhouse/src/test/java/com/facebook/presto/plugin/clickhouse/TestClickHouseConfig.java index 8ed3bc685a04d..19834ce3ac861 100755 --- a/presto-clickhouse/src/test/java/com/facebook/presto/plugin/clickhouse/TestClickHouseConfig.java +++ b/presto-clickhouse/src/test/java/com/facebook/presto/plugin/clickhouse/TestClickHouseConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.plugin.clickhouse; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-client/pom.xml b/presto-client/pom.xml index 7a9dbf3395b4d..19f5dda0c31b0 100644 --- a/presto-client/pom.xml +++ b/presto-client/pom.xml @@ -71,7 +71,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-client/src/main/java/com/facebook/presto/client/ClientSession.java b/presto-client/src/main/java/com/facebook/presto/client/ClientSession.java index 5896a3c6f2d3c..5b217e41182e1 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/ClientSession.java +++ b/presto-client/src/main/java/com/facebook/presto/client/ClientSession.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.client; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.TimeZoneKey; import com.facebook.presto.spi.security.SelectedRole; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import java.net.URI; import java.nio.charset.CharsetEncoder; diff --git a/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java b/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java index 327214c7ad327..6de636a82404e 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java +++ b/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.client; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import java.util.Objects; import java.util.Optional; diff --git a/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java b/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java index a83bc29b997a5..c3475791a3876 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java +++ b/presto-client/src/main/java/com/facebook/presto/client/SpnegoHandler.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.client; +import com.facebook.airlift.units.Duration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.errorprone.annotations.concurrent.GuardedBy; import com.sun.security.auth.module.Krb5LoginModule; -import io.airlift.units.Duration; import okhttp3.Authenticator; import okhttp3.Interceptor; import okhttp3.Request; diff --git a/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java b/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java index be3cbefa5f20c..c06f041b90143 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java +++ b/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java @@ -14,6 +14,7 @@ package com.facebook.presto.client; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.OkHttpUtil.NullCallback; import com.facebook.presto.common.type.TimeZoneKey; import com.facebook.presto.spi.security.SelectedRole; @@ -22,7 +23,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import okhttp3.Headers; import okhttp3.HttpUrl; diff --git a/presto-client/src/test/java/com/facebook/presto/client/TestServerInfo.java b/presto-client/src/test/java/com/facebook/presto/client/TestServerInfo.java index 8573ddd64d3c1..ba9ab0df881e1 100644 --- a/presto-client/src/test/java/com/facebook/presto/client/TestServerInfo.java +++ b/presto-client/src/test/java/com/facebook/presto/client/TestServerInfo.java @@ -14,6 +14,7 @@ package com.facebook.presto.client; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.codec.ThriftCodecManager; import com.facebook.drift.codec.internal.compiler.CompilerThriftCodecFactory; @@ -26,7 +27,6 @@ import com.facebook.drift.protocol.TMemoryBuffer; import com.facebook.drift.protocol.TProtocol; import com.facebook.drift.protocol.TTransport; -import io.airlift.units.Duration; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/presto-cluster-ttl-providers/pom.xml b/presto-cluster-ttl-providers/pom.xml index ae6f1eedade2a..038744ebe34f6 100644 --- a/presto-cluster-ttl-providers/pom.xml +++ b/presto-cluster-ttl-providers/pom.xml @@ -45,7 +45,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-delta/pom.xml b/presto-delta/pom.xml index 17bf1b14107af..ed920f0503bea 100644 --- a/presto-delta/pom.xml +++ b/presto-delta/pom.xml @@ -166,7 +166,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-druid/pom.xml b/presto-druid/pom.xml index 654cbdbf778d0..fcfc4cb9d7627 100644 --- a/presto-druid/pom.xml +++ b/presto-druid/pom.xml @@ -284,7 +284,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java index 12ad524e0f322..68e6742717dff 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidClient.java @@ -18,6 +18,7 @@ import com.facebook.airlift.http.client.Request; import com.facebook.airlift.http.client.ResponseHandler; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.druid.ingestion.DruidIngestTask; import com.facebook.presto.druid.metadata.DruidColumnInfo; import com.facebook.presto.druid.metadata.DruidSegmentIdWrapper; @@ -32,7 +33,6 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import jakarta.inject.Inject; diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java index 1e9c6f1519ee0..a1b7c1b2ccaf3 100644 --- a/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java +++ b/presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java @@ -15,11 +15,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.base.StandardSystemProperty; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import org.apache.hadoop.conf.Configuration; diff --git a/presto-druid/src/test/java/com/facebook/presto/druid/TestDruidConfig.java b/presto-druid/src/test/java/com/facebook/presto/druid/TestDruidConfig.java index 5b5b90043ab32..fc7ef974a71aa 100644 --- a/presto-druid/src/test/java/com/facebook/presto/druid/TestDruidConfig.java +++ b/presto-druid/src/test/java/com/facebook/presto/druid/TestDruidConfig.java @@ -14,10 +14,10 @@ package com.facebook.presto.druid; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.base.StandardSystemProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-elasticsearch/pom.xml b/presto-elasticsearch/pom.xml index 47c3638645551..add7c895d62b9 100644 --- a/presto-elasticsearch/pom.xml +++ b/presto-elasticsearch/pom.xml @@ -204,7 +204,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java index 354264b0fd0e2..869788a838d7d 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchConfig.java @@ -16,8 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java index bf2eed35a39f7..fef600e26e725 100644 --- a/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java +++ b/presto-elasticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java @@ -22,6 +22,7 @@ import com.facebook.airlift.json.JsonObjectMapperProvider; import com.facebook.airlift.log.Logger; import com.facebook.airlift.security.pem.PemReader; +import com.facebook.airlift.units.Duration; import com.facebook.presto.elasticsearch.AwsSecurityConfig; import com.facebook.presto.elasticsearch.ElasticsearchConfig; import com.facebook.presto.elasticsearch.PasswordConfig; @@ -33,7 +34,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/ElasticsearchQueryRunner.java b/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/ElasticsearchQueryRunner.java index 4619ba865073d..dddfe29cbbba1 100644 --- a/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/ElasticsearchQueryRunner.java +++ b/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/ElasticsearchQueryRunner.java @@ -31,9 +31,9 @@ import java.util.Map; import static com.facebook.airlift.testing.Closeables.closeAllSuppress; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.Locale.ENGLISH; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/TestElasticsearchConfig.java b/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/TestElasticsearchConfig.java index 0b4acfc9edf43..e532ffd8f0423 100644 --- a/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/TestElasticsearchConfig.java +++ b/presto-elasticsearch/src/test/java/com/facebook/presto/elasticsearch/TestElasticsearchConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.elasticsearch; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-example-http/pom.xml b/presto-example-http/pom.xml index 82f0de2e472c6..8c3f1f8f9b868 100644 --- a/presto-example-http/pom.xml +++ b/presto-example-http/pom.xml @@ -88,7 +88,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-function-namespace-managers-common/pom.xml b/presto-function-namespace-managers-common/pom.xml index 231fd3de0aa8a..2fda95e8621c5 100644 --- a/presto-function-namespace-managers-common/pom.xml +++ b/presto-function-namespace-managers-common/pom.xml @@ -43,7 +43,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/SqlInvokedFunctionNamespaceManagerConfig.java b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/SqlInvokedFunctionNamespaceManagerConfig.java index cf9552fd10f08..b3278b2efaf50 100644 --- a/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/SqlInvokedFunctionNamespaceManagerConfig.java +++ b/presto-function-namespace-managers-common/src/main/java/com/facebook/presto/functionNamespace/SqlInvokedFunctionNamespaceManagerConfig.java @@ -14,10 +14,10 @@ package com.facebook.presto.functionNamespace; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import java.util.Set; diff --git a/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java b/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java index d4b428e589240..120f41607b573 100644 --- a/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java +++ b/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManager.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.functionNamespace; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.common.type.TypeSignature; import com.facebook.presto.common.type.UserDefinedType; @@ -31,7 +32,6 @@ import com.facebook.presto.spi.function.SqlInvokedFunction; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Collection; diff --git a/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManagerConfig.java b/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManagerConfig.java index 8982d2c7097af..dbb8a1d6add7d 100644 --- a/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManagerConfig.java +++ b/presto-function-namespace-managers-common/src/test/java/com/facebook/presto/functionNamespace/TestSqlInvokedFunctionNamespaceManagerConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.functionNamespace; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-function-namespace-managers/pom.xml b/presto-function-namespace-managers/pom.xml index 8dcb2d7427c9e..d7d8008a6197e 100644 --- a/presto-function-namespace-managers/pom.xml +++ b/presto-function-namespace-managers/pom.xml @@ -113,7 +113,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java index 8a0ea29e6a4ff..4631ffa801814 100644 --- a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java +++ b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java @@ -60,7 +60,7 @@ public class FunctionPluginManager .add("com.fasterxml.jackson.annotation.") .add("com.fasterxml.jackson.module.afterburner.") .add("io.airlift.slice.") - .add("io.airlift.units.") + .add("com.facebook.airlift.units.") .add("org.openjdk.jol.") .add("com.facebook.presto.common") .add("com.facebook.drift.annotations.") diff --git a/presto-google-sheets/pom.xml b/presto-google-sheets/pom.xml index f14e545213d7f..f1e477011c882 100644 --- a/presto-google-sheets/pom.xml +++ b/presto-google-sheets/pom.xml @@ -80,7 +80,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java index f7b2f695e7581..428af875fa362 100644 --- a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java +++ b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-google-sheets/src/test/java/com/facebook/presto/google/sheets/TestSheetsConfig.java b/presto-google-sheets/src/test/java/com/facebook/presto/google/sheets/TestSheetsConfig.java index 64cb0233d22be..22fce99ee0c09 100644 --- a/presto-google-sheets/src/test/java/com/facebook/presto/google/sheets/TestSheetsConfig.java +++ b/presto-google-sheets/src/test/java/com/facebook/presto/google/sheets/TestSheetsConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.google.sheets; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.IOException; diff --git a/presto-hana/pom.xml b/presto-hana/pom.xml index 06f4b518ffd98..75fe6127667e6 100644 --- a/presto-hana/pom.xml +++ b/presto-hana/pom.xml @@ -79,7 +79,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-hdfs-core/pom.xml b/presto-hdfs-core/pom.xml index 30a6c04f9cde5..faf33cef20074 100644 --- a/presto-hdfs-core/pom.xml +++ b/presto-hdfs-core/pom.xml @@ -46,7 +46,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuota.java b/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuota.java index f7d26cdba1823..57ea433f11192 100644 --- a/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuota.java +++ b/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuota.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import java.util.Objects; import java.util.Optional; diff --git a/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuotaRequirement.java b/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuotaRequirement.java index ec30b024c58e7..ea73cc01e9e38 100644 --- a/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuotaRequirement.java +++ b/presto-hdfs-core/src/main/java/com/facebook/presto/hive/CacheQuotaRequirement.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; import java.util.Objects; import java.util.Optional; diff --git a/presto-hdfs-core/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java b/presto-hdfs-core/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java index 751c622636d87..0cb4643b16927 100644 --- a/presto-hdfs-core/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java +++ b/presto-hdfs-core/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java @@ -14,12 +14,12 @@ package com.facebook.presto.hive; import com.facebook.airlift.http.client.thrift.ThriftProtocolUtils; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.codec.ThriftCodecManager; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.LocatedFileStatus; import org.apache.hadoop.fs.Path; @@ -28,9 +28,9 @@ import java.io.IOException; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.drift.transport.netty.codec.Protocol.FB_COMPACT; import static com.facebook.presto.hive.HiveFileInfo.createHiveFileInfo; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; diff --git a/presto-hive-common/pom.xml b/presto-hive-common/pom.xml index d6fee2871d55a..9de477bac05be 100644 --- a/presto-hive-common/pom.xml +++ b/presto-hive-common/pom.xml @@ -88,7 +88,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java index 368d1bdf3c57f..0b5a34b2c8ed3 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonClientConfig.java @@ -15,15 +15,15 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationMode; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; -import io.airlift.units.DataSize; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotNull; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.spi.schedule.NodeSelectionStrategy.NO_PREFERENCE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; public class HiveCommonClientConfig { diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java index a674afc2318f1..de4bce0e2b661 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveCommonSessionProperties.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationMode; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; @@ -20,7 +21,6 @@ import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java index 54e09b1ff6477..cd327cf022afb 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/SortingFileWriterConfig.java @@ -16,13 +16,13 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; -import io.airlift.units.MaxDataSize; -import io.airlift.units.MinDataSize; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.MaxDataSize; +import com.facebook.airlift.units.MinDataSize; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class SortingFileWriterConfig { diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java index c5df5c18f72c7..799bae622b06f 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.annotation.Nullable; import jakarta.validation.constraints.AssertTrue; diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingsSupplier.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingsSupplier.java index 73d6052d01586..cfecf3aeacd11 100644 --- a/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingsSupplier.java +++ b/presto-hive-common/src/main/java/com/facebook/presto/hive/aws/security/AWSSecurityMappingsSupplier.java @@ -14,8 +14,8 @@ package com.facebook.presto.hive.aws.security; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.google.common.base.Suppliers; -import io.airlift.units.Duration; import java.io.File; import java.util.Optional; diff --git a/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveCommonClientConfig.java b/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveCommonClientConfig.java index b543c456cd308..da24f4e64bc32 100644 --- a/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveCommonClientConfig.java +++ b/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveCommonClientConfig.java @@ -14,16 +14,16 @@ package com.facebook.presto.hive; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.OrcWriteValidation; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.spi.schedule.NodeSelectionStrategy.HARD_AFFINITY; -import static io.airlift.units.DataSize.Unit.MEGABYTE; public class TestHiveCommonClientConfig { diff --git a/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java b/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java index 751c622636d87..0cb4643b16927 100644 --- a/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java +++ b/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveFileInfo.java @@ -14,12 +14,12 @@ package com.facebook.presto.hive; import com.facebook.airlift.http.client.thrift.ThriftProtocolUtils; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.codec.ThriftCodecManager; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.SliceOutput; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.LocatedFileStatus; import org.apache.hadoop.fs.Path; @@ -28,9 +28,9 @@ import java.io.IOException; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.drift.transport.netty.codec.Protocol.FB_COMPACT; import static com.facebook.presto.hive.HiveFileInfo.createHiveFileInfo; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; diff --git a/presto-hive-common/src/test/java/com/facebook/presto/hive/aws/security/TestAWSSecurityMappingConfig.java b/presto-hive-common/src/test/java/com/facebook/presto/hive/aws/security/TestAWSSecurityMappingConfig.java index c1d730d980ef4..90f289e689115 100644 --- a/presto-hive-common/src/test/java/com/facebook/presto/hive/aws/security/TestAWSSecurityMappingConfig.java +++ b/presto-hive-common/src/test/java/com/facebook/presto/hive/aws/security/TestAWSSecurityMappingConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive.aws.security; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.IOException; diff --git a/presto-hive-function-namespace/pom.xml b/presto-hive-function-namespace/pom.xml index bfe07d31c7410..0a0d370dbcdac 100644 --- a/presto-hive-function-namespace/pom.xml +++ b/presto-hive-function-namespace/pom.xml @@ -90,7 +90,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-hive-hadoop2/pom.xml b/presto-hive-hadoop2/pom.xml index 146bd8307341a..e53bbd131bf2d 100644 --- a/presto-hive-hadoop2/pom.xml +++ b/presto-hive-hadoop2/pom.xml @@ -91,7 +91,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java b/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java index d5b5e5b3e7e85..9449fe2682815 100644 --- a/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java +++ b/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectCsvPushdownWithSplits.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.hive.s3select; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.HiveClientConfig; import com.facebook.presto.hive.HiveColumnHandle; import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.testing.MaterializedResult; -import io.airlift.units.DataSize; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Parameters; @@ -26,12 +26,12 @@ import java.util.Optional; import static com.facebook.airlift.testing.Assertions.assertEqualsIgnoreOrder; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.hive.BaseHiveColumnHandle.ColumnType.REGULAR; import static com.facebook.presto.hive.HiveFileSystemTestUtils.newSession; import static com.facebook.presto.hive.HiveType.HIVE_LONG; import static com.facebook.presto.hive.s3select.S3SelectTestHelper.expectedResult; import static com.facebook.presto.hive.s3select.S3SelectTestHelper.isSplitCountInOpenInterval; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static org.testng.Assert.assertTrue; public class TestHiveFileSystemS3SelectCsvPushdownWithSplits diff --git a/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java b/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java index 7be723cdac203..5c3adc1db663d 100644 --- a/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java +++ b/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/s3select/TestHiveFileSystemS3SelectJsonPushdownWithSplits.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.hive.s3select; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.HiveClientConfig; import com.facebook.presto.hive.HiveColumnHandle; import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.testing.MaterializedResult; -import io.airlift.units.DataSize; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Parameters; @@ -26,12 +26,12 @@ import java.util.Optional; import static com.facebook.airlift.testing.Assertions.assertEqualsIgnoreOrder; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.hive.BaseHiveColumnHandle.ColumnType.REGULAR; import static com.facebook.presto.hive.HiveFileSystemTestUtils.newSession; import static com.facebook.presto.hive.HiveType.HIVE_LONG; import static com.facebook.presto.hive.s3select.S3SelectTestHelper.expectedResult; import static com.facebook.presto.hive.s3select.S3SelectTestHelper.isSplitCountInOpenInterval; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static org.testng.Assert.assertTrue; public class TestHiveFileSystemS3SelectJsonPushdownWithSplits diff --git a/presto-hive-metastore/pom.xml b/presto-hive-metastore/pom.xml index 0d3a1779878f9..584c890325c12 100644 --- a/presto-hive-metastore/pom.xml +++ b/presto-hive-metastore/pom.xml @@ -72,7 +72,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java index 2ed329b09d403..9e8577cc52e57 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.hive.metastore.StorageFormat; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat; import org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat; import org.apache.hadoop.hive.ql.io.RCFileInputFormat; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java index 59cfaf7d1c5f3..a0aec5f817698 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/MetastoreClientConfig.java @@ -15,10 +15,10 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.facebook.presto.hive.metastore.AbstractCachingHiveMetastore.MetastoreCacheScope; import com.google.common.net.HostAndPort; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/RetryDriver.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/RetryDriver.java index 20859c24028dd..340c5103dea34 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/RetryDriver.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/RetryDriver.java @@ -14,8 +14,8 @@ package com.facebook.presto.hive; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.ArrayList; import java.util.Arrays; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/aws/AbstractSdkMetricsCollector.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/aws/AbstractSdkMetricsCollector.java index e1dc61fde634f..ccb388659a34c 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/aws/AbstractSdkMetricsCollector.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/aws/AbstractSdkMetricsCollector.java @@ -18,7 +18,7 @@ import com.amazonaws.metrics.RequestMetricCollector; import com.amazonaws.util.AWSRequestMetrics; import com.amazonaws.util.TimingInfo; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.List; import java.util.function.Consumer; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java index dd75f953c4d3a..ef2feeec481b8 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/AbstractCachingHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HiveType; @@ -21,7 +22,6 @@ import com.facebook.presto.spi.security.PrestoPrincipal; import com.facebook.presto.spi.statistics.ColumnStatisticType; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import java.util.List; import java.util.Map; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/ExtendedHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/ExtendedHiveMetastore.java index 0f108f67dbf87..dc972904a0ac4 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/ExtendedHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/ExtendedHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.NotSupportedException; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; @@ -24,7 +25,6 @@ import com.facebook.presto.spi.security.RoleGrant; import com.facebook.presto.spi.statistics.ColumnStatisticType; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.List; import java.util.Map; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java index c4b5fec6bc5cd..f281c0f600c3b 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.hive.ForCachingHiveMetastore; import com.facebook.presto.hive.HiveTableHandle; @@ -31,7 +32,6 @@ import com.google.common.collect.SetMultimap; import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.weakref.jmx.Managed; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java index bfe2c6d252991..6163ae58b8d55 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/RecordingHiveMetastore.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive.metastore; import com.facebook.airlift.json.JsonObjectMapperProvider; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.ForRecordingHiveMetastore; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.weakref.jmx.Managed; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java index 632304295ed37..ea9c61603379f 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive.metastore; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; @@ -48,7 +49,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java index b9a67ffce0216..0d2953f65046d 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/file/FileHiveMetastore.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive.metastore.file; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HdfsContext; @@ -60,7 +61,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteStreams; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java index 5a12978c21324..20876e451db2a 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueHiveMetastore.java @@ -58,6 +58,7 @@ import com.amazonaws.services.glue.model.UpdateDatabaseRequest; import com.amazonaws.services.glue.model.UpdatePartitionRequest; import com.amazonaws.services.glue.model.UpdateTableRequest; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HdfsContext; @@ -96,7 +97,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueMetastoreStats.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueMetastoreStats.java index 1c7ece62c038b..7c0e99595d34a 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueMetastoreStats.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/glue/GlueMetastoreStats.java @@ -15,8 +15,8 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.aws.AbstractSdkMetricsCollector; -import io.airlift.units.Duration; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java index 30c4d2353f4b6..d80d5f16570ef 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/BridgingHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore.thrift; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HiveTableHandle; @@ -44,7 +45,6 @@ import com.facebook.presto.spi.statistics.ColumnStatisticType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.hadoop.hive.metastore.api.FieldSchema; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastore.java index cf23a1e85aadf..0d499b18eca8d 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastore.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore.thrift; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HiveTableHandle; @@ -34,7 +35,6 @@ import com.facebook.presto.spi.security.RoleGrant; import com.facebook.presto.spi.statistics.ColumnStatisticType; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Partition; diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java index 0ced2b8756a3b..402aabf814ecb 100644 --- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java +++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/thrift/HiveMetastoreClientFactory.java @@ -14,12 +14,12 @@ package com.facebook.presto.hive.metastore.thrift; import com.facebook.airlift.security.pem.PemReader; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.HiveCommonClientConfig; import com.facebook.presto.hive.MetastoreClientConfig; import com.facebook.presto.hive.authentication.HiveMetastoreAuthentication; import com.facebook.presto.spi.PrestoException; import com.google.common.net.HostAndPort; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.thrift.transport.TTransportException; diff --git a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestMetastoreClientConfig.java b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestMetastoreClientConfig.java index bc0d719e746cd..3c8e64dc48bba 100644 --- a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestMetastoreClientConfig.java +++ b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestMetastoreClientConfig.java @@ -14,12 +14,12 @@ package com.facebook.presto.hive.metastore; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.MetastoreClientConfig; import com.facebook.presto.hive.MetastoreClientConfig.HiveMetastoreAuthenticationType; import com.facebook.presto.hive.metastore.AbstractCachingHiveMetastore.MetastoreCacheScope; import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestRecordingHiveMetastore.java b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestRecordingHiveMetastore.java index d98968c73af62..6424716ce743c 100644 --- a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestRecordingHiveMetastore.java +++ b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/TestRecordingHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HiveBasicStatistics; @@ -31,7 +32,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/UnimplementedHiveMetastore.java b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/UnimplementedHiveMetastore.java index 6a6926aa4561b..018ed253bdb0f 100644 --- a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/UnimplementedHiveMetastore.java +++ b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/UnimplementedHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.HiveType; @@ -21,7 +22,6 @@ import com.facebook.presto.spi.security.PrestoPrincipal; import com.facebook.presto.spi.security.RoleGrant; import com.facebook.presto.spi.statistics.ColumnStatisticType; -import io.airlift.units.Duration; import java.util.List; import java.util.Map; diff --git a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/MockHiveMetastoreClientFactory.java b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/MockHiveMetastoreClientFactory.java index 196a72018ca72..4e060e6873bcb 100644 --- a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/MockHiveMetastoreClientFactory.java +++ b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/MockHiveMetastoreClientFactory.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.hive.metastore.thrift; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.authentication.NoHiveMetastoreAuthentication; import com.google.common.net.HostAndPort; -import io.airlift.units.Duration; import org.apache.thrift.transport.TTransportException; import java.util.ArrayList; diff --git a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/TestStaticHiveCluster.java b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/TestStaticHiveCluster.java index f8fbdc75f1f57..8b6a083d099ea 100644 --- a/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/TestStaticHiveCluster.java +++ b/presto-hive-metastore/src/test/java/com/facebook/presto/hive/metastore/thrift/TestStaticHiveCluster.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.metastore.thrift; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import org.apache.thrift.TException; import org.testng.annotations.Test; diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml index 42cefd00eb0f9..24d1225755302 100644 --- a/presto-hive/pom.xml +++ b/presto-hive/pom.xml @@ -317,7 +317,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java b/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java index bd9a369b17607..bb86d107efce2 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/CachingDirectoryLister.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.hive.filesystem.ExtendedFileSystem; import com.facebook.presto.hive.metastore.Partition; @@ -24,8 +26,6 @@ import com.google.common.cache.Weigher; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.hadoop.fs.Path; import org.openjdk.jol.info.ClassLayout; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java index 4e8a1dbc02766..3a33ef6828542 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfigurationInitializer.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.gcs.GcsConfigurationInitializer; import com.facebook.presto.hive.s3.S3ConfigurationUpdater; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java index 30ba86cf1ef31..be0b6482d39f8 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClientConfig.java @@ -17,15 +17,15 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; import com.facebook.airlift.configuration.LegacyConfig; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MaxDataSize; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.hive.s3.S3FileSystemType; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MaxDataSize; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; @@ -36,6 +36,9 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.BucketFunctionType.HIVE_COMPATIBLE; import static com.facebook.presto.hive.BucketFunctionType.PRESTO_NATIVE; import static com.facebook.presto.hive.HiveClientConfig.InsertExistingPartitionsBehavior.APPEND; @@ -44,9 +47,6 @@ import static com.facebook.presto.hive.HiveSessionProperties.INSERT_EXISTING_PARTITIONS_BEHAVIOR; import static com.facebook.presto.hive.HiveStorageFormat.ORC; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.Locale.ENGLISH; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java index 916abc4189f03..07d37e4671adf 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSinkProvider.java @@ -16,6 +16,7 @@ import com.facebook.airlift.event.client.EventClient; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.hive.metastore.ExtendedHiveMetastore; import com.facebook.presto.hive.metastore.HivePageSinkMetadataProvider; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListeningExecutorService; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java index 359da2a4e1e5a..1d8b557cf7dc0 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HivePageSourceProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.Subfield; import com.facebook.presto.common.Subfield.NestedField; @@ -45,7 +46,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java index 55061af33aa4f..2a1acfb9f835b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSessionProperties.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.parquet.column.ParquetProperties; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java index ba6820236a7c3..ddc1788558ee9 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java @@ -15,6 +15,7 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Subfield; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.predicate.Range; @@ -57,7 +58,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe; import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java index 031e82faf719b..6264ea5eab69e 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSource.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.InternalHiveSplit.InternalHiveBlock; import com.facebook.presto.hive.util.AsyncQueue; import com.facebook.presto.hive.util.AsyncQueue.BorrowResult; @@ -31,7 +32,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -51,6 +51,7 @@ import static com.facebook.airlift.concurrent.MoreFutures.failedFuture; import static com.facebook.airlift.concurrent.MoreFutures.toCompletableFuture; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.hive.HiveCommonSessionProperties.getAffinitySchedulingFileSectionSize; import static com.facebook.presto.hive.HiveErrorCode.HIVE_EXCEEDED_SPLIT_BUFFERING_LIMIT; import static com.facebook.presto.hive.HiveErrorCode.HIVE_FILE_NOT_FOUND; @@ -69,7 +70,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.util.concurrent.Futures.immediateFuture; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.String.format; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriterFactory.java index 4ac892cb21678..8606fcf4cbb72 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriterFactory.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive; import com.facebook.airlift.event.client.EventClient; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.SortOrder; import com.facebook.presto.common.type.Type; @@ -39,7 +40,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.FileUtils; import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java index aead218edc002..51c90630d12d3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterConfig.java @@ -15,11 +15,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.DefaultOrcWriterFlushPolicy; import com.facebook.presto.orc.OrcWriterOptions; import com.facebook.presto.orc.metadata.DwrfStripeCacheMode; import com.facebook.presto.orc.writer.StreamLayoutFactory; -import io.airlift.units.DataSize; import jakarta.validation.constraints.NotNull; import java.util.OptionalInt; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/ParquetFileWriterConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/ParquetFileWriterConfig.java index bef328563f843..541fdd3add710 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/ParquetFileWriterConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/ParquetFileWriterConfig.java @@ -14,11 +14,11 @@ package com.facebook.presto.hive; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.parquet.writer.ParquetWriterOptions; -import io.airlift.units.DataSize; import org.apache.parquet.hadoop.ParquetWriter; -import static io.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static org.apache.parquet.column.ParquetProperties.WriterVersion; public class ParquetFileWriterConfig diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java index 476b6e186ce4e..8a4b8755136dc 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/RecordFileWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; @@ -23,7 +24,6 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; import org.apache.hadoop.hive.serde2.SerDeException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java index 2ceac1b992813..4c74193f71b43 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.SortOrder; import com.facebook.presto.common.io.DataSink; @@ -29,7 +30,6 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; import com.google.common.io.Closer; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.openjdk.jol.info.ClassLayout; @@ -46,12 +46,12 @@ import java.util.function.Consumer; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR; import static com.facebook.presto.hive.HiveErrorCode.HIVE_WRITER_DATA_ERROR; 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.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.min; import static java.util.Comparator.comparing; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriterFactory.java index 84dc4fef5c0b3..dfb7511bcc6c5 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriterFactory.java @@ -14,13 +14,13 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.SortOrder; import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PageSorter; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfig.java index f4c2f3df498e4..4c66f49e87600 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/gcs/HiveGcsConfig.java @@ -15,7 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; public class HiveGcsConfig { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java index 9d122d93c6332..9053233d6ac69 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.hive.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.FileFormatDataSourceStats; import com.facebook.presto.orc.AbstractOrcDataSource; import com.facebook.presto.orc.OrcDataSourceId; import com.facebook.presto.spi.PrestoException; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.FSDataInputStream; import java.io.IOException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java index ec21f884d6797..c61507c7983bb 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcAggregatedPageSourceFactory.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.hive.EncryptionInformation; import com.facebook.presto.hive.FileFormatDataSourceStats; @@ -35,7 +36,6 @@ import com.facebook.presto.spi.FixedPageSource; import com.facebook.presto.spi.function.StandardFunctionResolution; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPageSourceFactoryUtils.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPageSourceFactoryUtils.java index 5051cf97ca8ab..bbe56caa1c3d6 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPageSourceFactoryUtils.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPageSourceFactoryUtils.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.EncryptionInformation; import com.facebook.presto.hive.FileFormatDataSourceStats; import com.facebook.presto.hive.HdfsEnvironment; @@ -33,7 +34,6 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.google.common.util.concurrent.UncheckedExecutionException; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java index 4e914c319aedf..60354406ace2f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSourceFactory.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.Subfield; import com.facebook.presto.common.function.SqlFunctionProperties; @@ -68,7 +69,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java index 5d270bbd99835..76f676d1f1770 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.hive.pagefile; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.io.DataSink; import com.facebook.presto.hive.HiveCompressionCodec; import com.facebook.presto.hive.HiveFileWriter; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.page.PagesSerde; -import io.airlift.units.DataSize; import org.openjdk.jol.info.ClassLayout; import java.io.IOException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java index f5387f67fbb91..807685aac053b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.hive.pagefile; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.io.DataOutput; import com.facebook.presto.common.io.DataSink; import com.facebook.presto.hive.HiveCompressionCodec; import com.facebook.presto.spi.page.PageDataOutput; import com.facebook.presto.spi.page.SerializedPage; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.openjdk.jol.info.ClassLayout; import java.io.Closeable; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSource.java index a37427cc52fac..ae0899dea1f61 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.rcfile; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -28,7 +29,6 @@ import com.facebook.presto.spi.ConnectorPageSource; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.io.IOException; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java index e992d90577aed..4b1e18e4647dc 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/rcfile/RcFilePageSourceFactory.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.hive.rcfile; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeManager; @@ -38,8 +40,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java index b29a84d729932..a49850a4c692b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/HiveS3Config.java @@ -16,18 +16,18 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.StandardSystemProperty; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import java.io.File; import java.util.concurrent.TimeUnit; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class HiveS3Config { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java index 02c05b65fef16..8008d36a2db32 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ClientFactory.java @@ -26,9 +26,9 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Builder; import com.amazonaws.services.s3.AmazonS3Client; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.HiveClientConfig; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import org.apache.hadoop.conf.Configuration; import java.net.URI; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java index eb9728949493f..5323f39fdb2cc 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3ConfigurationUpdater.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive.s3; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystem.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystem.java index bc71a852de713..f402478b1d7b7 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystem.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystem.java @@ -54,6 +54,8 @@ import com.amazonaws.services.s3.transfer.TransferManagerBuilder; import com.amazonaws.services.s3.transfer.Upload; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.filesystem.ExtendedFileSystem; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.AbstractSequentialIterator; @@ -61,8 +63,6 @@ import com.google.common.collect.Iterators; import com.google.common.io.Closer; import com.google.common.net.MediaType; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; @@ -105,6 +105,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.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.RetryDriver.retry; import static com.facebook.presto.hive.s3.S3ConfigurationUpdater.S3_ACCESS_KEY; import static com.facebook.presto.hive.s3.S3ConfigurationUpdater.S3_ACL_TYPE; @@ -146,7 +147,6 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.base.Verify.verify; import static com.google.common.collect.Iterables.toArray; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.max; import static java.lang.Math.toIntExact; import static java.lang.String.format; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemMetricCollector.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemMetricCollector.java index 97c5fe0c220ba..8b0ca6e75c631 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemMetricCollector.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemMetricCollector.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive.s3; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.aws.AbstractSdkMetricsCollector; -import io.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemStats.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemStats.java index 880182aba154f..ef429fc973993 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemStats.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3/PrestoS3FileSystemStats.java @@ -16,7 +16,7 @@ import com.amazonaws.AbortedException; import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectLineRecordReader.java b/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectLineRecordReader.java index 24d394b2d132d..f271566e193b1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectLineRecordReader.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/s3select/S3SelectLineRecordReader.java @@ -20,6 +20,7 @@ import com.amazonaws.services.s3.model.OutputSerialization; import com.amazonaws.services.s3.model.ScanRange; import com.amazonaws.services.s3.model.SelectObjectContentRequest; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.HiveClientConfig; import com.facebook.presto.hive.s3.HiveS3Config; import com.facebook.presto.hive.s3.PrestoS3ClientFactory; @@ -28,7 +29,6 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.Closer; -import io.airlift.units.Duration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java index 2f4b71501647a..bd9dd7dc16c6d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/security/ranger/RangerBasedAccessControlConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigSecuritySensitive; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import java.util.concurrent.TimeUnit; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/InternalHiveSplitFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/InternalHiveSplitFactory.java index 67a04948f7508..24424a95362d3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/InternalHiveSplitFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/InternalHiveSplitFactory.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.util; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.hive.BlockLocation; import com.facebook.presto.hive.EncryptionInformation; @@ -24,7 +25,6 @@ import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.mapred.FileSplit; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/SizeBasedSplitWeightProvider.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/SizeBasedSplitWeightProvider.java index 97f135689b762..84cc35e37a565 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/SizeBasedSplitWeightProvider.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/SizeBasedSplitWeightProvider.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.hive.util; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.HiveSplitWeightProvider; import com.facebook.presto.spi.SplitWeight; -import io.airlift.units.DataSize; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java index 8095ffe9e82df..2cf344f57b219 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/SortBuffer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.util; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; @@ -21,7 +22,6 @@ import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.PageSorter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.openjdk.jol.info.ClassLayout; import java.util.ArrayList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileReader.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileReader.java index f1a1c8f2cc5ea..3039318e43feb 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileReader.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.util; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; @@ -28,7 +29,6 @@ import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.AbstractIterator; -import io.airlift.units.DataSize; import java.io.IOException; import java.io.InterruptedIOException; @@ -36,11 +36,11 @@ import java.util.List; import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.HiveErrorCode.HIVE_WRITER_DATA_ERROR; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.OrcEncoding.ORC; import static com.facebook.presto.orc.OrcReader.INITIAL_BATCH_SIZE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; import static org.joda.time.DateTimeZone.UTC; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java index ae9a7071b8e44..ed57ac9dd2a8c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.util; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.NotSupportedException; import com.facebook.presto.common.Page; import com.facebook.presto.common.io.DataSink; @@ -23,7 +24,6 @@ import com.facebook.presto.orc.OrcWriterOptions; import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import java.io.Closeable; import java.io.IOException; @@ -32,14 +32,14 @@ import java.util.Optional; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; import static com.facebook.presto.orc.OrcEncoding.ORC; import static com.facebook.presto.orc.metadata.CompressionKind.LZ4; import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.joda.time.DateTimeZone.UTC; public class TempFileWriter diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java b/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java index d4261baa984c9..17b2e70cff0ec 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java @@ -15,6 +15,8 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.GroupByHashPageIndexerFactory; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.common.Page; @@ -139,8 +141,6 @@ import com.google.common.net.HostAndPort; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -188,6 +188,8 @@ import static com.facebook.airlift.testing.Assertions.assertGreaterThanOrEqual; import static com.facebook.airlift.testing.Assertions.assertInstanceOf; import static com.facebook.airlift.testing.Assertions.assertLessThanOrEqual; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.common.predicate.TupleDomain.withColumnDomains; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; @@ -324,8 +326,6 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator; 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 java.lang.Float.floatToRawIntBits; import static java.lang.Math.toIntExact; import static java.lang.String.format; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestBackgroundHiveSplitLoader.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestBackgroundHiveSplitLoader.java index ed7abe427cedd..0bc9692b58223 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestBackgroundHiveSplitLoader.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestBackgroundHiveSplitLoader.java @@ -14,6 +14,8 @@ package com.facebook.presto.hive; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.hive.BaseHiveColumnHandle.ColumnType; import com.facebook.presto.hive.HiveBucketing.HiveBucketFilter; @@ -33,8 +35,6 @@ 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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.FSDataInputStream; @@ -67,6 +67,9 @@ import java.util.stream.Collectors; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.hive.BucketFunctionType.HIVE_COMPATIBLE; @@ -86,9 +89,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; 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 java.util.concurrent.Executors.newCachedThreadPool; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveClientConfig.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveClientConfig.java index ba7cae29f0929..878330c46764e 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveClientConfig.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveClientConfig.java @@ -14,14 +14,14 @@ package com.facebook.presto.hive; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.hive.HiveClientConfig.HdfsAuthenticationType; import com.facebook.presto.hive.s3.S3FileSystemType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.time.ZoneId; @@ -29,6 +29,9 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.BucketFunctionType.HIVE_COMPATIBLE; import static com.facebook.presto.hive.BucketFunctionType.PRESTO_NATIVE; import static com.facebook.presto.hive.HiveClientConfig.InsertExistingPartitionsBehavior.APPEND; @@ -37,9 +40,6 @@ import static com.facebook.presto.hive.HiveStorageFormat.DWRF; import static com.facebook.presto.hive.HiveStorageFormat.ORC; import static com.facebook.presto.hive.TestHiveUtil.nonDefaultTimeZone; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; public class TestHiveClientConfig { diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHivePageSourceProvider.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHivePageSourceProvider.java index 32d50c8676162..e27ddea274ea0 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHivePageSourceProvider.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHivePageSourceProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; @@ -41,7 +42,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveRecoverableExecution.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveRecoverableExecution.java index 3fa1507441d48..9bface0dc0145 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveRecoverableExecution.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveRecoverableExecution.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.metadata.AllNodes; import com.facebook.presto.server.testing.TestingPrestoServer; @@ -26,7 +27,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java index 0113e717e7765..8d1340d489180 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplitSource.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.metastore.Storage; import com.facebook.presto.hive.metastore.StorageFormat; import com.facebook.presto.spi.ConnectorSplit; @@ -24,7 +25,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.time.Instant; @@ -39,6 +39,9 @@ import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue; import static com.facebook.airlift.testing.Assertions.assertContains; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.CacheQuotaScope.GLOBAL; import static com.facebook.presto.hive.CacheQuotaScope.PARTITION; import static com.facebook.presto.hive.CacheQuotaScope.TABLE; @@ -48,9 +51,6 @@ import static com.facebook.presto.spi.connector.NotPartitionedPartitionHandle.NOT_PARTITIONED; import static com.facebook.presto.spi.schedule.NodeSelectionStrategy.NO_PREFERENCE; import static com.facebook.presto.spi.schedule.NodeSelectionStrategy.SOFT_AFFINITY; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcBatchPageSourceMemoryTracking.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcBatchPageSourceMemoryTracking.java index 30f02bb1a0477..42509b0089f7b 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcBatchPageSourceMemoryTracking.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcBatchPageSourceMemoryTracking.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive; import com.facebook.airlift.stats.Distribution; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.predicate.TupleDomain; @@ -55,7 +56,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -102,6 +102,7 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertBetweenInclusive; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.VarcharType.createUnboundedVarcharType; import static com.facebook.presto.hive.BaseHiveColumnHandle.ColumnType.PARTITION_KEY; import static com.facebook.presto.hive.BaseHiveColumnHandle.ColumnType.REGULAR; @@ -119,7 +120,6 @@ import static com.google.common.base.Predicates.not; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriter.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriter.java index 15029cb135563..8a0a058718f55 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriter.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.common.io.DataOutput; import com.facebook.presto.common.io.DataSink; @@ -21,13 +22,13 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.ErrorType.EXTERNAL; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.hive.HiveErrorCode.HIVE_WRITER_CLOSE_ERROR; @@ -36,7 +37,6 @@ import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; import static com.facebook.presto.orc.OrcEncoding.ORC; import static com.facebook.presto.orc.metadata.CompressionKind.NONE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; public class TestOrcFileWriter diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriterConfig.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriterConfig.java index 83d4fb359ec23..ecb01c6fc082b 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriterConfig.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcFileWriterConfig.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.OrcFileWriterConfig.StreamLayoutType; import com.facebook.presto.orc.OrcWriterOptions; import com.facebook.presto.orc.metadata.DwrfStripeCacheMode; import com.facebook.presto.orc.writer.StreamLayoutFactory.ColumnSizeLayoutFactory; import com.facebook.presto.orc.writer.StreamLayoutFactory.StreamSizeLayoutFactory; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; @@ -29,14 +29,14 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.hive.OrcFileWriterConfig.StreamLayoutType.BY_COLUMN_SIZE; import static com.facebook.presto.hive.OrcFileWriterConfig.StreamLayoutType.BY_STREAM_SIZE; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.FOOTER; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestParquetFileWriterConfig.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestParquetFileWriterConfig.java index c1932253b6650..a520d5f9c6114 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestParquetFileWriterConfig.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestParquetFileWriterConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.apache.parquet.column.ParquetProperties; import org.apache.parquet.hadoop.ParquetWriter; import org.testng.annotations.Test; @@ -24,8 +24,8 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class TestParquetFileWriterConfig { diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestSortingFileWriterConfig.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestSortingFileWriterConfig.java index b1da10e5467f8..f3899312571f8 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestSortingFileWriterConfig.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestSortingFileWriterConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; @@ -22,8 +22,8 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class TestSortingFileWriterConfig { diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestStoragePartitionLoader.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestStoragePartitionLoader.java index ee8eba10e5b17..b24c7746ea803 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestStoragePartitionLoader.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestStoragePartitionLoader.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.hive; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.TestBackgroundHiveSplitLoader.TestingHdfsEnvironment; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.testing.TestingConnectorSession; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.LocatedFileStatus; @@ -34,6 +34,8 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.hive.HiveSessionProperties.isSkipEmptyFilesEnabled; import static com.facebook.presto.hive.HiveSessionProperties.isUseListDirectoryCache; import static com.facebook.presto.hive.HiveStorageFormat.PARQUET; @@ -45,8 +47,6 @@ import static com.facebook.presto.hive.TestBackgroundHiveSplitLoader.samplePartitionMetadatas; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static org.testng.Assert.assertEquals; public class TestStoragePartitionLoader diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java b/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java index e0c1a052830a0..11b67fea8b68e 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.benchmark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.BlockEncodingManager; import com.facebook.presto.common.io.OutputStreamDataSink; @@ -66,7 +67,6 @@ import com.facebook.presto.spi.page.PagesSerde; import com.google.common.collect.ImmutableMap; import io.airlift.slice.OutputStreamSliceOutput; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/HiveFileFormatBenchmark.java b/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/HiveFileFormatBenchmark.java index 7ded16aeed836..e17c895057f89 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/HiveFileFormatBenchmark.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/HiveFileFormatBenchmark.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.benchmark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.BlockBuilder; @@ -32,7 +33,6 @@ import io.airlift.tpch.TpchColumn; import io.airlift.tpch.TpchEntity; import io.airlift.tpch.TpchTable; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.ints.IntArrays; import org.openjdk.jmh.annotations.AuxCounters; import org.openjdk.jmh.annotations.Benchmark; @@ -61,6 +61,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.DateType.DATE; import static com.facebook.presto.common.type.DoubleType.DOUBLE; @@ -74,7 +75,6 @@ import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; import static io.airlift.tpch.TpchTable.LINE_ITEM; import static io.airlift.tpch.TpchTable.ORDERS; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.nio.file.Files.createTempDirectory; import static java.util.stream.Collectors.toList; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/metastore/TestInMemoryCachingHiveMetastore.java b/presto-hive/src/test/java/com/facebook/presto/hive/metastore/TestInMemoryCachingHiveMetastore.java index 8b131d8c2618a..9e4c4be57add6 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/metastore/TestInMemoryCachingHiveMetastore.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/metastore/TestInMemoryCachingHiveMetastore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.metastore; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.MetastoreClientConfig; import com.facebook.presto.hive.MockHiveMetastore; import com.facebook.presto.hive.PartitionMutator; @@ -32,7 +33,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.ListeningExecutorService; -import io.airlift.units.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/AbstractTestParquetReader.java b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/AbstractTestParquetReader.java index e8c88af69a7df..7b06cb102e9ae 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/AbstractTestParquetReader.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/AbstractTestParquetReader.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.hive.parquet; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.RowType; import com.facebook.presto.common.type.SqlDate; @@ -35,8 +37,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import com.google.common.primitives.Shorts; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaHiveDecimalObjectInspector; @@ -72,6 +72,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.DateType.DATE; @@ -102,7 +103,6 @@ import static com.google.common.collect.Iterables.cycle; import static com.google.common.collect.Iterables.limit; import static com.google.common.collect.Iterables.transform; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java index 1fea385a98992..e1a2b0b852417 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/BenchmarkParquetPageSource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.parquet; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; @@ -34,7 +35,6 @@ import com.facebook.presto.testing.TestingSession; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.DataSize; import org.apache.parquet.column.ParquetProperties; import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.hadoop.metadata.ParquetMetadata; @@ -69,6 +69,7 @@ import java.util.Random; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.function.OperatorType.EQUAL; import static com.facebook.presto.common.function.OperatorType.GREATER_THAN_OR_EQUAL; import static com.facebook.presto.common.function.OperatorType.LESS_THAN_OR_EQUAL; @@ -94,7 +95,6 @@ import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/ParquetTester.java b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/ParquetTester.java index 53236fab53134..acd6d69e2aa12 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/ParquetTester.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/ParquetTester.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.parquet; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; @@ -58,7 +59,6 @@ import com.google.common.collect.Lists; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe; @@ -97,6 +97,7 @@ import java.util.Properties; import java.util.Set; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.Chars.truncateToLengthAndTrimSpaces; @@ -128,7 +129,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.transform; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Math.toIntExact; import static java.util.Arrays.stream; import static java.util.Collections.singletonList; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/TestParquetReaderMemoryTracking.java b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/TestParquetReaderMemoryTracking.java index e8932c3db63c2..b55c835a693f4 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/TestParquetReaderMemoryTracking.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/TestParquetReaderMemoryTracking.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.parquet; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; import com.facebook.presto.parquet.Field; @@ -21,7 +22,6 @@ import com.facebook.presto.parquet.reader.ParquetReader; import com.facebook.presto.parquet.writer.ParquetWriterOptions; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.hadoop.metadata.ParquetMetadata; import org.apache.parquet.io.ColumnIOConverter; @@ -38,6 +38,7 @@ import java.util.concurrent.ThreadLocalRandom; import static com.facebook.airlift.testing.Assertions.assertBetweenInclusive; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.hive.parquet.ParquetTester.writeParquetFileFromPresto; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; @@ -45,7 +46,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.UUID.randomUUID; import static org.apache.parquet.hadoop.metadata.CompressionCodecName.UNCOMPRESSED; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/s3/TestHiveS3Config.java b/presto-hive/src/test/java/com/facebook/presto/hive/s3/TestHiveS3Config.java index 0dc652710bc42..e042a36cd5af8 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/s3/TestHiveS3Config.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/s3/TestHiveS3Config.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.hive.s3; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.Duration; import com.google.common.base.StandardSystemProperty; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java b/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java index c1903b146a8a0..52a15eba17030 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java @@ -15,9 +15,9 @@ import com.facebook.airlift.configuration.ConfigurationFactory; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; import com.google.inject.ConfigurationException; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestParquetQuickStatsBuilder.java b/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestParquetQuickStatsBuilder.java index c8cb678cfbcd1..5976c61a04f8a 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestParquetQuickStatsBuilder.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestParquetQuickStatsBuilder.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive.statistics; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.FileFormatDataSourceStats; import com.facebook.presto.hive.HdfsConfigurationInitializer; import com.facebook.presto.hive.HdfsContext; @@ -40,7 +41,6 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; -import io.airlift.units.Duration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocatedFileStatus; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestQuickStatsProvider.java b/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestQuickStatsProvider.java index 3c7948b2b68de..15feedd158ea1 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestQuickStatsProvider.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/statistics/TestQuickStatsProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.hive.statistics; +import com.facebook.airlift.units.Duration; import com.facebook.presto.hive.DirectoryLister; import com.facebook.presto.hive.HadoopDirectoryLister; import com.facebook.presto.hive.HdfsContext; @@ -41,7 +42,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat; import org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/util/TestSizeBasedSplitWeightProvider.java b/presto-hive/src/test/java/com/facebook/presto/hive/util/TestSizeBasedSplitWeightProvider.java index 955c4ad204595..5bbe25c1f68b5 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/util/TestSizeBasedSplitWeightProvider.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/util/TestSizeBasedSplitWeightProvider.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive.util; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.SplitWeight; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/presto-hudi/pom.xml b/presto-hudi/pom.xml index f57d049b2bfeb..9581be57ab9d6 100644 --- a/presto-hudi/pom.xml +++ b/presto-hudi/pom.xml @@ -245,7 +245,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java index 1749893c25a22..98e5154a108c3 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiConfig.java @@ -16,13 +16,13 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class HudiConfig { diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java index a273c65f705d5..b559e55c1cee9 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiSessionProperties.java @@ -14,11 +14,11 @@ package com.facebook.presto.hudi; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/HudiPartitionSplitGenerator.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/HudiPartitionSplitGenerator.java index 93fb0896fada1..54fd0f4bda8a0 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/HudiPartitionSplitGenerator.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/HudiPartitionSplitGenerator.java @@ -15,6 +15,7 @@ package com.facebook.presto.hudi.split; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.metastore.ExtendedHiveMetastore; import com.facebook.presto.hive.metastore.MetastoreContext; import com.facebook.presto.hive.util.AsyncQueue; @@ -28,7 +29,6 @@ import com.facebook.presto.spi.ConnectorSplit; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.Path; import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.model.FileSlice; diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/SizeBasedSplitWeightProvider.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/SizeBasedSplitWeightProvider.java index 9c41dc68114ae..55cac196f9181 100644 --- a/presto-hudi/src/main/java/com/facebook/presto/hudi/split/SizeBasedSplitWeightProvider.java +++ b/presto-hudi/src/main/java/com/facebook/presto/hudi/split/SizeBasedSplitWeightProvider.java @@ -14,8 +14,8 @@ package com.facebook.presto.hudi.split; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.SplitWeight; -import io.airlift.units.DataSize; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.primitives.Doubles.constrainToRange; diff --git a/presto-hudi/src/test/java/com/facebook/presto/hudi/TestHudiConfig.java b/presto-hudi/src/test/java/com/facebook/presto/hudi/TestHudiConfig.java index d2051474c0353..163490005e60a 100644 --- a/presto-hudi/src/test/java/com/facebook/presto/hudi/TestHudiConfig.java +++ b/presto-hudi/src/test/java/com/facebook/presto/hudi/TestHudiConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.hudi; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; @@ -23,7 +23,7 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class TestHudiConfig { diff --git a/presto-hudi/src/test/java/com/facebook/presto/hudi/split/TestSizeBasedSplitWeightProvider.java b/presto-hudi/src/test/java/com/facebook/presto/hudi/split/TestSizeBasedSplitWeightProvider.java index a2ffa48b1abb2..f81bc2132b5c2 100644 --- a/presto-hudi/src/test/java/com/facebook/presto/hudi/split/TestSizeBasedSplitWeightProvider.java +++ b/presto-hudi/src/test/java/com/facebook/presto/hudi/split/TestSizeBasedSplitWeightProvider.java @@ -14,11 +14,11 @@ package com.facebook.presto.hudi.split; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.SplitWeight; -import io.airlift.units.DataSize; import org.testng.annotations.Test; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; public class TestSizeBasedSplitWeightProvider diff --git a/presto-i18n-functions/pom.xml b/presto-i18n-functions/pom.xml index 43e4721654619..2152a31f48803 100644 --- a/presto-i18n-functions/pom.xml +++ b/presto-i18n-functions/pom.xml @@ -53,7 +53,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml index 6524a62aaace1..6871247d7d3d4 100644 --- a/presto-iceberg/pom.xml +++ b/presto-iceberg/pom.xml @@ -190,7 +190,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java index dd4cf09052d0b..86d4f0118113c 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergConfig.java @@ -16,11 +16,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.LegacyConfig; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.hive.HiveCompressionCodec; import com.facebook.presto.spi.statistics.ColumnStatisticType; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Max; @@ -31,12 +31,12 @@ import java.util.EnumSet; import java.util.List; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctDataSize; import static com.facebook.presto.hive.HiveCompressionCodec.GZIP; import static com.facebook.presto.iceberg.CatalogType.HIVE; import static com.facebook.presto.iceberg.IcebergFileFormat.PARQUET; import static com.facebook.presto.iceberg.util.StatisticsUtil.decodeMergeFlags; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctDataSize; import static org.apache.iceberg.CatalogProperties.IO_MANIFEST_CACHE_EXPIRATION_INTERVAL_MS_DEFAULT; import static org.apache.iceberg.CatalogProperties.IO_MANIFEST_CACHE_MAX_CONTENT_LENGTH_DEFAULT; import static org.apache.iceberg.CatalogProperties.IO_MANIFEST_CACHE_MAX_TOTAL_BYTES_DEFAULT; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java index 60eec55366d51..a0cb74928b530 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveTableOperationsConfig.java @@ -15,11 +15,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; -import static io.airlift.units.Duration.succinctDuration; +import static com.facebook.airlift.units.Duration.succinctDuration; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java index d87cf25507816..ab469be8e83bc 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSourceProvider.java @@ -14,6 +14,7 @@ package com.facebook.presto.iceberg; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.Subfield; import com.facebook.presto.common.predicate.Domain; @@ -83,7 +84,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java index b926a741bd727..7c1cca1d73715 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergSessionProperties.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.iceberg; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.cache.CacheConfig; import com.facebook.presto.hive.HiveCompressionCodec; import com.facebook.presto.hive.OrcFileWriterConfig; @@ -25,7 +26,6 @@ import com.facebook.presto.spi.statistics.ColumnStatisticType; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.parquet.column.ParquetProperties; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java index 7849c2b9baa67..b5e8f6662cc69 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java @@ -14,6 +14,7 @@ package com.facebook.presto.iceberg; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.GenericInternalException; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.predicate.Domain; @@ -50,7 +51,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.airlift.units.DataSize; import org.apache.iceberg.BaseTable; import org.apache.iceberg.ContentFile; import org.apache.iceberg.ContentScanTask; @@ -106,6 +106,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.Chars.isCharType; @@ -159,7 +160,6 @@ import static com.google.common.collect.Streams.stream; import static io.airlift.slice.Slices.utf8Slice; import static io.airlift.slice.Slices.wrappedBuffer; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Double.doubleToRawLongBits; import static java.lang.Double.longBitsToDouble; import static java.lang.Double.parseDouble; diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergConfig.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergConfig.java index 7ba659745c45e..59b07b26db5a1 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergConfig.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergConfig.java @@ -22,6 +22,8 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctDataSize; import static com.facebook.presto.hive.HiveCompressionCodec.GZIP; import static com.facebook.presto.hive.HiveCompressionCodec.NONE; import static com.facebook.presto.iceberg.CatalogType.HADOOP; @@ -30,8 +32,6 @@ import static com.facebook.presto.iceberg.IcebergFileFormat.PARQUET; import static com.facebook.presto.spi.statistics.ColumnStatisticType.NUMBER_OF_DISTINCT_VALUES; import static com.facebook.presto.spi.statistics.ColumnStatisticType.TOTAL_SIZE_IN_BYTES; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctDataSize; import static org.apache.iceberg.CatalogProperties.IO_MANIFEST_CACHE_EXPIRATION_INTERVAL_MS_DEFAULT; import static org.apache.iceberg.CatalogProperties.IO_MANIFEST_CACHE_MAX_CONTENT_LENGTH_DEFAULT; import static org.apache.iceberg.CatalogProperties.IO_MANIFEST_CACHE_MAX_TOTAL_BYTES_DEFAULT; diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java index b87e793547de7..4e14cf3a1c639 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java @@ -14,6 +14,7 @@ package com.facebook.presto.iceberg; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.BooleanType; @@ -40,7 +41,6 @@ import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; import org.apache.iceberg.MetricsConfig; diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSystemTables.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSystemTables.java index 2147d3894c3b8..e75f0b88e74f0 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSystemTables.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSystemTables.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.iceberg; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.transaction.TransactionId; import com.facebook.presto.spi.security.AllowAllAccessControl; @@ -23,7 +24,6 @@ import com.facebook.presto.tests.DistributedQueryRunner; import com.facebook.presto.transaction.TransactionManager; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestHiveTableOperationsConfig.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestHiveTableOperationsConfig.java index db1b2d8d885f2..5ac51d56b975b 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestHiveTableOperationsConfig.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestHiveTableOperationsConfig.java @@ -22,7 +22,7 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.Duration.succinctDuration; +import static com.facebook.airlift.units.Duration.succinctDuration; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestIcebergSystemTablesNessie.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestIcebergSystemTablesNessie.java index 4c2e169cffc98..83e835b67b02c 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestIcebergSystemTablesNessie.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestIcebergSystemTablesNessie.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.iceberg.nessie; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.iceberg.IcebergConfig; import com.facebook.presto.iceberg.IcebergPlugin; @@ -24,7 +25,6 @@ import com.facebook.presto.testing.containers.NessieContainer; import com.facebook.presto.tests.DistributedQueryRunner; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/presto-jdbc/pom.xml b/presto-jdbc/pom.xml index b22ee31f6f58c..a970c0a9b1719 100644 --- a/presto-jdbc/pom.xml +++ b/presto-jdbc/pom.xml @@ -62,7 +62,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-jdbc/src/main/java/com/facebook/presto/jdbc/PrestoConnection.java b/presto-jdbc/src/main/java/com/facebook/presto/jdbc/PrestoConnection.java index 1f3f760631850..d27be99e448fe 100644 --- a/presto-jdbc/src/main/java/com/facebook/presto/jdbc/PrestoConnection.java +++ b/presto-jdbc/src/main/java/com/facebook/presto/jdbc/PrestoConnection.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.jdbc; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ClientSession; import com.facebook.presto.client.ServerInfo; import com.facebook.presto.client.StatementClient; @@ -23,7 +24,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Ints; -import io.airlift.units.Duration; import java.net.URI; import java.nio.charset.CharsetEncoder; diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java index 1d91cc3bf05d7..667023ff947e9 100644 --- a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java +++ b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java @@ -14,6 +14,7 @@ package com.facebook.presto.jdbc; import com.facebook.airlift.log.Logging; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.common.type.BooleanType; @@ -42,7 +43,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.testng.annotations.AfterClass; @@ -81,6 +81,7 @@ import static com.facebook.airlift.testing.Assertions.assertContains; import static com.facebook.airlift.testing.Assertions.assertInstanceOf; import static com.facebook.airlift.testing.Assertions.assertLessThan; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.common.type.CharType.createCharType; import static com.facebook.presto.common.type.DecimalType.createDecimalType; import static com.facebook.presto.common.type.VarcharType.createUnboundedVarcharType; @@ -90,7 +91,6 @@ import static com.facebook.presto.testing.TestingSession.TESTING_CATALOG; import static com.facebook.presto.testing.TestingSession.createBogusTestingCatalog; import static com.facebook.presto.tests.AbstractTestQueries.TEST_CATALOG_PROPERTIES; -import static io.airlift.units.Duration.nanosSince; import static java.lang.Float.POSITIVE_INFINITY; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestQueryExecutor.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestQueryExecutor.java index 71e6c5d042941..c3b37334781a7 100644 --- a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestQueryExecutor.java +++ b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestQueryExecutor.java @@ -14,8 +14,8 @@ package com.facebook.presto.jdbc; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ServerInfo; -import io.airlift.units.Duration; import okhttp3.OkHttpClient; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; diff --git a/presto-jmx/pom.xml b/presto-jmx/pom.xml index 8233d3cc7e38e..83478ca779bc7 100644 --- a/presto-jmx/pom.xml +++ b/presto-jmx/pom.xml @@ -99,7 +99,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java index ddaae1f234780..7a109004d2b13 100644 --- a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java +++ b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorConfig.java @@ -14,11 +14,11 @@ package com.facebook.presto.connector.jmx; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxConnectorConfig.java b/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxConnectorConfig.java index 950c39de138af..c5fca4f2720e2 100644 --- a/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxConnectorConfig.java +++ b/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxConnectorConfig.java @@ -14,9 +14,9 @@ package com.facebook.presto.connector.jmx; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxSplitManager.java b/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxSplitManager.java index b35b8663a918c..16ba589ef282f 100644 --- a/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxSplitManager.java +++ b/presto-jmx/src/test/java/com/facebook/presto/connector/jmx/TestJmxSplitManager.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.connector.jmx; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.common.predicate.NullableValue; import com.facebook.presto.common.predicate.TupleDomain; @@ -36,7 +37,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-kafka/pom.xml b/presto-kafka/pom.xml index 220ca0321f00b..2d750614cbadf 100644 --- a/presto-kafka/pom.xml +++ b/presto-kafka/pom.xml @@ -143,7 +143,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java index a9889cbfe2aa0..dc7e249493db4 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnectorConfig.java @@ -15,12 +15,12 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.facebook.presto.kafka.schema.file.FileTableDescriptionSupplier; import com.facebook.presto.kafka.server.file.FileKafkaClusterMetadataSupplier; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-kafka/src/test/java/com/facebook/presto/kafka/KafkaQueryRunner.java b/presto-kafka/src/test/java/com/facebook/presto/kafka/KafkaQueryRunner.java index 5e067e6dfdb83..1429a87511592 100644 --- a/presto-kafka/src/test/java/com/facebook/presto/kafka/KafkaQueryRunner.java +++ b/presto-kafka/src/test/java/com/facebook/presto/kafka/KafkaQueryRunner.java @@ -36,12 +36,12 @@ import java.util.Optional; import static com.facebook.airlift.testing.Closeables.closeAllSuppress; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.kafka.util.TestUtils.installKafkaPlugin; import static com.facebook.presto.kafka.util.TestUtils.loadTpchTopicDescription; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; import static com.google.common.io.ByteStreams.toByteArray; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.Locale.ENGLISH; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-kudu/pom.xml b/presto-kudu/pom.xml index eef4a5dc5f462..23c7653ecedec 100644 --- a/presto-kudu/pom.xml +++ b/presto-kudu/pom.xml @@ -111,7 +111,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java index e3d4df557ee1e..d8b660aa150d2 100755 --- a/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java +++ b/presto-kudu/src/main/java/com/facebook/presto/kudu/KuduClientConfig.java @@ -14,11 +14,11 @@ package com.facebook.presto.kudu; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MaxDuration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; -import io.airlift.units.MaxDuration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/presto-lark-sheets/pom.xml b/presto-lark-sheets/pom.xml index ffed6fa28c29d..ecd72087bec5d 100644 --- a/presto-lark-sheets/pom.xml +++ b/presto-lark-sheets/pom.xml @@ -100,7 +100,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-local-file/pom.xml b/presto-local-file/pom.xml index 960a76014eb2f..0a6afd612b434 100644 --- a/presto-local-file/pom.xml +++ b/presto-local-file/pom.xml @@ -74,7 +74,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-main-base/pom.xml b/presto-main-base/pom.xml index 3f8b319edc03e..cce4c22c4a064 100644 --- a/presto-main-base/pom.xml +++ b/presto-main-base/pom.xml @@ -139,7 +139,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-main-base/src/main/java/com/facebook/presto/ExceededCpuLimitException.java b/presto-main-base/src/main/java/com/facebook/presto/ExceededCpuLimitException.java index 7e2a097422168..8da204f884668 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ExceededCpuLimitException.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ExceededCpuLimitException.java @@ -13,8 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.PrestoException; -import io.airlift.units.Duration; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_CPU_LIMIT; import static java.lang.String.format; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ExceededIntermediateWrittenBytesException.java b/presto-main-base/src/main/java/com/facebook/presto/ExceededIntermediateWrittenBytesException.java index d2c8599cb2383..e0f648c3e042e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ExceededIntermediateWrittenBytesException.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ExceededIntermediateWrittenBytesException.java @@ -13,8 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.PrestoException; -import io.airlift.units.DataSize; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_WRITTEN_INTERMEDIATE_BYTES_LIMIT; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ExceededMemoryLimitException.java b/presto-main-base/src/main/java/com/facebook/presto/ExceededMemoryLimitException.java index 8d5225e5be307..84643433614e1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ExceededMemoryLimitException.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ExceededMemoryLimitException.java @@ -13,10 +13,10 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.ErrorCause; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.StandardErrorCode; -import io.airlift.units.DataSize; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ExceededOutputSizeLimitException.java b/presto-main-base/src/main/java/com/facebook/presto/ExceededOutputSizeLimitException.java index 305922cdd9cf5..0c3af0a089449 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ExceededOutputSizeLimitException.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ExceededOutputSizeLimitException.java @@ -13,8 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.PrestoException; -import io.airlift.units.DataSize; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_OUTPUT_SIZE_LIMIT; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ExceededScanLimitException.java b/presto-main-base/src/main/java/com/facebook/presto/ExceededScanLimitException.java index 6557f7ede8954..3a95fa4c66aff 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ExceededScanLimitException.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ExceededScanLimitException.java @@ -13,8 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.PrestoException; -import io.airlift.units.DataSize; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_SCAN_RAW_BYTES_READ_LIMIT; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ExceededSpillLimitException.java b/presto-main-base/src/main/java/com/facebook/presto/ExceededSpillLimitException.java index eeb9c22ef5eca..99ef446e47d26 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ExceededSpillLimitException.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ExceededSpillLimitException.java @@ -13,8 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.PrestoException; -import io.airlift.units.DataSize; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_SPILL_LIMIT; import static java.lang.String.format; diff --git a/presto-main-base/src/main/java/com/facebook/presto/Session.java b/presto-main-base/src/main/java/com/facebook/presto/Session.java index 393b0b1e3e428..14b7a05d142d7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/Session.java +++ b/presto-main-base/src/main/java/com/facebook/presto/Session.java @@ -13,6 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.function.SqlFunctionProperties; import com.facebook.presto.common.resourceGroups.QueryType; @@ -43,8 +45,6 @@ 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.airlift.units.Duration; import java.security.Principal; import java.util.HashMap; diff --git a/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java b/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java index 723d90b17b2f0..ce1fb24c3fb1d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java +++ b/presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java @@ -13,6 +13,8 @@ */ package com.facebook.presto; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.WarningHandlingLevel; import com.facebook.presto.common.plan.PlanCanonicalizationStrategy; import com.facebook.presto.cost.HistoryBasedOptimizationConfig; @@ -49,8 +51,6 @@ import com.facebook.presto.tracing.TracingConfig; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.Comparator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java index 828bb4e87e476..48b7f53a0db87 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.connector.system; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.predicate.TupleDomain; @@ -30,7 +31,6 @@ import com.facebook.presto.spi.SystemTable; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java index 2c33f2f05581f..f2f168281308c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java +++ b/presto-main-base/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java @@ -14,6 +14,8 @@ package com.facebook.presto.connector.system; import com.facebook.airlift.node.NodeInfo; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.execution.TaskManager; @@ -27,8 +29,6 @@ import com.facebook.presto.spi.SchemaTableName; import com.facebook.presto.spi.SystemTable; import com.facebook.presto.spi.connector.ConnectorTransactionHandle; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import static com.facebook.presto.common.type.BigintType.BIGINT; diff --git a/presto-main-base/src/main/java/com/facebook/presto/cost/FragmentStatsProvider.java b/presto-main-base/src/main/java/com/facebook/presto/cost/FragmentStatsProvider.java index a9ec314b0bf03..f8c8b79b7cdc4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/cost/FragmentStatsProvider.java +++ b/presto-main-base/src/main/java/com/facebook/presto/cost/FragmentStatsProvider.java @@ -14,12 +14,12 @@ package com.facebook.presto.cost; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.QueryId; import com.facebook.presto.spi.plan.PlanFragmentId; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.inject.Inject; -import io.airlift.units.DataSize; import java.util.Objects; import java.util.stream.IntStream; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java index d04774e82dae4..6445da1f82351 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/DispatchInfo.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.dispatcher; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.ExecutionFailureInfo; -import io.airlift.units.Duration; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java index ab2eb972af2d0..ed1818f916228 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java +++ b/presto-main-base/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.dispatcher; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.execution.ExecutionFailureInfo; @@ -23,7 +24,6 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.net.URI; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java index 2fc557e3c7f0f..8094b02e809a5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java @@ -83,6 +83,7 @@ import java.util.Optional; import java.util.stream.Collectors; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.SystemSessionProperties.logQueryPlansUsedInHistoryBasedOptimizer; import static com.facebook.presto.execution.QueryState.QUEUED; import static com.facebook.presto.execution.StageInfo.getAllStages; @@ -92,7 +93,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.airlift.units.DataSize.succinctBytes; import static java.lang.Double.NaN; import static java.lang.Math.max; import static java.lang.Math.toIntExact; diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java index bd3143ebabbd7..b48cdb9cf7b96 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitorConfig.java @@ -15,11 +15,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; -import io.airlift.units.Duration; -import io.airlift.units.MaxDataSize; -import io.airlift.units.MinDataSize; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MaxDataSize; +import com.facebook.airlift.units.MinDataSize; import jakarta.validation.constraints.NotNull; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java index c4c7fad28d47c..cef18a44ddd61 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryProgressMonitor.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.event; +import com.facebook.airlift.units.Duration; import com.facebook.presto.dispatcher.DispatchManager; import com.facebook.presto.server.BasicQueryInfo; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java index 40917e71fce62..d8a1b751c8de3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.analyzer.PreparedQuery; import com.facebook.presto.common.resourceGroups.QueryType; @@ -36,7 +37,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/BasicStageExecutionStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/BasicStageExecutionStats.java index 24e0f47c8c611..3e6c7f06e5f1d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/BasicStageExecutionStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/BasicStageExecutionStats.java @@ -13,16 +13,16 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.operator.BlockedReason; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import java.util.HashSet; import java.util.OptionalDouble; import java.util.Set; +import static com.facebook.airlift.units.Duration.succinctDuration; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.Duration.succinctDuration; import static java.lang.Math.min; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java index d143b0beb77de..708af458d5a67 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ClusterSizeMonitor.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.scheduler.NodeSchedulerConfig; import com.facebook.presto.metadata.AllNodes; import com.facebook.presto.metadata.InternalNodeManager; @@ -23,7 +24,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java index 7a58f36900fd4..abffda10d555c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.StateMachine.StateChangeListener; import com.facebook.presto.memory.VersionedMemoryPoolId; @@ -28,7 +29,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/ManagedQueryExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/ManagedQueryExecution.java index 31caf9ae91280..217e12c197601 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/ManagedQueryExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/ManagedQueryExecution.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.execution.StateMachine.StateChangeListener; import com.facebook.presto.server.BasicQueryInfo; import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; -import io.airlift.units.Duration; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecution.java index af23ce6bc9791..35c9db00bcfba 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.analyzer.PreparedQuery; import com.facebook.presto.common.resourceGroups.QueryType; import com.facebook.presto.common.type.Type; @@ -28,7 +29,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.net.URI; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryLimit.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryLimit.java index f638dbdf9251b..690c205631d60 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryLimit.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryLimit.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.Arrays; import java.util.Comparator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java index e62d189a79244..8eb4ced151805 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryManagerConfig.java @@ -17,20 +17,20 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; import com.facebook.airlift.configuration.LegacyConfig; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; import com.facebook.presto.connector.system.GlobalSystemConnector; import com.facebook.presto.spi.api.Experimental; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import java.util.concurrent.TimeUnit; -import static io.airlift.units.DataSize.Unit.PETABYTE; -import static io.airlift.units.DataSize.Unit.TERABYTE; +import static com.facebook.airlift.units.DataSize.Unit.PETABYTE; +import static com.facebook.airlift.units.DataSize.Unit.TERABYTE; import static java.util.concurrent.TimeUnit.MINUTES; @DefunctConfig({ diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java index 1659ba6b100b2..598de9e487ce3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java @@ -77,6 +77,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.execution.BasicStageExecutionStats.EMPTY_STAGE_STATS; import static com.facebook.presto.execution.QueryState.DISPATCHING; import static com.facebook.presto.execution.QueryState.FINISHED; @@ -101,7 +102,6 @@ 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.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateTimer.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateTimer.java index 36da1ab1d57ad..7629b7f4d52c3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateTimer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateTimer.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.google.common.base.Ticker; -import io.airlift.units.Duration; import java.util.concurrent.atomic.AtomicReference; -import static io.airlift.units.Duration.succinctNanos; +import static com.facebook.airlift.units.Duration.succinctNanos; import static java.lang.Math.max; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java index 6009cb2b5494c..cea3addcdba0a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.operator.BlockedReason; import com.facebook.presto.operator.ExchangeOperator; @@ -27,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; 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; @@ -38,10 +38,10 @@ import java.util.OptionalDouble; import java.util.Set; +import static com.facebook.airlift.units.DataSize.succinctBytes; +import static com.facebook.airlift.units.Duration.succinctDuration; import static com.facebook.presto.util.DateTimeUtils.toTimeStampInMillis; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.succinctBytes; -import static io.airlift.units.Duration.succinctDuration; import static java.lang.Math.min; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java index d88ecae6bb972..142c71485c78b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/QueryTracker.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.QueryTracker.TrackedQuery; import com.facebook.presto.resourcemanager.ClusterQueryTrackerService; @@ -24,7 +25,6 @@ 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 java.util.Collection; import java.util.NoSuchElementException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java index 990a7a8cf08fd..d7b0a56a4f822 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SplitConcurrencyController.java @@ -14,7 +14,7 @@ package com.facebook.presto.execution; import com.facebook.airlift.concurrent.NotThreadSafe; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SplitRunner.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SplitRunner.java index ded9bd28c1d49..590b2a662c187 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SplitRunner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SplitRunner.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.io.Closeable; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java index 746ab2c90f94c..8fec068228b6d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution; import com.facebook.airlift.concurrent.SetThreadName; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.InvalidFunctionArgumentException; import com.facebook.presto.common.analyzer.PreparedQuery; @@ -67,7 +68,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java index d7e82ff936499..16f5a65fa748f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlStageExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.execution.StateMachine.StateChangeListener; @@ -43,7 +44,6 @@ import com.google.common.collect.Sets; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import java.net.URI; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java index e0e21ee57b1fd..899552d6feedf 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskExecution.java @@ -15,6 +15,7 @@ import com.facebook.airlift.concurrent.NotThreadSafe; import com.facebook.airlift.concurrent.SetThreadName; +import com.facebook.airlift.units.Duration; import com.facebook.presto.event.SplitMonitor; import com.facebook.presto.execution.StateMachine.StateChangeListener; import com.facebook.presto.execution.buffer.BufferState; @@ -42,7 +43,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.lang.ref.WeakReference; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java index 49db6383b9a9d..6f5d5fd2c94a7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/SqlTaskManager.java @@ -19,6 +19,8 @@ import com.facebook.airlift.node.NodeInfo; import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.GcMonitor; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.block.BlockEncodingSerde; import com.facebook.presto.event.SplitMonitor; @@ -53,8 +55,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionInfo.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionInfo.java index 77e47cdb378f8..cea22884f15d8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionInfo.java @@ -33,6 +33,7 @@ import java.util.Optional; import java.util.Set; +import static com.facebook.airlift.units.Duration.succinctDuration; import static com.facebook.presto.common.RuntimeMetricName.DRIVER_COUNT_PER_TASK; import static com.facebook.presto.common.RuntimeMetricName.TASK_BLOCKED_TIME_NANOS; import static com.facebook.presto.common.RuntimeMetricName.TASK_ELAPSED_TIME_NANOS; @@ -42,7 +43,6 @@ import static com.facebook.presto.common.RuntimeUnit.NONE; import static com.facebook.presto.execution.StageExecutionState.FINISHED; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.Duration.succinctDuration; import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.toIntExact; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java index fe56615dc5430..96fe14bf310c0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStateMachine.java @@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.common.RuntimeMetricName.EVENT_LOOP_METHOD_EXECUTION_CPU_TIME_NANOS; import static com.facebook.presto.common.RuntimeMetricName.GET_SPLITS_TIME_NANOS; import static com.facebook.presto.common.RuntimeMetricName.SCAN_STAGE_SCHEDULER_BLOCKED_TIME_NANOS; @@ -62,7 +63,6 @@ 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.airlift.units.Duration.succinctNanos; import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.System.currentTimeMillis; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java index 721655049c312..b684fa12cb152 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java @@ -15,6 +15,7 @@ import com.facebook.airlift.stats.Distribution; import com.facebook.airlift.stats.Distribution.DistributionSnapshot; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.operator.BlockedReason; import com.facebook.presto.operator.OperatorStats; @@ -24,7 +25,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import java.util.List; import java.util.OptionalDouble; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java index c3a57ec1498d6..6c6ba888e6a21 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TaskManagerConfig.java @@ -17,12 +17,12 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; import com.facebook.airlift.configuration.LegacyConfig; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MaxDuration; +import com.facebook.airlift.units.MinDuration; import com.facebook.presto.memory.HighMemoryTaskKillerStrategy; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; -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.Min; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/TimeoutThread.java b/presto-main-base/src/main/java/com/facebook/presto/execution/TimeoutThread.java index 473aa1c82f6a2..e6b077999f1d8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/TimeoutThread.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/TimeoutThread.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/PrioritizedSplitRunner.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/PrioritizedSplitRunner.java index d4017069c1fb8..682ea8abef9f4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/PrioritizedSplitRunner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/PrioritizedSplitRunner.java @@ -16,11 +16,11 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.SplitRunner; import com.google.common.base.Ticker; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java index 3d109f52a15da..4b9dd6097aa0e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java @@ -19,6 +19,7 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeDistribution; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.SplitRunner; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskManagerConfig; @@ -37,7 +38,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java index 2e3190280ab06..4616aced43015 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/executor/TaskHandle.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.execution.executor; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.SplitConcurrencyController; import com.facebook.presto.execution.TaskId; 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 java.util.ArrayDeque; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java index d85c5a00818b7..e1504e7b50f21 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java @@ -14,6 +14,8 @@ package com.facebook.presto.execution.resourceGroups; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.ManagedQueryExecution; import com.facebook.presto.execution.resourceGroups.WeightedFairQueue.Usage; import com.facebook.presto.metadata.InternalNodeManager; @@ -28,8 +30,6 @@ import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; @@ -49,6 +49,7 @@ import java.util.function.Function; import java.util.function.Predicate; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.SystemSessionProperties.getQueryPriority; import static com.facebook.presto.common.ErrorType.USER_ERROR; import static com.facebook.presto.server.QueryStateInfo.createQueryStateInfo; @@ -68,7 +69,6 @@ import static com.google.common.math.LongMath.saturatedAdd; import static com.google.common.math.LongMath.saturatedMultiply; import static com.google.common.math.LongMath.saturatedSubtract; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.min; import static java.lang.String.format; import static java.lang.System.currentTimeMillis; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java index aae2a38a923e3..6dbf4115d0442 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.node.NodeInfo; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.ManagedQueryExecution; import com.facebook.presto.execution.QueryManagerConfig; import com.facebook.presto.execution.resourceGroups.InternalResourceGroup.RootInternalResourceGroup; @@ -36,7 +37,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkLocationCache.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkLocationCache.java index d4c75c4c72364..84c982f229be7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkLocationCache.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NetworkLocationCache.java @@ -14,12 +14,12 @@ package com.facebook.presto.execution.scheduler; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.HostAddress; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import io.airlift.units.Duration; import java.util.concurrent.ExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java index 47d124d4bd086..6b05db702bc49 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/NodeScheduler.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution.scheduler; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.NodeTaskMap; import com.facebook.presto.execution.QueryManager; @@ -42,7 +43,6 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledWriterScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledWriterScheduler.java index 4ffc5da5a25a4..d4791d04ea625 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledWriterScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/ScaledWriterScheduler.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution.scheduler; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.execution.RemoteTask; import com.facebook.presto.execution.SqlStageExecution; import com.facebook.presto.execution.TaskStatus; @@ -20,7 +21,6 @@ import com.facebook.presto.metadata.InternalNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; import java.util.Collection; import java.util.HashSet; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQueryScheduler.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQueryScheduler.java index 93a707e4e2da1..20f693df2b3ae 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQueryScheduler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQueryScheduler.java @@ -16,6 +16,7 @@ import com.facebook.airlift.concurrent.SetThreadName; import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.cost.StatsAndCosts; import com.facebook.presto.execution.BasicStageExecutionStats; @@ -53,7 +54,6 @@ import com.google.common.collect.Iterables; import com.google.common.util.concurrent.ListenableFuture; import com.sun.management.ThreadMXBean; -import io.airlift.units.Duration; import org.apache.http.client.utils.URIBuilder; import java.lang.management.ManagementFactory; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQuerySchedulerInterface.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQuerySchedulerInterface.java index 03a2d0e7e62d7..94aa0f7444e0f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQuerySchedulerInterface.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/SqlQuerySchedulerInterface.java @@ -14,10 +14,10 @@ package com.facebook.presto.execution.scheduler; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.BasicStageExecutionStats; import com.facebook.presto.execution.StageId; import com.facebook.presto.execution.StageInfo; -import io.airlift.units.Duration; public interface SqlQuerySchedulerInterface { diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelector.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelector.java index cb3c7291909d3..1b2592d59a009 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelector.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution.scheduler.nodeSelection; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.NodeTaskMap; import com.facebook.presto.execution.QueryManager; @@ -39,7 +40,6 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.time.Instant; import java.util.Comparator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelectorConfig.java b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelectorConfig.java index 71462289c5460..eea9b72195e53 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelectorConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/scheduler/nodeSelection/SimpleTtlNodeSelectorConfig.java @@ -14,7 +14,7 @@ package com.facebook.presto.execution.scheduler.nodeSelection; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java b/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java index 64c3858729384..d1364f2bac4b6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/ClusterMemoryLeakDetector.java @@ -14,12 +14,12 @@ package com.facebook.presto.memory; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.server.BasicQueryInfo; import com.facebook.presto.spi.QueryId; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; import java.util.Map; import java.util.Map.Entry; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java b/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java index 235655c1b5493..844ab5088001e 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/LocalMemoryManager.java @@ -13,25 +13,25 @@ */ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spi.memory.MemoryPoolInfo; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import java.util.List; import java.util.Map; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.memory.NodeMemoryConfig.QUERY_MAX_MEMORY_PER_NODE_CONFIG; import static com.facebook.presto.memory.NodeMemoryConfig.QUERY_MAX_TOTAL_MEMORY_PER_NODE_CONFIG; import static com.facebook.presto.memory.NodeMemoryConfig.QUERY_SOFT_MAX_MEMORY_PER_NODE_CONFIG; import static com.facebook.presto.memory.NodeMemoryConfig.QUERY_SOFT_MAX_TOTAL_MEMORY_PER_NODE_CONFIG; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryInfo.java b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryInfo.java index 86f7dd737927b..73cbe09c9a9c4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryInfo.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -21,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java index 0e8dd09cb29dd..dd0ac9ebc47fe 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryManagerConfig.java @@ -16,13 +16,13 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.succinctBytes; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static java.util.concurrent.TimeUnit.MINUTES; @DefunctConfig({ diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java index 851149d7f0383..fa693a6ec643b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/MemoryPool.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.execution.TaskId; import com.facebook.presto.spi.QueryId; import com.facebook.presto.spi.memory.MemoryAllocation; @@ -22,7 +23,6 @@ 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 jakarta.annotation.Nullable; import org.weakref.jmx.Managed; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java b/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java index c0ee34ba8dad9..9b7fd353885a5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/NodeMemoryConfig.java @@ -15,10 +15,10 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import jakarta.validation.constraints.NotNull; -import static io.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; // This is separate from MemoryManagerConfig because it's difficult to test the default value of maxQueryMemoryPerNode public class NodeMemoryConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java b/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java index 49b70b09a1693..74f9b7b501b9d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/QueryContext.java @@ -15,6 +15,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.stats.GcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskStateMachine; @@ -32,7 +33,6 @@ 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 java.util.Collection; import java.util.Comparator; @@ -48,6 +48,8 @@ import java.util.function.BiPredicate; import java.util.function.Predicate; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalBroadcastMemoryLimit; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalRevocableMemoryLimit; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalTotalMemoryLimit; @@ -62,8 +64,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Comparator.comparing; import static java.util.Map.Entry.comparingByValue; diff --git a/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java b/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java index 46659e410d77a..8116eb4a84bbd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/memory/ReservedSystemMemoryConfig.java @@ -14,10 +14,10 @@ package com.facebook.presto.memory; import com.facebook.airlift.configuration.Config; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import jakarta.validation.constraints.NotNull; -import static io.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; // This is separate from MemoryManagerConfig because it's difficult to test the default value of reservedSystemMemory public class ReservedSystemMemoryConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java index f75811f8c2af8..20bdf929e723b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java +++ b/presto-main-base/src/main/java/com/facebook/presto/metadata/ThriftRemoteNodeState.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.metadata; +import com.facebook.airlift.units.Duration; import com.facebook.drift.client.DriftClient; import com.facebook.presto.server.thrift.ThriftServerInfoClient; import com.facebook.presto.spi.NodeState; @@ -20,7 +21,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.net.URI; @@ -29,9 +29,9 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.google.common.base.Preconditions.checkState; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; @ThreadSafe diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java b/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java index f73ec8babc8eb..442572f7725fb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/Driver.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.execution.FragmentResultCacheContext; import com.facebook.presto.execution.ScheduledSplit; @@ -31,7 +32,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import java.io.Closeable; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverContext.java b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverContext.java index 95bac0519e9ef..f6165fcf4449f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverContext.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.FragmentResultCacheContext; import com.facebook.presto.execution.Lifespan; @@ -26,7 +27,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.util.List; import java.util.Optional; @@ -37,11 +37,11 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.getFirst; import static com.google.common.collect.Iterables.getLast; import static com.google.common.collect.Iterables.transform; -import static io.airlift.units.Duration.succinctNanos; import static java.lang.Math.max; import static java.lang.System.currentTimeMillis; import static java.lang.System.nanoTime; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java index e202f6adb9f03..675cef78b4624 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -22,7 +23,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java index 6d12a519295e8..d4221e6b1eb9c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/DynamicFilterSourceOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -24,7 +25,6 @@ import com.facebook.presto.spi.plan.PlanNodeId; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java index 498b0c1bcd3bb..77540227a7c16 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClient.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.TaskId; import com.facebook.presto.memory.context.LocalMemoryContext; import com.facebook.presto.operator.PageBufferClient.ClientCallback; @@ -24,8 +26,6 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.io.Closeable; @@ -43,6 +43,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -50,7 +51,6 @@ import static com.google.common.collect.Sets.newConcurrentHashSet; import static com.google.common.util.concurrent.Futures.immediateFuture; import static io.airlift.slice.Slices.EMPTY_SLICE; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.max; import static java.lang.Math.min; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java index 3dd337c2f5450..33ed5473598dc 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientConfig.java @@ -15,17 +15,17 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.DefunctConfig; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import java.util.concurrent.TimeUnit; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctDataSize; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctDataSize; @DefunctConfig("exchange.async-page-transport-enabled") public class ExchangeClientConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java index 1429f99a4ea4a..abd07ed290194 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ExchangeClientFactory.java @@ -14,9 +14,9 @@ package com.facebook.presto.operator; import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.memory.context.LocalMemoryContext; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.weakref.jmx.Managed; @@ -27,8 +27,8 @@ import java.util.concurrent.ThreadPoolExecutor; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newFixedThreadPool; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java b/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java index 20cc390582e50..ebdf0baca862c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/FileFragmentResultCacheConfig.java @@ -15,17 +15,17 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; import com.facebook.presto.CompressionCodec; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import java.net.URI; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.DAYS; public class FileFragmentResultCacheConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/FilterAndProjectOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/FilterAndProjectOperator.java index b06428a276639..1c2cb20363034 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/FilterAndProjectOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/FilterAndProjectOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.function.SqlFunctionProperties; import com.facebook.presto.common.type.Type; @@ -21,7 +22,6 @@ import com.facebook.presto.operator.project.PageProcessor; import com.facebook.presto.spi.plan.PlanNodeId; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; import java.util.function.Supplier; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java index 1d4e8cdb19568..92d6f37de0b53 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; @@ -35,7 +36,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; @@ -43,6 +43,7 @@ import java.util.OptionalLong; import java.util.stream.Collectors; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.operator.aggregation.builder.InMemoryHashAggregationBuilder.toTypes; import static com.facebook.presto.sql.planner.PlannerUtils.INITIAL_HASH_VALUE; import static com.facebook.presto.type.TypeUtils.NULL_HASH_CODE; @@ -50,7 +51,6 @@ 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.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; public class HashAggregationOperator diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java index 8b181b6d667ac..6e7917a53cb7b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java @@ -40,6 +40,7 @@ import java.util.Queue; import static com.facebook.airlift.concurrent.MoreFutures.getDone; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalUserMemoryLimit; import static com.facebook.presto.SystemSessionProperties.getQueryMaxMemoryPerNode; import static com.facebook.presto.operator.SpillingUtils.checkSpillSucceeded; @@ -47,7 +48,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static com.google.common.util.concurrent.Futures.immediateFuture; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPages.java b/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPages.java index 35546b68b7068..e9f5fcb74c1ef 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPages.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPages.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPagesBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPagesBuilder.java index e807c6e84f931..a20f4cf10e3ed 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPagesBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/NestedLoopJoinPagesBuilder.java @@ -13,17 +13,17 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.operator.project.PageProcessor; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.List; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.addExact; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java index d282f75d249b9..bb60267c0f0c4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorContext.java @@ -39,13 +39,13 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.operator.BlockedReason.WAITING_FOR_MEMORY; import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; 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.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.Duration.succinctNanos; import static java.lang.Math.max; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorMemoryReservationSummary.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorMemoryReservationSummary.java index eb8557f563074..a0687e56f9561 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorMemoryReservationSummary.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorMemoryReservationSummary.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spi.plan.PlanNodeId; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java index 9d50ba23b177f..aced7ab03012d 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -22,15 +23,14 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.util.HashSet; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.Duration.succinctNanos; import static java.lang.Math.max; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java index c42e36fc9de59..fd3f0839db4a9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PageBufferClient.java @@ -14,6 +14,8 @@ package com.facebook.presto.operator; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.server.remotetask.Backoff; import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.PrestoException; @@ -25,8 +27,6 @@ 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 jakarta.annotation.Nullable; import org.apache.http.client.utils.URIBuilder; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java index 713c99e79047a..c301db4fecb23 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesHash.java @@ -13,20 +13,20 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.array.AdaptiveLongBigArray; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.HashCommon; import org.openjdk.jol.info.ClassLayout; import java.util.Arrays; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.operator.SyntheticAddress.decodePosition; import static com.facebook.presto.operator.SyntheticAddress.decodeSliceIndex; import static com.facebook.presto.util.HashCollisionsEstimator.estimateNumberOfHashCollisions; import static io.airlift.slice.SizeOf.sizeOf; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java index 7fb65e5cd2855..640ae9919ca90 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesIndex.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; @@ -36,7 +37,6 @@ import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.Swapper; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import jakarta.inject.Inject; @@ -53,6 +53,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.operator.SyntheticAddress.decodePosition; import static com.facebook.presto.operator.SyntheticAddress.decodeSliceIndex; import static com.facebook.presto.operator.SyntheticAddress.encodeSyntheticAddress; @@ -60,7 +61,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static io.airlift.slice.SizeOf.sizeOf; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; /** diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java index 8ec0b2661c321..c57c79705a216 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/PagesSpatialIndexSupplier.java @@ -16,6 +16,7 @@ import com.esri.core.geometry.Operator; import com.esri.core.geometry.OperatorFactoryLocal; import com.esri.core.geometry.ogc.OGCGeometry; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.array.AdaptiveLongBigArray; import com.facebook.presto.common.block.Block; @@ -27,7 +28,6 @@ import com.facebook.presto.operator.SpatialIndexBuilderOperator.SpatialPredicate; import com.facebook.presto.sql.gen.JoinFilterFunctionCompiler; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.openjdk.jol.info.ClassLayout; @@ -36,6 +36,7 @@ import java.util.Optional; import java.util.function.Supplier; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.DoubleType.DOUBLE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.geospatial.GeometryUtils.accelerateGeometry; @@ -44,7 +45,6 @@ import static com.facebook.presto.operator.SyntheticAddress.decodePosition; import static com.facebook.presto.operator.SyntheticAddress.decodeSliceIndex; import static com.google.common.base.Verify.verify; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/RpcShuffleClient.java b/presto-main-base/src/main/java/com/facebook/presto/operator/RpcShuffleClient.java index b03ea89e042bf..6eadc430f3653 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/RpcShuffleClient.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/RpcShuffleClient.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.operator.PageBufferClient.PagesResponse; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; /** * All methods in this class should be async diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java index 56d24cdb00292..f45d8faccafd4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.RuntimeStats; @@ -43,7 +44,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; import java.io.Closeable; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishInfo.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishInfo.java index 0362d366676d2..c4038f20146d8 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishInfo.java @@ -14,19 +14,19 @@ package com.facebook.presto.operator; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.facebook.presto.spi.connector.ConnectorOutputMetadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Optional; import static com.facebook.airlift.json.JsonCodec.jsonCodec; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishOperator.java index 80d989c9bdeb4..ddf2c0e102a42 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TableFinishOperator.java @@ -46,6 +46,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.SystemSessionProperties.isStatisticsCpuTimerEnabled; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.VarbinaryType.VARBINARY; @@ -61,7 +62,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.util.concurrent.Futures.whenAllSucceed; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.Duration.succinctNanos; import static java.lang.Thread.currentThread; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeInfo.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeInfo.java index a09362c5494c8..9f5ef5ea0ead6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeInfo.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.facebook.presto.util.Mergeable; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import static com.google.common.base.MoreObjects.toStringHelper; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeOperator.java index 174392dc56ae5..a34db48c9381c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterMergeOperator.java @@ -32,6 +32,7 @@ import java.util.Queue; import java.util.function.Supplier; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.SystemSessionProperties.isStatisticsCpuTimerEnabled; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.operator.TableWriterUtils.CONTEXT_CHANNEL; @@ -43,7 +44,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static io.airlift.slice.Slices.wrappedBuffer; -import static io.airlift.units.Duration.succinctNanos; import static java.util.Objects.requireNonNull; public class TableWriterMergeOperator diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterOperator.java index ef750907d605b..d46627202c6ec 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TableWriterOperator.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -44,7 +45,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.slice.Slice; -import io.airlift.units.Duration; import java.util.Collection; import java.util.List; @@ -54,6 +54,7 @@ import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue; import static com.facebook.airlift.concurrent.MoreFutures.toListenableFuture; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.SystemSessionProperties.isStatisticsCpuTimerEnabled; import static com.facebook.presto.common.RuntimeMetricName.WRITTEN_FILES_COUNT; import static com.facebook.presto.common.RuntimeUnit.NONE; @@ -67,7 +68,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.util.concurrent.Futures.allAsList; import static io.airlift.slice.Slices.wrappedBuffer; -import static io.airlift.units.Duration.succinctNanos; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java index 922f582762b66..08ef39808fa3f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskContext.java @@ -15,6 +15,8 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.GcMonitor; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.execution.Lifespan; @@ -40,8 +42,6 @@ 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 java.util.ArrayList; import java.util.Collection; @@ -53,6 +53,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicLong; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.sql.planner.optimizations.PlanNodeSearcher.searchFrom; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -60,8 +62,6 @@ import static com.google.common.collect.Iterables.getLast; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Sets.newConcurrentHashSet; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Math.max; import static java.lang.Math.toIntExact; import static java.lang.System.currentTimeMillis; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskMemoryReservationSummary.java b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskMemoryReservationSummary.java index b6ce6dcce05d7..94e8c2a76ff10 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/TaskMemoryReservationSummary.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/TaskMemoryReservationSummary.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java index 3fdd8bea2c9f8..4f3ac2e2e15cb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/GenericAccumulatorFactory.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.aggregation; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; @@ -54,7 +55,6 @@ import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java index 0ddd89e74779d..0dca29f836107 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/TypedSet.java @@ -13,18 +13,19 @@ */ package com.facebook.presto.operator.aggregation; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.type.Type; import com.facebook.presto.spi.PrestoException; import com.google.common.annotations.VisibleForTesting; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.ints.IntArrayList; import org.openjdk.jol.info.ClassLayout; import java.lang.invoke.MethodHandle; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.TypeUtils.readNativeValue; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT; import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES; @@ -33,7 +34,6 @@ import static com.facebook.presto.util.Failures.internalError; import static com.google.common.base.Defaults.defaultValue; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static it.unimi.dsi.fastutil.HashCommon.arraySize; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/InMemoryHashAggregationBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/InMemoryHashAggregationBuilder.java index b66343ae40bdd..127eac1555b03 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/InMemoryHashAggregationBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/InMemoryHashAggregationBuilder.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.aggregation.builder; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.BlockBuilder; @@ -37,7 +38,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.ints.IntIterator; import it.unimi.dsi.fastutil.ints.IntIterators; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/MergingHashAggregationBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/MergingHashAggregationBuilder.java index 302692c0a9525..85bb894a556f3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/MergingHashAggregationBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/MergingHashAggregationBuilder.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.aggregation.builder; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; import com.facebook.presto.memory.context.LocalMemoryContext; @@ -25,7 +26,6 @@ import com.facebook.presto.spi.plan.AggregationNode; import com.facebook.presto.sql.gen.JoinCompiler; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.io.Closeable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/SpillableHashAggregationBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/SpillableHashAggregationBuilder.java index ba258cff0d8e3..c3d0bf74fc066 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/SpillableHashAggregationBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/builder/SpillableHashAggregationBuilder.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.aggregation.builder; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; import com.facebook.presto.memory.context.LocalMemoryContext; @@ -29,7 +30,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.Closer; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import java.io.IOException; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/PartialAggregationController.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/PartialAggregationController.java index 917afe5dac25f..a4d159ef9b3e3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/PartialAggregationController.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/partial/PartialAggregationController.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.operator.aggregation.partial; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import java.util.OptionalLong; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java index 72b8d57dd5683..37ab3ee42bdac 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/exchange/LocalExchange.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.exchange; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.type.Type; import com.facebook.presto.execution.Lifespan; @@ -30,7 +31,6 @@ import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; import java.io.Closeable; import java.util.ArrayList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/DynamicTupleFilterFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/DynamicTupleFilterFactory.java index 942eebedf0427..246eaad3f8c63 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/DynamicTupleFilterFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/DynamicTupleFilterFactory.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.index; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.function.SqlFunctionProperties; import com.facebook.presto.common.type.Type; @@ -27,7 +28,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import java.util.List; import java.util.Map; @@ -36,10 +36,10 @@ import java.util.function.Supplier; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.operator.FilterAndProjectOperator.FilterAndProjectOperatorFactory; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; public class DynamicTupleFilterFactory diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java index b4b0165f9579f..9d29195940009 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLoader.java @@ -14,6 +14,8 @@ package com.facebook.presto.operator.index; import com.facebook.airlift.concurrent.NotThreadSafe; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.type.Type; @@ -37,8 +39,6 @@ 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 java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSourceFactory.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSourceFactory.java index 55c3f5a2fe1f4..5e7d1dbf3f2e6 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSourceFactory.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexLookupSourceFactory.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.operator.index; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.Type; import com.facebook.presto.operator.LookupSourceFactory; import com.facebook.presto.operator.LookupSourceProvider; @@ -27,8 +29,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.List; import java.util.Map; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshotBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshotBuilder.java index f37f524117b7d..bb014869c60a2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshotBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/index/IndexSnapshotBuilder.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.index; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; @@ -23,7 +24,6 @@ import com.facebook.presto.operator.PagesIndex; import com.facebook.presto.operator.index.UnloadedIndexKeyRecordSet.UnloadedIndexKeyRecordCursor; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java index 1d110ba41861e..b125f573bfc96 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/OptimizedPartitionedOutputOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.repartition; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.ArrayAllocator; import com.facebook.presto.common.block.ArrayBlock; @@ -51,7 +52,6 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.SliceOutput; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java index 0d4af067346f0..a77a6829b5d08 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/repartition/PartitionedOutputOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.repartition; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; @@ -35,7 +36,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import java.util.Arrays; diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/DateTimeFunctions.java b/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/DateTimeFunctions.java index 30ef6f473cb46..43f4de46c1e9b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/DateTimeFunctions.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/scalar/DateTimeFunctions.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator.scalar; import com.facebook.airlift.concurrent.ThreadLocalCache; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.NotSupportedException; import com.facebook.presto.common.function.SqlFunctionProperties; import com.facebook.presto.common.type.StandardTypes; @@ -26,7 +27,6 @@ import com.facebook.presto.spi.function.SqlType; import com.facebook.presto.type.TimestampOperators; import io.airlift.slice.Slice; -import io.airlift.units.Duration; import org.joda.time.DateTime; import org.joda.time.DateTimeField; import org.joda.time.DateTimeZone; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/AggregatedResourceGroupInfoBuilder.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/AggregatedResourceGroupInfoBuilder.java index 1d035af361de9..5463780328727 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/AggregatedResourceGroupInfoBuilder.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/AggregatedResourceGroupInfoBuilder.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.server.QueryStateInfo; import com.facebook.presto.server.ResourceGroupInfo; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; @@ -20,7 +21,6 @@ import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import java.util.HashMap; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java index 89f32495ff2ce..828b1a2f71b05 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStateProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.resourceGroups.ResourceGroupRuntimeInfo; import com.facebook.presto.memory.ClusterMemoryPool; import com.facebook.presto.memory.MemoryInfo; @@ -32,7 +33,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.net.URI; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java index 7bdd99105cec3..b8e5793873a95 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java index 377a8b3b225a3..cb50153fb958f 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerResourceGroupService.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.Duration; import com.facebook.drift.client.DriftClient; import com.facebook.presto.execution.resourceGroups.ResourceGroupRuntimeInfo; import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.metadata.InternalNodeManager; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/security/FileBasedSystemAccessControl.java b/presto-main-base/src/main/java/com/facebook/presto/security/FileBasedSystemAccessControl.java index 9037220fa6718..53aa63b9d20d2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/security/FileBasedSystemAccessControl.java +++ b/presto-main-base/src/main/java/com/facebook/presto/security/FileBasedSystemAccessControl.java @@ -14,6 +14,7 @@ package com.facebook.presto.security; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.CatalogSchemaName; import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.plugin.base.security.ForwardingSystemAccessControl; @@ -36,7 +37,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import java.nio.file.Paths; import java.security.Principal; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java b/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java index 8cafa1b8cbe1f..f12a7851233c7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/BasicQueryStats.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -22,16 +24,14 @@ 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 org.joda.time.DateTime; import java.util.OptionalDouble; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.util.DateTimeUtils.toTimeStampInMillis; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.System.currentTimeMillis; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/DataSizeSerializer.java b/presto-main-base/src/main/java/com/facebook/presto/server/DataSizeSerializer.java index 906c3111c148b..d826e872938e1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/DataSizeSerializer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/DataSizeSerializer.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.DataSize; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import io.airlift.units.DataSize; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/DurationSerializer.java b/presto-main-base/src/main/java/com/facebook/presto/server/DurationSerializer.java index a5f77d4cdfbac..bc8118caec2f0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/DurationSerializer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/DurationSerializer.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.Duration; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import io.airlift.units.Duration; import java.io.IOException; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java b/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java index fee51abfb1a61..187cb7d39f600 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/GracefulShutdownHandler.java @@ -15,11 +15,11 @@ import com.facebook.airlift.bootstrap.LifeCycleManager; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.QueryManager; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.execution.TaskManager; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java index bc69b9c95f8bd..06990e3057559 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/InternalCommunicationConfig.java @@ -16,14 +16,14 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.transport.netty.codec.Protocol; -import io.airlift.units.DataSize; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.NotNull; import java.util.Optional; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class InternalCommunicationConfig { diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/NodeStatus.java b/presto-main-base/src/main/java/com/facebook/presto/server/NodeStatus.java index 14262e205f8c3..0845a70bacdea 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/NodeStatus.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/NodeStatus.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -20,7 +21,6 @@ import com.facebook.presto.memory.MemoryInfo; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java index 9be5916ff4692..20cddf1264fb0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java @@ -60,7 +60,7 @@ public class PluginManagerUtil .add("com.fasterxml.jackson.annotation.") .add("com.fasterxml.jackson.module.afterburner.") .add("io.airlift.slice.") - .add("io.airlift.units.") + .add("com.facebook.airlift.units.") .add("org.openjdk.jol.") .add("com.facebook.presto.common") .add("com.facebook.drift.annotations.") diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java b/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java index 54639916273ad..ab5c3cb706b72 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ResourceGroupInfo.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -21,7 +22,6 @@ import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java index 58618e3ace2ed..cc612e3d4c3d3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/ServerConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.server; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.NodePoolType; -import io.airlift.units.Duration; import jakarta.validation.constraints.NotNull; import static com.facebook.presto.spi.NodePoolType.DEFAULT; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java b/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java index 775195d70114a..130a2732b1349 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/protocol/QueryBlockingRateLimiter.java @@ -15,6 +15,7 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.QueryManagerConfig; import com.facebook.presto.spi.QueryId; import com.google.common.cache.CacheBuilder; @@ -24,7 +25,6 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.RateLimiter; import com.google.inject.Inject; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/RetryCircuitBreaker.java b/presto-main-base/src/main/java/com/facebook/presto/server/protocol/RetryCircuitBreaker.java index 8201518284837..6ae4480230fc7 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/protocol/RetryCircuitBreaker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/protocol/RetryCircuitBreaker.java @@ -14,9 +14,9 @@ package com.facebook.presto.server.protocol; import com.facebook.airlift.stats.DecayCounter; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.QueryManagerConfig; import com.google.inject.Inject; -import io.airlift.units.Duration; import org.weakref.jmx.Managed; import static com.google.common.base.Preconditions.checkArgument; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java b/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java index 99fea9da25c42..4947017880bd5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/remotetask/Backoff.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.server.remotetask; +import com.facebook.airlift.units.Duration; 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 java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java b/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java index 0697d33168a39..aa389b56b9a88 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/thrift/ThriftTaskService.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.server.thrift; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftMethod; import com.facebook.drift.annotations.ThriftService; import com.facebook.presto.execution.TaskId; @@ -25,7 +26,6 @@ import com.facebook.presto.server.ForAsyncRpc; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sessionpropertyproviders/JavaWorkerSessionPropertyProvider.java b/presto-main-base/src/main/java/com/facebook/presto/sessionpropertyproviders/JavaWorkerSessionPropertyProvider.java index d53339750ed33..0b304c37bdb46 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sessionpropertyproviders/JavaWorkerSessionPropertyProvider.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sessionpropertyproviders/JavaWorkerSessionPropertyProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sessionpropertyproviders; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.spi.session.PropertyMetadata; import com.facebook.presto.spi.session.WorkerSessionPropertyProvider; @@ -21,7 +22,6 @@ import com.facebook.presto.sql.analyzer.JavaFeaturesConfig; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; -import io.airlift.units.DataSize; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java index 41084358e0e9d..1e8746c2076d1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/NodeSpillConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.spiller; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.CompressionCodec; -import io.airlift.units.DataSize; import jakarta.validation.constraints.NotNull; public class NodeSpillConfig diff --git a/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java b/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java index f5b73f102ac80..e2bea719ef512 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java +++ b/presto-main-base/src/main/java/com/facebook/presto/spiller/SpillSpaceTracker.java @@ -13,18 +13,18 @@ */ package com.facebook.presto.spiller; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededSpillLimitException; 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 static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededSpillLimitException.exceededLocalLimit; import static com.facebook.presto.operator.Operator.NOT_BLOCKED; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.succinctBytes; import static java.util.Objects.requireNonNull; @ThreadSafe diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java index 99832665da022..a6749bf1a7e18 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java @@ -17,6 +17,9 @@ import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.DefunctConfig; import com.facebook.airlift.configuration.LegacyConfig; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MaxDataSize; import com.facebook.presto.CompressionCodec; import com.facebook.presto.common.function.OperatorType; import com.facebook.presto.spi.function.FunctionMetadata; @@ -24,9 +27,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MaxDataSize; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; @@ -37,14 +37,14 @@ import java.nio.file.Paths; import java.util.List; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.sql.analyzer.FeaturesConfig.AggregationPartitioningMergingStrategy.LEGACY; import static com.facebook.presto.sql.analyzer.FeaturesConfig.JoinNotNullInferenceStrategy.NONE; import static com.facebook.presto.sql.analyzer.FeaturesConfig.TaskSpillingStrategy.ORDER_BY_CREATE_TIME; import static com.facebook.presto.sql.expressions.ExpressionOptimizerManager.DEFAULT_EXPRESSION_OPTIMIZER_NAME; import static com.facebook.presto.sql.tree.CreateView.Security.DEFINER; 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 java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/JavaFeaturesConfig.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/JavaFeaturesConfig.java index ae5e783775650..51d238a46e610 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/JavaFeaturesConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/JavaFeaturesConfig.java @@ -15,9 +15,9 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class JavaFeaturesConfig { diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionProfiler.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionProfiler.java index b8719343d28ba..7caf6a102a5bd 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionProfiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/ExpressionProfiler.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.sql.gen; +import com.facebook.airlift.units.Duration; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Ticker; -import io.airlift.units.Duration; import static com.facebook.presto.execution.executor.PrioritizedSplitRunner.SPLIT_RUN_QUANTA; import static com.google.common.base.Ticker.systemTicker; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java index a2e440031c145..c07fd31994d6b 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java @@ -14,6 +14,7 @@ package com.facebook.presto.sql.planner; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.SystemSessionProperties; import com.facebook.presto.common.Page; @@ -232,7 +233,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.SetMultimap; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import java.util.ArrayList; @@ -253,6 +253,7 @@ import java.util.stream.IntStream; import static com.facebook.airlift.concurrent.MoreFutures.addSuccessCallback; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.SystemSessionProperties.getAdaptivePartialAggregationRowsReductionRatioThreshold; import static com.facebook.presto.SystemSessionProperties.getDynamicFilteringMaxPerDriverRowCount; import static com.facebook.presto.SystemSessionProperties.getDynamicFilteringMaxPerDriverSize; @@ -352,7 +353,6 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Range.closedOpen; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.stream.IntStream.range; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/IterativeOptimizer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/IterativeOptimizer.java index 79768c665870a..7798d019181ee 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/IterativeOptimizer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/IterativeOptimizer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sql.planner.iterative; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.SystemSessionProperties; import com.facebook.presto.cost.CachingCostProvider; @@ -39,7 +40,6 @@ import com.facebook.presto.sql.planner.optimizations.PlanOptimizerResult; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.HashSet; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/AddExchangesBelowPartialAggregationOverGroupIdRuleSet.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/AddExchangesBelowPartialAggregationOverGroupIdRuleSet.java index 8fc35402b5dda..45f075c88b1eb 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/AddExchangesBelowPartialAggregationOverGroupIdRuleSet.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/AddExchangesBelowPartialAggregationOverGroupIdRuleSet.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sql.planner.iterative.rule; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.cost.PlanNodeStatsEstimate; import com.facebook.presto.cost.TaskCountEstimator; @@ -38,7 +39,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; -import io.airlift.units.DataSize; import java.util.Collection; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineJoinDistributionType.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineJoinDistributionType.java index 683755bb5da2e..fd70e91978fc0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineJoinDistributionType.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineJoinDistributionType.java @@ -14,6 +14,7 @@ package com.facebook.presto.sql.planner.iterative.rule; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.cost.CostComparator; import com.facebook.presto.cost.LocalCostEstimate; @@ -36,7 +37,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineSemiJoinDistributionType.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineSemiJoinDistributionType.java index 34cf06d392872..dfe03747e5ba3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineSemiJoinDistributionType.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/DetermineSemiJoinDistributionType.java @@ -27,6 +27,7 @@ */ package com.facebook.presto.sql.planner.iterative.rule; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.cost.CostComparator; import com.facebook.presto.cost.LocalCostEstimate; @@ -41,7 +42,6 @@ import com.facebook.presto.sql.analyzer.FeaturesConfig.JoinDistributionType; import com.facebook.presto.sql.planner.iterative.Rule; import com.google.common.collect.Ordering; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/JoinSwappingUtils.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/JoinSwappingUtils.java index 82c60a43119ee..c5cb256552057 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/JoinSwappingUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/JoinSwappingUtils.java @@ -14,6 +14,7 @@ package com.facebook.presto.sql.planner.iterative.rule; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.cost.StatsProvider; import com.facebook.presto.metadata.Metadata; @@ -31,7 +32,6 @@ import com.facebook.presto.sql.planner.plan.ExchangeNode; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/HashCollisionPlanNodeStats.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/HashCollisionPlanNodeStats.java index fc2d099ef5189..6fff4cf2b15a4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/HashCollisionPlanNodeStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/HashCollisionPlanNodeStats.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.sql.planner.planPrinter; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.operator.DynamicFilterStats; import com.facebook.presto.spi.plan.PlanNodeId; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Map; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStats.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStats.java index 676231c237053..0a61a39ffc0fe 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStats.java @@ -13,22 +13,22 @@ */ package com.facebook.presto.sql.planner.planPrinter; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.operator.DynamicFilterStats; import com.facebook.presto.spi.plan.PlanNodeId; import com.facebook.presto.util.Mergeable; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Collections; import java.util.Map; import java.util.Optional; import java.util.Set; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.util.MoreMaps.mergeMaps; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Double.max; import static java.lang.Math.sqrt; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStatsSummarizer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStatsSummarizer.java index ec8d8d8e63fdc..17b8fce3ebf48 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStatsSummarizer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanNodeStatsSummarizer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sql.planner.planPrinter; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.StageInfo; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.operator.DynamicFilterStats; @@ -23,7 +24,6 @@ import com.facebook.presto.operator.WindowInfo; import com.facebook.presto.spi.plan.PlanNodeId; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import java.util.ArrayList; import java.util.HashMap; @@ -33,11 +33,11 @@ import java.util.Optional; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.succinctDataSize; import static com.facebook.presto.util.MoreMaps.mergeMaps; import static com.google.common.collect.Iterables.getLast; import static com.google.common.collect.Lists.reverse; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.succinctDataSize; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.stream.Collectors.toList; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java index 3036b8e5815e9..74f3e23443771 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sql.planner.planPrinter; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.predicate.Range; @@ -114,7 +115,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Streams; import io.airlift.slice.Slice; -import io.airlift.units.Duration; import java.util.ArrayList; import java.util.Collections; @@ -128,6 +128,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.SystemSessionProperties.isVerboseOptimizerInfoEnabled; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.execution.StageInfo.getAllStages; @@ -146,7 +147,6 @@ 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.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Arrays.stream; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanRepresentation.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanRepresentation.java index 3e1d41e99a1f4..167a2a15a8800 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanRepresentation.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanRepresentation.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.sql.planner.planPrinter; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.eventlistener.CTEInformation; import com.facebook.presto.spi.eventlistener.PlanOptimizerInformation; import com.facebook.presto.spi.plan.PlanNode; import com.facebook.presto.spi.plan.PlanNodeId; import com.facebook.presto.sql.planner.TypeProvider; import com.facebook.presto.sql.planner.optimizations.OptimizerResult; -import io.airlift.units.Duration; import java.util.HashMap; import java.util.List; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/TextRenderer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/TextRenderer.java index 1f7330a742153..2809b8145831a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/TextRenderer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/TextRenderer.java @@ -29,8 +29,8 @@ import java.util.Optional; import java.util.Set; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.google.common.collect.Iterables.getOnlyElement; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Double.isFinite; import static java.lang.Double.isNaN; import static java.lang.String.format; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/WindowPlanNodeStats.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/WindowPlanNodeStats.java index f373525c004f3..512a580c597d1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/WindowPlanNodeStats.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/planPrinter/WindowPlanNodeStats.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.sql.planner.planPrinter; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.operator.DynamicFilterStats; import com.facebook.presto.spi.plan.PlanNodeId; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Map; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java b/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java index 67e1c396d3c4b..d4acc6900c3c5 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java @@ -15,6 +15,7 @@ import com.facebook.airlift.node.NodeInfo; import com.facebook.drift.codec.ThriftCodecManager; +import com.facebook.airlift.units.Duration; import com.facebook.presto.ClientRequestFilterManager; import com.facebook.presto.GroupByHashPageIndexerFactory; import com.facebook.presto.PagesIndexPageSorter; @@ -239,7 +240,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.Closer; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import org.weakref.jmx.MBeanExporter; import org.weakref.jmx.testing.TestingMBeanServer; diff --git a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingTaskContext.java b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingTaskContext.java index edbfc8486d93f..9fb8f52d37c83 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingTaskContext.java +++ b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingTaskContext.java @@ -15,6 +15,7 @@ import com.facebook.airlift.stats.GcMonitor; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskStateMachine; @@ -26,15 +27,14 @@ import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spi.plan.PlanNode; import com.facebook.presto.spiller.SpillSpaceTracker; -import io.airlift.units.DataSize; import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public final class TestingTaskContext { diff --git a/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java b/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java index e728ce8c5e9a3..8afc8c07370e4 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/transaction/InMemoryTransactionManager.java @@ -16,6 +16,7 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.concurrent.ExecutorServiceAdapter; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.transaction.TransactionId; import com.facebook.presto.metadata.Catalog; import com.facebook.presto.metadata.CatalogManager; @@ -36,7 +37,6 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import java.util.HashMap; import java.util.Iterator; diff --git a/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionInfo.java b/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionInfo.java index 1a3999a4977cc..8eeb196a5b709 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionInfo.java +++ b/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionInfo.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.transaction; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -20,7 +21,6 @@ import com.facebook.presto.spi.ConnectorId; import com.facebook.presto.spi.transaction.IsolationLevel; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.List; import java.util.Optional; diff --git a/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java index 16eb34f95a790..2b94e5ee43037 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/transaction/TransactionManagerConfig.java @@ -15,10 +15,10 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java b/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java index 00037ee368cd8..40f69ea28e380 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/ConfidenceBasedNodeTtlFetcherManager.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.scheduler.NodeSchedulerConfig; import com.facebook.presto.metadata.AllNodes; import com.facebook.presto.metadata.InternalNode; @@ -28,7 +29,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.weakref.jmx.Managed; diff --git a/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/NodeTtlFetcherManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/NodeTtlFetcherManagerConfig.java index 5d9fd626b55f4..7103ef976adf2 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/NodeTtlFetcherManagerConfig.java +++ b/presto-main-base/src/main/java/com/facebook/presto/ttl/nodettlfetchermanagers/NodeTtlFetcherManagerConfig.java @@ -14,7 +14,7 @@ package com.facebook.presto.ttl.nodettlfetchermanagers; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; public class NodeTtlFetcherManagerConfig { diff --git a/presto-main-base/src/main/java/com/facebook/presto/util/TaskUtils.java b/presto-main-base/src/main/java/com/facebook/presto/util/TaskUtils.java index cef3997f6e653..7ea843b7d94f3 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/util/TaskUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/util/TaskUtils.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.util; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.concurrent.ThreadLocalRandom; diff --git a/presto-main-base/src/test/java/com/facebook/presto/event/TestQueryMonitorConfig.java b/presto-main-base/src/test/java/com/facebook/presto/event/TestQueryMonitorConfig.java index 5c1df0ce98c64..3f44858b4bb01 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/event/TestQueryMonitorConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/event/TestQueryMonitorConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.event; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; @@ -24,7 +24,7 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit; +import static com.facebook.airlift.units.DataSize.Unit; public class TestQueryMonitorConfig { diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/MockManagedQueryExecution.java b/presto-main-base/src/test/java/com/facebook/presto/execution/MockManagedQueryExecution.java index f58136db19c68..c2213c099df6c 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/MockManagedQueryExecution.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/MockManagedQueryExecution.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.execution.StateMachine.StateChangeListener; @@ -24,8 +26,6 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.net.URI; import java.util.ArrayList; @@ -33,6 +33,7 @@ import java.util.Optional; import java.util.OptionalDouble; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.SystemSessionProperties.QUERY_PRIORITY; import static com.facebook.presto.execution.QueryState.FAILED; import static com.facebook.presto.execution.QueryState.FINISHED; @@ -40,7 +41,6 @@ import static com.facebook.presto.execution.QueryState.RUNNING; import static com.facebook.presto.execution.QueryState.WAITING_FOR_PREREQUISITES; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/MockQueryExecution.java b/presto-main-base/src/test/java/com/facebook/presto/execution/MockQueryExecution.java index 88a1ba2f7f0a2..890df43e12345 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/MockQueryExecution.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/MockQueryExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.memory.VersionedMemoryPoolId; import com.facebook.presto.server.BasicQueryInfo; @@ -20,13 +21,12 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; import com.facebook.presto.sql.planner.Plan; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import static io.airlift.units.Duration.succinctDuration; +import static com.facebook.airlift.units.Duration.succinctDuration; import static java.util.concurrent.TimeUnit.MILLISECONDS; public class MockQueryExecution diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java b/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java index f010af56af61a..9bd75207fa9cf 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.cost.StatsAndCosts; @@ -59,7 +60,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; import java.net.URI; import java.util.ArrayList; @@ -78,6 +78,8 @@ import java.util.stream.Stream; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.execution.StateMachine.StateChangeListener; @@ -89,8 +91,6 @@ import static com.facebook.presto.util.Failures.toFailures; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.util.concurrent.Futures.nonCancellationPropagating; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.addExact; import static java.lang.System.currentTimeMillis; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestClusterSizeMonitor.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestClusterSizeMonitor.java index 9ef10e188e0d7..89ac8c3caa263 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestClusterSizeMonitor.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestClusterSizeMonitor.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.metadata.InMemoryNodeManager; import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.spi.ConnectorId; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestNodeScheduler.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestNodeScheduler.java index d88cc189c618a..b48d486009a40 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestNodeScheduler.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestNodeScheduler.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.dispatcher.NoOpQueryManager; @@ -59,8 +61,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryLimit.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryLimit.java index 28534f907d749..6a9778f3f2c67 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryLimit.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryLimit.java @@ -13,10 +13,12 @@ */ package com.facebook.presto.execution; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import org.testng.annotations.Test; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.execution.QueryLimit.Source.QUERY; import static com.facebook.presto.execution.QueryLimit.Source.RESOURCE_GROUP; import static com.facebook.presto.execution.QueryLimit.Source.SYSTEM; @@ -24,8 +26,6 @@ import static com.facebook.presto.execution.QueryLimit.createDurationLimit; import static com.facebook.presto.execution.QueryLimit.getMinimum; import static com.facebook.presto.testing.assertions.Assert.assertEquals; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MINUTES; import static org.testng.Assert.assertThrows; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryManagerConfig.java index 4769b669c3386..dd2527f0435fd 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryManagerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryManagerConfig.java @@ -14,18 +14,18 @@ package com.facebook.presto.execution; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.QueryManagerConfig.ExchangeMaterializationStrategy; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; import java.util.concurrent.TimeUnit; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.Unit.PETABYTE; -import static io.airlift.units.DataSize.Unit.TERABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.PETABYTE; +import static com.facebook.airlift.units.DataSize.Unit.TERABYTE; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java index 8172ce296a0c9..ede763c6a776d 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution; import com.facebook.airlift.testing.TestingTicker; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.FailureInfo; import com.facebook.presto.common.resourceGroups.QueryType; @@ -36,7 +37,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStats.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStats.java index cc45686fa770e..f3e743385025e 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStats.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryStats.java @@ -16,6 +16,8 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.stats.Distribution; import com.facebook.airlift.testing.TestingTicker; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeMetric; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.operator.DynamicFilterStats; @@ -36,8 +38,6 @@ import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.joda.time.DateTime; import org.testng.annotations.Test; @@ -45,8 +45,8 @@ import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.RuntimeUnit.NONE; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static org.joda.time.DateTimeZone.UTC; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryTrackerQueuedTime.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryTrackerQueuedTime.java index 37b5521ac3b60..22ebe5256436b 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryTrackerQueuedTime.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryTrackerQueuedTime.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.SystemSessionProperties; import com.facebook.presto.execution.QueryTracker.TrackedQuery; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.QueryId; import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; -import io.airlift.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,9 +29,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import static com.facebook.airlift.units.Duration.succinctDuration; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_TIME_LIMIT; -import static io.airlift.units.Duration.succinctDuration; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestSplitConcurrencyController.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestSplitConcurrencyController.java index 1b22cc5069f03..a9707353c9714 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestSplitConcurrencyController.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestSplitConcurrencyController.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.execution; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import org.testng.annotations.Test; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskExecution.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskExecution.java index 2758637601d44..23cf1359a8cbc 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskExecution.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskExecution.java @@ -14,6 +14,8 @@ package com.facebook.presto.execution; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.CompressionCodec; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.BlockEncodingManager; @@ -64,8 +66,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -88,6 +88,8 @@ import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue; import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createStringSequenceBlock; import static com.facebook.presto.block.BlockAssertions.createStringsBlock; @@ -108,8 +110,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -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.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.HOURS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java index 311c7081a76ad..8787dcddd4986 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java @@ -15,6 +15,9 @@ import com.facebook.airlift.node.NodeInfo; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.block.BlockEncodingManager; import com.facebook.presto.execution.buffer.BufferInfo; import com.facebook.presto.execution.buffer.BufferResult; @@ -43,9 +46,6 @@ import com.google.common.base.Ticker; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestStageExecutionStats.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestStageExecutionStats.java index 3f21aab0b8e22..da8bbc14ed5ba 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestStageExecutionStats.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestStageExecutionStats.java @@ -16,11 +16,11 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.stats.Distribution; import com.facebook.airlift.stats.Distribution.DistributionSnapshot; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.spi.eventlistener.StageGcStatistics; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.Test; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestStartTransactionTask.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestStartTransactionTask.java index 1acc47d1b8a9f..c68b2719c872d 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestStartTransactionTask.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestStartTransactionTask.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.Session.SessionBuilder; import com.facebook.presto.common.transaction.TransactionId; @@ -30,7 +31,6 @@ import com.facebook.presto.transaction.TransactionManager; import com.facebook.presto.transaction.TransactionManagerConfig; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestTaskManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestTaskManagerConfig.java index 0fce5aab8aa1a..b381ccb8980a7 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestTaskManagerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestTaskManagerConfig.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.memory.HighMemoryTaskKillerStrategy; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.math.BigDecimal; @@ -26,9 +26,9 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; +import static com.facebook.airlift.units.DataSize.Unit; import static com.facebook.presto.execution.TaskManagerConfig.TaskPriorityTracking.QUERY_FAIR; import static com.facebook.presto.execution.TaskManagerConfig.TaskPriorityTracking.TASK_FAIR; -import static io.airlift.units.DataSize.Unit; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; @@ -52,8 +52,8 @@ public void testDefaults() .setMinDriversPerTask(3) .setMaxDriversPerTask(Integer.MAX_VALUE) .setMaxTasksPerStage(Integer.MAX_VALUE) - .setInfoMaxAge(new Duration(15, TimeUnit.MINUTES)) - .setClientTimeout(new Duration(2, TimeUnit.MINUTES)) + .setInfoMaxAge(new Duration(15, MINUTES)) + .setClientTimeout(new Duration(2, MINUTES)) .setMaxIndexMemoryUsage(new DataSize(64, Unit.MEGABYTE)) .setShareIndexLoading(false) .setMaxPartialAggregationMemoryUsage(new DataSize(16, Unit.MEGABYTE)) @@ -153,7 +153,7 @@ public void testExplicitPropertyMappings() .setMinDriversPerTask(5) .setMaxDriversPerTask(13) .setMaxTasksPerStage(999) - .setInfoMaxAge(new Duration(22, TimeUnit.MINUTES)) + .setInfoMaxAge(new Duration(22, MINUTES)) .setClientTimeout(new Duration(10, SECONDS)) .setSinkMaxBufferSize(new DataSize(42, Unit.MEGABYTE)) .setMaxPagePartitioningBufferSize(new DataSize(40, Unit.MEGABYTE)) diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestThriftResourceGroupInfo.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestThriftResourceGroupInfo.java index 4aa4311705af7..43e8610923c5a 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/TestThriftResourceGroupInfo.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/TestThriftResourceGroupInfo.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.codec.ThriftCodecManager; import com.facebook.drift.codec.internal.compiler.CompilerThriftCodecFactory; @@ -37,7 +38,6 @@ import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import org.joda.time.DateTime; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/BufferTestUtils.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/BufferTestUtils.java index 03801a8f21167..3ba233e902182 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/BufferTestUtils.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/BufferTestUtils.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.execution.buffer; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.block.BlockAssertions; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; @@ -23,8 +25,6 @@ import com.facebook.presto.spi.page.SerializedPage; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.List; import java.util.Optional; @@ -32,10 +32,10 @@ import java.util.stream.Collectors; import static com.facebook.airlift.concurrent.MoreFutures.tryGetFutureValue; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.execution.buffer.TestingPagesSerdeFactory.testingPagesSerde; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestArbitraryOutputBuffer.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestArbitraryOutputBuffer.java index ee0c641cf2b5a..cde1c631c69a9 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestArbitraryOutputBuffer.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestArbitraryOutputBuffer.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.execution.buffer; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.execution.Lifespan; @@ -21,8 +23,6 @@ import com.facebook.presto.memory.context.SimpleLocalMemoryContext; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -34,6 +34,7 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.execution.buffer.BufferResult.emptyResults; import static com.facebook.presto.execution.buffer.BufferState.OPEN; @@ -53,7 +54,6 @@ import static com.facebook.presto.execution.buffer.OutputBuffers.BufferType.ARBITRARY; import static com.facebook.presto.execution.buffer.OutputBuffers.createInitialEmptyOutputBuffers; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestBroadcastOutputBuffer.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestBroadcastOutputBuffer.java index 3fcd01d68907f..aaf64f5cd1dab 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestBroadcastOutputBuffer.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestBroadcastOutputBuffer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution.buffer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.execution.StateMachine; @@ -24,7 +25,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -35,6 +35,7 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.execution.buffer.BufferResult.emptyResults; import static com.facebook.presto.execution.buffer.BufferState.OPEN; @@ -61,7 +62,6 @@ import static com.facebook.presto.memory.context.AggregatedMemoryContext.newRootAggregatedMemoryContext; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java index 157e28ed46324..99aea6a2ab2f3 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestClientBuffer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution.buffer; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.execution.Lifespan; @@ -23,7 +24,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.ArrayDeque; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestPartitionedOutputBuffer.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestPartitionedOutputBuffer.java index e15bc4a96b483..85f21b214b1e3 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestPartitionedOutputBuffer.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestPartitionedOutputBuffer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution.buffer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.execution.StateMachine; @@ -20,7 +21,6 @@ import com.facebook.presto.memory.context.SimpleLocalMemoryContext; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -30,6 +30,7 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.execution.buffer.BufferResult.emptyResults; import static com.facebook.presto.execution.buffer.BufferState.OPEN; @@ -53,7 +54,6 @@ import static com.facebook.presto.execution.buffer.OutputBuffers.BufferType.PARTITIONED; import static com.facebook.presto.execution.buffer.OutputBuffers.createInitialEmptyOutputBuffers; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestSpoolingOutputBuffer.java b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestSpoolingOutputBuffer.java index e12a48e9bda17..50ab99ba79adb 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestSpoolingOutputBuffer.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/buffer/TestSpoolingOutputBuffer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution.buffer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.execution.QueryIdGenerator; @@ -23,7 +24,6 @@ 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 org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -35,6 +35,7 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.execution.buffer.BufferResult.emptyResults; import static com.facebook.presto.execution.buffer.BufferState.OPEN; @@ -52,7 +53,6 @@ import static com.facebook.presto.execution.buffer.BufferTestUtils.sizeOfPages; import static com.facebook.presto.execution.buffer.OutputBuffers.BufferType.PARTITIONED; import static com.facebook.presto.execution.buffer.OutputBuffers.BufferType.SPOOLING; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/executor/TestTaskExecutor.java b/presto-main-base/src/test/java/com/facebook/presto/execution/executor/TestTaskExecutor.java index 4ca05ddaa271a..d5bbf86036e33 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/executor/TestTaskExecutor.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/executor/TestTaskExecutor.java @@ -14,6 +14,7 @@ package com.facebook.presto.execution.executor; import com.facebook.airlift.testing.TestingTicker; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.SplitRunner; import com.facebook.presto.execution.TaskId; import com.facebook.presto.server.ServerConfig; @@ -23,7 +24,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Arrays; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/BenchmarkResourceGroup.java b/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/BenchmarkResourceGroup.java index ac60da6966f7c..dfa9235e2f4f7 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/BenchmarkResourceGroup.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/BenchmarkResourceGroup.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.execution.resourceGroups; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.execution.MockManagedQueryExecution; import com.facebook.presto.execution.resourceGroups.InternalResourceGroup.RootInternalResourceGroup; import com.facebook.presto.metadata.InMemoryNodeManager; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -39,7 +39,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; @SuppressWarnings("MethodMayBeStatic") @State(Scope.Thread) diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroups.java b/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroups.java index 1503f97b74723..2b0eb9ac7d299 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroups.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroups.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.execution.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.MockManagedQueryExecution; import com.facebook.presto.execution.resourceGroups.InternalResourceGroup.RootInternalResourceGroup; import com.facebook.presto.metadata.InMemoryNodeManager; @@ -22,8 +24,6 @@ import com.facebook.presto.server.ResourceGroupInfo; import com.facebook.presto.spi.ConnectorId; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.commons.math3.distribution.BinomialDistribution; import org.testng.annotations.Test; @@ -43,6 +43,9 @@ import static com.facebook.airlift.testing.Assertions.assertBetweenInclusive; import static com.facebook.airlift.testing.Assertions.assertGreaterThan; import static com.facebook.airlift.testing.Assertions.assertLessThan; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.execution.QueryState.FAILED; import static com.facebook.presto.execution.QueryState.QUEUED; import static com.facebook.presto.execution.QueryState.RUNNING; @@ -53,9 +56,6 @@ import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.WEIGHTED; import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.WEIGHTED_FAIR; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Collections.reverse; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelector.java b/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelector.java index eaf27ad3c87c3..6f0cded44be3e 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelector.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelector.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.execution.scheduler.nodeselection; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.scheduler.nodeSelection.SimpleTtlNodeSelector; import com.facebook.presto.spi.ttl.ConfidenceBasedTtlInfo; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.concurrent.TimeUnit; diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelectorConfig.java b/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelectorConfig.java index 43a558799528f..1f861adad98a2 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelectorConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/execution/scheduler/nodeselection/TestSimpleTtlNodeSelectorConfig.java @@ -14,9 +14,9 @@ package com.facebook.presto.execution.scheduler.nodeselection; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.scheduler.nodeSelection.SimpleTtlNodeSelectorConfig; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/LowMemoryKillerTestingUtils.java b/presto-main-base/src/test/java/com/facebook/presto/memory/LowMemoryKillerTestingUtils.java index e3f3650e89669..34fc05e034fa7 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/LowMemoryKillerTestingUtils.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/LowMemoryKillerTestingUtils.java @@ -14,6 +14,7 @@ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.spi.QueryId; @@ -21,16 +22,15 @@ import com.facebook.presto.spi.memory.MemoryPoolInfo; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.memory.LocalMemoryManager.GENERAL_POOL; import static com.facebook.presto.memory.LocalMemoryManager.RESERVED_POOL; -import static io.airlift.units.DataSize.Unit.BYTE; public class LowMemoryKillerTestingUtils { diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestLocalMemoryManager.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestLocalMemoryManager.java index 05ec026e2db5d..414ed2756c3b0 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestLocalMemoryManager.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestLocalMemoryManager.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.memory; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import org.testng.annotations.Test; -import static io.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryManagerConfig.java index 43313580b64b5..1738e38d58bdc 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryManagerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryManagerConfig.java @@ -14,18 +14,18 @@ package com.facebook.presto.memory; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.memory.MemoryManagerConfig.LowMemoryKillerPolicy.NONE; import static com.facebook.presto.memory.MemoryManagerConfig.LowMemoryKillerPolicy.TOTAL_RESERVATION_ON_BLOCKED_NODES; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryPools.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryPools.java index 71ff26aa1a7e2..bfada8044be1a 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryPools.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryPools.java @@ -14,6 +14,7 @@ package com.facebook.presto.memory; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.CompressionCodec; import com.facebook.presto.Session; import com.facebook.presto.common.Page; @@ -40,7 +41,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -52,14 +52,14 @@ import java.util.function.Function; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SystemSessionProperties.REMOVE_REDUNDANT_CAST_TO_VARCHAR_IN_JOIN; import static com.facebook.presto.testing.LocalQueryRunner.queryRunnerWithInitialTransaction; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryTracking.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryTracking.java index e635923781150..5f713c317ae25 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryTracking.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestMemoryTracking.java @@ -14,6 +14,7 @@ package com.facebook.presto.memory; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskStateMachine; @@ -32,7 +33,6 @@ import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spi.plan.PlanNodeId; import com.facebook.presto.spiller.SpillSpaceTracker; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -46,9 +46,9 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.execution.TaskTestUtils.PLAN_FRAGMENT; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.lang.String.format; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestNodeMemoryConfig.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestNodeMemoryConfig.java index 2b8b134dd8c31..b3057d46c51ca 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestNodeMemoryConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestNodeMemoryConfig.java @@ -14,17 +14,17 @@ package com.facebook.presto.memory; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.memory.LocalMemoryManager.validateHeapHeadroom; import static com.facebook.presto.memory.NodeMemoryConfig.AVAILABLE_HEAP_MEMORY; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; public class TestNodeMemoryConfig { diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestQueryContext.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestQueryContext.java index e389403847c00..cdd588119c127 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestQueryContext.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestQueryContext.java @@ -14,6 +14,7 @@ package com.facebook.presto.memory; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskStateMachine; @@ -27,7 +28,6 @@ import com.facebook.presto.spiller.SpillSpaceTracker; import com.facebook.presto.testing.LocalQueryRunner; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -38,12 +38,12 @@ import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.execution.TaskTestUtils.PLAN_FRAGMENT; import static com.facebook.presto.memory.LocalMemoryManager.GENERAL_POOL; import static com.facebook.presto.memory.LocalMemoryManager.RESERVED_POOL; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestReservedSystemMemoryConfig.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestReservedSystemMemoryConfig.java index ef9a0ed40bb86..0e52c87971539 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestReservedSystemMemoryConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestReservedSystemMemoryConfig.java @@ -13,15 +13,15 @@ */ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static org.testng.Assert.fail; public class TestReservedSystemMemoryConfig diff --git a/presto-main-base/src/test/java/com/facebook/presto/memory/TestSystemMemoryBlocking.java b/presto-main-base/src/test/java/com/facebook/presto/memory/TestSystemMemoryBlocking.java index f49952457825f..8d7ef6964aef3 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/memory/TestSystemMemoryBlocking.java +++ b/presto-main-base/src/test/java/com/facebook/presto/memory/TestSystemMemoryBlocking.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.Type; import com.facebook.presto.execution.ScheduledSplit; import com.facebook.presto.execution.TaskSource; @@ -39,8 +41,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkDynamicFilterSourceOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkDynamicFilterSourceOperator.java index 0b3dbf5e75526..2556805f5e5df 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkDynamicFilterSourceOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkDynamicFilterSourceOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.spi.plan.PlanNodeId; @@ -20,7 +21,6 @@ import com.google.common.collect.ImmutableList; import io.airlift.tpch.LineItem; import io.airlift.tpch.LineItemGenerator; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; @@ -45,12 +45,12 @@ import java.util.concurrent.TimeUnit; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.SystemSessionProperties.getDynamicFilteringMaxPerDriverRowCount; import static com.facebook.presto.SystemSessionProperties.getDynamicFilteringMaxPerDriverSize; import static com.facebook.presto.SystemSessionProperties.getDynamicFilteringRangeRowLimitPerDriver; import static com.facebook.presto.common.type.BigintType.BIGINT; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndSegmentedAggregationOperators.java b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndSegmentedAggregationOperators.java index 139ce5f2b2b37..bc94cbce32811 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndSegmentedAggregationOperators.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndSegmentedAggregationOperators.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.BlockBuilder; @@ -26,7 +27,6 @@ import com.facebook.presto.sql.gen.JoinCompiler; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -50,6 +50,9 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createLongRepeatBlock; import static com.facebook.presto.block.BlockAssertions.createLongSequenceBlock; @@ -59,9 +62,6 @@ import static com.facebook.presto.operator.BenchmarkHashAndSegmentedAggregationOperators.Context.TOTAL_PAGES; import static com.facebook.presto.operator.aggregation.GenericAccumulatorFactory.generateAccumulatorFactory; import static com.facebook.presto.sql.analyzer.TypeSignatureProvider.fromTypes; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndStreamingAggregationOperators.java b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndStreamingAggregationOperators.java index 6a097684675b7..33bf6651d4b95 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndStreamingAggregationOperators.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashAndStreamingAggregationOperators.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.BlockBuilder; @@ -27,7 +28,6 @@ import com.facebook.presto.sql.gen.JoinCompiler; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -51,6 +51,9 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createLongSequenceBlock; import static com.facebook.presto.common.type.BigintType.BIGINT; @@ -59,9 +62,6 @@ import static com.facebook.presto.operator.BenchmarkHashAndStreamingAggregationOperators.Context.TOTAL_PAGES; import static com.facebook.presto.operator.aggregation.GenericAccumulatorFactory.generateAccumulatorFactory; import static com.facebook.presto.sql.analyzer.TypeSignatureProvider.fromTypes; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashBuildAndJoinOperators.java b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashBuildAndJoinOperators.java index 030993b5fa56b..c2491ebbfbc3f 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashBuildAndJoinOperators.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkHashBuildAndJoinOperators.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; @@ -25,7 +26,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -51,13 +51,13 @@ import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.spiller.PartitioningSpillerFactory.unsupportedPartitioningSpillerFactory; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newCachedThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkUnnestOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkUnnestOperator.java index d240874106aea..8bbca76adc103 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkUnnestOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkUnnestOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeSignature; @@ -21,7 +22,6 @@ import com.facebook.presto.spi.plan.PlanNodeId; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -50,10 +50,10 @@ import java.util.concurrent.TimeUnit; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.metadata.MetadataManager.createTestMetadataManager; import static com.facebook.presto.operator.PageAssertions.createPageWithRandomData; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkWindowOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkWindowOperator.java index 14a8e388b7e12..223a79b99fe7a 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkWindowOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/BenchmarkWindowOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.BlockBuilder; @@ -21,7 +22,6 @@ import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -45,6 +45,7 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createLongSequenceBlock; import static com.facebook.presto.common.type.BigintType.BIGINT; @@ -52,7 +53,6 @@ import static com.facebook.presto.operator.BenchmarkWindowOperator.Context.TOTAL_PAGES; import static com.facebook.presto.operator.TestWindowOperator.ROW_NUMBER; import static com.facebook.presto.operator.TestWindowOperator.createFactoryUnbounded; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java b/presto-main-base/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java index 296b00c46049e..2892d64ac5619 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; @@ -23,7 +24,6 @@ import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spiller.SpillSpaceTracker; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import java.util.LinkedList; import java.util.List; @@ -36,14 +36,14 @@ import static com.facebook.airlift.testing.Assertions.assertBetweenInclusive; import static com.facebook.airlift.testing.Assertions.assertGreaterThan; import static com.facebook.airlift.testing.Assertions.assertLessThan; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.operator.OperatorAssertion.finishOperator; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; import static com.facebook.presto.testing.assertions.Assert.assertEquals; -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.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/OperatorAssertion.java b/presto-main-base/src/test/java/com/facebook/presto/operator/OperatorAssertion.java index 2175292a8bfd0..3b7b9d0a8a3cf 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/OperatorAssertion.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/OperatorAssertion.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; @@ -24,7 +25,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriver.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriver.java index f1b1256596292..b7ec5bafd5e73 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriver.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriver.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.common.type.Type; @@ -48,7 +49,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriverStats.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriverStats.java index 6750dc4d30170..e1ea49bbb6301 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriverStats.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestDriverStats.java @@ -14,10 +14,10 @@ package com.facebook.presto.operator; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.Lifespan; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.joda.time.DateTime; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestDynamicFilterSourceOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestDynamicFilterSourceOperator.java index e727c35ae4bbf..73230f934e9f9 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestDynamicFilterSourceOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestDynamicFilterSourceOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -24,7 +25,6 @@ import com.facebook.presto.testing.MaterializedResult; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,6 +37,7 @@ import java.util.stream.IntStream; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createBlockOfReals; import static com.facebook.presto.block.BlockAssertions.createBooleansBlock; @@ -67,7 +68,6 @@ import static com.google.common.base.Strings.repeat; import static com.google.common.collect.ImmutableList.toImmutableList; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.lang.Float.floatToRawIntBits; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestExchangeClientConfig.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestExchangeClientConfig.java index d56eafb5f84f3..bf5c5a3867e34 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestExchangeClientConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestExchangeClientConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; @@ -24,9 +24,9 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctDataSize; +import static com.facebook.airlift.units.DataSize.Unit; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctDataSize; public class TestExchangeClientConfig { diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheConfig.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheConfig.java index d93de79164d2c..8b422ea071779 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheConfig.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.CompressionCodec; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.net.URI; @@ -25,8 +25,8 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.DAYS; public class TestFileFragmentResultCacheConfig diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheManager.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheManager.java index 8719124d0d6d4..6367ce3586782 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheManager.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestFileFragmentResultCacheManager.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.TestingBlockEncodingSerde; import com.facebook.presto.metadata.Split; @@ -23,7 +24,6 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.facebook.presto.spi.schedule.NodeSelectionStrategy; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestFilterAndProjectOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestFilterAndProjectOperator.java index 94ac9812c1bf8..b1819fa39fba9 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestFilterAndProjectOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestFilterAndProjectOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.metadata.FunctionAndTypeManager; import com.facebook.presto.metadata.MetadataManager; @@ -23,7 +24,6 @@ import com.facebook.presto.sql.gen.PageFunctionCompiler; import com.facebook.presto.testing.MaterializedResult; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,6 +35,8 @@ import java.util.function.Supplier; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.function.OperatorType.ADD; @@ -50,8 +52,6 @@ import static com.facebook.presto.sql.relational.Expressions.constant; import static com.facebook.presto.sql.relational.Expressions.field; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java index 6265b47e6e9a3..ad2d90829f0b9 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; @@ -41,8 +43,6 @@ import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -59,6 +59,10 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertEqualsIgnoreOrder; import static com.facebook.airlift.testing.Assertions.assertGreaterThan; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; +import static com.facebook.airlift.units.DataSize.succinctDataSize; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createLongRepeatBlock; @@ -85,10 +89,6 @@ import static com.google.common.util.concurrent.Futures.immediateFailedFuture; import static io.airlift.slice.SizeOf.SIZE_OF_DOUBLE; import static io.airlift.slice.SizeOf.SIZE_OF_LONG; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; -import static io.airlift.units.DataSize.succinctDataSize; import static java.lang.String.format; import static java.util.Collections.emptyIterator; import static java.util.concurrent.Executors.newCachedThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperatorInSegmentedAggregationMode.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperatorInSegmentedAggregationMode.java index 3bc91c526211d..60cb1d17734f2 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperatorInSegmentedAggregationMode.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashAggregationOperatorInSegmentedAggregationMode.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.LongArrayBlock; @@ -26,7 +27,6 @@ import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,14 +37,14 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.operator.OperatorAssertion.assertPagesEqualIgnoreOrder; import static com.facebook.presto.operator.OperatorAssertion.toPages; import static com.facebook.presto.operator.aggregation.GenericAccumulatorFactory.generateAccumulatorFactory; import static com.facebook.presto.testing.MaterializedResult.resultBuilder; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashJoinOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashJoinOperator.java index 7da0680696695..01ce32dc6c459 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashJoinOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashJoinOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.Session; @@ -47,7 +48,6 @@ import com.google.common.collect.Iterators; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -73,6 +73,8 @@ import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertEqualsIgnoreOrder; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE; @@ -93,8 +95,6 @@ import static com.google.common.collect.Iterators.unmodifiableIterator; import static com.google.common.util.concurrent.Futures.immediateFailedFuture; import static com.google.common.util.concurrent.Futures.immediateFuture; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.Collections.nCopies; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashSemiJoinOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashSemiJoinOperator.java index a2a754ea3ae1b..39618409990bf 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashSemiJoinOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestHashSemiJoinOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; @@ -24,7 +25,6 @@ import com.facebook.presto.testing.MaterializedResult; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -38,6 +38,7 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertGreaterThan; import static com.facebook.airlift.testing.Assertions.assertGreaterThanOrEqual; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.BigintType.BIGINT; @@ -49,7 +50,6 @@ import static com.facebook.presto.testing.MaterializedResult.resultBuilder; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; import static com.google.common.collect.Iterables.concat; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorAssertion.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorAssertion.java index 97e0b10a6ffcc..07e72e31c416b 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorAssertion.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorAssertion.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.testing.assertions.Assert; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java index b2a4f01dc5a55..20f09bc357b4a 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java @@ -14,13 +14,13 @@ package com.facebook.presto.operator; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeMetric; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.operator.repartition.PartitionedOutputInfo; import com.facebook.presto.spi.plan.PlanNodeId; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Arrays; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOrderByOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOrderByOperator.java index 74cd44555d1c6..de055caf8c547 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOrderByOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOrderByOperator.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.common.Page; import com.facebook.presto.operator.OrderByOperator.OrderByOperatorFactory; @@ -21,8 +23,6 @@ import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -35,6 +35,7 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertGreaterThan; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.block.SortOrder.ASC_NULLS_LAST; @@ -47,7 +48,6 @@ import static com.facebook.presto.operator.OperatorAssertion.toPages; import static com.facebook.presto.testing.MaterializedResult.resultBuilder; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestPartitionedOutputOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestPartitionedOutputOperator.java index 8110b4139cb61..089b204f1b55d 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestPartitionedOutputOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestPartitionedOutputOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.CompressionCodec; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; @@ -30,7 +31,6 @@ import com.facebook.presto.sql.planner.OutputPartitioning; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.List; @@ -42,6 +42,9 @@ import java.util.function.Function; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createLongDictionaryBlock; import static com.facebook.presto.block.BlockAssertions.createLongSequenceBlock; @@ -52,9 +55,6 @@ import static com.facebook.presto.execution.buffer.OutputBuffers.BufferType.PARTITIONED; import static com.facebook.presto.execution.buffer.OutputBuffers.createInitialEmptyOutputBuffers; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java index cbce577e9e919..56221b726fed9 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.SequencePageBuilder; import com.facebook.presto.block.BlockAssertions; import com.facebook.presto.common.Page; @@ -48,7 +49,6 @@ import com.facebook.presto.testing.TestingTransactionHandle; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Iterator; @@ -59,6 +59,8 @@ import java.util.function.Supplier; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.toValues; @@ -77,8 +79,6 @@ import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; import static com.facebook.presto.testing.assertions.Assert.assertEquals; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNOperator.java index eff0c91c22515..0eeca35157918 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNOperator.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.common.Page; import com.facebook.presto.operator.TopNOperator.TopNOperatorFactory; import com.facebook.presto.spi.plan.PlanNodeId; import com.facebook.presto.testing.MaterializedResult; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,6 +29,7 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.block.SortOrder.ASC_NULLS_LAST; @@ -39,7 +40,6 @@ import static com.facebook.presto.operator.OperatorAssertion.assertOperatorEquals; import static com.facebook.presto.testing.MaterializedResult.resultBuilder; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertFalse; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNRowNumberOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNRowNumberOperator.java index 73c0e593a5dc8..ee3ce16a66a0e 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNRowNumberOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestTopNRowNumberOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.RowPagesBuilder; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.SortOrder; @@ -24,7 +25,6 @@ import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestWindowOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestWindowOperator.java index 1133a0e21a144..b5f9ebbe5c8da 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestWindowOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestWindowOperator.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.ExceededMemoryLimitException; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.SortOrder; @@ -33,8 +35,6 @@ import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -47,6 +47,7 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertGreaterThan; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.BigintType.BIGINT; @@ -63,7 +64,6 @@ import static com.facebook.presto.spi.plan.WindowNode.Frame.WindowType.RANGE; import static com.facebook.presto.testing.MaterializedResult.resultBuilder; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/exchange/TestLocalExchange.java b/presto-main-base/src/test/java/com/facebook/presto/operator/exchange/TestLocalExchange.java index b363940ed0b33..465a374eca960 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/exchange/TestLocalExchange.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/exchange/TestLocalExchange.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.exchange; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.SequencePageBuilder; import com.facebook.presto.Session; import com.facebook.presto.common.Page; @@ -38,7 +39,6 @@ import com.facebook.presto.sql.planner.PartitioningProviderManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; @@ -51,6 +51,7 @@ import java.util.stream.Stream; import static com.facebook.airlift.testing.Assertions.assertContains; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.operator.PipelineExecutionStrategy.GROUPED_EXECUTION; import static com.facebook.presto.operator.PipelineExecutionStrategy.UNGROUPED_EXECUTION; @@ -64,7 +65,6 @@ import static com.facebook.presto.sql.planner.SystemPartitioningHandle.SINGLE_DISTRIBUTION; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.BYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/project/TestPageProcessor.java b/presto-main-base/src/test/java/com/facebook/presto/operator/project/TestPageProcessor.java index b4bf55690bcd8..f90e7d9d92671 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/project/TestPageProcessor.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/project/TestPageProcessor.java @@ -14,6 +14,7 @@ package com.facebook.presto.operator.project; import com.facebook.airlift.testing.TestingTicker; +import com.facebook.airlift.units.Duration; import com.facebook.presto.block.BlockAssertions; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.Duration; import org.openjdk.jol.info.ClassLayout; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/BenchmarkPartitionedOutputOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/BenchmarkPartitionedOutputOperator.java index f7a268f4a8170..62780860fc640 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/BenchmarkPartitionedOutputOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/BenchmarkPartitionedOutputOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.repartition; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.CompressionCodec; import com.facebook.presto.Session; import com.facebook.presto.common.Page; @@ -40,7 +41,6 @@ import com.facebook.presto.sql.planner.OutputPartitioning; import com.facebook.presto.testing.TestingTaskContext; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -70,6 +70,9 @@ import java.util.stream.IntStream; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.block.BlockAssertions.createMapType; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; @@ -90,9 +93,6 @@ import static com.facebook.presto.sql.planner.SystemPartitioningHandle.SystemPartitionFunction.HASH; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Collections.nCopies; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/TestOptimizedPartitionedOutputOperator.java b/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/TestOptimizedPartitionedOutputOperator.java index d2e576d71bdcf..4ed538593ba58 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/TestOptimizedPartitionedOutputOperator.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/repartition/TestOptimizedPartitionedOutputOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.repartition; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.CompressionCodec; import com.facebook.presto.Session; import com.facebook.presto.common.Page; @@ -48,7 +49,6 @@ import com.google.common.collect.Maps; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.ArrayList; @@ -67,6 +67,10 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertBetweenInclusive; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.block.BlockAssertions.Encoding.DICTIONARY; import static com.facebook.presto.block.BlockAssertions.Encoding.RUN_LENGTH; import static com.facebook.presto.block.BlockAssertions.createLongDictionaryBlock; @@ -95,10 +99,6 @@ import static com.facebook.presto.operator.PageAssertions.updateBlockTypesWithHashBlockAndNullBlock; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; -import static io.airlift.units.DataSize.Unit.BYTE; -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 java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkDateTimeFunctions.java b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkDateTimeFunctions.java index 98db8aba9568d..1b84f57715c23 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkDateTimeFunctions.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkDateTimeFunctions.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.operator.scalar; +import com.facebook.airlift.units.Duration; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.Duration; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java index c12cf7e62fa88..17ba3c70823db 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator.scalar; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.common.InvalidTypeDefinitionException; import com.facebook.presto.common.Page; @@ -91,7 +92,6 @@ import com.google.common.util.concurrent.UncheckedExecutionException; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.intellij.lang.annotations.Language; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -115,6 +115,7 @@ import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertInstanceOf; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.block.BlockAssertions.createBooleansBlock; import static com.facebook.presto.block.BlockAssertions.createDoublesBlock; @@ -149,7 +150,6 @@ import static com.facebook.presto.util.AnalyzerUtil.createParsingOptions; import static com.facebook.presto.util.Failures.toFailure; import static io.airlift.slice.SizeOf.sizeOf; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.String.format; import static java.util.Collections.emptyMap; import static java.util.Objects.requireNonNull; diff --git a/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStateProvider.java b/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStateProvider.java index c02683eb63a4f..4afefed16b9a2 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStateProvider.java +++ b/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStateProvider.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.execution.QueryState; import com.facebook.presto.execution.resourceGroups.ResourceGroupRuntimeInfo; @@ -32,8 +34,6 @@ 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 org.joda.time.DateTime; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -45,6 +45,8 @@ import java.util.Optional; import java.util.OptionalDouble; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.execution.QueryState.DISPATCHING; import static com.facebook.presto.execution.QueryState.FAILED; @@ -60,8 +62,6 @@ import static com.facebook.presto.memory.LocalMemoryManager.RESERVED_POOL; import static com.facebook.presto.metadata.SessionPropertyManager.createTestingSessionPropertyManager; import static com.facebook.presto.operator.BlockedReason.WAITING_FOR_MEMORY; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerConfig.java index 89dd90527e383..48c47a24731b6 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.resourcemanager; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestBasicQueryInfo.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestBasicQueryInfo.java index d42ec25723201..23b66dc052ed6 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/TestBasicQueryInfo.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestBasicQueryInfo.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.resourceGroups.QueryType; import com.facebook.presto.cost.StatsAndCosts; @@ -26,8 +28,6 @@ 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 org.joda.time.DateTime; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestInternalCommunicationConfig.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestInternalCommunicationConfig.java index b171d5fdda8c3..ba6faf2a97c53 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/TestInternalCommunicationConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestInternalCommunicationConfig.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.server.InternalCommunicationConfig.CommunicationProtocol; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; @@ -24,7 +24,7 @@ import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; import static com.facebook.airlift.configuration.testing.ConfigAssertions.recordDefaults; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class TestInternalCommunicationConfig { diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestQueryStateInfo.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestQueryStateInfo.java index 682fc084ecef9..09230829b8e23 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/TestQueryStateInfo.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestQueryStateInfo.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.cost.StatsAndCosts; import com.facebook.presto.execution.QueryInfo; @@ -28,8 +30,6 @@ 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 org.joda.time.DateTime; import org.testng.annotations.Test; @@ -38,6 +38,7 @@ import java.util.Optional; import java.util.OptionalInt; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.execution.QueryState.FINISHED; import static com.facebook.presto.execution.QueryState.QUEUED; @@ -47,7 +48,6 @@ import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_GLOBAL_MEMORY_LIMIT; import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.WEIGHTED; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestServerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestServerConfig.java index 56f94a1ec216b..d10949f15bb65 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/TestServerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestServerConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.server; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/remotetask/TestBackoff.java b/presto-main-base/src/test/java/com/facebook/presto/server/remotetask/TestBackoff.java index 886bd7a6433c4..589981cada9d6 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/server/remotetask/TestBackoff.java +++ b/presto-main-base/src/test/java/com/facebook/presto/server/remotetask/TestBackoff.java @@ -14,8 +14,8 @@ package com.facebook.presto.server.remotetask; import com.facebook.airlift.testing.TestingTicker; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import org.testng.annotations.Test; import static java.util.concurrent.TimeUnit.MICROSECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/spiller/TestNodeSpillConfig.java b/presto-main-base/src/test/java/com/facebook/presto/spiller/TestNodeSpillConfig.java index 54c3749d6cc0e..c4ee47d96b020 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/spiller/TestNodeSpillConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/spiller/TestNodeSpillConfig.java @@ -14,18 +14,18 @@ package com.facebook.presto.spiller; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.CompressionCodec; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; -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 com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class TestNodeSpillConfig { diff --git a/presto-main-base/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java b/presto-main-base/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java index e7f10941c75a2..b058b44295ffb 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java +++ b/presto-main-base/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.spiller; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.ExceededSpillLimitException; -import io.airlift.units.DataSize; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; @Test(singleThreaded = true) diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java b/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java index 54e94bcabbe49..56920001aa06e 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java @@ -15,6 +15,8 @@ import com.facebook.airlift.configuration.ConfigurationFactory; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.CompressionCodec; import com.facebook.presto.sql.analyzer.FeaturesConfig.AggregationIfToFilterRewriteStrategy; import com.facebook.presto.sql.analyzer.FeaturesConfig.CteMaterializationStrategy; @@ -27,14 +29,15 @@ import com.facebook.presto.sql.analyzer.FeaturesConfig.RandomizeOuterJoinNullKeyStrategy; import com.facebook.presto.sql.analyzer.FeaturesConfig.SingleStreamSpillerChoice; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.sql.analyzer.FeaturesConfig.AggregationPartitioningMergingStrategy.LEGACY; import static com.facebook.presto.sql.analyzer.FeaturesConfig.AggregationPartitioningMergingStrategy.TOP_DOWN; import static com.facebook.presto.sql.analyzer.FeaturesConfig.JoinDistributionType.BROADCAST; @@ -47,9 +50,6 @@ import static com.facebook.presto.sql.analyzer.FeaturesConfig.TaskSpillingStrategy.PER_TASK_MEMORY_THRESHOLD; import static com.facebook.presto.sql.tree.CreateView.Security.DEFINER; import static com.facebook.presto.sql.tree.CreateView.Security.INVOKER; -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 java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestJavaFeaturesConfig.java b/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestJavaFeaturesConfig.java index f83f6b3eb03ba..91445461149e5 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestJavaFeaturesConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestJavaFeaturesConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.sql.analyzer; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java b/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java index eb486ebf02708..c5383b669af60 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.log.Logging; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.SqlDecimal; import com.facebook.presto.common.type.SqlTimestampWithTimeZone; @@ -44,7 +45,6 @@ import io.airlift.joni.Regex; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.Duration; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.testng.annotations.AfterClass; diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/TestLogicalAddExchangesBelowPartialAggregationOverGroupIdRuleSet.java b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/TestLogicalAddExchangesBelowPartialAggregationOverGroupIdRuleSet.java index 5cffdb0dcd22d..2e8684cb05da0 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/TestLogicalAddExchangesBelowPartialAggregationOverGroupIdRuleSet.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/TestLogicalAddExchangesBelowPartialAggregationOverGroupIdRuleSet.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sql.planner; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.execution.TaskManagerConfig; import com.facebook.presto.spi.WarningCollector; @@ -23,9 +24,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import org.testng.annotations.Test; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SystemSessionProperties.ADD_EXCHANGE_BELOW_PARTIAL_AGGREGATION_OVER_GROUP_ID; import static com.facebook.presto.SystemSessionProperties.MERGE_AGGREGATIONS_WITH_AND_WITHOUT_FILTER; import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.anyTree; @@ -37,8 +39,6 @@ import static com.facebook.presto.sql.planner.plan.ExchangeNode.Scope.LOCAL; import static com.facebook.presto.sql.planner.plan.ExchangeNode.Scope.REMOTE_STREAMING; import static com.facebook.presto.sql.planner.plan.ExchangeNode.Type.REPARTITION; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; public class TestLogicalAddExchangesBelowPartialAggregationOverGroupIdRuleSet extends BasePlanTest diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/planPrinter/TestPlanPrinter.java b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/planPrinter/TestPlanPrinter.java index 3333c24aa8fe8..4872e86029341 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/planPrinter/TestPlanPrinter.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/planPrinter/TestPlanPrinter.java @@ -14,6 +14,7 @@ package com.facebook.presto.sql.planner.planPrinter; import com.facebook.airlift.stats.Distribution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeMetric; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.predicate.Domain; @@ -47,7 +48,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.List; diff --git a/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManager.java b/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManager.java index 8fa3f5d3178a1..dccda22b6a342 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManager.java +++ b/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManager.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.transaction; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.transaction.TransactionId; import com.facebook.presto.connector.informationSchema.InformationSchemaConnector; import com.facebook.presto.connector.system.SystemConnector; @@ -30,7 +31,6 @@ import com.facebook.presto.tpch.TpchConnectorFactory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManagerConfig.java index b6c3f5a8b1f80..257adaeae1049 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManagerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/transaction/TestTransactionManagerConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.transaction; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main-base/src/test/java/com/facebook/presto/ttl/TestNodeTtlFetcherManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/ttl/TestNodeTtlFetcherManagerConfig.java index 1fe4aeaa004f3..a2e42c0670239 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/ttl/TestNodeTtlFetcherManagerConfig.java +++ b/presto-main-base/src/test/java/com/facebook/presto/ttl/TestNodeTtlFetcherManagerConfig.java @@ -14,9 +14,9 @@ package com.facebook.presto.ttl; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.facebook.presto.ttl.nodettlfetchermanagers.NodeTtlFetcherManagerConfig; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java b/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java index 184d305423448..a6f180e0d6504 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java +++ b/presto-main-base/src/test/java/com/facebook/presto/util/MockPowerOfTwo.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.util; -import io.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDataSize; import jakarta.validation.Payload; import java.lang.annotation.Annotation; diff --git a/presto-main/pom.xml b/presto-main/pom.xml index fefcbf837fca1..7dafeb7419874 100644 --- a/presto-main/pom.xml +++ b/presto-main/pom.xml @@ -191,7 +191,7 @@ presto-analyzer - io.airlift + com.facebook.airlift units diff --git a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java index 73f0478900107..1e964f597e52d 100644 --- a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java +++ b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java @@ -14,6 +14,7 @@ package com.facebook.presto.dispatcher; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.event.QueryMonitor; @@ -34,7 +35,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java index 346e13e9d3e34..92f1ba0fdef65 100644 --- a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java +++ b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java @@ -15,6 +15,8 @@ import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.ExceededCpuLimitException; import com.facebook.presto.ExceededIntermediateWrittenBytesException; import com.facebook.presto.ExceededOutputSizeLimitException; @@ -38,8 +40,6 @@ import com.google.common.collect.Ordering; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; @@ -58,6 +58,7 @@ import java.util.function.Consumer; import static com.facebook.airlift.concurrent.Threads.threadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.SystemSessionProperties.getQueryMaxCpuTime; import static com.facebook.presto.SystemSessionProperties.getQueryMaxOutputPositions; import static com.facebook.presto.SystemSessionProperties.getQueryMaxOutputSize; @@ -74,7 +75,6 @@ import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.util.concurrent.Futures.immediateFailedFuture; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java b/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java index 14a0a9f267413..ddcfd14f8a28f 100644 --- a/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java +++ b/presto-main/src/main/java/com/facebook/presto/failureDetector/FailureDetectorConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; diff --git a/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java b/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java index 56a0fc2197904..f023979ca13b2 100644 --- a/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java +++ b/presto-main/src/main/java/com/facebook/presto/failureDetector/HeartbeatFailureDetector.java @@ -24,6 +24,7 @@ import com.facebook.airlift.node.NodeInfo; import com.facebook.airlift.stats.DecayCounter; import com.facebook.airlift.stats.ExponentialDecay; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.FailureInfo; import com.facebook.presto.server.InternalCommunicationConfig; import com.facebook.presto.spi.HostAddress; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableMap; import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; diff --git a/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java b/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java index df9c8008a6487..2134cd160e32f 100644 --- a/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/ClusterMemoryManager.java @@ -18,6 +18,8 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.LocationFactory; import com.facebook.presto.execution.QueryExecution; import com.facebook.presto.execution.QueryIdGenerator; @@ -46,8 +48,6 @@ import com.google.common.collect.Streams; import com.google.common.io.Closer; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.weakref.jmx.JmxException; @@ -71,6 +71,8 @@ import java.util.function.Supplier; import java.util.stream.Stream; +import static com.facebook.airlift.units.DataSize.succinctBytes; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.ExceededMemoryLimitException.exceededGlobalTotalLimit; import static com.facebook.presto.ExceededMemoryLimitException.exceededGlobalUserLimit; import static com.facebook.presto.SystemSessionProperties.RESOURCE_OVERCOMMIT; @@ -93,8 +95,6 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.MoreCollectors.toOptional; import static com.google.common.collect.Sets.difference; -import static io.airlift.units.DataSize.succinctBytes; -import static io.airlift.units.Duration.nanosSince; import static java.lang.Math.min; import static java.lang.String.format; import static java.util.AbstractMap.SimpleEntry; diff --git a/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java b/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java index d81139cfddf83..c382bd7d28ac7 100644 --- a/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/HighMemoryTaskKiller.java @@ -15,6 +15,8 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.GarbageCollectionNotificationInfo; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.SqlTask; import com.facebook.presto.execution.SqlTaskManager; import com.facebook.presto.execution.TaskInfo; @@ -25,8 +27,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Ticker; import com.google.common.collect.ListMultimap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java b/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java index ca298046f1dfe..4167aee6f845a 100644 --- a/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java +++ b/presto-main/src/main/java/com/facebook/presto/memory/RemoteNodeMemory.java @@ -22,12 +22,12 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.server.smile.BaseResponse; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.net.URI; @@ -39,12 +39,12 @@ import static com.facebook.airlift.http.client.HttpStatus.OK; import static com.facebook.airlift.http.client.JsonBodyGenerator.jsonBodyGenerator; import static com.facebook.airlift.http.client.Request.Builder.preparePost; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.server.RequestHelpers.setContentTypeHeaders; import static com.facebook.presto.server.smile.AdaptingJsonResponseHandler.createAdaptingJsonResponseHandler; import static com.facebook.presto.server.smile.FullSmileResponseHandler.createFullSmileResponseHandler; import static com.facebook.presto.server.smile.SmileBodyGenerator.smileBodyGenerator; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java b/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java index 71682bc50af5c..8276fa0976895 100644 --- a/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java +++ b/presto-main/src/main/java/com/facebook/presto/metadata/HttpRemoteNodeState.java @@ -18,11 +18,11 @@ import com.facebook.airlift.http.client.HttpClient.HttpResponseFuture; import com.facebook.airlift.http.client.Request; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.NodeState; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.net.URI; @@ -35,9 +35,9 @@ import static com.facebook.airlift.http.client.HttpStatus.OK; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; import static com.facebook.airlift.json.JsonCodec.jsonCodec; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.google.common.net.MediaType.JSON_UTF_8; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -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; diff --git a/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java b/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java index 9e15dfa7594ce..0f3f772c3d6f4 100644 --- a/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java +++ b/presto-main/src/main/java/com/facebook/presto/operator/HttpRpcShuffleClient.java @@ -20,6 +20,7 @@ import com.facebook.airlift.http.client.ResponseHandler; import com.facebook.airlift.http.client.ResponseTooLargeException; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.operator.PageBufferClient.PagesResponse; import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.page.SerializedPage; @@ -29,7 +30,6 @@ import com.google.errorprone.annotations.ThreadSafe; import io.airlift.slice.InputStreamSliceInput; import io.airlift.slice.SliceInput; -import io.airlift.units.DataSize; import java.io.BufferedReader; import java.io.IOException; diff --git a/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java b/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java index 0ffde870cb6b8..794171111ee8a 100644 --- a/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java +++ b/presto-main/src/main/java/com/facebook/presto/operator/ThriftRpcShuffleClient.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.operator; +import com.facebook.airlift.units.DataSize; import com.facebook.drift.client.DriftClient; import com.facebook.drift.transport.client.MessageTooLargeException; import com.facebook.presto.execution.TaskId; @@ -23,7 +24,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.DataSize; import java.net.URI; import java.util.Optional; diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java index 4537a1bbf0865..5efac272478d4 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/DistributedClusterStatsResource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.QueryState; import com.facebook.presto.execution.scheduler.NodeSchedulerConfig; import com.facebook.presto.metadata.InternalNodeManager; @@ -22,7 +23,6 @@ import com.facebook.presto.spi.NodeState; import com.facebook.presto.spi.memory.MemoryPoolId; import com.facebook.presto.spi.memory.MemoryPoolInfo; -import io.airlift.units.Duration; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.ws.rs.GET; diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java index c6c8c7622c3f8..bed088a412cf5 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerClusterStatusSender.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.Duration; import com.facebook.drift.client.DriftClient; import com.facebook.presto.execution.ManagedQueryExecution; import com.facebook.presto.execution.resourceGroups.ResourceGroupManager; @@ -24,7 +25,6 @@ import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.QueryId; import com.facebook.presto.util.PeriodicTaskExecutor; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; diff --git a/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java index 5162dc268a8a9..aa915fe1fb998 100644 --- a/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java +++ b/presto-main/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerProxy.java @@ -17,13 +17,13 @@ import com.facebook.airlift.http.client.HeaderName; import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.http.client.Request; +import com.facebook.airlift.units.Duration; import com.facebook.presto.metadata.InternalNodeManager; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.io.ByteStreams; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import io.airlift.units.Duration; import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.container.AsyncResponse; diff --git a/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java b/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java index 874046df0974d..d904d725e4621 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java +++ b/presto-main/src/main/java/com/facebook/presto/server/AsyncPageTransportServlet.java @@ -16,6 +16,8 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskManager; import com.facebook.presto.execution.buffer.BufferInfo; @@ -27,8 +29,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.servlet.AsyncContext; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java b/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java index da78359f0bf83..db24433f6c09d 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ClusterStatsResource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; @@ -28,7 +29,6 @@ import com.facebook.presto.ttl.clusterttlprovidermanagers.ClusterTtlProviderManager; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.Duration; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; diff --git a/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java b/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java index a90514beb8693..bf480522e1cc8 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java @@ -18,6 +18,7 @@ import com.facebook.airlift.discovery.server.EmbeddedDiscoveryModule; import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.http.server.HttpServerBinder.HttpResourceBinding; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.QueryResults; import com.facebook.presto.cost.CostCalculator; import com.facebook.presto.cost.CostCalculator.EstimatedExchanges; @@ -104,7 +105,6 @@ import com.google.inject.Provides; import com.google.inject.Scopes; import com.google.inject.multibindings.MapBinder; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import jakarta.inject.Singleton; diff --git a/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java b/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java index 361249a6dbd33..bc3414a6e943f 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java +++ b/presto-main/src/main/java/com/facebook/presto/server/HttpRequestSessionContext.java @@ -14,6 +14,8 @@ package com.facebook.presto.server; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session.ResourceEstimateBuilder; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.transaction.TransactionId; @@ -37,8 +39,6 @@ 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 jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; diff --git a/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java b/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java index 955cdf1fbf640..a5e40792cdc23 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java +++ b/presto-main/src/main/java/com/facebook/presto/server/RequestErrorTracker.java @@ -15,6 +15,7 @@ import com.facebook.airlift.event.client.ServiceUnavailableException; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.TaskId; import com.facebook.presto.server.remotetask.Backoff; import com.facebook.presto.spi.ErrorCodeSupplier; @@ -24,7 +25,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import java.io.EOFException; import java.net.SocketException; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java b/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java index 4d048bba33ec4..892e73be39e0c 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ResourceGroupStateInfoResource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.server; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.resourceGroups.ResourceGroupManager; import com.facebook.presto.metadata.InternalNode; import com.facebook.presto.metadata.InternalNodeManager; @@ -20,7 +21,6 @@ import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; -import io.airlift.units.Duration; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java b/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java index e965e82fa9551..6109c99d70113 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ResourceManagerModule.java @@ -15,6 +15,8 @@ import com.facebook.airlift.configuration.AbstractConfigurationAwareModule; import com.facebook.airlift.discovery.server.EmbeddedDiscoveryModule; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.dispatcher.NoOpQueryManager; import com.facebook.presto.execution.QueryIdGenerator; import com.facebook.presto.execution.QueryInfo; @@ -38,8 +40,6 @@ import com.google.inject.Binder; import com.google.inject.Provides; import com.google.inject.Scopes; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Singleton; import static com.facebook.airlift.configuration.ConditionalModule.installModuleIf; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java b/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java index 8974a5d4f1725..e24a08ab00559 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ServerInfoResource.java @@ -34,11 +34,11 @@ import static com.facebook.airlift.http.client.thrift.ThriftRequestUtils.APPLICATION_THRIFT_BINARY; import static com.facebook.airlift.http.client.thrift.ThriftRequestUtils.APPLICATION_THRIFT_COMPACT; import static com.facebook.airlift.http.client.thrift.ThriftRequestUtils.APPLICATION_THRIFT_FB_COMPACT; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.server.security.RoleType.ADMIN; import static com.facebook.presto.spi.NodeState.ACTIVE; import static com.facebook.presto.spi.NodeState.INACTIVE; import static com.facebook.presto.spi.NodeState.SHUTTING_DOWN; -import static io.airlift.units.Duration.nanosSince; 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; diff --git a/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java b/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java index 12a4363139ad5..fa85aaeba1b2a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java +++ b/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java @@ -21,6 +21,8 @@ import com.facebook.airlift.stats.GcMonitor; import com.facebook.airlift.stats.JmxGcMonitor; import com.facebook.airlift.stats.PauseMeter; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.client.ExceptionClassification; import com.facebook.drift.client.address.AddressSelector; import com.facebook.drift.codec.utils.DefaultThriftCodecsModule; @@ -242,8 +244,6 @@ import com.google.inject.Scopes; import com.google.inject.multibindings.MapBinder; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Singleton; import jakarta.servlet.Filter; @@ -267,6 +267,7 @@ import static com.facebook.airlift.json.JsonBinder.jsonBinder; import static com.facebook.airlift.json.JsonCodecBinder.jsonCodecBinder; import static com.facebook.airlift.json.smile.SmileCodecBinder.smileCodecBinder; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.drift.client.ExceptionClassification.HostStatus.DOWN; import static com.facebook.drift.client.ExceptionClassification.HostStatus.NORMAL; import static com.facebook.drift.client.guice.DriftClientBinder.driftClientBinder; @@ -281,7 +282,6 @@ import static com.google.inject.multibindings.MapBinder.newMapBinder; import static com.google.inject.multibindings.Multibinder.newSetBinder; import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newFixedThreadPool; diff --git a/presto-main/src/main/java/com/facebook/presto/server/StatusResource.java b/presto-main/src/main/java/com/facebook/presto/server/StatusResource.java index 84921c2203ba6..98f17b1b281e9 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/StatusResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/StatusResource.java @@ -28,8 +28,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.server.security.RoleType.INTERNAL; -import static io.airlift.units.Duration.nanosSince; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static java.util.Objects.requireNonNull; diff --git a/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java b/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java index 78a0507c84910..f98d3424e500a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/TaskResource.java @@ -16,6 +16,7 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskInfo; @@ -29,7 +30,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java index fd3fe9253d849..9ecb10985c339 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingQueryResponseProvider.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.server.protocol; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.dispatcher.DispatchInfo; import com.facebook.presto.spi.QueryId; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java index 7f42f413140d9..0973ed96f63e0 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/ExecutingStatementResource.java @@ -15,6 +15,8 @@ import com.facebook.airlift.concurrent.BoundedExecutor; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.QueryResults; import com.facebook.presto.execution.QueryManager; import com.facebook.presto.server.ForStatementResource; @@ -22,8 +24,6 @@ import com.facebook.presto.spi.QueryId; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.ws.rs.DELETE; @@ -44,6 +44,7 @@ import org.weakref.jmx.Nested; import static com.facebook.airlift.http.server.AsyncResponseHandler.bindAsyncResponse; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_PREFIX_URL; import static com.facebook.presto.server.protocol.QueryResourceUtil.abortIfPrefixUrlInvalid; import static com.facebook.presto.server.protocol.QueryResourceUtil.toResponse; @@ -53,7 +54,6 @@ import static com.google.common.util.concurrent.Futures.transform; import static com.google.common.util.concurrent.Futures.transformAsync; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java index 510f12a8aa71a..f67e7f5641302 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/LocalExecutingQueryResponseProvider.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.server.protocol; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.dispatcher.DispatchInfo; import com.facebook.presto.spi.QueryId; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java index b6b249fecdc1e..71bc119f6ac49 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java @@ -14,6 +14,8 @@ package com.facebook.presto.server.protocol; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.Column; import com.facebook.presto.client.FailureInfo; @@ -54,8 +56,6 @@ import com.google.errorprone.annotations.ThreadSafe; import com.google.errorprone.annotations.concurrent.GuardedBy; import io.airlift.slice.DynamicSliceOutput; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java index 5c3601241ea24..5cca337690a3f 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueryResourceUtil.java @@ -15,6 +15,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.Column; import com.facebook.presto.client.QueryError; import com.facebook.presto.client.QueryResults; @@ -28,7 +29,6 @@ import com.facebook.presto.spi.function.SqlFunctionId; import com.facebook.presto.spi.function.SqlInvokedFunction; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.CacheControl; import jakarta.ws.rs.core.Context; diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java index 63b6b2df7788c..432efa1ffdcdb 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java +++ b/presto-main/src/main/java/com/facebook/presto/server/protocol/QueuedStatementResource.java @@ -15,6 +15,8 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.TimeStat; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.QueryError; import com.facebook.presto.client.QueryResults; import com.facebook.presto.common.ErrorCode; @@ -34,8 +36,6 @@ import com.google.common.collect.Ordering; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; @@ -73,6 +73,7 @@ import static com.facebook.airlift.concurrent.MoreFutures.addTimeout; import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.airlift.http.server.AsyncResponseHandler.bindAsyncResponse; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_PREFIX_URL; import static com.facebook.presto.server.protocol.QueryResourceUtil.NO_DURATION; import static com.facebook.presto.server.protocol.QueryResourceUtil.abortIfPrefixUrlInvalid; @@ -91,7 +92,6 @@ import static com.google.common.util.concurrent.Futures.immediateFuture; import static com.google.common.util.concurrent.Futures.transformAsync; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.MEGABYTE; 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; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java index 5badbd9821202..c6a0832a9b261 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java @@ -23,6 +23,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.execution.StateMachine; import com.facebook.presto.execution.TaskId; @@ -38,7 +39,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; @@ -48,6 +48,7 @@ import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.client.PrestoHeaders.PRESTO_CURRENT_STATE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_WAIT; import static com.facebook.presto.server.RequestErrorTracker.taskRequestErrorTracker; @@ -59,7 +60,6 @@ import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_ERROR; import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_MISMATCH; import static com.facebook.presto.util.Failures.REMOTE_TASK_MISMATCH_ERROR; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcherWithEventLoop.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcherWithEventLoop.java index c7d1a3658dc4d..5207ee7a1850a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcherWithEventLoop.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcherWithEventLoop.java @@ -22,6 +22,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.execution.StateMachine; import com.facebook.presto.execution.TaskId; @@ -36,7 +37,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import io.netty.channel.EventLoop; import java.util.concurrent.atomic.AtomicBoolean; @@ -44,6 +44,7 @@ import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.client.PrestoHeaders.PRESTO_CURRENT_STATE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_WAIT; import static com.facebook.presto.server.RequestErrorTracker.taskRequestErrorTracker; @@ -56,7 +57,6 @@ import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_MISMATCH; import static com.facebook.presto.util.Failures.REMOTE_TASK_MISMATCH_ERROR; import static com.google.common.base.Verify.verify; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java index 587c503fa78ba..f6c9fb6acadbb 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTask.java @@ -27,6 +27,7 @@ import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.DecayCounter; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.Session; import com.facebook.presto.execution.FutureStateChange; @@ -75,7 +76,6 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; import com.sun.management.ThreadMXBean; -import io.airlift.units.Duration; import it.unimi.dsi.fastutil.longs.LongArrayList; import jakarta.annotation.Nullable; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java index 1bda3e2fd5b3e..48b8af9dd79ce 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskFactory.java @@ -21,6 +21,7 @@ import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.stats.DecayCounter; import com.facebook.airlift.stats.ExponentialDecay; +import com.facebook.airlift.units.Duration; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.Session; @@ -49,7 +50,6 @@ import com.facebook.presto.sql.planner.PlanFragment; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.airlift.units.Duration; import io.netty.channel.EventLoop; import io.netty.util.concurrent.AbstractEventExecutorGroup; import jakarta.annotation.PreDestroy; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java index 1976140762739..9ef85adcae21a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/HttpRemoteTaskWithEventLoop.java @@ -26,6 +26,8 @@ import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.DecayCounter; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.Session; import com.facebook.presto.execution.FutureStateChange; @@ -74,8 +76,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.sun.management.ThreadMXBean; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import it.unimi.dsi.fastutil.longs.LongArrayList; import jakarta.annotation.Nullable; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java index 89be82997a271..10d1128c81de2 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcher.java @@ -23,6 +23,7 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.Session; import com.facebook.presto.execution.QueryManager; @@ -42,7 +43,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import java.net.URI; import java.util.Optional; @@ -55,6 +55,7 @@ import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.client.PrestoHeaders.PRESTO_CURRENT_STATE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_WAIT; import static com.facebook.presto.server.RequestErrorTracker.taskRequestErrorTracker; @@ -63,7 +64,6 @@ import static com.facebook.presto.server.smile.FullSmileResponseHandler.createFullSmileResponseHandler; import static com.facebook.presto.server.thrift.ThriftCodecWrapper.unwrapThriftCodec; import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_ERROR; -import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcherWithEventLoop.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcherWithEventLoop.java index a80d8c8d2ca33..df56d783976eb 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcherWithEventLoop.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/TaskInfoFetcherWithEventLoop.java @@ -22,6 +22,7 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.smile.SmileCodec; +import com.facebook.airlift.units.Duration; import com.facebook.drift.transport.netty.codec.Protocol; import com.facebook.presto.Session; import com.facebook.presto.execution.QueryManager; @@ -40,7 +41,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import io.netty.channel.EventLoop; import java.net.URI; @@ -51,6 +51,7 @@ import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.client.PrestoHeaders.PRESTO_CURRENT_STATE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_WAIT; import static com.facebook.presto.server.RequestErrorTracker.taskRequestErrorTracker; @@ -60,7 +61,6 @@ import static com.facebook.presto.server.thrift.ThriftCodecWrapper.unwrapThriftCodec; import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_ERROR; import static com.google.common.base.Verify.verify; -import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main/src/test/java/com/facebook/presto/dispatcher/TestLocalDispatchQuery.java b/presto-main/src/test/java/com/facebook/presto/dispatcher/TestLocalDispatchQuery.java index 1b54dc1dea4f9..70b85cbcf36e7 100644 --- a/presto-main/src/test/java/com/facebook/presto/dispatcher/TestLocalDispatchQuery.java +++ b/presto-main/src/test/java/com/facebook/presto/dispatcher/TestLocalDispatchQuery.java @@ -14,6 +14,7 @@ package com.facebook.presto.dispatcher; import com.facebook.airlift.node.NodeInfo; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.cost.HistoryBasedOptimizationConfig; @@ -51,7 +52,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java b/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java index cccb271166fb7..9c21564fc41ef 100644 --- a/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java +++ b/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java @@ -15,6 +15,7 @@ package com.facebook.presto.eventlistener; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.plan.PlanCanonicalizationStrategy; import com.facebook.presto.common.resourceGroups.QueryType; @@ -45,7 +46,6 @@ import com.facebook.presto.spi.session.ResourceEstimates; import com.facebook.presto.spi.statistics.PlanStatisticsWithSourceInfo; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.File; @@ -346,10 +346,10 @@ private static QueryContext createDummyQueryContext() sessionProperties.put("property2", "value2"); ResourceEstimates resourceEstimates = new ResourceEstimates( - Optional.of(new io.airlift.units.Duration(1200, TimeUnit.SECONDS)), - Optional.of(new io.airlift.units.Duration(1200, TimeUnit.SECONDS)), - Optional.of(new io.airlift.units.DataSize(2, DataSize.Unit.GIGABYTE)), - Optional.of(new io.airlift.units.DataSize(2, DataSize.Unit.GIGABYTE))); + Optional.of(new com.facebook.airlift.units.Duration(1200, TimeUnit.SECONDS)), + Optional.of(new com.facebook.airlift.units.Duration(1200, TimeUnit.SECONDS)), + Optional.of(new com.facebook.airlift.units.DataSize(2, DataSize.Unit.GIGABYTE)), + Optional.of(new com.facebook.airlift.units.DataSize(2, DataSize.Unit.GIGABYTE))); return new QueryContext( user, principal, diff --git a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java index 08c5992dd1b7a..63630b7df2d01 100644 --- a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java +++ b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java @@ -15,6 +15,7 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.BlockEncodingManager; import com.facebook.presto.execution.TestSqlTaskManager.MockExchangeClientSupplier; import com.facebook.presto.execution.buffer.BufferInfo; @@ -40,7 +41,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; @@ -52,6 +52,8 @@ import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.execution.SqlTask.createSqlTask; import static com.facebook.presto.execution.TaskManagerConfig.TaskPriorityTracking.TASK_FAIR; @@ -65,8 +67,6 @@ import static com.facebook.presto.execution.buffer.OutputBuffers.BufferType.PARTITIONED; import static com.facebook.presto.execution.buffer.OutputBuffers.createInitialEmptyOutputBuffers; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.SECONDS; import static org.testng.Assert.assertEquals; diff --git a/presto-main/src/test/java/com/facebook/presto/memory/TestHighMemoryTaskKiller.java b/presto-main/src/test/java/com/facebook/presto/memory/TestHighMemoryTaskKiller.java index c809c5de26445..36fc388e00ace 100644 --- a/presto-main/src/test/java/com/facebook/presto/memory/TestHighMemoryTaskKiller.java +++ b/presto-main/src/test/java/com/facebook/presto/memory/TestHighMemoryTaskKiller.java @@ -15,6 +15,7 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.BlockEncodingManager; import com.facebook.presto.execution.SqlTask; import com.facebook.presto.execution.SqlTaskExecutionFactory; @@ -40,7 +41,6 @@ import com.google.common.base.Ticker; import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.net.URI; @@ -52,6 +52,8 @@ import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.execution.SqlTask.createSqlTask; import static com.facebook.presto.execution.TaskManagerConfig.TaskPriorityTracking.TASK_FAIR; @@ -62,8 +64,6 @@ import static com.facebook.presto.execution.buffer.OutputBuffers.createInitialEmptyOutputBuffers; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.google.common.collect.ImmutableListMultimap.toImmutableListMultimap; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/presto-main/src/test/java/com/facebook/presto/operator/MockExchangeRequestProcessor.java b/presto-main/src/test/java/com/facebook/presto/operator/MockExchangeRequestProcessor.java index 2b1eb3daecb13..d9a42d0967f40 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/MockExchangeRequestProcessor.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/MockExchangeRequestProcessor.java @@ -18,6 +18,7 @@ import com.facebook.airlift.http.client.Response; import com.facebook.airlift.http.client.testing.TestingHttpClient; import com.facebook.airlift.http.client.testing.TestingResponse; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.client.PrestoHeaders; import com.facebook.presto.common.Page; import com.facebook.presto.execution.buffer.BufferResult; @@ -29,7 +30,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableListMultimap; import io.airlift.slice.DynamicSliceOutput; -import io.airlift.units.DataSize; import java.net.URI; import java.util.ArrayList; diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java b/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java index ea201f2d9a451..c6d23fc85a323 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java @@ -16,6 +16,8 @@ import com.facebook.airlift.http.client.Request; import com.facebook.airlift.http.client.Response; import com.facebook.airlift.http.client.testing.TestingHttpClient; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.block.BlockAssertions; import com.facebook.presto.common.Page; import com.facebook.presto.execution.TaskId; @@ -27,8 +29,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.UncheckedTimeoutException; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -48,6 +48,8 @@ import static com.facebook.airlift.concurrent.MoreFutures.tryGetFutureValue; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; import static com.facebook.airlift.testing.Assertions.assertLessThan; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES; import static com.facebook.presto.execution.buffer.TestingPagesSerdeFactory.testingPagesSerde; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; @@ -55,8 +57,6 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeOperator.java b/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeOperator.java index e17171967246f..458d2cb19311e 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeOperator.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeOperator.java @@ -15,6 +15,8 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.http.client.testing.TestingHttpClient; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.CompressionCodec; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; @@ -32,8 +34,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -47,13 +47,13 @@ import java.util.concurrent.TimeUnit; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.operator.ExchangeOperator.REMOTE_CONNECTOR_ID; import static com.facebook.presto.operator.PageAssertions.assertPageEquals; import static com.facebook.presto.operator.TestingTaskBuffer.PAGE; import static com.facebook.presto.testing.TestingTaskContext.createTaskContext; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestPageBufferClient.java b/presto-main/src/test/java/com/facebook/presto/operator/TestPageBufferClient.java index 8a4dc445561c8..c0a3f829cc147 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/TestPageBufferClient.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/TestPageBufferClient.java @@ -19,15 +19,15 @@ import com.facebook.airlift.http.client.testing.TestingHttpClient; import com.facebook.airlift.http.client.testing.TestingResponse; import com.facebook.airlift.testing.TestingTicker; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.Page; import com.facebook.presto.operator.PageBufferClient.ClientCallback; import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.page.PagesSerde; import com.facebook.presto.spi.page.SerializedPage; import com.google.common.collect.ImmutableListMultimap; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java b/presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java index ab28b1bcc895a..d0ba55a09151d 100644 --- a/presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java +++ b/presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStatusSender.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.resourcemanager; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.execution.MockManagedQueryExecution; import com.facebook.presto.execution.resourceGroups.NoOpResourceGroupManager; @@ -23,8 +25,6 @@ import com.facebook.presto.server.ServerConfig; import com.facebook.presto.spi.ConnectorId; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -32,7 +32,7 @@ import java.net.URI; import java.util.OptionalInt; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-main/src/test/java/com/facebook/presto/server/TestFailureDetectorConfig.java b/presto-main/src/test/java/com/facebook/presto/server/TestFailureDetectorConfig.java index 1bc543a0f1cb2..eee32c75ad13b 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/TestFailureDetectorConfig.java +++ b/presto-main/src/test/java/com/facebook/presto/server/TestFailureDetectorConfig.java @@ -14,9 +14,9 @@ package com.facebook.presto.server; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.facebook.presto.failureDetector.FailureDetectorConfig; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java index 20240cb0e5e36..2de40f4fa2173 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java +++ b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java @@ -22,6 +22,8 @@ import com.facebook.airlift.json.JsonModule; import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.json.smile.SmileModule; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.codec.guice.ThriftCodecModule; import com.facebook.drift.codec.utils.DataSizeToBytesThriftCodec; @@ -88,8 +90,6 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.DefaultValue; diff --git a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java index 46cce8fd10573..3e8cc6d11e4b4 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java +++ b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java @@ -22,6 +22,8 @@ import com.facebook.airlift.json.JsonModule; import com.facebook.airlift.json.smile.SmileCodec; import com.facebook.airlift.json.smile.SmileModule; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.codec.ThriftCodec; import com.facebook.drift.codec.guice.ThriftCodecModule; import com.facebook.drift.codec.utils.DataSizeToBytesThriftCodec; @@ -87,8 +89,6 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.Scopes; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.DefaultValue; diff --git a/presto-memory-context/pom.xml b/presto-memory-context/pom.xml index 33d8891e58edf..8ffd0fba14ee0 100644 --- a/presto-memory-context/pom.xml +++ b/presto-memory-context/pom.xml @@ -48,7 +48,7 @@ - io.airlift + com.facebook.airlift units test diff --git a/presto-memory-context/src/test/java/com/facebook/presto/memory/context/TestMemoryContexts.java b/presto-memory-context/src/test/java/com/facebook/presto/memory/context/TestMemoryContexts.java index 463004321d500..85e2e439baaff 100644 --- a/presto-memory-context/src/test/java/com/facebook/presto/memory/context/TestMemoryContexts.java +++ b/presto-memory-context/src/test/java/com/facebook/presto/memory/context/TestMemoryContexts.java @@ -13,17 +13,17 @@ */ package com.facebook.presto.memory.context; +import com.facebook.airlift.units.DataSize; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newRootAggregatedMemoryContext; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotEquals; diff --git a/presto-memory/pom.xml b/presto-memory/pom.xml index 3be78246c3bbb..630afbc6cecdc 100644 --- a/presto-memory/pom.xml +++ b/presto-memory/pom.xml @@ -85,7 +85,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java index 1dc2f6fe492c5..127fed18e7f7d 100644 --- a/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java +++ b/presto-memory/src/main/java/com/facebook/presto/plugin/memory/MemoryConfig.java @@ -14,7 +14,7 @@ package com.facebook.presto.plugin.memory; import com.facebook.airlift.configuration.Config; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import jakarta.validation.constraints.NotNull; public class MemoryConfig diff --git a/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryPagesStore.java b/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryPagesStore.java index 32308f8cb2ef8..ad10dc89816a3 100644 --- a/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryPagesStore.java +++ b/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryPagesStore.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.memory; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.spi.ConnectorInsertTableHandle; @@ -25,7 +26,6 @@ import com.facebook.presto.testing.TestingConnectorSession; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryWorkerCrash.java b/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryWorkerCrash.java index 6d33c46a13550..1c2d2bb27f983 100644 --- a/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryWorkerCrash.java +++ b/presto-memory/src/test/java/com/facebook/presto/plugin/memory/TestMemoryWorkerCrash.java @@ -13,18 +13,18 @@ */ package com.facebook.presto.plugin.memory; +import com.facebook.airlift.units.Duration; import com.facebook.presto.server.testing.TestingPrestoServer; import com.facebook.presto.testing.QueryRunner; import com.facebook.presto.tests.AbstractTestQueryFramework; import com.facebook.presto.tests.DistributedQueryRunner; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.testing.Assertions.assertLessThan; -import static io.airlift.units.Duration.nanosSince; +import static com.facebook.airlift.units.Duration.nanosSince; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-ml/pom.xml b/presto-ml/pom.xml index 018c069f9cf9b..cef4195f2af28 100644 --- a/presto-ml/pom.xml +++ b/presto-ml/pom.xml @@ -84,7 +84,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-mongodb/pom.xml b/presto-mongodb/pom.xml index 39fb4b954cd42..28524b2c7e1ae 100644 --- a/presto-mongodb/pom.xml +++ b/presto-mongodb/pom.xml @@ -113,7 +113,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-mysql/pom.xml b/presto-mysql/pom.xml index b2579d59b17dc..63c424e18582e 100644 --- a/presto-mysql/pom.xml +++ b/presto-mysql/pom.xml @@ -90,7 +90,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java b/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java index e2865b212c68a..28c1278504e49 100644 --- a/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java +++ b/presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlConfig.java @@ -14,7 +14,7 @@ package com.facebook.presto.plugin.mysql; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import jakarta.validation.constraints.Min; import java.util.concurrent.TimeUnit; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlConfig.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlConfig.java index 543145fe12efb..1cda3184aa235 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlConfig.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.plugin.mysql; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java index 58446b0682622..906997a293c6d 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.mysql; +import com.facebook.airlift.units.Duration; import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.QueryRunner; import com.facebook.presto.testing.mysql.MySqlOptions; @@ -21,7 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.tpch.TpchTable; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Optional; import org.testng.annotations.Test; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java index 789f934b9607f..e173298708c5b 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.mysql; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.MaterializedRow; @@ -23,7 +24,6 @@ import com.facebook.presto.tests.DistributedQueryRunner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java index 95a6f16acc707..e22ae0fe43fc0 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.plugin.mysql; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.type.TimeZoneKey; import com.facebook.presto.common.type.VarcharType; @@ -28,7 +29,6 @@ import com.facebook.presto.tests.sql.PrestoSqlExecutor; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/presto-native-sidecar-plugin/pom.xml b/presto-native-sidecar-plugin/pom.xml index 06e49dccc2aeb..cd35eaa347f48 100644 --- a/presto-native-sidecar-plugin/pom.xml +++ b/presto-native-sidecar-plugin/pom.xml @@ -84,7 +84,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarPlugin.java b/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarPlugin.java index 6a8e0988496e4..2e25e413e3b21 100644 --- a/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarPlugin.java +++ b/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarPlugin.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.sidecar; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils; import com.facebook.presto.sidecar.functionNamespace.FunctionDefinitionProvider; import com.facebook.presto.sidecar.functionNamespace.NativeFunctionDefinitionProvider; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; -import io.airlift.units.DataSize; import org.intellij.lang.annotations.Language; import org.testng.annotations.Test; @@ -43,6 +43,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.Utils.checkArgument; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.nativeworker.NativeQueryRunnerUtils.createLineitem; @@ -50,7 +51,6 @@ import static com.facebook.presto.nativeworker.NativeQueryRunnerUtils.createOrders; import static com.facebook.presto.nativeworker.NativeQueryRunnerUtils.createOrdersEx; import static com.facebook.presto.nativeworker.NativeQueryRunnerUtils.createRegion; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-node-ttl-fetchers/pom.xml b/presto-node-ttl-fetchers/pom.xml index 758fc1f1191aa..1b2d3758be4e5 100644 --- a/presto-node-ttl-fetchers/pom.xml +++ b/presto-node-ttl-fetchers/pom.xml @@ -40,7 +40,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-open-telemetry/pom.xml b/presto-open-telemetry/pom.xml index 8ecfae1cb738b..a44a9155504f4 100644 --- a/presto-open-telemetry/pom.xml +++ b/presto-open-telemetry/pom.xml @@ -94,7 +94,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-oracle/pom.xml b/presto-oracle/pom.xml index 79de1d457b662..6e7fd89cc84de 100644 --- a/presto-oracle/pom.xml +++ b/presto-oracle/pom.xml @@ -91,7 +91,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-orc/pom.xml b/presto-orc/pom.xml index 22c7eafc38b55..ac1cbe89f3058 100644 --- a/presto-orc/pom.xml +++ b/presto-orc/pom.xml @@ -32,7 +32,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcDataSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcDataSource.java index 70e7c5dbd1665..8bb34c4672030 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcDataSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcDataSource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; import io.airlift.slice.BasicSliceInput; import io.airlift.slice.ChunkedSliceInput; @@ -21,7 +22,6 @@ import io.airlift.slice.FixedLengthSliceInput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java index 0d0a07ada9b96..048f9465424fc 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/AbstractOrcRecordReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.Subfield; @@ -37,7 +38,6 @@ import com.google.common.io.Closer; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.joda.time.DateTimeZone; import org.openjdk.jol.info.ClassLayout; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/ColumnWriterOptions.java b/presto-orc/src/main/java/com/facebook/presto/orc/ColumnWriterOptions.java index 7b4cd44d37e7f..97199f41bc4df 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/ColumnWriterOptions.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/ColumnWriterOptions.java @@ -13,15 +13,16 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.CompressionKind; import com.facebook.presto.orc.writer.CompressionBufferPool; import com.facebook.presto.orc.writer.CompressionBufferPool.LastUsedCompressionBufferPool; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import java.util.OptionalInt; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_LAZY_OUTPUT_BUFFER; import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_MAX_COMPRESSION_BUFFER_SIZE; import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_MAX_FLATTENED_MAP_KEY_COUNT; @@ -31,7 +32,6 @@ import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_PRESERVE_DIRECT_ENCODING_STRIPE_COUNT; import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_RESET_OUTPUT_BUFFER; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/DefaultOrcWriterFlushPolicy.java b/presto-orc/src/main/java/com/facebook/presto/orc/DefaultOrcWriterFlushPolicy.java index 8c8886f464f45..21b8f34dbb952 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/DefaultOrcWriterFlushPolicy.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/DefaultOrcWriterFlushPolicy.java @@ -13,17 +13,17 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; -import io.airlift.units.DataSize; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.FlushReason.DICTIONARY_FULL; import static com.facebook.presto.orc.FlushReason.MAX_BYTES; import static com.facebook.presto.orc.FlushReason.MAX_ROWS; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.max; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/DictionaryCompressionOptimizer.java b/presto-orc/src/main/java/com/facebook/presto/orc/DictionaryCompressionOptimizer.java index 890f9f913f9eb..87c68dcf1751c 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/DictionaryCompressionOptimizer.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/DictionaryCompressionOptimizer.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Longs; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.Iterator; @@ -24,10 +24,10 @@ import java.util.OptionalInt; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; 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.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/DwrfStripeCacheOptions.java b/presto-orc/src/main/java/com/facebook/presto/orc/DwrfStripeCacheOptions.java index c9c302cd655aa..dae0ec6082e29 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/DwrfStripeCacheOptions.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/DwrfStripeCacheOptions.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.DwrfStripeCacheMode; -import io.airlift.units.DataSize; import static com.google.common.base.MoreObjects.toStringHelper; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java index ba024a0144037..fba3782fce65a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.orc; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import java.io.File; import java.io.FileNotFoundException; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSourceUtils.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSourceUtils.java index 0220d6727be88..e3d46b1625a9b 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSourceUtils.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSourceUtils.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.Collection; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcDecompressor.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcDecompressor.java index 1c046553b36b4..5882dfe4a46b3 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcDecompressor.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcDecompressor.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.CompressionKind; -import io.airlift.units.DataSize; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.metadata.CompressionKind.NONE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; public interface OrcDecompressor diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java index 5921070a41dfd..b156e1db7b55a 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.Subfield; import com.facebook.presto.common.block.Block; @@ -40,7 +41,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.joda.time.DateTimeZone; import java.io.IOException; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcReaderOptions.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcReaderOptions.java index cc59108e08b26..b6abfc7b54e5e 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcReaderOptions.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcReaderOptions.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.orc; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.google.common.base.MoreObjects.toStringHelper; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.Objects.requireNonNull; public class OrcReaderOptions diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReaderOptions.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReaderOptions.java index 7729d287f11f8..df2434bbe341b 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReaderOptions.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReaderOptions.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.orc; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java index b1fb7fe3ad46c..94e28d55b46df 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.io.DataOutput; import com.facebook.presto.common.io.DataSink; @@ -52,7 +53,6 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.ints.Int2LongMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; @@ -75,6 +75,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.io.DataOutput.createDataOutput; import static com.facebook.presto.orc.DwrfEncryptionInfo.UNENCRYPTED; import static com.facebook.presto.orc.DwrfEncryptionInfo.createNodeToGroupMap; @@ -96,7 +97,6 @@ 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.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Integer.min; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriterOptions.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriterOptions.java index e051d3434a6f6..97dd650361c63 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriterOptions.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriterOptions.java @@ -13,22 +13,22 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.DwrfStripeCacheMode; import com.facebook.presto.orc.writer.StreamLayoutFactory; import com.facebook.presto.orc.writer.StreamLayoutFactory.ColumnSizeLayoutFactory; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import java.util.Optional; import java.util.OptionalInt; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; public class OrcWriterOptions diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/cache/OrcCacheConfig.java b/presto-orc/src/main/java/com/facebook/presto/orc/cache/OrcCacheConfig.java index 9e07de77752fb..942029120b7bd 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/cache/OrcCacheConfig.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/cache/OrcCacheConfig.java @@ -15,14 +15,14 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.OrcDataSourceUtils.EXPECTED_FOOTER_SIZE_IN_BYTES; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.SECONDS; public class OrcCacheConfig diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfStripeCacheWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfStripeCacheWriter.java index 908beb33aca67..7fdada54195d9 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfStripeCacheWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfStripeCacheWriter.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.orc.metadata; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.io.DataOutput; import com.google.common.collect.ImmutableList; import io.airlift.slice.DynamicSliceOutput; -import io.airlift.units.DataSize; import java.util.ArrayList; import java.util.List; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java index d92ee4d9b6846..36ff1bb93650f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.metadata; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.RuntimeUnit; import com.facebook.presto.orc.DwrfEncryptionProvider; @@ -44,7 +45,6 @@ import com.sun.management.ThreadMXBean; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import java.io.IOException; import java.io.InputStream; @@ -57,6 +57,7 @@ import java.util.OptionalLong; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.orc.metadata.ColumnEncoding.DEFAULT_SEQUENCE_ID; import static com.facebook.presto.orc.metadata.CompressionKind.LZ4; import static com.facebook.presto.orc.metadata.CompressionKind.NONE; @@ -72,7 +73,6 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static io.airlift.slice.SliceUtf8.lengthOfCodePoint; import static io.airlift.slice.SliceUtf8.tryGetCodePointAt; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.lang.Character.MIN_SUPPLEMENTARY_CODE_POINT; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryColumnWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryColumnWriter.java index 1a5127356de08..7e45556452a72 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryColumnWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/writer/SliceDictionaryColumnWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.writer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.AbstractVariableWidthType; import com.facebook.presto.common.type.Type; @@ -30,20 +31,19 @@ import com.facebook.presto.orc.stream.PresentOutputStream; import com.facebook.presto.orc.stream.StreamDataOutput; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.ints.IntArrays; import org.openjdk.jol.info.ClassLayout; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.OrcEncoding.DWRF; import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; import static com.facebook.presto.orc.stream.LongOutputStream.createLengthOutputStream; 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 java.lang.Math.toIntExact; public class SliceDictionaryColumnWriter diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestDwrfStripeCaching.java b/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestDwrfStripeCaching.java index b0a4b6d0f1fa2..5c1790c1c18fe 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestDwrfStripeCaching.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestDwrfStripeCaching.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -26,7 +27,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.testng.annotations.AfterClass; import org.testng.annotations.DataProvider; @@ -39,6 +39,7 @@ import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; @@ -51,7 +52,6 @@ import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.FOOTER; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java index 457acb71be179..5391ffb9df6da 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.CharType; import com.facebook.presto.common.type.DecimalType; import com.facebook.presto.common.type.SqlDate; @@ -36,8 +38,6 @@ import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Range; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; import org.apache.hadoop.hive.serde2.SerDeException; @@ -59,6 +59,7 @@ import java.util.Random; import java.util.stream.Collectors; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.CharType.createCharType; @@ -86,7 +87,6 @@ import static com.google.common.collect.Iterables.cycle; import static com.google.common.collect.Iterables.limit; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.nCopies; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReaders.java b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReaders.java index 860584be4b7ca..8f6482f1ba9a1 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReaders.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReaders.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.DecimalType; @@ -24,7 +25,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -51,6 +51,7 @@ import java.util.Random; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.DecimalType.createDecimalType; import static com.facebook.presto.common.type.TimeZoneKey.UTC_KEY; import static com.facebook.presto.metadata.FunctionAndTypeManager.createTestFunctionAndTypeManager; @@ -64,7 +65,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.stream.Collectors.toList; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReadersWithZstd.java b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReadersWithZstd.java index fcf7c29a3d32f..5302611a1fa52 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReadersWithZstd.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkBatchStreamReadersWithZstd.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.DecimalType; @@ -24,7 +25,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -51,6 +51,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.DecimalType.createDecimalType; import static com.facebook.presto.common.type.TimeZoneKey.UTC_KEY; import static com.facebook.presto.metadata.FunctionAndTypeManager.createTestFunctionAndTypeManager; @@ -63,7 +64,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.stream.Collectors.toList; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkDictionaryWriter.java b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkDictionaryWriter.java index a0a02cf3ba5da..646a431fa7dcf 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkDictionaryWriter.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkDictionaryWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.type.Type; @@ -25,7 +26,6 @@ import com.facebook.presto.orc.writer.LongDictionaryColumnWriter; import com.facebook.presto.orc.writer.SliceDictionaryColumnWriter; import com.facebook.presto.orc.writer.SliceDirectColumnWriter; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -48,6 +48,7 @@ import java.util.OptionalInt; import java.util.Random; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.common.type.VarcharType.VARCHAR; @@ -56,7 +57,6 @@ import static com.facebook.presto.orc.metadata.ColumnEncoding.DEFAULT_SEQUENCE_ID; import static com.google.common.base.Preconditions.checkState; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.max; import static java.lang.Math.toIntExact; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java index d6701570e7234..36e403223a91d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/BenchmarkSelectiveStreamReaders.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.Subfield; @@ -37,7 +38,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.DataSize; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -69,6 +69,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.predicate.TupleDomainFilter.LongDecimalRange; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; @@ -92,7 +93,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/OrcReaderTestingUtils.java b/presto-orc/src/test/java/com/facebook/presto/orc/OrcReaderTestingUtils.java index db76d94148067..ee5106438d254 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/OrcReaderTestingUtils.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/OrcReaderTestingUtils.java @@ -13,14 +13,14 @@ */ package com.facebook.presto.orc; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.StandardCopyOption; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class OrcReaderTestingUtils { diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java index 1018c310c5619..10faad504f0dc 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.hive.orc.lazy.OrcLazyObject; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; @@ -60,8 +62,6 @@ import com.google.common.collect.Maps; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.type.HiveChar; @@ -128,6 +128,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.hive.orc.OrcConf.ConfVars.HIVE_ORC_BUILD_STRIDE_DICTIONARY; import static com.facebook.hive.orc.OrcConf.ConfVars.HIVE_ORC_COMPRESSION; import static com.facebook.hive.orc.OrcConf.ConfVars.HIVE_ORC_DICTIONARY_ENCODING_INTERVAL; @@ -175,8 +177,6 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.Lists.newArrayList; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Math.toIntExact; import static java.util.Arrays.asList; import static java.util.Objects.requireNonNull; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestCachingOrcDataSource.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestCachingOrcDataSource.java index 6e866d7ee5ecb..40052742cffd8 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestCachingOrcDataSource.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestCachingOrcDataSource.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; import com.facebook.presto.orc.OrcTester.Format; @@ -21,8 +23,6 @@ import com.facebook.presto.orc.metadata.StripeInformation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.FileSinkOperator; import org.apache.hadoop.hive.ql.io.IOConstants; @@ -45,6 +45,7 @@ import static com.facebook.airlift.testing.Assertions.assertGreaterThanOrEqual; import static com.facebook.airlift.testing.Assertions.assertInstanceOf; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.orc.AbstractOrcRecordReader.LinearProbeRangeFinder.createTinyStripesRangeFinder; import static com.facebook.presto.orc.AbstractOrcRecordReader.wrapWithCacheIfTinyStripes; @@ -58,7 +59,6 @@ import static com.facebook.presto.orc.metadata.CompressionKind.NONE; import static com.facebook.presto.orc.metadata.CompressionKind.ZLIB; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory.javaStringObjectInspector; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnStatistics.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnStatistics.java index 2057f2e384080..1c1e584721d4d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnStatistics.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnStatistics.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.ArrayBlockBuilder; @@ -50,7 +51,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; @@ -73,6 +73,7 @@ import java.util.Optional; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.DoubleType.DOUBLE; @@ -96,7 +97,6 @@ import static com.facebook.presto.orc.writer.ColumnWriter.NULL_SIZE; import static com.google.common.base.Preconditions.checkArgument; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.stream.Collectors.toList; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnWriterOptions.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnWriterOptions.java index d7559dd942608..3f14614d609df 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnWriterOptions.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestColumnWriterOptions.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.CompressionKind; import com.facebook.presto.orc.writer.CompressionBufferPool; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.OptionalInt; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestDecryption.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestDecryption.java index 4bee9227222b5..73412b64e584f 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestDecryption.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestDecryption.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.Subfield; import com.facebook.presto.common.type.Type; @@ -29,7 +30,6 @@ import com.google.common.collect.Sets; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; @@ -43,6 +43,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.orc.AbstractOrcRecordReader.getDecryptionKeyMetadata; @@ -69,7 +70,6 @@ import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_INDEX; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.testng.Assert.assertEquals; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestDefaultOrcWriterFlushPolicy.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestDefaultOrcWriterFlushPolicy.java index b06cf4c7500be..3d757616e93b8 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestDefaultOrcWriterFlushPolicy.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestDefaultOrcWriterFlushPolicy.java @@ -13,15 +13,15 @@ */ package com.facebook.presto.orc; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.orc.FlushReason.DICTIONARY_FULL; import static com.facebook.presto.orc.FlushReason.MAX_BYTES; import static com.facebook.presto.orc.FlushReason.MAX_ROWS; -import static io.airlift.units.DataSize.Unit.BYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryColumnWriter.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryColumnWriter.java index ece5108ebfffb..6116bccb623e8 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryColumnWriter.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryColumnWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -25,7 +26,6 @@ import com.facebook.presto.orc.writer.SliceDictionaryColumnWriter; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; @@ -37,6 +37,7 @@ import java.util.Random; import java.util.UUID; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.common.type.StandardTypes.ARRAY; @@ -61,7 +62,6 @@ import static com.google.common.collect.Lists.newArrayList; import static io.airlift.slice.SizeOf.SIZE_OF_BYTE; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryCompressionOptimizer.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryCompressionOptimizer.java index 2434f7ea61c6b..dda93533c0c7f 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryCompressionOptimizer.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestDictionaryCompressionOptimizer.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.orc.DictionaryCompressionOptimizer.DictionaryColumn; import com.google.common.collect.ImmutableSet; import com.google.common.math.IntMath; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import org.testng.annotations.Test; import java.util.List; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestDwrfStripeCacheOptions.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestDwrfStripeCacheOptions.java index 408d9e6b098e5..5b1d7af11b2ca 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestDwrfStripeCacheOptions.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestDwrfStripeCacheOptions.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.orc; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import org.testng.annotations.Test; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; public class TestDwrfStripeCacheOptions diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestLongDictionaryProvider.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestLongDictionaryProvider.java index 748b4ec86e47d..13d7d19df9232 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestLongDictionaryProvider.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestLongDictionaryProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.StreamDescriptorFactory.AllStreams; import com.facebook.presto.orc.StreamDescriptorFactory.StreamProperty; import com.facebook.presto.orc.checkpoint.StreamCheckpoint; @@ -33,7 +34,6 @@ import com.google.common.collect.ImmutableSet; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -44,6 +44,7 @@ import java.util.Optional; import java.util.Set; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.orc.OrcDecompressor.createOrcDecompressor; import static com.facebook.presto.orc.checkpoint.Checkpoints.getDictionaryStreamCheckpoint; import static com.facebook.presto.orc.metadata.ColumnEncoding.DEFAULT_SEQUENCE_ID; @@ -51,7 +52,6 @@ import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.LONG; import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; import static com.facebook.presto.orc.stream.CheckpointInputStreamSource.createCheckpointStreamSource; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestMapFlatBatchStreamReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestMapFlatBatchStreamReader.java index f1868a0b79c6e..19a44b2bffdc5 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestMapFlatBatchStreamReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestMapFlatBatchStreamReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.BigintType; @@ -34,7 +35,6 @@ import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.nio.charset.StandardCharsets; @@ -47,6 +47,7 @@ import java.util.Optional; import java.util.function.Function; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.common.type.VarcharType.VARCHAR; @@ -62,7 +63,6 @@ import static com.facebook.presto.orc.TestingOrcPredicate.createOrcPredicate; import static com.facebook.presto.testing.TestingConnectorSession.SESSION; import static com.google.common.collect.Iterators.advance; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcCacheConfig.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcCacheConfig.java index db34fcf7f03bf..139667136d92c 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcCacheConfig.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcCacheConfig.java @@ -14,18 +14,18 @@ package com.facebook.presto.orc; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.orc.cache.OrcCacheConfig; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.OrcDataSourceUtils.EXPECTED_FOOTER_SIZE_IN_BYTES; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcDataSourceUtils.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcDataSourceUtils.java index 422c838ef3052..d50222b787425 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcDataSourceUtils.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcDataSourceUtils.java @@ -13,15 +13,15 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.List; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.orc.OrcDataSourceUtils.mergeAdjacentDiskRanges; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static org.testng.Assert.assertEquals; public class TestOrcDataSourceUtils diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcFileIntrospection.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcFileIntrospection.java index 283b5d1c2f67b..b632d8fb2f6e0 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcFileIntrospection.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcFileIntrospection.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.BlockBuilder; @@ -22,7 +23,6 @@ import com.facebook.presto.orc.metadata.RowGroupIndex; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.joda.time.DateTimeZone; import org.testng.annotations.Test; @@ -32,12 +32,12 @@ import java.util.Map; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; import static com.facebook.presto.orc.NoopOrcAggregatedMemoryContext.NOOP_ORC_AGGREGATED_MEMORY_CONTEXT; import static com.facebook.presto.orc.OrcTester.createOrcWriter; import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_INDEX; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcLz4.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcLz4.java index d24db8e968952..8e96da3ae164e 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcLz4.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcLz4.java @@ -13,17 +13,18 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.joda.time.DateTimeZone; import org.testng.annotations.Test; import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; @@ -33,7 +34,6 @@ import static com.facebook.presto.orc.metadata.CompressionKind.LZ4; import static com.google.common.io.Resources.getResource; import static com.google.common.io.Resources.toByteArray; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcOutputBuffer.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcOutputBuffer.java index c63fa0cda73e8..5dd40f444064d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcOutputBuffer.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcOutputBuffer.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.CompressionKind; import com.facebook.presto.orc.stream.SharedBuffer; import com.facebook.presto.orc.writer.CompressionBufferPool; @@ -20,7 +21,6 @@ import io.airlift.slice.BasicSliceInput; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.ByteArrayInputStream; @@ -33,13 +33,13 @@ import java.util.Optional; import java.util.OptionalInt; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.common.array.Arrays.ensureCapacity; import static com.facebook.presto.orc.NoopOrcLocalMemoryContext.NOOP_ORC_LOCAL_MEMORY_CONTEXT; import static com.facebook.presto.orc.metadata.CompressionKind.ZSTD; import static io.airlift.slice.Slices.EMPTY_SLICE; import static io.airlift.slice.Slices.wrappedBuffer; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.util.Collections.reverse; import static java.util.stream.Collectors.toList; import static org.testng.Assert.assertEquals; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderDwrfStripeCaching.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderDwrfStripeCaching.java index b0c5a23b710f7..9d91f687f9e7d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderDwrfStripeCaching.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderDwrfStripeCaching.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.orc.StripeReader.StripeId; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.orc.metadata.DwrfStripeCache; import com.facebook.presto.orc.proto.DwrfProto; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.File; @@ -28,10 +28,10 @@ import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.NoopOrcAggregatedMemoryContext.NOOP_ORC_AGGREGATED_MEMORY_CONTEXT; import static com.facebook.presto.orc.OrcEncoding.DWRF; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderPositions.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderPositions.java index ebabdcb292f46..22c001f42d812 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderPositions.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReaderPositions.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; @@ -29,7 +30,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.FileSinkOperator; @@ -54,6 +54,7 @@ import java.util.Map; import java.util.stream.LongStream; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; @@ -68,7 +69,6 @@ import static com.facebook.presto.orc.OrcTester.createCustomOrcSelectiveRecordReader; import static com.facebook.presto.orc.OrcTester.createOrcRecordWriter; import static com.facebook.presto.orc.OrcTester.createSettableStructObjectInspector; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.min; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.hive.ql.io.orc.CompressionKind.SNAPPY; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcRecordReaderDwrfStripeCaching.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcRecordReaderDwrfStripeCaching.java index 9d19cfb8b4521..120eca9c4f2f4 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcRecordReaderDwrfStripeCaching.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcRecordReaderDwrfStripeCaching.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; @@ -21,7 +22,6 @@ import com.facebook.presto.orc.proto.DwrfProto; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.File; @@ -29,6 +29,7 @@ import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.NoopOrcAggregatedMemoryContext.NOOP_ORC_AGGREGATED_MEMORY_CONTEXT; @@ -38,7 +39,6 @@ import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.FOOTER; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java index 366c0eb96b211..96775cf88fb91 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -29,7 +30,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -46,6 +46,7 @@ import java.util.stream.Collectors; import static com.facebook.airlift.testing.Assertions.assertGreaterThanOrEqual; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; @@ -58,7 +59,6 @@ import static com.facebook.presto.orc.metadata.CompressionKind.NONE; import static com.facebook.presto.orc.metadata.CompressionKind.ZLIB; import static com.facebook.presto.orc.metadata.CompressionKind.ZSTD; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriterOptions.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriterOptions.java index 8b02f9c55f801..0bfa1a81d2738 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriterOptions.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriterOptions.java @@ -13,21 +13,21 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.metadata.DwrfStripeCacheMode; import com.facebook.presto.orc.writer.StreamLayoutFactory; import com.facebook.presto.orc.writer.StreamLayoutFactory.ColumnSizeLayoutFactory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Optional; import java.util.OptionalInt; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestReadBloomFilter.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestReadBloomFilter.java index ff99f871fdd49..c50401bacffbb 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestReadBloomFilter.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestReadBloomFilter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.predicate.NullableValue; import com.facebook.presto.common.type.SqlVarbinary; @@ -20,13 +21,13 @@ import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.predicate.TupleDomain.fromFixedValues; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.DoubleType.DOUBLE; @@ -48,7 +49,6 @@ import static com.google.common.collect.Iterables.limit; import static com.google.common.collect.Lists.newArrayList; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.nio.charset.StandardCharsets.UTF_8; import static org.testng.Assert.assertEquals; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestStorageOrcFileTailSource.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestStorageOrcFileTailSource.java index abb3ce0f52723..3a5e1ae048196 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestStorageOrcFileTailSource.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestStorageOrcFileTailSource.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.orc.metadata.DwrfMetadataReader; @@ -23,7 +24,6 @@ import com.facebook.presto.orc.protobuf.AbstractMessageLite; import com.facebook.presto.orc.protobuf.InvalidProtocolBufferException; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,11 +34,11 @@ import java.io.OutputStream; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.OrcReader.MODIFICATION_TIME_NOT_SET; import static com.facebook.presto.orc.metadata.DwrfStripeCacheMode.INDEX_AND_FOOTER; import static com.facebook.presto.orc.proto.DwrfProto.CompressionKind.NONE; import static com.facebook.presto.orc.proto.DwrfProto.StripeCacheMode.BOTH; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestStreamLayout.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestStreamLayout.java index 9c26584f82e1a..3a1d17f723af1 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestStreamLayout.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestStreamLayout.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.BlockBuilder; @@ -37,7 +38,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.joda.time.DateTimeZone; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -56,6 +56,7 @@ import java.util.Random; import java.util.SortedMap; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.IntegerType.INTEGER; import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; import static com.facebook.presto.orc.NoopOrcAggregatedMemoryContext.NOOP_ORC_AGGREGATED_MEMORY_CONTEXT; @@ -70,7 +71,6 @@ import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Collections.shuffle; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java index 996398b2e8e01..26c222373e096 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java @@ -14,6 +14,7 @@ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.block.Block; @@ -32,7 +33,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,6 +46,7 @@ import java.util.Map; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.metadata.FunctionAndTypeManager.createTestFunctionAndTypeManager; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; @@ -57,7 +58,6 @@ import static com.facebook.presto.orc.TestingOrcPredicate.ORC_ROW_GROUP_SIZE; import static com.facebook.presto.orc.TestingOrcPredicate.ORC_STRIPE_SIZE; import static com.facebook.presto.orc.metadata.CompressionKind.NONE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.joda.time.DateTimeZone.UTC; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestZstdJniDecompression.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestZstdJniDecompression.java index 9ebbe26154ebc..67bc1fc866e5a 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestZstdJniDecompression.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestZstdJniDecompression.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.orc; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.zstd.ZstdJniCompressor; import com.facebook.presto.testing.assertions.Assert; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/TestDwrfMetadataReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/TestDwrfMetadataReader.java index dad519788cb9c..b560b0001f96e 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/metadata/TestDwrfMetadataReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/metadata/TestDwrfMetadataReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.metadata; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.orc.DwrfEncryptionProvider; import com.facebook.presto.orc.DwrfKeyProvider; @@ -30,7 +31,6 @@ import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -42,6 +42,7 @@ import java.util.Optional; import java.util.OptionalLong; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.orc.metadata.OrcMetadataReader.maxStringTruncateToValidRange; import static com.facebook.presto.orc.metadata.OrcMetadataReader.minStringTruncateToValidRange; import static com.facebook.presto.orc.metadata.TestOrcMetadataReader.ALL_UTF8_SEQUENCES; @@ -49,7 +50,6 @@ import static com.facebook.presto.orc.metadata.TestOrcMetadataReader.concatSlice; import static com.facebook.presto.orc.proto.DwrfProto.Stream.Kind.DATA; import static io.airlift.slice.SliceUtf8.codePointToUtf8; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/reader/TestMaxSliceReadSize.java b/presto-orc/src/test/java/com/facebook/presto/orc/reader/TestMaxSliceReadSize.java index 2d69467df5e77..2737a368c37a1 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/reader/TestMaxSliceReadSize.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/reader/TestMaxSliceReadSize.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.reader; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.GenericInternalException; import com.facebook.presto.common.Page; import com.facebook.presto.common.RuntimeStats; @@ -32,20 +33,19 @@ import com.facebook.presto.orc.metadata.CompressionKind; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.VarbinaryType.VARBINARY; import static com.facebook.presto.orc.DwrfEncryptionProvider.NO_ENCRYPTION; import static com.facebook.presto.orc.NoOpOrcWriterStats.NOOP_WRITER_STATS; import static com.facebook.presto.orc.NoopOrcAggregatedMemoryContext.NOOP_ORC_AGGREGATED_MEMORY_CONTEXT; import static com.facebook.presto.orc.OrcTester.Format.DWRF; import static com.facebook.presto.orc.OrcTester.HIVE_STORAGE_TIME_ZONE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.expectThrows; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/stream/AbstractTestValueStream.java b/presto-orc/src/test/java/com/facebook/presto/orc/stream/AbstractTestValueStream.java index 44c47b602ca12..edbea91af5c64 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/stream/AbstractTestValueStream.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/stream/AbstractTestValueStream.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.stream; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.ColumnWriterOptions; import com.facebook.presto.orc.OrcCorruptionException; import com.facebook.presto.orc.OrcDataSourceId; @@ -22,17 +23,16 @@ import com.facebook.presto.orc.metadata.Stream.StreamKind; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import java.io.IOException; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.orc.OrcDecompressor.createOrcDecompressor; import static com.facebook.presto.orc.metadata.ColumnEncoding.DEFAULT_SEQUENCE_ID; import static com.facebook.presto.orc.metadata.CompressionKind.SNAPPY; import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static java.lang.Math.toIntExact; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/stream/TestBooleanOutputStream.java b/presto-orc/src/test/java/com/facebook/presto/orc/stream/TestBooleanOutputStream.java index a55bd1331b9a7..4ef8b267dd704 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/stream/TestBooleanOutputStream.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/stream/TestBooleanOutputStream.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.stream; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.orc.ColumnWriterOptions; import com.facebook.presto.orc.OrcOutputBuffer; import com.facebook.presto.orc.checkpoint.BooleanStreamCheckpoint; @@ -20,14 +21,13 @@ import com.google.common.collect.ImmutableList; import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; import static com.facebook.presto.orc.metadata.CompressionKind.NONE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestSliceDictionaryColumnWriter.java b/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestSliceDictionaryColumnWriter.java index 68a93491494a6..0278d2cc151a8 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestSliceDictionaryColumnWriter.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestSliceDictionaryColumnWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.writer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.block.RunLengthEncodedBlock; @@ -34,7 +35,6 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; @@ -43,6 +43,8 @@ import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.VarcharType.VARCHAR; import static com.facebook.presto.orc.OrcDecompressor.createOrcDecompressor; import static com.facebook.presto.orc.OrcEncoding.DWRF; @@ -53,8 +55,6 @@ import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; import static com.google.common.collect.MoreCollectors.onlyElement; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.nio.charset.StandardCharsets.UTF_8; import static org.testng.Assert.assertEquals; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestWriterBlockRawSize.java b/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestWriterBlockRawSize.java index 50b00bc3d2cc8..1a59510206701 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestWriterBlockRawSize.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/writer/TestWriterBlockRawSize.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.writer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -35,7 +36,6 @@ import com.facebook.presto.orc.metadata.OrcType; import com.facebook.presto.orc.metadata.StripeInformation; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -45,6 +45,8 @@ import java.util.OptionalInt; import java.util.OptionalLong; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.DoubleType.DOUBLE; @@ -62,8 +64,6 @@ import static com.facebook.presto.orc.metadata.ColumnEncoding.DEFAULT_SEQUENCE_ID; import static com.facebook.presto.orc.metadata.CompressionKind.ZSTD; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/presto-parquet/pom.xml b/presto-parquet/pom.xml index aeebbd67b0e8c..8397aee7900d1 100644 --- a/presto-parquet/pom.xml +++ b/presto-parquet/pom.xml @@ -47,7 +47,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/cache/ParquetCacheConfig.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/cache/ParquetCacheConfig.java index f16d553c11150..d1be867be56cd 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/cache/ParquetCacheConfig.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/cache/ParquetCacheConfig.java @@ -15,12 +15,12 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDataSize; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDataSize; +import com.facebook.airlift.units.MinDuration; -import static io.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static java.util.concurrent.TimeUnit.SECONDS; public class ParquetCacheConfig diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java index 197d2f6a92d5a..133b069c68df4 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/reader/ParquetReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.parquet.reader; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.ArrayBlock; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -38,7 +39,6 @@ import com.facebook.presto.parquet.predicate.Predicate; import com.facebook.presto.parquet.predicate.TupleDomainParquetPredicate; import com.facebook.presto.parquet.reader.ColumnIndexFilterUtils.OffsetRange; -import io.airlift.units.DataSize; import it.unimi.dsi.fastutil.booleans.BooleanArrayList; import it.unimi.dsi.fastutil.booleans.BooleanList; import it.unimi.dsi.fastutil.ints.IntArrayList; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java index 5003212854dc8..456fd89bf41e4 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.parquet.writer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; import com.facebook.presto.parquet.writer.ColumnWriter.BufferData; @@ -22,7 +23,6 @@ import io.airlift.slice.OutputStreamSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.apache.parquet.column.ParquetProperties; import org.apache.parquet.column.ParquetProperties.Builder; import org.apache.parquet.format.ColumnMetaData; diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriterOptions.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriterOptions.java index 967201e27ceb4..63cd380cd00e5 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriterOptions.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetWriterOptions.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.parquet.writer; -import io.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize; import org.apache.parquet.column.ParquetProperties.WriterVersion; import static java.lang.Math.toIntExact; diff --git a/presto-parquet/src/test/java/com/facebook/presto/parquet/BenchmarkParquetReader.java b/presto-parquet/src/test/java/com/facebook/presto/parquet/BenchmarkParquetReader.java index c1b56956e16cf..bc9512312a4df 100644 --- a/presto-parquet/src/test/java/com/facebook/presto/parquet/BenchmarkParquetReader.java +++ b/presto-parquet/src/test/java/com/facebook/presto/parquet/BenchmarkParquetReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.parquet; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.DecimalType; @@ -23,7 +24,6 @@ import com.facebook.presto.parquet.cache.MetadataReader; import com.facebook.presto.parquet.reader.ParquetReader; import com.google.common.base.Strings; -import io.airlift.units.DataSize; import org.apache.parquet.hadoop.metadata.ParquetMetadata; import org.apache.parquet.io.ColumnIOConverter; import org.apache.parquet.io.MessageColumnIO; @@ -54,6 +54,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.IntegerType.INTEGER; @@ -63,7 +64,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-parquet/src/test/java/com/facebook/presto/parquet/ParquetTestUtils.java b/presto-parquet/src/test/java/com/facebook/presto/parquet/ParquetTestUtils.java index e143ff35c691d..c03ccadac93c8 100644 --- a/presto-parquet/src/test/java/com/facebook/presto/parquet/ParquetTestUtils.java +++ b/presto-parquet/src/test/java/com/facebook/presto/parquet/ParquetTestUtils.java @@ -14,6 +14,7 @@ package com.facebook.presto.parquet; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.CharType; import com.facebook.presto.common.type.DateType; @@ -28,7 +29,6 @@ import com.facebook.presto.spi.PrestoException; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; @@ -77,6 +77,8 @@ import java.util.List; import java.util.Properties; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.DoubleType.DOUBLE; @@ -84,8 +86,6 @@ import static com.facebook.presto.common.type.RealType.REAL; import static com.facebook.presto.common.type.TimestampType.TIMESTAMP; import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; diff --git a/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/BenchmarkDecimalColumnBatchReader.java b/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/BenchmarkDecimalColumnBatchReader.java index a825348a94248..b189031ab5fd2 100644 --- a/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/BenchmarkDecimalColumnBatchReader.java +++ b/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/BenchmarkDecimalColumnBatchReader.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.parquet.reader; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.DecimalType; import com.facebook.presto.common.type.Type; @@ -20,7 +21,6 @@ import com.facebook.presto.parquet.Field; import com.facebook.presto.parquet.FileParquetDataSource; import com.facebook.presto.parquet.cache.MetadataReader; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.parquet.column.ParquetProperties.WriterVersion; @@ -63,6 +63,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; import static com.facebook.presto.parquet.BenchmarkParquetReader.ROWS; import static com.facebook.presto.parquet.ParquetTypeUtils.getColumnIO; @@ -72,7 +73,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.time.format.DateTimeFormatter.ISO_DATE_TIME; import static java.util.UUID.randomUUID; diff --git a/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestEncryption.java b/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestEncryption.java index 8a792562608f6..9b6235bfc3a77 100644 --- a/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestEncryption.java +++ b/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestEncryption.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.parquet.reader; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.MapType; @@ -27,7 +28,6 @@ import com.facebook.presto.parquet.cache.MetadataReader; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; diff --git a/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestLargeRowGroup.java b/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestLargeRowGroup.java index 1d9e8d00f933d..c5d3d88cf2b67 100644 --- a/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestLargeRowGroup.java +++ b/presto-parquet/src/test/java/com/facebook/presto/parquet/reader/TestLargeRowGroup.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.parquet.reader; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.parquet.Field; import com.facebook.presto.parquet.ParquetDataSourceId; import com.facebook.presto.parquet.cache.MetadataReader; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; diff --git a/presto-parquet/src/test/java/com/facebook/presto/parquet/writer/TestParquetWriter.java b/presto-parquet/src/test/java/com/facebook/presto/parquet/writer/TestParquetWriter.java index 4e3a4583dfe12..2ea82c3ecfb45 100644 --- a/presto-parquet/src/test/java/com/facebook/presto/parquet/writer/TestParquetWriter.java +++ b/presto-parquet/src/test/java/com/facebook/presto/parquet/writer/TestParquetWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.parquet.writer; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.PageBuilder; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.DecimalType; @@ -25,7 +26,6 @@ import com.facebook.presto.parquet.cache.MetadataReader; import com.facebook.presto.parquet.reader.ParquetReader; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.hadoop.metadata.ParquetMetadata; import org.apache.parquet.io.ColumnIOConverter; @@ -44,6 +44,7 @@ import java.util.Optional; import java.util.Random; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.block.MethodHandleUtil.nativeValueGetter; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; @@ -61,7 +62,6 @@ import static com.google.common.io.Files.createTempDir; import static com.google.common.io.MoreFiles.deleteRecursively; import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.UUID.randomUUID; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/presto-password-authenticators/pom.xml b/presto-password-authenticators/pom.xml index 2e1995f91f2e1..05a3e084593dd 100644 --- a/presto-password-authenticators/pom.xml +++ b/presto-password-authenticators/pom.xml @@ -91,7 +91,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java b/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java index fc2c94f2c3eac..5e2deab7ab19b 100644 --- a/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java +++ b/presto-password-authenticators/src/main/java/com/facebook/presto/password/file/FileConfig.java @@ -16,8 +16,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java b/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java index fe2280474d29f..667ca796339af 100644 --- a/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java +++ b/presto-password-authenticators/src/main/java/com/facebook/presto/password/ldap/LdapConfig.java @@ -15,7 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; diff --git a/presto-password-authenticators/src/test/java/com/facebook/presto/password/file/TestFileConfig.java b/presto-password-authenticators/src/test/java/com/facebook/presto/password/file/TestFileConfig.java index 20c63bd07c885..490446292c9d1 100644 --- a/presto-password-authenticators/src/test/java/com/facebook/presto/password/file/TestFileConfig.java +++ b/presto-password-authenticators/src/test/java/com/facebook/presto/password/file/TestFileConfig.java @@ -14,8 +14,8 @@ */ package com.facebook.presto.password.file; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java b/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java index 4f92e9d30b410..0a8bb77594e12 100644 --- a/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java +++ b/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java @@ -14,8 +14,8 @@ */ package com.facebook.presto.password.ldap; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import org.testng.annotations.Test; diff --git a/presto-pinot-toolkit/pom.xml b/presto-pinot-toolkit/pom.xml index 93c53e09ccaf9..335d50f30a128 100644 --- a/presto-pinot-toolkit/pom.xml +++ b/presto-pinot-toolkit/pom.xml @@ -491,7 +491,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java index c514877da4813..2a3f4e2bf64ac 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java @@ -15,13 +15,13 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigSecuritySensitive; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.base.Splitter.MapSplitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; @@ -31,10 +31,10 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.pinot.PinotErrorCode.PINOT_INVALID_CONFIGURATION; import static com.facebook.presto.pinot.PinotPushdownUtils.PINOT_DISTINCT_COUNT_FUNCTION_NAME; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.MEGABYTE; public class PinotConfig { diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java index 112daf04cac43..3d6bd2a3ccdf9 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotModule.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.pinot; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.pinot.auth.PinotBrokerAuthenticationProvider; @@ -23,8 +25,6 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.concurrent.Executor; @@ -35,9 +35,9 @@ import static com.facebook.airlift.json.JsonBinder.jsonBinder; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; import static com.facebook.airlift.json.JsonCodecBinder.jsonCodecBinder; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.TypeSignature.parseTypeSignature; import static com.google.common.base.Preconditions.checkArgument; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotClusterInfoFetcher.java b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotClusterInfoFetcher.java index 33365ab5a380d..f2da58f799854 100644 --- a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotClusterInfoFetcher.java +++ b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotClusterInfoFetcher.java @@ -18,13 +18,13 @@ import com.facebook.airlift.http.client.HttpStatus; import com.facebook.airlift.http.client.testing.TestingHttpClient; import com.facebook.airlift.http.client.testing.TestingResponse; +import com.facebook.airlift.units.Duration; import com.facebook.presto.pinot.auth.PinotBrokerAuthenticationProvider; import com.facebook.presto.pinot.auth.PinotControllerAuthenticationProvider; import com.facebook.presto.pinot.auth.none.PinotEmptyAuthenticationProvider; import com.facebook.presto.testing.assertions.Assert; import com.google.common.collect.ImmutableSet; import com.google.common.net.MediaType; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.concurrent.TimeUnit; diff --git a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java index cbb3bcb585f33..436b1865b849f 100644 --- a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java +++ b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.pinot; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-pinot/pom.xml b/presto-pinot/pom.xml index d9222168ef66e..1c8e1247d2807 100644 --- a/presto-pinot/pom.xml +++ b/presto-pinot/pom.xml @@ -85,7 +85,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-plan-checker-router-plugin/pom.xml b/presto-plan-checker-router-plugin/pom.xml index e62baad8607d5..f28a3060deb81 100644 --- a/presto-plan-checker-router-plugin/pom.xml +++ b/presto-plan-checker-router-plugin/pom.xml @@ -55,7 +55,7 @@ - io.airlift + com.facebook.airlift units provided @@ -107,7 +107,7 @@ - com.facebook.drift + com.facebook.airlift.drift drift-api provided diff --git a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/HttpRequestSessionContext.java b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/HttpRequestSessionContext.java index 08e6144231025..222c81e5d8aae 100644 --- a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/HttpRequestSessionContext.java +++ b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/HttpRequestSessionContext.java @@ -14,6 +14,8 @@ package com.facebook.presto.router.scheduler; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.common.transaction.TransactionId; import com.facebook.presto.spi.function.SqlFunctionId; @@ -28,11 +30,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.security.Principal; import java.util.Collection; import java.util.HashMap; @@ -67,6 +65,8 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.net.HttpHeaders.USER_AGENT; import static java.lang.String.format; +import static java.net.URLDecoder.decode; +import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.emptyList; import static java.util.Locale.ROOT; import static java.util.Objects.requireNonNull; @@ -316,6 +316,7 @@ private static Map> normalizeHeaderMap(Map parseSessionHeaders(Map> headerMap) { return parseProperty(headerMap, PRESTO_SESSION); @@ -492,12 +493,7 @@ private static String trimEmptyToNull(String value) private static String urlDecode(String value) { - try { - return URLDecoder.decode(value, "UTF-8"); - } - catch (UnsupportedEncodingException e) { - throw new AssertionError(e); - } + return decode(value, UTF_8); } private Set parseClientTags() diff --git a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginConfig.java b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginConfig.java index 62dc47bbfa05e..96a5705286970 100644 --- a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginConfig.java +++ b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginConfig.java @@ -14,10 +14,10 @@ package com.facebook.presto.router.scheduler; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.base.Splitter; import com.google.common.collect.Streams; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import java.net.URI; import java.util.List; diff --git a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java index 613f5cb886307..eef555b6ca1e0 100644 --- a/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java +++ b/presto-plan-checker-router-plugin/src/main/java/com/facebook/presto/router/scheduler/PlanCheckerRouterPluginPrestoClient.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ClientSession; import com.facebook.presto.client.QueryError; import com.facebook.presto.client.StatementClient; diff --git a/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerProviderRouterPluginConfig.java b/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerProviderRouterPluginConfig.java index c656b20e5cab6..2626da6fa0c5a 100644 --- a/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerProviderRouterPluginConfig.java +++ b/presto-plan-checker-router-plugin/src/test/java/com/facebook/presto/router/scheduler/TestPlanCheckerProviderRouterPluginConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.router.scheduler; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.net.URI; diff --git a/presto-plugin-toolkit/pom.xml b/presto-plugin-toolkit/pom.xml index 9de6b4c61f614..26a0ba7bcbba8 100644 --- a/presto-plugin-toolkit/pom.xml +++ b/presto-plugin-toolkit/pom.xml @@ -69,7 +69,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java b/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java index c83d1a2d250c7..b297e2d2cd3d4 100644 --- a/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java +++ b/presto-plugin-toolkit/src/main/java/com/facebook/presto/plugin/base/security/FileBasedAccessControlConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.plugin.base.security; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; public class FileBasedAccessControlConfig diff --git a/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java b/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java index 63e956c89fa62..991907692a2ac 100644 --- a/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java +++ b/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java @@ -15,9 +15,9 @@ import com.facebook.airlift.configuration.ConfigurationFactory; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; import com.google.inject.ConfigurationException; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-postgresql/pom.xml b/presto-postgresql/pom.xml index fadfb4d97c122..2ec12a1003116 100644 --- a/presto-postgresql/pom.xml +++ b/presto-postgresql/pom.xml @@ -89,7 +89,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-product-tests/pom.xml b/presto-product-tests/pom.xml index c4218ae2adf4e..bdde63c95993d 100644 --- a/presto-product-tests/pom.xml +++ b/presto-product-tests/pom.xml @@ -148,7 +148,7 @@ log - io.airlift + com.facebook.airlift units diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestInsertIntoCassandraTable.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestInsertIntoCassandraTable.java index bee7d4c4ef0fb..dd153447c8c44 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestInsertIntoCassandraTable.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestInsertIntoCassandraTable.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.tests.cassandra; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.Requirement; import io.prestodb.tempto.RequirementsProvider; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java index d35ad87c83524..6ca6b7c0359fe 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java @@ -14,7 +14,7 @@ package com.facebook.presto.tests.cassandra; import com.datastax.driver.core.utils.Bytes; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.Requirement; import io.prestodb.tempto.RequirementsProvider; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveStorageFormats.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveStorageFormats.java index 74a022e2631ed..94f869bde089a 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveStorageFormats.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveStorageFormats.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.tests.hive; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.tests.utils.JdbcDriverUtils; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.assertions.QueryAssert.Row; import io.prestodb.tempto.query.QueryResult; diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/utils/QueryAssertions.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/utils/QueryAssertions.java index 6356d582bdfd7..a6c686da08469 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/utils/QueryAssertions.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/utils/QueryAssertions.java @@ -13,15 +13,15 @@ */ package com.facebook.presto.tests.utils; +import com.facebook.airlift.units.Duration; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; -import io.airlift.units.Duration; import io.prestodb.tempto.query.QueryResult; import java.util.function.Supplier; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.testng.Assert.fail; diff --git a/presto-prometheus/pom.xml b/presto-prometheus/pom.xml index adbc66605135b..46bf760af3265 100644 --- a/presto-prometheus/pom.xml +++ b/presto-prometheus/pom.xml @@ -44,7 +44,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java index 0b96e62038135..b02c11a215c9a 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusConnectorConfig.java @@ -16,11 +16,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.ConfigSecuritySensitive; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.google.common.collect.ImmutableList; import com.google.inject.ConfigurationException; import com.google.inject.spi.Message; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.annotation.PostConstruct; import jakarta.validation.constraints.NotNull; diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java index 052682e62ee74..cc3f1cf4bf74d 100644 --- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java +++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java @@ -14,6 +14,7 @@ package com.facebook.presto.plugin.prometheus; import com.facebook.airlift.http.client.HttpUriBuilder; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.predicate.Domain; import com.facebook.presto.common.predicate.Marker; import com.facebook.presto.common.predicate.TupleDomain; @@ -29,7 +30,6 @@ import com.facebook.presto.spi.connector.ConnectorTransactionHandle; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.math.BigDecimal; diff --git a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusQueryRunner.java b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusQueryRunner.java index 9b0553f13f0e4..e28cba8b2193b 100644 --- a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusQueryRunner.java +++ b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/PrometheusQueryRunner.java @@ -15,10 +15,10 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.log.Logging; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.tests.DistributedQueryRunner; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import java.util.Map; diff --git a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusConnectorConfig.java b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusConnectorConfig.java index b2e49fb9007ff..4a5dcaa3a0bca 100644 --- a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusConnectorConfig.java +++ b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusConnectorConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.plugin.prometheus; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; import com.google.inject.ConfigurationException; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusSplit.java b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusSplit.java index 37b06781a8d9b..7443ecc554431 100644 --- a/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusSplit.java +++ b/presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusSplit.java @@ -93,7 +93,7 @@ public class TestPrometheusSplit * @param queryChunkDuration the duration value that would be used for each query, `30s` for instance * @return the values from the Prometheus data that would be return by all the chunked queries */ - private static List mockPrometheusResponseToChunkedQueries(io.airlift.units.Duration queryChunkDuration, List splitTimes) + private static List mockPrometheusResponseToChunkedQueries(com.facebook.airlift.units.Duration queryChunkDuration, List splitTimes) { return Lists.reverse(splitTimes).stream() .map(endTime -> mockPrometheusResponseToQuery(queryChunkDuration, endTime)) @@ -106,7 +106,7 @@ private static List mockPrometheusResponseToChunkedQueries(io.airlift.un /** * mock Prometheus instant query */ - private static List mockPrometheusResponseToQuery(io.airlift.units.Duration queryChunkDuration, String endTimeStr) + private static List mockPrometheusResponseToQuery(com.facebook.airlift.units.Duration queryChunkDuration, String endTimeStr) { Double endTime = Double.valueOf(endTimeStr); Double duration = queryChunkDuration.getValue(TimeUnit.SECONDS); @@ -141,16 +141,16 @@ private static long longFromDecimalSecondString(String decimalString) private static String getQueryChunkSizeDurationAsPrometheusCompatibleDurationString(PrometheusConnectorConfig config) { return config.getQueryChunkSizeDuration().roundTo(config.getQueryChunkSizeDuration().getUnit()) + - io.airlift.units.Duration.timeUnitToString(config.getQueryChunkSizeDuration().getUnit()); + com.facebook.airlift.units.Duration.timeUnitToString(config.getQueryChunkSizeDuration().getUnit()); } private static PrometheusConnectorConfig getCommonConfig(URI dataUri) { PrometheusConnectorConfig config = new PrometheusConnectorConfig(); config.setPrometheusURI(dataUri); - config.setMaxQueryRangeDuration(io.airlift.units.Duration.valueOf("21d")); - config.setQueryChunkSizeDuration(io.airlift.units.Duration.valueOf("1d")); - config.setCacheDuration(io.airlift.units.Duration.valueOf("30s")); + config.setMaxQueryRangeDuration(com.facebook.airlift.units.Duration.valueOf("21d")); + config.setQueryChunkSizeDuration(com.facebook.airlift.units.Duration.valueOf("1d")); + config.setCacheDuration(com.facebook.airlift.units.Duration.valueOf("30s")); return config; } @@ -328,8 +328,8 @@ public void testQueryDividedIntoSplitsShouldHaveCorrectSpacingBetweenTimes() @Test public void testSplitTimesCorrect() { - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(3, TimeUnit.DAYS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(1, TimeUnit.DAYS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(3, TimeUnit.DAYS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(1, TimeUnit.DAYS); Instant now = ofEpochMilli(1000000000L); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName"); @@ -344,8 +344,8 @@ public void testSplitTimesCorrect() @Test public void testSplitTimesCorrectNonModuloZeroDurationToChunk() { - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(3, TimeUnit.DAYS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(2, TimeUnit.DAYS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(3, TimeUnit.DAYS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(2, TimeUnit.DAYS); Instant now = ofEpochMilli(1000000000L); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName"); @@ -358,8 +358,8 @@ public void testSplitTimesCorrectNonModuloZeroDurationToChunk() @Test public void testSplitTimesCorrectVersusMock() { - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(120, TimeUnit.SECONDS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(30, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(120, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS); Instant now = ofEpochMilli(1568638172000L); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName"); @@ -371,8 +371,8 @@ public void testSplitTimesCorrectVersusMock() @Test public void testSplitTimesAreTimesNearBoundaryNotMissing() { - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(120, TimeUnit.SECONDS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(30, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(120, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS); Instant now = ofEpochMilli(1568638171999L); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName"); @@ -385,21 +385,21 @@ public void testSplitTimesAreTimesNearBoundaryNotMissing() public void testMockPrometheusResponseShouldBeCorrectWhenUpperBoundaryAlignsWithData() { List expectedResponse = ImmutableList.of(1568638142.0, 1568638157.0, 1568638171.999); - assertEquals(mockPrometheusResponseToQuery(new io.airlift.units.Duration(30, TimeUnit.SECONDS), "1568638171.999"), expectedResponse); + assertEquals(mockPrometheusResponseToQuery(new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS), "1568638171.999"), expectedResponse); } @Test public void testMockPrometheusResponseShouldBeCorrectWhenLowerBoundaryAlignsWithData() { List expectedResponse = ImmutableList.of(1568638142.0, 1568638157.0, 1568638171.999); - assertEquals(mockPrometheusResponseToQuery(new io.airlift.units.Duration(30, TimeUnit.SECONDS), "1568638172."), expectedResponse); + assertEquals(mockPrometheusResponseToQuery(new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS), "1568638172."), expectedResponse); } @Test public void testMockPrometheusResponseShouldBeCorrectWhenLowerBoundaryLaterThanData() { List expectedResponse = ImmutableList.of(1568638157.0, 1568638171.999); - assertEquals(mockPrometheusResponseToQuery(new io.airlift.units.Duration(30, TimeUnit.SECONDS), "1568638172.001"), expectedResponse); + assertEquals(mockPrometheusResponseToQuery(new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS), "1568638172.001"), expectedResponse); } @Test @@ -407,7 +407,7 @@ public void testMockPrometheusResponseWithSeveralChunksShouldBeCorrect() { List expectedResponse = ImmutableList.of("1568638112", "1568638126.997", "1568638142", "1568638157", "1568638171.999"); List splitTimes = ImmutableList.of("1568638141.999", "1568638172."); - assertEquals(mockPrometheusResponseToChunkedQueries(new io.airlift.units.Duration(30, TimeUnit.SECONDS), splitTimes), expectedResponse); + assertEquals(mockPrometheusResponseToChunkedQueries(new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS), splitTimes), expectedResponse); } @Test @@ -437,8 +437,8 @@ public void testPredicatePushDownSetsLowerBoundOnly() new PrometheusColumnHandle("timestamp", TIMESTAMP_WITH_TIME_ZONE, 2), testDomain)); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName") .withPredicate(testTupleDomain); - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(120, TimeUnit.SECONDS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(30, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(120, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS); Instant now = ofEpochMilli(1568638171999L); TemporalAmount maxQueryAsTime = java.time.Duration.ofMillis(maxQueryRangeDuration.toMillis()); List splitTimes = PrometheusSplitManager.generateTimesForSplits(now, maxQueryRangeDuration, queryChunkSizeDuration, prometheusTableHandle); @@ -463,8 +463,8 @@ public void testPredicatePushDownSetsUpperBoundOnly() new PrometheusColumnHandle("timestamp", TIMESTAMP_WITH_TIME_ZONE, 2), testDomain)); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName") .withPredicate(testTupleDomain); - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(120, TimeUnit.SECONDS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(30, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(120, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS); Instant now = ofEpochMilli(1568638171999L + 600000L); List splitTimes = PrometheusSplitManager.generateTimesForSplits(now, maxQueryRangeDuration, queryChunkSizeDuration, prometheusTableHandle); @@ -497,13 +497,13 @@ public void testPredicatePushDownSetsUpperAndLowerBound() new PrometheusColumnHandle("timestamp", TIMESTAMP_WITH_TIME_ZONE, 2), testDomain)); PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName") .withPredicate(testTupleDomain); - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(120, TimeUnit.SECONDS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(30, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(120, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS); Instant now = ofEpochMilli(1568638171999L + 1200000L); List splitTimes = PrometheusSplitManager.generateTimesForSplits(now, maxQueryRangeDuration, queryChunkSizeDuration, prometheusTableHandle); - TemporalAmount expectedMaxQueryAsTime = java.time.Duration.ofMillis(new io.airlift.units.Duration(10, TimeUnit.MINUTES).toMillis() + + TemporalAmount expectedMaxQueryAsTime = java.time.Duration.ofMillis(new com.facebook.airlift.units.Duration(10, TimeUnit.MINUTES).toMillis() + ((splitTimes.size() - 1) * OFFSET_MILLIS)); String lastSplit = splitTimes.get(splitTimes.size() - 1); Instant lastSplitAsTime = ofEpochMilli(longFromDecimalSecondString(lastSplit)); @@ -522,8 +522,8 @@ public void testEmptyPredicatePredicatePushDown() { long predicateLowValue = 1570460709643L; PrometheusTableHandle prometheusTableHandle = new PrometheusTableHandle("schemaName", "tableName"); - io.airlift.units.Duration maxQueryRangeDuration = new io.airlift.units.Duration(120, TimeUnit.SECONDS); - io.airlift.units.Duration queryChunkSizeDuration = new io.airlift.units.Duration(30, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration maxQueryRangeDuration = new com.facebook.airlift.units.Duration(120, TimeUnit.SECONDS); + com.facebook.airlift.units.Duration queryChunkSizeDuration = new com.facebook.airlift.units.Duration(30, TimeUnit.SECONDS); Instant now = ofEpochMilli(1568638171999L); TemporalAmount maxQueryAsTime = java.time.Duration.ofMillis(maxQueryRangeDuration.toMillis()); List splitTimes = PrometheusSplitManager.generateTimesForSplits(now, maxQueryRangeDuration, queryChunkSizeDuration, prometheusTableHandle); diff --git a/presto-proxy/pom.xml b/presto-proxy/pom.xml index 759a0dc7154ac..b0e49cddfde26 100644 --- a/presto-proxy/pom.xml +++ b/presto-proxy/pom.xml @@ -45,7 +45,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java index cd967f66e83d1..67789ed06d2a9 100644 --- a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java +++ b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyConfig.java @@ -15,7 +15,7 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import jakarta.validation.constraints.NotNull; import java.io.File; diff --git a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java index f5d96f67886c1..afe66a5088a02 100644 --- a/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java +++ b/presto-proxy/src/main/java/com/facebook/presto/proxy/ProxyResource.java @@ -16,6 +16,7 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.http.client.Request; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.proxy.ProxyResponseHandler.ProxyResponse; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; @@ -25,7 +26,6 @@ import com.google.common.hash.HashFunction; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.annotation.security.PermitAll; import jakarta.inject.Inject; diff --git a/presto-proxy/src/test/java/com/facebook/presto/proxy/TestProxyConfig.java b/presto-proxy/src/test/java/com/facebook/presto/proxy/TestProxyConfig.java index 13c6256eb4c3d..c6b3d6b998f75 100644 --- a/presto-proxy/src/test/java/com/facebook/presto/proxy/TestProxyConfig.java +++ b/presto-proxy/src/test/java/com/facebook/presto/proxy/TestProxyConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.proxy; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.File; diff --git a/presto-rcfile/pom.xml b/presto-rcfile/pom.xml index 563433aaf2401..30b79d578af4e 100644 --- a/presto-rcfile/pom.xml +++ b/presto-rcfile/pom.xml @@ -28,7 +28,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileReader.java b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileReader.java index 10ca73bc94915..aa64d82023344 100644 --- a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileReader.java +++ b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileReader.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.rcfile; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.RunLengthEncodedBlock; @@ -27,8 +29,6 @@ import io.airlift.slice.Slice; import io.airlift.slice.SliceInput; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; import java.io.Closeable; import java.io.IOException; diff --git a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java index 2a2bc70ceebbb..2151b02a58542 100644 --- a/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java +++ b/presto-rcfile/src/main/java/com/facebook/presto/rcfile/RcFileWriter.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.rcfile; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.type.Type; @@ -22,7 +23,6 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; -import io.airlift.units.DataSize; import jakarta.annotation.Nullable; import org.openjdk.jol.info.ClassLayout; @@ -35,6 +35,8 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.function.Consumer; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.rcfile.PageSplitterUtil.splitPage; import static com.facebook.presto.rcfile.RcFileDecoderUtils.writeLengthPrefixedString; import static com.facebook.presto.rcfile.RcFileDecoderUtils.writeVInt; @@ -42,8 +44,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.StrictMath.toIntExact; import static java.util.Objects.requireNonNull; diff --git a/presto-rcfile/src/test/java/com/facebook/presto/rcfile/RcFileTester.java b/presto-rcfile/src/test/java/com/facebook/presto/rcfile/RcFileTester.java index 3429a2e20070c..3bb2445e547e1 100644 --- a/presto-rcfile/src/test/java/com/facebook/presto/rcfile/RcFileTester.java +++ b/presto-rcfile/src/test/java/com/facebook/presto/rcfile/RcFileTester.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.rcfile; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; @@ -43,7 +44,6 @@ import io.airlift.slice.OutputStreamSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.type.HiveDecimal; @@ -118,6 +118,9 @@ import java.util.Set; import java.util.concurrent.ThreadLocalRandom; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.BigintType.BIGINT; import static com.facebook.presto.common.type.BooleanType.BOOLEAN; import static com.facebook.presto.common.type.DateType.DATE; @@ -152,9 +155,6 @@ import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; import static io.airlift.slice.SizeOf.SIZE_OF_INT; import static io.airlift.slice.SizeOf.SIZE_OF_LONG; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.Unit.KILOBYTE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.stream.Collectors.toList; diff --git a/presto-rcfile/src/test/java/com/facebook/presto/rcfile/TestRcFileReaderManual.java b/presto-rcfile/src/test/java/com/facebook/presto/rcfile/TestRcFileReaderManual.java index 8969af44c3629..9552ff1f89ad3 100644 --- a/presto-rcfile/src/test/java/com/facebook/presto/rcfile/TestRcFileReaderManual.java +++ b/presto-rcfile/src/test/java/com/facebook/presto/rcfile/TestRcFileReaderManual.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.rcfile; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.Block; import com.facebook.presto.rcfile.binary.BinaryRcFileEncoding; import com.google.common.collect.ImmutableList; @@ -20,16 +21,15 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.io.IOException; import java.util.List; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.common.type.SmallintType.SMALLINT; import static com.google.common.base.Preconditions.checkArgument; import static io.airlift.slice.Slices.utf8Slice; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.Math.toIntExact; import static java.util.stream.Collectors.toList; import static org.testng.Assert.assertEquals; diff --git a/presto-redis/pom.xml b/presto-redis/pom.xml index 7bdc8f4d4217b..350be928c4f22 100644 --- a/presto-redis/pom.xml +++ b/presto-redis/pom.xml @@ -114,7 +114,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java index e9f171e666bfe..cab360b3eda21 100644 --- a/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java +++ b/presto-redis/src/main/java/com/facebook/presto/redis/RedisConnectorConfig.java @@ -15,11 +15,11 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigSecuritySensitive; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.facebook.presto.spi.HostAddress; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/presto-redis/src/test/java/com/facebook/presto/redis/RedisQueryRunner.java b/presto-redis/src/test/java/com/facebook/presto/redis/RedisQueryRunner.java index a23a8eac1bc1d..5f2e3ba948c6d 100644 --- a/presto-redis/src/test/java/com/facebook/presto/redis/RedisQueryRunner.java +++ b/presto-redis/src/test/java/com/facebook/presto/redis/RedisQueryRunner.java @@ -32,11 +32,11 @@ import java.util.Map; import static com.facebook.airlift.testing.Closeables.closeAllSuppress; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.redis.util.RedisTestUtils.installRedisPlugin; import static com.facebook.presto.redis.util.RedisTestUtils.loadTpchTableDescription; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; -import static io.airlift.units.Duration.nanosSince; import static java.util.Locale.ENGLISH; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-redshift/pom.xml b/presto-redshift/pom.xml index 5277cc233da3b..a56d962e20a77 100644 --- a/presto-redshift/pom.xml +++ b/presto-redshift/pom.xml @@ -82,7 +82,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-resource-group-managers/pom.xml b/presto-resource-group-managers/pom.xml index ab99b06d93b04..c19ea1541e85e 100644 --- a/presto-resource-group-managers/pom.xml +++ b/presto-resource-group-managers/pom.xml @@ -135,7 +135,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java index 91052dc8ed71c..924ecc3bf1912 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/AbstractResourceConfigurationManager.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.resourceGroups.QueryType; import com.facebook.presto.spi.memory.ClusterMemoryPoolManager; import com.facebook.presto.spi.memory.MemoryPoolId; @@ -21,8 +23,6 @@ import com.facebook.presto.spi.resourceGroups.SelectionContext; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.AbstractMap; import java.util.ArrayList; @@ -33,9 +33,9 @@ import java.util.Optional; import java.util.Queue; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.String.format; import static java.util.function.Predicate.isEqual; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java index f50c6f901a529..70efde956da71 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/FileResourceGroupConfigurationManager.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.JsonCodecFactory; import com.facebook.airlift.json.JsonObjectMapperProvider; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.memory.ClusterMemoryPoolManager; import com.facebook.presto.spi.resourceGroups.ResourceGroup; import com.facebook.presto.spi.resourceGroups.SelectionContext; @@ -23,7 +24,6 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; import com.google.common.annotations.VisibleForTesting; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.io.IOException; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ManagerSpec.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ManagerSpec.java index b8105e04f12be..93b1426c59797 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ManagerSpec.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ManagerSpec.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.Duration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.util.HashSet; import java.util.List; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ResourceGroupSpec.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ResourceGroupSpec.java index 0c21ce6570e22..c97d892e8c1d0 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ResourceGroupSpec.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/ResourceGroupSpec.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.HashSet; import java.util.List; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/SelectorResourceEstimate.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/SelectorResourceEstimate.java index 53b49da92230f..b0ad09d7a3163 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/SelectorResourceEstimate.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/SelectorResourceEstimate.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.session.ResourceEstimates; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Objects; import java.util.Optional; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbManagerSpecProvider.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbManagerSpecProvider.java index f3a81bdc2547e..cc061e75ddc4c 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbManagerSpecProvider.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbManagerSpecProvider.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.resourceGroups.db; +import com.facebook.airlift.units.Duration; import com.facebook.presto.resourceGroups.ManagerSpec; import com.facebook.presto.resourceGroups.ResourceGroupIdTemplate; import com.facebook.presto.resourceGroups.ResourceGroupSelector; @@ -23,7 +24,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; -import io.airlift.units.Duration; import java.util.HashMap; import java.util.HashSet; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbSourceExactMatchSelector.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbSourceExactMatchSelector.java index d137bcb1576eb..53690b363b306 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbSourceExactMatchSelector.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/DbSourceExactMatchSelector.java @@ -25,8 +25,8 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.resourceGroups.VariableMap.emptyVariableMap; -import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; public class DbSourceExactMatchSelector diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupGlobalProperties.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupGlobalProperties.java index d51eb8d32b1a5..5e52888903a3f 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupGlobalProperties.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupGlobalProperties.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.resourceGroups.db; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import org.jdbi.v3.core.mapper.RowMapper; import org.jdbi.v3.core.statement.StatementContext; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupSpecBuilder.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupSpecBuilder.java index 5a8c357b5b0fb..d0e7f6c224196 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupSpecBuilder.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/ResourceGroupSpecBuilder.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.resourceGroups.db; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.resourceGroups.ResourceGroupNameTemplate; import com.facebook.presto.resourceGroups.ResourceGroupSpec; import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.jdbi.v3.core.mapper.RowMapper; import org.jdbi.v3.core.statement.StatementContext; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfig.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfig.java index ff61cd2357cbf..ed2299652c2d1 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfig.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfig.java @@ -15,8 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import static java.util.concurrent.TimeUnit.HOURS; diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java index 904471e0cb985..7058a180950df 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/reloading/ReloadingResourceGroupConfigurationManager.java @@ -15,6 +15,7 @@ import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.resourceGroups.AbstractResourceConfigurationManager; import com.facebook.presto.resourceGroups.ManagerSpec; import com.facebook.presto.resourceGroups.ResourceGroupIdTemplate; @@ -31,7 +32,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; @@ -54,10 +54,10 @@ import java.util.concurrent.atomic.AtomicReference; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.Duration.succinctNanos; import static com.facebook.presto.spi.StandardErrorCode.CONFIGURATION_INVALID; import static com.facebook.presto.spi.StandardErrorCode.CONFIGURATION_UNAVAILABLE; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.Duration.succinctNanos; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestFileResourceGroupConfigurationManager.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestFileResourceGroupConfigurationManager.java index 113a4e8724995..39416d4f51ea9 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestFileResourceGroupConfigurationManager.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestFileResourceGroupConfigurationManager.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.resourceGroups.ResourceGroup; import com.facebook.presto.spi.resourceGroups.ResourceGroupConfigurationManager; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; @@ -21,17 +23,15 @@ import com.facebook.presto.spi.session.ResourceEstimates; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.io.IOException; import java.util.List; import java.util.Optional; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.WEIGHTED; import static com.facebook.presto.util.ResourceFileUtils.getResourceFile; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.HOURS; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestStaticSelector.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestStaticSelector.java index 56f98a805e174..3317e5f147745 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestStaticSelector.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestStaticSelector.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.resourceGroups.SelectorResourceEstimate.Range; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.facebook.presto.spi.resourceGroups.SelectionContext; @@ -20,8 +22,6 @@ import com.facebook.presto.spi.session.ResourceEstimates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Optional; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestingResourceGroup.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestingResourceGroup.java index 0b65c5ee40803..5484111b8d666 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestingResourceGroup.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/TestingResourceGroup.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.resourceGroups; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.spi.resourceGroups.ResourceGroup; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits; import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/TestResourceGroupsDao.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/TestResourceGroupsDao.java index cdd6ec6da30a8..3148d4f7bf3ab 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/TestResourceGroupsDao.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/TestResourceGroupsDao.java @@ -14,13 +14,13 @@ package com.facebook.presto.resourceGroups.db; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.resourceGroups.ResourceGroupNameTemplate; import com.facebook.presto.resourceGroups.SelectorResourceEstimate; import com.facebook.presto.resourceGroups.SelectorResourceEstimate.Range; import com.facebook.presto.spi.resourceGroups.ResourceGroupId; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.h2.jdbc.JdbcSQLIntegrityConstraintViolationException; import org.jdbi.v3.core.statement.UnableToExecuteStatementException; import org.testng.annotations.Test; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfig.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfig.java index a4fee9b7d8f2d..d87c0fad9baf3 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfig.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.resourceGroups.reloading; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfigurationManager.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfigurationManager.java index 4911ceffdc899..8f02abab278e5 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfigurationManager.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/reloading/TestReloadingResourceGroupConfigurationManager.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.resourceGroups.reloading; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.resourceGroups.InternalResourceGroup; import com.facebook.presto.metadata.InMemoryNodeManager; import com.facebook.presto.resourceGroups.VariableMap; @@ -26,20 +28,18 @@ import com.facebook.presto.spi.resourceGroups.SchedulingPolicy; import com.facebook.presto.spi.resourceGroups.SelectionContext; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.execution.resourceGroups.InternalResourceGroup.DEFAULT_WEIGHT; import static com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits.NO_LIMITS; import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.FAIR; import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.WEIGHTED; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-router/pom.xml b/presto-router/pom.xml index 73c28471c6c14..60886e69b07ff 100644 --- a/presto-router/pom.xml +++ b/presto-router/pom.xml @@ -70,7 +70,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-router/src/main/java/com/facebook/presto/router/RouterModule.java b/presto-router/src/main/java/com/facebook/presto/router/RouterModule.java index dcd56dfe75cd5..efc7cc783ddb7 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/RouterModule.java +++ b/presto-router/src/main/java/com/facebook/presto/router/RouterModule.java @@ -14,6 +14,7 @@ package com.facebook.presto.router; import com.facebook.airlift.configuration.AbstractConfigurationAwareModule; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.NodeVersion; import com.facebook.presto.router.cluster.ClusterManager; import com.facebook.presto.router.cluster.ClusterManager.ClusterStatusTracker; @@ -33,7 +34,6 @@ import com.facebook.presto.server.WebUiResource; import com.google.inject.Binder; import com.google.inject.Scopes; -import io.airlift.units.Duration; import java.lang.annotation.Annotation; import java.util.Optional; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java index 60775a50b049f..8e7baaa815c98 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/ClusterManager.java @@ -14,6 +14,7 @@ package com.facebook.presto.router.cluster; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.router.RouterConfig; import com.facebook.presto.router.scheduler.CustomSchedulerManager; import com.facebook.presto.router.scheduler.SchedulerFactory; @@ -30,7 +31,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.sun.nio.file.SensitivityWatchEventModifier; -import io.airlift.units.Duration; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; import org.weakref.jmx.Managed; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java index d99d314e2da82..08d847dca6713 100755 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteState.java @@ -18,6 +18,7 @@ import com.facebook.airlift.http.client.Request; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.router.RouterConfig; import com.facebook.presto.router.spec.RouterSpec; import com.facebook.presto.spi.PrestoException; @@ -25,7 +26,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.errorprone.annotations.ThreadSafe; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import jakarta.inject.Inject; @@ -41,10 +41,10 @@ import static com.facebook.airlift.http.client.HttpStatus.OK; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; import static com.facebook.airlift.json.JsonCodec.jsonCodec; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.router.RouterUtil.parseRouterConfig; import static com.facebook.presto.spi.StandardErrorCode.CONFIGURATION_INVALID; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; -import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteStateConfig.java b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteStateConfig.java index e5bf7df5a1208..79b605609f6c7 100644 --- a/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteStateConfig.java +++ b/presto-router/src/main/java/com/facebook/presto/router/cluster/RemoteStateConfig.java @@ -15,9 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; - -import javax.validation.constraints.NotNull; +import com.facebook.airlift.units.Duration; +import jakarta.validation.constraints.NotNull; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-session-property-managers/pom.xml b/presto-session-property-managers/pom.xml index 548c7de776d37..08b6a74223d70 100644 --- a/presto-session-property-managers/pom.xml +++ b/presto-session-property-managers/pom.xml @@ -77,7 +77,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-singlestore/pom.xml b/presto-singlestore/pom.xml index 877761ea5e506..58ecf462372eb 100644 --- a/presto-singlestore/pom.xml +++ b/presto-singlestore/pom.xml @@ -80,7 +80,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index 1f4c1c0db587a..170a624f083c7 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -94,7 +94,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java index 89a5d481ccfaf..1b0e96ed2f36b 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkConfig.java @@ -16,10 +16,10 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; import com.facebook.airlift.configuration.LegacyConfig; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; @@ -27,10 +27,10 @@ import java.util.Map; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.google.common.base.Strings.nullToEmpty; -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 java.util.concurrent.TimeUnit.MINUTES; public class PrestoSparkConfig diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkMemoryBasedBroadcastDependency.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkMemoryBasedBroadcastDependency.java index 9f80c60230857..43278c1944ad3 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkMemoryBasedBroadcastDependency.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkMemoryBasedBroadcastDependency.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.spark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spark.classloader_interface.PrestoSparkSerializedPage; -import io.airlift.units.DataSize; import org.apache.spark.SparkException; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.broadcast.Broadcast; @@ -24,9 +24,9 @@ import java.util.Set; import java.util.concurrent.TimeoutException; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalBroadcastMemoryLimit; import static com.facebook.presto.spark.util.PrestoSparkUtils.computeNextTimeout; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkNativeStorageBasedDependency.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkNativeStorageBasedDependency.java index 5ddf5ddb37e3d..e1381addb2fdb 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkNativeStorageBasedDependency.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkNativeStorageBasedDependency.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.spark; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.type.BigintType; import com.facebook.presto.spark.classloader_interface.PrestoSparkSerializedPage; import com.facebook.presto.spark.util.PrestoSparkUtils; import com.facebook.presto.spi.page.PagesSerde; -import io.airlift.units.DataSize; import org.apache.spark.SparkException; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.broadcast.Broadcast; @@ -28,9 +28,9 @@ import java.util.concurrent.TimeoutException; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalBroadcastMemoryLimit; import static com.facebook.presto.spark.util.PrestoSparkUtils.computeNextTimeout; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkPhysicalResourceCalculator.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkPhysicalResourceCalculator.java index e2312ec501536..b3c36cc30ca94 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkPhysicalResourceCalculator.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkPhysicalResourceCalculator.java @@ -14,12 +14,13 @@ package com.facebook.presto.spark; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.SystemSessionProperties; import com.facebook.presto.spi.plan.PlanNode; import com.facebook.presto.spi.prestospark.PhysicalResourceSettings; -import io.airlift.units.DataSize; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.spark.PrestoSparkSessionProperties.getAverageInputDataSizePerExecutor; import static com.facebook.presto.spark.PrestoSparkSessionProperties.getAverageInputDataSizePerPartition; import static com.facebook.presto.spark.PrestoSparkSessionProperties.getMaxExecutorCount; @@ -30,7 +31,6 @@ import static com.facebook.presto.spark.PrestoSparkSessionProperties.isSparkHashPartitionCountAllocationStrategyEnabled; import static com.facebook.presto.spark.PrestoSparkSessionProperties.isSparkResourceAllocationStrategyEnabled; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.DataSize.Unit.BYTE; public class PrestoSparkPhysicalResourceCalculator { diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java index 1d603b8599c6a..042b56ce62e1a 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkQueryExecutionFactory.java @@ -17,6 +17,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.Distribution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.Column; import com.facebook.presto.client.QueryError; @@ -110,7 +111,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ListMultimap; import com.google.common.io.BaseEncoding; -import io.airlift.units.Duration; import jakarta.inject.Inject; import org.apache.spark.SparkContext; import org.apache.spark.SparkException; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkServiceWaitTimeMetrics.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkServiceWaitTimeMetrics.java index 60ca10fd168dc..1dbffc8b231f1 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkServiceWaitTimeMetrics.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkServiceWaitTimeMetrics.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.spark; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; public interface PrestoSparkServiceWaitTimeMetrics { diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java index d3fec9dcda2c7..355337056ee59 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionProperties.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.spark; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.spi.session.PropertyMetadata; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSettingsRequirements.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSettingsRequirements.java index b64e908fb4327..bdc8bf7bdb746 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSettingsRequirements.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSettingsRequirements.java @@ -13,12 +13,12 @@ */ package com.facebook.presto.spark; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.connector.system.GlobalSystemConnector; import com.facebook.presto.execution.QueryManagerConfig; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.sql.analyzer.FeaturesConfig; -import io.airlift.units.Duration; import org.apache.spark.SparkConf; import org.apache.spark.SparkContext; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkStorageBasedBroadcastDependency.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkStorageBasedBroadcastDependency.java index 408fa4cde0501..48636f0cc2ef4 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkStorageBasedBroadcastDependency.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkStorageBasedBroadcastDependency.java @@ -14,12 +14,12 @@ package com.facebook.presto.spark; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.spark.classloader_interface.PrestoSparkStorageHandle; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.storage.TempDataOperationContext; import com.facebook.presto.spi.storage.TempStorage; import com.facebook.presto.spi.storage.TempStorageHandle; -import io.airlift.units.DataSize; import org.apache.spark.SparkException; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.broadcast.Broadcast; @@ -30,10 +30,10 @@ import java.util.Set; import java.util.concurrent.TimeoutException; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalBroadcastMemoryLimit; import static com.facebook.presto.spark.SparkErrorCode.STORAGE_ERROR; import static com.facebook.presto.spark.util.PrestoSparkUtils.computeNextTimeout; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkTestingServiceWaitTimeMetrics.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkTestingServiceWaitTimeMetrics.java index 4e4d216a06839..717623289a5da 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkTestingServiceWaitTimeMetrics.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkTestingServiceWaitTimeMetrics.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.spark; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java index 25614f514a323..2e03dd64a54d1 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java @@ -16,6 +16,8 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.Page; import com.facebook.presto.common.type.Type; @@ -90,8 +92,6 @@ 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.airlift.units.Duration; import org.apache.spark.MapOutputStatistics; import org.apache.spark.Partitioner; import org.apache.spark.ShuffleDependency; @@ -118,6 +118,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.SystemSessionProperties.getQueryMaxBroadcastMemory; import static com.facebook.presto.SystemSessionProperties.getQueryMaxTotalMemoryPerNode; import static com.facebook.presto.common.type.BigintType.BIGINT; @@ -156,7 +157,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.util.concurrent.Futures.getUnchecked; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.lang.Math.min; import static java.util.Collections.unmodifiableList; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkAdaptiveQueryExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkAdaptiveQueryExecution.java index 946db2b2f8d21..2076e695cbf90 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkAdaptiveQueryExecution.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkAdaptiveQueryExecution.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.cost.FragmentStatsProvider; import com.facebook.presto.cost.HistoryBasedPlanStatisticsTracker; @@ -67,7 +68,6 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.UncheckedExecutionException; -import io.airlift.units.Duration; import org.apache.spark.MapOutputStatistics; import org.apache.spark.SimpleFutureAction; import org.apache.spark.SparkException; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowOutputOperator.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowOutputOperator.java index f6d946eb85990..a000c6b9337fb 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowOutputOperator.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkRowOutputOperator.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spark.execution; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.RunLengthEncodedBlock; @@ -32,7 +33,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.slice.SliceOutput; -import io.airlift.units.DataSize; import java.util.List; import java.util.Optional; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkStaticQueryExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkStaticQueryExecution.java index 67fabe6bcb777..e4d3a6e521260 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkStaticQueryExecution.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/PrestoSparkStaticQueryExecution.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.cost.HistoryBasedPlanStatisticsTracker; import com.facebook.presto.event.QueryMonitor; @@ -52,7 +53,6 @@ import com.facebook.presto.transaction.TransactionManager; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import org.apache.spark.SparkException; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.util.CollectionAccumulator; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConnectorConfig.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConnectorConfig.java index 94b252c0dd860..34fc929b6da79 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConnectorConfig.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConnectorConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.spark.execution.property; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionSystemConfig.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionSystemConfig.java index 4a28d7c83b1ee..71e72975610fa 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionSystemConfig.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionSystemConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.spark.execution.property; import com.facebook.airlift.configuration.Config; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java index 51e92b1e52010..d3a3f13a412e0 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecution.java @@ -14,6 +14,7 @@ package com.facebook.presto.spark.execution.task; import com.facebook.airlift.concurrent.SetThreadName; +import com.facebook.airlift.units.Duration; import com.facebook.presto.event.SplitMonitor; import com.facebook.presto.execution.Lifespan; import com.facebook.presto.execution.ScheduledSplit; @@ -43,7 +44,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import jakarta.annotation.Nullable; import java.util.ArrayList; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java index bbf32a748e31a..0123bf3a8bcd2 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkTaskExecutorFactory.java @@ -17,6 +17,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.SessionRepresentation; import com.facebook.presto.common.RuntimeStats; @@ -108,7 +109,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import io.airlift.slice.Slice; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.spark.broadcast.Broadcast; import org.apache.spark.util.CollectionAccumulator; @@ -138,6 +138,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.zip.CRC32; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalTotalMemoryLimit; import static com.facebook.presto.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE; import static com.facebook.presto.SystemSessionProperties.QUERY_MAX_REVOCABLE_MEMORY_PER_NODE; @@ -174,8 +176,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Throwables.propagateIfPossible; import static com.google.common.collect.Iterables.getFirst; -import static io.airlift.units.DataSize.Unit.BYTE; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.Math.min; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodeScheduler.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodeScheduler.java index 64d9d8b9197a5..0bc8bf89b94aa 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodeScheduler.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/node/PrestoSparkNodeScheduler.java @@ -14,6 +14,7 @@ package com.facebook.presto.spark.node; import com.facebook.airlift.stats.CounterStat; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.dispatcher.NoOpQueryManager; import com.facebook.presto.execution.NodeTaskMap; @@ -28,7 +29,6 @@ import com.facebook.presto.spi.ConnectorId; import com.facebook.presto.ttl.nodettlfetchermanagers.ThrowingNodeTtlFetcherManager; import com.facebook.presto.util.FinalizerService; -import io.airlift.units.Duration; import java.util.Map; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java index e685260861d1d..6b0cb50d4267c 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.execution.ScheduledSplit; import com.facebook.presto.execution.TaskSource; @@ -54,7 +55,6 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import io.airlift.units.DataSize; import jakarta.inject.Inject; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.JavaSparkContext; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkUtils.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkUtils.java index 447d43e711c39..49f20e5ca36f9 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkUtils.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/util/PrestoSparkUtils.java @@ -14,6 +14,7 @@ package com.facebook.presto.spark.util; import com.facebook.airlift.json.Codec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.block.BlockEncodingManager; import com.facebook.presto.spark.PrestoSparkServiceWaitTimeMetrics; import com.facebook.presto.spark.classloader_interface.PrestoSparkSerializedPage; @@ -28,7 +29,6 @@ import com.google.common.util.concurrent.UncheckedExecutionException; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.Duration; import org.apache.spark.JavaFutureActionWrapper; import org.apache.spark.SimpleFutureAction; import org.apache.spark.SparkException; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java index 109c52e48d6cf..27c1c9d6d037e 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java @@ -111,6 +111,7 @@ import static com.facebook.airlift.log.Level.ERROR; import static com.facebook.airlift.log.Level.INFO; import static com.facebook.airlift.log.Level.WARN; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.spark.PrestoSparkSessionProperties.getQueryExecutionStrategies; import static com.facebook.presto.spark.PrestoSparkSettingsRequirements.SPARK_EXECUTOR_CORES_PROPERTY; import static com.facebook.presto.spark.PrestoSparkSettingsRequirements.SPARK_TASK_CPUS_PROPERTY; @@ -133,7 +134,6 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.collect.Iterables.getOnlyElement; import static io.airlift.tpch.TpchTable.getTables; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.nio.file.Files.createTempDirectory; import static java.util.Locale.ENGLISH; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkConfig.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkConfig.java index 37657bc560a54..b9dc04d7f96f6 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkConfig.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkConfig.java @@ -14,18 +14,18 @@ package com.facebook.presto.spark; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertFullMapping; import static com.facebook.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults; -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 com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static java.util.concurrent.TimeUnit.MINUTES; public class TestPrestoSparkConfig diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkQueryRunner.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkQueryRunner.java index 170d54b943764..917fd40597b02 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkQueryRunner.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkQueryRunner.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spark; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.QueryRunner; @@ -22,7 +23,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import com.google.common.io.Files; -import io.airlift.units.Duration; import org.apache.hadoop.fs.Path; import org.testng.annotations.Ignore; import org.testng.annotations.Test; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/property/TestNativeExecutionSystemConfig.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/property/TestNativeExecutionSystemConfig.java index 2e4bf0cd7ac57..67cb2cdeca9b7 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/property/TestNativeExecutionSystemConfig.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/property/TestNativeExecutionSystemConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.spark.execution.property; import com.facebook.airlift.configuration.testing.ConfigAssertions; -import io.airlift.units.DataSize; -import io.airlift.units.DataSize.Unit; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.DataSize.Unit; import org.testng.annotations.Test; import java.io.File; @@ -117,7 +117,7 @@ public void testNativeExecutionSystemConfig() .setPrestoVersion("presto-version") .setShutdownOnsetSec(30) .setSystemMemoryGb(40) - .setQueryMemoryGb(new DataSize(20, DataSize.Unit.GIGABYTE)) + .setQueryMemoryGb(new DataSize(20, Unit.GIGABYTE)) .setUseMmapAllocator(false) .setMemoryArbitratorKind("") .setMemoryArbitratorCapacityGb(10) diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkPhysicalResourceAllocationStrategy.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkPhysicalResourceAllocationStrategy.java index 79280f9a03fde..6278e3b4586fd 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkPhysicalResourceAllocationStrategy.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkPhysicalResourceAllocationStrategy.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spark.planner; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.metadata.AbstractMockMetadata; import com.facebook.presto.metadata.Metadata; @@ -34,7 +35,6 @@ import com.facebook.presto.testing.TestingMetadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.List; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkSourceDistributionSplitAssigner.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkSourceDistributionSplitAssigner.java index 9460696bcc8d6..b06c488d1190d 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkSourceDistributionSplitAssigner.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/planner/TestPrestoSparkSourceDistributionSplitAssigner.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spark.planner; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.execution.Lifespan; import com.facebook.presto.execution.ScheduledSplit; import com.facebook.presto.metadata.Split; @@ -31,7 +32,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.SetMultimap; import com.google.common.util.concurrent.ListenableFuture; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.ArrayList; @@ -42,6 +42,7 @@ import java.util.OptionalLong; import java.util.concurrent.ThreadLocalRandom; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; import static com.facebook.presto.spi.connector.NotPartitionedPartitionHandle.NOT_PARTITIONED; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -49,7 +50,6 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.primitives.Ints.min; import static com.google.common.util.concurrent.Futures.immediateFuture; -import static io.airlift.units.DataSize.Unit.BYTE; import static java.util.Objects.requireNonNull; import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/task/TestPrestoSparkTaskExecution.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/task/TestPrestoSparkTaskExecution.java index 485e08a7ea9d1..4c60d850bd3d2 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/task/TestPrestoSparkTaskExecution.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/task/TestPrestoSparkTaskExecution.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.spark.task; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.execution.ScheduledSplit; import com.facebook.presto.execution.TaskId; @@ -35,7 +36,6 @@ import com.google.common.base.Ticker; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -47,13 +47,13 @@ import java.util.concurrent.ScheduledExecutorService; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; import static com.facebook.presto.execution.TaskManagerConfig.TaskPriorityTracking.TASK_FAIR; import static com.facebook.presto.execution.TaskTestUtils.TABLE_SCAN_NODE_ID; import static com.facebook.presto.execution.TaskTestUtils.createPlanFragment; import static com.facebook.presto.execution.TaskTestUtils.createTestingPlanner; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.tpch.TpchMetadata.TINY_SCHEMA_NAME; -import static io.airlift.units.DataSize.Unit.GIGABYTE; import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.Executors.newScheduledThreadPool; import static org.testng.Assert.assertEquals; diff --git a/presto-spark-classloader-interface/pom.xml b/presto-spark-classloader-interface/pom.xml index 7e620a0afe2ba..2615b3220645c 100644 --- a/presto-spark-classloader-interface/pom.xml +++ b/presto-spark-classloader-interface/pom.xml @@ -25,7 +25,7 @@ guava - io.airlift + com.facebook.airlift units diff --git a/presto-spark-classloader-interface/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkBootstrapTimer.java b/presto-spark-classloader-interface/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkBootstrapTimer.java index 857a6cb2b38b6..6b5ca05f6096b 100644 --- a/presto-spark-classloader-interface/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkBootstrapTimer.java +++ b/presto-spark-classloader-interface/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkBootstrapTimer.java @@ -13,14 +13,14 @@ */ package com.facebook.presto.spark.classloader_interface; +import com.facebook.airlift.units.Duration; import com.google.common.base.Ticker; -import io.airlift.units.Duration; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import static io.airlift.units.Duration.succinctNanos; +import static com.facebook.airlift.units.Duration.succinctNanos; import static java.lang.Math.max; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-testing/pom.xml b/presto-spark-testing/pom.xml index 661b86be66bbf..4bdee1dc8fbde 100644 --- a/presto-spark-testing/pom.xml +++ b/presto-spark-testing/pom.xml @@ -26,7 +26,7 @@ - io.airlift + com.facebook.airlift units test diff --git a/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java b/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java index db9438fa41d2c..d8ca2cc8d9304 100644 --- a/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java +++ b/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java @@ -14,6 +14,7 @@ package com.facebook.presto.spark.testing; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.hive.HiveHadoop2Plugin; @@ -27,7 +28,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.hash.Hashing; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; diff --git a/presto-spi/pom.xml b/presto-spi/pom.xml index 21ea78b6564ae..bcb8a4bc7a76d 100644 --- a/presto-spi/pom.xml +++ b/presto-spi/pom.xml @@ -34,7 +34,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java index e3d5c89f97db8..649d64a7a685f 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/OperatorStatistics.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.spi.eventlistener; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.RuntimeStats; import com.facebook.presto.spi.plan.PlanNodeId; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/StageStatistics.java b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/StageStatistics.java index a655c8e33987a..a81259e3940a0 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/StageStatistics.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/StageStatistics.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.spi.eventlistener; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroup.java b/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroup.java index 097e2281e23c6..26c3d348882fe 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroup.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroup.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.spi.resourceGroups; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; public interface ResourceGroup { diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroupQueryLimits.java b/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroupQueryLimits.java index 35fb50b0279d4..ff27266e9ffd6 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroupQueryLimits.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/resourceGroups/ResourceGroupQueryLimits.java @@ -12,10 +12,11 @@ * limitations under the License. */ package com.facebook.presto.spi.resourceGroups; + +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Objects; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/session/PropertyMetadata.java b/presto-spi/src/main/java/com/facebook/presto/spi/session/PropertyMetadata.java index c30b0f4317621..7a6cdbf65ca31 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/session/PropertyMetadata.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/session/PropertyMetadata.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.spi.session; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.type.Type; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Objects; import java.util.function.Function; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/session/ResourceEstimates.java b/presto-spi/src/main/java/com/facebook/presto/spi/session/ResourceEstimates.java index f38f9258ccb2a..8787613e5e5d7 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/session/ResourceEstimates.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/session/ResourceEstimates.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.spi.session; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.drift.annotations.ThriftConstructor; import com.facebook.drift.annotations.ThriftField; import com.facebook.drift.annotations.ThriftStruct; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.Optional; diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/ttl/NodeTtlFetcher.java b/presto-spi/src/main/java/com/facebook/presto/spi/ttl/NodeTtlFetcher.java index 37eb9c2291e5b..329bd0a18ceb5 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/ttl/NodeTtlFetcher.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/ttl/NodeTtlFetcher.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.spi.ttl; -import io.airlift.units.Duration; +import com.facebook.airlift.units.Duration; import java.util.Map; import java.util.Set; diff --git a/presto-sqlserver/pom.xml b/presto-sqlserver/pom.xml index 005fe199a64aa..16ccef778bf5e 100644 --- a/presto-sqlserver/pom.xml +++ b/presto-sqlserver/pom.xml @@ -60,7 +60,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-teradata-functions/pom.xml b/presto-teradata-functions/pom.xml index 845c741f745bf..c4e7043d64685 100644 --- a/presto-teradata-functions/pom.xml +++ b/presto-teradata-functions/pom.xml @@ -63,7 +63,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-testng-services/pom.xml b/presto-testng-services/pom.xml index df44a67efb294..777f4abbf2ea5 100644 --- a/presto-testng-services/pom.xml +++ b/presto-testng-services/pom.xml @@ -39,7 +39,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java b/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java index 8c1475a495f99..92c6703cb2f2f 100644 --- a/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java +++ b/presto-testng-services/src/main/java/com/facebook/presto/testng/services/LogTestDurationListener.java @@ -14,9 +14,9 @@ package com.facebook.presto.testng.services; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.airlift.units.Duration; import org.testng.IClassListener; import org.testng.IExecutionListener; import org.testng.IInvokedMethod; @@ -36,8 +36,8 @@ import java.util.concurrent.atomic.AtomicLong; import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.google.common.base.Preconditions.checkState; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.lang.management.ManagementFactory.getThreadMXBean; import static java.util.stream.Collectors.joining; diff --git a/presto-tests/pom.xml b/presto-tests/pom.xml index 131e274010735..14146307183db 100644 --- a/presto-tests/pom.xml +++ b/presto-tests/pom.xml @@ -142,7 +142,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestDistributedQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestDistributedQueries.java index 49fdda88d9096..a099fe3e8cc05 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestDistributedQueries.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestDistributedQueries.java @@ -14,6 +14,7 @@ package com.facebook.presto.tests; import com.facebook.airlift.testing.Assertions; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.SystemSessionProperties; import com.facebook.presto.dispatcher.DispatchManager; @@ -32,7 +33,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.UncheckedTimeoutException; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import org.testng.annotations.Test; @@ -44,6 +44,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE; import static com.facebook.presto.SystemSessionProperties.JOIN_REORDERING_STRATEGY; import static com.facebook.presto.SystemSessionProperties.OPTIMIZE_PAYLOAD_JOINS; @@ -79,7 +80,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.lang.Thread.currentThread; import static java.util.Collections.nCopies; diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueryFramework.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueryFramework.java index 86c744faf3bdc..72999fbe97c16 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueryFramework.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueryFramework.java @@ -14,6 +14,7 @@ package com.facebook.presto.tests; import com.facebook.airlift.node.NodeInfo; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.transaction.TransactionId; import com.facebook.presto.common.type.Type; @@ -51,7 +52,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import org.testng.SkipException; import org.testng.annotations.AfterClass; diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestingPrestoClient.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestingPrestoClient.java index 5316b636b30e0..9eb4d3eda142b 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestingPrestoClient.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestingPrestoClient.java @@ -14,6 +14,7 @@ package com.facebook.presto.tests; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ClientSession; import com.facebook.presto.client.Column; @@ -33,7 +34,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import okhttp3.OkHttpClient; import org.intellij.lang.annotations.Language; diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/DistributedQueryRunner.java b/presto-tests/src/main/java/com/facebook/presto/tests/DistributedQueryRunner.java index 4c0bef0ce4e99..d9ce3439011ab 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/DistributedQueryRunner.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/DistributedQueryRunner.java @@ -19,6 +19,7 @@ import com.facebook.airlift.http.client.jetty.JettyHttpClient; import com.facebook.airlift.log.Logger; import com.facebook.airlift.testing.Assertions; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.Session.SessionBuilder; import com.facebook.presto.common.QualifiedObjectName; @@ -56,7 +57,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Closer; import com.google.inject.Module; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; @@ -87,6 +87,7 @@ import static com.facebook.airlift.http.client.JsonResponseHandler.createJsonResponseHandler; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; import static com.facebook.airlift.json.JsonCodec.jsonCodec; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.client.PrestoHeaders.PRESTO_USER; import static com.facebook.presto.spi.NodePoolType.INTERMEDIATE; import static com.facebook.presto.spi.NodePoolType.LEAF; @@ -98,7 +99,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.collect.Iterables.getOnlyElement; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.lang.System.nanoTime; import static java.util.Objects.requireNonNull; diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/QueryAssertions.java b/presto-tests/src/main/java/com/facebook/presto/tests/QueryAssertions.java index 9a1cdbe8b7755..508b0694f0fb3 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/QueryAssertions.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/QueryAssertions.java @@ -14,6 +14,7 @@ package com.facebook.presto.tests; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.spi.WarningCollector; @@ -29,7 +30,6 @@ import com.google.common.collect.Multiset; import com.google.common.collect.Multisets; import io.airlift.tpch.TpchTable; -import io.airlift.units.Duration; import org.intellij.lang.annotations.Language; import java.util.List; @@ -39,9 +39,9 @@ import java.util.function.Supplier; import java.util.regex.Pattern; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; -import static io.airlift.units.Duration.nanosSince; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/presto-tests/src/test/java/com/facebook/presto/execution/TestFinalQueryInfo.java b/presto-tests/src/test/java/com/facebook/presto/execution/TestFinalQueryInfo.java index 9058d480a9360..2913c9594fc72 100644 --- a/presto-tests/src/test/java/com/facebook/presto/execution/TestFinalQueryInfo.java +++ b/presto-tests/src/test/java/com/facebook/presto/execution/TestFinalQueryInfo.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.execution; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ClientSession; import com.facebook.presto.client.StatementClient; @@ -22,7 +23,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import okhttp3.OkHttpClient; import org.testng.annotations.Test; diff --git a/presto-tests/src/test/java/com/facebook/presto/execution/TestMemoryRevokingScheduler.java b/presto-tests/src/test/java/com/facebook/presto/execution/TestMemoryRevokingScheduler.java index 84a699714938f..17a4b31188fcd 100644 --- a/presto-tests/src/test/java/com/facebook/presto/execution/TestMemoryRevokingScheduler.java +++ b/presto-tests/src/test/java/com/facebook/presto/execution/TestMemoryRevokingScheduler.java @@ -16,6 +16,7 @@ import com.facebook.airlift.stats.CounterStat; import com.facebook.airlift.stats.TestingGcMonitor; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.common.block.BlockEncodingManager; import com.facebook.presto.execution.TestSqlTaskManager.MockExchangeClientSupplier; import com.facebook.presto.execution.buffer.OutputBuffers; @@ -44,7 +45,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -64,6 +64,10 @@ import static com.facebook.airlift.concurrent.Threads.threadsNamed; import static com.facebook.airlift.json.JsonCodec.listJsonCodec; +import static com.facebook.airlift.units.DataSize.Unit.BYTE; +import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.SessionTestUtils.TEST_SESSION; import static com.facebook.presto.execution.SqlTask.createSqlTask; import static com.facebook.presto.execution.TaskManagerConfig.TaskPriorityTracking.TASK_FAIR; @@ -78,10 +82,6 @@ import static com.facebook.presto.memory.LocalMemoryManager.GENERAL_POOL; import static com.facebook.presto.sql.analyzer.FeaturesConfig.TaskSpillingStrategy.ORDER_BY_CREATE_TIME; import static com.facebook.presto.sql.analyzer.FeaturesConfig.TaskSpillingStrategy.ORDER_BY_REVOCABLE_BYTES; -import static io.airlift.units.DataSize.Unit.BYTE; -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 java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java b/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java index c4b4c242cb12a..98b7e4068919a 100644 --- a/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java +++ b/presto-tests/src/test/java/com/facebook/presto/execution/TestQueues.java @@ -17,6 +17,8 @@ import com.facebook.airlift.http.client.Request; import com.facebook.airlift.http.client.jetty.JettyHttpClient; import com.facebook.airlift.json.JsonObjectMapperProvider; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.dispatcher.DispatchManager; import com.facebook.presto.plugin.blackhole.BlackHolePlugin; @@ -36,8 +38,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.inject.Key; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import jakarta.ws.rs.core.Response.Status; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; diff --git a/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroupIntegration.java b/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroupIntegration.java index 743bff0e8ea32..ae6550fe85dff 100644 --- a/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroupIntegration.java +++ b/presto-tests/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroupIntegration.java @@ -24,9 +24,9 @@ import java.util.List; import static com.facebook.airlift.testing.Assertions.assertLessThan; +import static com.facebook.airlift.units.Duration.nanosSince; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.utils.ResourceUtils.getResourceFilePath; -import static io.airlift.units.Duration.nanosSince; import static java.util.concurrent.TimeUnit.SECONDS; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/presto-tests/src/test/java/com/facebook/presto/memory/TestClusterMemoryLeakDetector.java b/presto-tests/src/test/java/com/facebook/presto/memory/TestClusterMemoryLeakDetector.java index e454d9e758fab..f3c1b9ce8026f 100644 --- a/presto-tests/src/test/java/com/facebook/presto/memory/TestClusterMemoryLeakDetector.java +++ b/presto-tests/src/test/java/com/facebook/presto/memory/TestClusterMemoryLeakDetector.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.memory; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.QueryState; import com.facebook.presto.server.BasicQueryInfo; import com.facebook.presto.server.BasicQueryStats; @@ -21,8 +23,6 @@ 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 org.joda.time.DateTime; import org.testng.annotations.Test; diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java index b96aedd2a6165..4e64b6777bd1d 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.tests; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.QualifiedObjectName; import com.facebook.presto.testing.MaterializedResult; @@ -20,7 +21,6 @@ import com.facebook.presto.testing.QueryRunner; import com.google.common.base.Stopwatch; import com.google.common.collect.Iterables; -import io.airlift.units.Duration; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestQueryManager.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestQueryManager.java index 11c93aaf2284a..161462192ac07 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestQueryManager.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestQueryManager.java @@ -13,6 +13,8 @@ */ package com.facebook.presto.tests; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.SystemSessionProperties; import com.facebook.presto.common.RuntimeStats; @@ -41,8 +43,6 @@ 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 org.intellij.lang.annotations.Language; import org.joda.time.DateTime; import org.testng.annotations.AfterClass; diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestQuerySpillLimits.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestQuerySpillLimits.java index 00add104ab5e0..18b95908a98d9 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestQuerySpillLimits.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestQuerySpillLimits.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.tests; +import com.facebook.airlift.units.DataSize; import com.facebook.presto.Session; import com.facebook.presto.spiller.NodeSpillConfig; import com.facebook.presto.sql.analyzer.FeaturesConfig; @@ -22,7 +23,6 @@ import com.facebook.presto.tpch.TpchConnectorFactory; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import io.airlift.units.DataSize; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/presto-thrift-connector/pom.xml b/presto-thrift-connector/pom.xml index 980f161b1d895..b40d56d9f4df5 100644 --- a/presto-thrift-connector/pom.xml +++ b/presto-thrift-connector/pom.xml @@ -142,7 +142,7 @@ - io.airlift + com.facebook.airlift units provided diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java index afb8b0fe57f9c..1f598859089a7 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftConnectorConfig.java @@ -14,13 +14,13 @@ package com.facebook.presto.connector.thrift; import com.facebook.airlift.configuration.Config; -import io.airlift.units.DataSize; -import io.airlift.units.MaxDataSize; -import io.airlift.units.MinDataSize; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.MaxDataSize; +import com.facebook.airlift.units.MinDataSize; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class ThriftConnectorConfig { diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java index 2abbf4d455b32..d0291feb4035e 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/ThriftMetadata.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.connector.thrift; +import com.facebook.airlift.units.Duration; import com.facebook.drift.TException; import com.facebook.drift.client.DriftClient; import com.facebook.presto.common.predicate.TupleDomain; @@ -42,7 +43,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-thrift-connector/src/test/java/com/facebook/presto/connector/thrift/TestThriftConnectorConfig.java b/presto-thrift-connector/src/test/java/com/facebook/presto/connector/thrift/TestThriftConnectorConfig.java index 6213a7c43a3a0..25408469c913f 100644 --- a/presto-thrift-connector/src/test/java/com/facebook/presto/connector/thrift/TestThriftConnectorConfig.java +++ b/presto-thrift-connector/src/test/java/com/facebook/presto/connector/thrift/TestThriftConnectorConfig.java @@ -14,13 +14,13 @@ package com.facebook.presto.connector.thrift; import com.facebook.airlift.configuration.testing.ConfigAssertions; +import com.facebook.airlift.units.DataSize; import com.google.common.collect.ImmutableMap; -import io.airlift.units.DataSize; import org.testng.annotations.Test; import java.util.Map; -import static io.airlift.units.DataSize.Unit.MEGABYTE; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; public class TestThriftConnectorConfig { diff --git a/presto-verifier/pom.xml b/presto-verifier/pom.xml index 5582143ef1fa7..4da5b6bb503f7 100644 --- a/presto-verifier/pom.xml +++ b/presto-verifier/pom.xml @@ -179,7 +179,7 @@ - io.airlift + com.facebook.airlift units diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java index fbcba95ffea11..770cc9a59f78f 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryInfo.java @@ -15,12 +15,12 @@ import com.facebook.airlift.event.client.EventField; import com.facebook.airlift.event.client.EventType; +import com.facebook.airlift.units.Duration; import com.facebook.presto.jdbc.QueryStats; import com.facebook.presto.verifier.prestoaction.QueryActionStats; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.errorprone.annotations.Immutable; -import io.airlift.units.Duration; import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoAction.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoAction.java index 9ae4fd0c25ed2..06f460fc88704 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoAction.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoAction.java @@ -14,6 +14,7 @@ package com.facebook.presto.verifier.prestoaction; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.jdbc.PrestoConnection; import com.facebook.presto.jdbc.PrestoStatement; import com.facebook.presto.jdbc.QueryStats; @@ -31,7 +32,6 @@ import com.facebook.presto.verifier.retry.RetryConfig; import com.facebook.presto.verifier.retry.RetryDriver; import com.google.common.collect.ImmutableList; -import io.airlift.units.Duration; import java.sql.DriverManager; import java.sql.ResultSet; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoActionFactory.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoActionFactory.java index 1544aed958995..3c7d004ed2575 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoActionFactory.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/JdbcPrestoActionFactory.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.verifier.prestoaction; +import com.facebook.airlift.units.Duration; import com.facebook.presto.verifier.framework.QueryConfiguration; import com.facebook.presto.verifier.framework.VerificationContext; import com.facebook.presto.verifier.retry.RetryConfig; -import io.airlift.units.Duration; import static java.util.Objects.requireNonNull; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java index 2978a1d7974cb..c721254736dd4 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/PrestoActionConfig.java @@ -15,13 +15,13 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionUtil.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionUtil.java index f08de181ec881..2a3a032087244 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionUtil.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionUtil.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.verifier.prestoaction; +import com.facebook.airlift.units.Duration; import com.facebook.presto.verifier.framework.QueryStage; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import java.util.HashMap; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java index 84082e80a8e51..260037042901b 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.verifier.prestoaction; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.NotNull; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java index 6ccf5103c32c5..a4a4bd4cb17dc 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolver.java @@ -14,6 +14,7 @@ package com.facebook.presto.verifier.resolver; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.common.ErrorCode; import com.facebook.presto.common.ErrorType; import com.facebook.presto.jdbc.QueryStats; @@ -29,7 +30,6 @@ import com.facebook.presto.verifier.framework.QueryObjectBundle; import com.facebook.presto.verifier.prestoaction.PrestoAction; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import jakarta.inject.Inject; import java.util.List; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java index 78d147256f987..c127994508037 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/resolver/TooManyOpenPartitionsFailureResolverConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.verifier.resolver; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java index 030e2b92759ff..1d2f7e9312e3f 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryConfig.java @@ -14,8 +14,8 @@ package com.facebook.presto.verifier.retry; import com.facebook.airlift.configuration.Config; -import io.airlift.units.Duration; -import io.airlift.units.MinDuration; +import com.facebook.airlift.units.Duration; +import com.facebook.airlift.units.MinDuration; import jakarta.validation.constraints.Min; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryDriver.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryDriver.java index 344d93bc58259..39d7ed7f585b7 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryDriver.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/retry/RetryDriver.java @@ -14,8 +14,8 @@ package com.facebook.presto.verifier.retry; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.verifier.framework.QueryException; -import io.airlift.units.Duration; import java.util.concurrent.ThreadLocalRandom; import java.util.function.Consumer; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java index 58ac2834cc556..f163dda4ab386 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.verifier; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.plugin.memory.MemoryPlugin; @@ -37,7 +38,6 @@ import com.facebook.presto.verifier.source.VerifierDao; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestPrestoActionConfig.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestPrestoActionConfig.java index 5bbfb637a8efe..d9ae1852b2c21 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestPrestoActionConfig.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestPrestoActionConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.verifier.prestoaction; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.net.URI; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestQueryActionsConfig.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestQueryActionsConfig.java index dad2c1587a5a7..e2997f172125c 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestQueryActionsConfig.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/prestoaction/TestQueryActionsConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.verifier.prestoaction; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/resolver/TestTooManyOpenPartitionsFailureResolverConfig.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/resolver/TestTooManyOpenPartitionsFailureResolverConfig.java index bb6fd2156a548..3431ff194b44c 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/resolver/TestTooManyOpenPartitionsFailureResolverConfig.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/resolver/TestTooManyOpenPartitionsFailureResolverConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.verifier.resolver; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryConfig.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryConfig.java index ae32577fc5b6c..aa3d2ea58ee0e 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryConfig.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryConfig.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.verifier.retry; +import com.facebook.airlift.units.Duration; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryDriver.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryDriver.java index 9d48707aca936..0f1db70ecbab4 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryDriver.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/retry/TestRetryDriver.java @@ -14,13 +14,13 @@ package com.facebook.presto.verifier.retry; import com.facebook.airlift.log.Logging; +import com.facebook.airlift.units.Duration; import com.facebook.presto.verifier.framework.ClusterConnectionException; import com.facebook.presto.verifier.framework.PrestoQueryException; import com.facebook.presto.verifier.framework.QueryException; import com.facebook.presto.verifier.framework.QueryStage; import com.facebook.presto.verifier.framework.VerificationContext; import com.facebook.presto.verifier.retry.RetryDriver.RetryOperation; -import io.airlift.units.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/redis-hbo-provider/pom.xml b/redis-hbo-provider/pom.xml index 19fa46419463f..99171c8b4f5ed 100644 --- a/redis-hbo-provider/pom.xml +++ b/redis-hbo-provider/pom.xml @@ -118,7 +118,7 @@ - io.airlift + com.facebook.airlift units provided From c932864f2ac243e9b9007f71d8338bd885ef806b Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Mon, 21 Apr 2025 21:10:49 -0400 Subject: [PATCH 06/27] Migrate from io.airlift:airline to com.facebook.airlift:airline --- pom.xml | 4 ++-- presto-benchmark-driver/pom.xml | 2 +- presto-benchmark-runner/pom.xml | 2 +- presto-cli/pom.xml | 2 +- presto-spark-launcher/pom.xml | 2 +- presto-testing-server-launcher/pom.xml | 2 +- presto-verifier/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 90d5debd388e1..88986852f6076 100644 --- a/pom.xml +++ b/pom.xml @@ -1396,9 +1396,9 @@ - io.airlift + com.facebook.airlift airline - 0.8 + 0.9 diff --git a/presto-benchmark-driver/pom.xml b/presto-benchmark-driver/pom.xml index 2360c65070342..a8fc81d3473cf 100644 --- a/presto-benchmark-driver/pom.xml +++ b/presto-benchmark-driver/pom.xml @@ -24,7 +24,7 @@ - io.airlift + com.facebook.airlift airline diff --git a/presto-benchmark-runner/pom.xml b/presto-benchmark-runner/pom.xml index 254707e085710..03ac29bb58365 100644 --- a/presto-benchmark-runner/pom.xml +++ b/presto-benchmark-runner/pom.xml @@ -139,7 +139,7 @@ - io.airlift + com.facebook.airlift airline diff --git a/presto-cli/pom.xml b/presto-cli/pom.xml index 153fa1752bfc0..416b9a6fef8e0 100644 --- a/presto-cli/pom.xml +++ b/presto-cli/pom.xml @@ -38,7 +38,7 @@ - io.airlift + com.facebook.airlift airline diff --git a/presto-spark-launcher/pom.xml b/presto-spark-launcher/pom.xml index e08e207c62098..8b8ec893530df 100644 --- a/presto-spark-launcher/pom.xml +++ b/presto-spark-launcher/pom.xml @@ -33,7 +33,7 @@ - io.airlift + com.facebook.airlift airline diff --git a/presto-testing-server-launcher/pom.xml b/presto-testing-server-launcher/pom.xml index 11b52a5439723..864b87c9a7b61 100644 --- a/presto-testing-server-launcher/pom.xml +++ b/presto-testing-server-launcher/pom.xml @@ -29,7 +29,7 @@ - io.airlift + com.facebook.airlift airline diff --git a/presto-verifier/pom.xml b/presto-verifier/pom.xml index 4da5b6bb503f7..bb9ad5c47c984 100644 --- a/presto-verifier/pom.xml +++ b/presto-verifier/pom.xml @@ -128,7 +128,7 @@ - io.airlift + com.facebook.airlift airline From 1131192c061cf72fa3ff5f6d91eb9a8732164437 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Fri, 4 Apr 2025 17:08:05 -0700 Subject: [PATCH 07/27] Update all GH actions to java 17 --- .github/workflows/arrow-flight-tests.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/hive-tests.yml | 4 ++-- .github/workflows/kudu.yml | 2 +- .github/workflows/maven-checks.yml | 2 +- .github/workflows/presto-release-prepare.yml | 2 +- .github/workflows/prestocpp-linux-build-and-unit-test.yml | 8 ++++---- .github/workflows/product-tests-basic-environment.yml | 2 +- .github/workflows/product-tests-specific-environment.yml | 4 ++-- .github/workflows/singlestore-tests.yml | 2 +- .github/workflows/spark-integration.yml | 2 +- .github/workflows/test-other-modules.yml | 2 +- .github/workflows/tests.yml | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/arrow-flight-tests.yml b/.github/workflows/arrow-flight-tests.yml index c82e97c0a0f0f..0104596330972 100644 --- a/.github/workflows/arrow-flight-tests.yml +++ b/.github/workflows/arrow-flight-tests.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] modules: - ":presto-base-arrow-flight" # Only run tests for the `presto-base-arrow-flight` module @@ -183,7 +183,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8.0.452 + java-version: 17.0.15 cache: 'maven' - name: Download nodejs to maven cache run: .github/bin/download_nodejs diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 248534e1bd8b3..dc6bb5de6b955 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8.0.452 + java-version: 17.0.15 cache: 'maven' - name: Maven Install run: | diff --git a/.github/workflows/hive-tests.yml b/.github/workflows/hive-tests.yml index 9cde661161ae4..97b707f6aed6b 100644 --- a/.github/workflows/hive-tests.yml +++ b/.github/workflows/hive-tests.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 @@ -88,7 +88,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 20 diff --git a/.github/workflows/kudu.yml b/.github/workflows/kudu.yml index 6adac25782dab..7969d9cc565a5 100644 --- a/.github/workflows/kudu.yml +++ b/.github/workflows/kudu.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 diff --git a/.github/workflows/maven-checks.yml b/.github/workflows/maven-checks.yml index 380e6b7bab927..acfcc41efdbc3 100644 --- a/.github/workflows/maven-checks.yml +++ b/.github/workflows/maven-checks.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest timeout-minutes: 45 concurrency: diff --git a/.github/workflows/presto-release-prepare.yml b/.github/workflows/presto-release-prepare.yml index 4dec92d148417..34a411791ff2d 100644 --- a/.github/workflows/presto-release-prepare.yml +++ b/.github/workflows/presto-release-prepare.yml @@ -15,7 +15,7 @@ on: required: false env: - JAVA_VERSION: ${{ vars.JAVA_VERSION || '17' }} + JAVA_VERSION: ${{ vars.JAVA_VERSION || '17.0.13' }} JAVA_DISTRIBUTION: ${{ vars.JAVA_DISTRIBUTION || 'temurin' }} MAVEN_OPTS: ${{ vars.MAVEN_OPTS }} GIT_CI_USER: ${{ vars.GIT_CI_USER || 'prestodb-ci' }} diff --git a/.github/workflows/prestocpp-linux-build-and-unit-test.yml b/.github/workflows/prestocpp-linux-build-and-unit-test.yml index c1df70a1c57d9..c6c4d36aeb15e 100644 --- a/.github/workflows/prestocpp-linux-build-and-unit-test.yml +++ b/.github/workflows/prestocpp-linux-build-and-unit-test.yml @@ -174,7 +174,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8.0.452 + java-version: 17.0.15 cache: 'maven' - name: Download nodejs to maven cache if: | @@ -270,7 +270,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '8.0.452' + java-version: 17.0.15 cache: 'maven' - name: Download nodejs to maven cache if: | @@ -358,7 +358,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '8.0.452' + java-version: 17.0.15 cache: 'maven' - name: Download nodejs to maven cache if: | @@ -443,7 +443,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '8.0.452' + java-version: 17.0.15 cache: 'maven' - name: Download nodejs to maven cache if: | diff --git a/.github/workflows/product-tests-basic-environment.yml b/.github/workflows/product-tests-basic-environment.yml index 1b29d0431f763..92ba0a4384ee8 100644 --- a/.github/workflows/product-tests-basic-environment.yml +++ b/.github/workflows/product-tests-basic-environment.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 diff --git a/.github/workflows/product-tests-specific-environment.yml b/.github/workflows/product-tests-specific-environment.yml index 6542dc5295b5c..1f7892e07fb6f 100644 --- a/.github/workflows/product-tests-specific-environment.yml +++ b/.github/workflows/product-tests-specific-environment.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 @@ -98,7 +98,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 diff --git a/.github/workflows/singlestore-tests.yml b/.github/workflows/singlestore-tests.yml index cb2635e705cf9..e65e6fba0b62f 100644 --- a/.github/workflows/singlestore-tests.yml +++ b/.github/workflows/singlestore-tests.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 30 diff --git a/.github/workflows/spark-integration.yml b/.github/workflows/spark-integration.yml index 025e8ad7d509f..b87e330d17164 100644 --- a/.github/workflows/spark-integration.yml +++ b/.github/workflows/spark-integration.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 diff --git a/.github/workflows/test-other-modules.yml b/.github/workflows/test-other-modules.yml index 8d6d47003543c..bb0c5a31abaa8 100644 --- a/.github/workflows/test-other-modules.yml +++ b/.github/workflows/test-other-modules.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] runs-on: ubuntu-latest needs: changes timeout-minutes: 60 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ca764557532aa..0afc4c0fbfa82 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8.0.452, 17.0.15 ] + java: [ 17.0.15 ] modules: - ":presto-tests -P presto-tests-execution-memory" - ":presto-tests -P presto-tests-general" From cdb7934ddc2e95429f8e4520c6f164541b8dae94 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 9 Apr 2025 15:53:16 -0700 Subject: [PATCH 08/27] Disable modernizer plugin on each module This could be done in a single file, but by splitting this up it will allows contributors and maintainers to incrementally re- enable the modernizer on each module since it will cause lots of code change. It will also introduce lots of opportunities for new contributors to get involved with Presto. --- presto-accumulo/pom.xml | 1 + presto-analyzer/pom.xml | 1 + presto-atop/pom.xml | 1 + presto-base-arrow-flight/pom.xml | 1 + presto-base-jdbc/pom.xml | 1 + presto-benchmark-driver/pom.xml | 1 + presto-benchmark-runner/pom.xml | 1 + presto-benchmark/pom.xml | 1 + presto-benchto-benchmarks/pom.xml | 1 + presto-bigquery/pom.xml | 1 + presto-blackhole/pom.xml | 1 + presto-bytecode/pom.xml | 1 + presto-cache/pom.xml | 1 + presto-cassandra/pom.xml | 1 + presto-cli/pom.xml | 1 + presto-clickhouse/pom.xml | 1 + presto-client/pom.xml | 1 + presto-cluster-ttl-providers/pom.xml | 1 + presto-common/pom.xml | 1 + presto-delta/pom.xml | 1 + presto-docs/pom.xml | 1 + presto-druid/pom.xml | 1 + presto-elasticsearch/pom.xml | 1 + presto-example-http/pom.xml | 1 + presto-expressions/pom.xml | 1 + presto-function-namespace-managers-common/pom.xml | 1 + presto-function-namespace-managers/pom.xml | 1 + presto-function-server/pom.xml | 1 + presto-geospatial-toolkit/pom.xml | 1 + presto-google-sheets/pom.xml | 1 + presto-grpc-api/pom.xml | 1 + presto-grpc-testing-udf-server/pom.xml | 1 + presto-hana/pom.xml | 1 + presto-hdfs-core/pom.xml | 1 + presto-hive-common/pom.xml | 1 + presto-hive-function-namespace/pom.xml | 1 + presto-hive-hadoop2/pom.xml | 1 + presto-hive-metastore/pom.xml | 1 + presto-hive/pom.xml | 1 + presto-hudi/pom.xml | 1 + presto-i18n-functions/pom.xml | 1 + presto-iceberg/pom.xml | 1 + presto-jdbc/pom.xml | 1 + presto-jmx/pom.xml | 1 + presto-kafka/pom.xml | 1 + presto-kudu/pom.xml | 1 + presto-lark-sheets/pom.xml | 1 + presto-local-file/pom.xml | 1 + presto-main-base/pom.xml | 1 + presto-main/pom.xml | 1 + presto-matching/pom.xml | 1 + presto-memory-context/pom.xml | 1 + presto-memory/pom.xml | 1 + presto-ml/pom.xml | 1 + presto-mongodb/pom.xml | 1 + presto-mysql/pom.xml | 1 + presto-native-execution/pom.xml | 1 + presto-native-sidecar-plugin/pom.xml | 1 + presto-native-tests/pom.xml | 1 + presto-node-ttl-fetchers/pom.xml | 1 + presto-open-telemetry/pom.xml | 1 + presto-openapi/pom.xml | 1 + presto-oracle/pom.xml | 1 + presto-orc/pom.xml | 1 + presto-parquet/pom.xml | 1 + presto-parser/pom.xml | 1 + presto-password-authenticators/pom.xml | 1 + presto-pinot-toolkit/pom.xml | 1 + presto-pinot/pom.xml | 1 + presto-plugin-toolkit/pom.xml | 1 + presto-postgresql/pom.xml | 1 + presto-product-tests/pom.xml | 1 + presto-prometheus/pom.xml | 1 + presto-proxy/pom.xml | 1 + presto-rcfile/pom.xml | 1 + presto-record-decoder/pom.xml | 1 + presto-redis/pom.xml | 1 + presto-redshift/pom.xml | 1 + presto-resource-group-managers/pom.xml | 1 + presto-router/pom.xml | 1 + presto-server/pom.xml | 4 +++- presto-session-property-managers/pom.xml | 1 + presto-singlestore/pom.xml | 1 + presto-spark-base/pom.xml | 1 + presto-spark-classloader-interface/pom.xml | 1 + presto-spark-common/pom.xml | 1 + presto-spark-launcher/pom.xml | 1 + presto-spark-package/pom.xml | 1 + presto-spark-testing/pom.xml | 1 + presto-spark/pom.xml | 1 + presto-spi/pom.xml | 1 + presto-sqlserver/pom.xml | 1 + presto-teradata-functions/pom.xml | 1 + presto-test-coverage/pom.xml | 1 + presto-testing-docker/pom.xml | 1 + presto-testing-server-launcher/pom.xml | 1 + presto-testng-services/pom.xml | 1 + presto-tests/pom.xml | 1 + presto-thrift-api/pom.xml | 1 + presto-thrift-connector/pom.xml | 1 + presto-thrift-spec/pom.xml | 1 + presto-thrift-testing-server/pom.xml | 1 + presto-thrift-testing-udf-server/pom.xml | 1 + presto-tpcds/pom.xml | 1 + presto-tpch/pom.xml | 1 + presto-ui/pom.xml | 1 + presto-verifier/pom.xml | 1 + redis-hbo-provider/pom.xml | 1 + 108 files changed, 110 insertions(+), 1 deletion(-) diff --git a/presto-accumulo/pom.xml b/presto-accumulo/pom.xml index 895dc8791e3fc..acf1ec0b56ed5 100644 --- a/presto-accumulo/pom.xml +++ b/presto-accumulo/pom.xml @@ -18,6 +18,7 @@ 1.10.1 2.12.0 2.24.3 + true diff --git a/presto-analyzer/pom.xml b/presto-analyzer/pom.xml index b3e141e01c609..e1c2ff5bf062c 100644 --- a/presto-analyzer/pom.xml +++ b/presto-analyzer/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-atop/pom.xml b/presto-atop/pom.xml index cb49e43388321..d686e4b8d5db6 100644 --- a/presto-atop/pom.xml +++ b/presto-atop/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-base-arrow-flight/pom.xml b/presto-base-arrow-flight/pom.xml index 72b399382ca33..ef866ce6f3925 100644 --- a/presto-base-arrow-flight/pom.xml +++ b/presto-base-arrow-flight/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} -Xss10M + true diff --git a/presto-base-jdbc/pom.xml b/presto-base-jdbc/pom.xml index 18aa5a31370bb..3667d6c4c3866 100644 --- a/presto-base-jdbc/pom.xml +++ b/presto-base-jdbc/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-benchmark-driver/pom.xml b/presto-benchmark-driver/pom.xml index a8fc81d3473cf..1ea86335581be 100644 --- a/presto-benchmark-driver/pom.xml +++ b/presto-benchmark-driver/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} com.facebook.presto.benchmark.driver.PrestoBenchmarkDriver 17 + true diff --git a/presto-benchmark-runner/pom.xml b/presto-benchmark-runner/pom.xml index 03ac29bb58365..75c24687af740 100644 --- a/presto-benchmark-runner/pom.xml +++ b/presto-benchmark-runner/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} com.facebook.presto.benchmark.PrestoBenchmarkRunner 17 + true diff --git a/presto-benchmark/pom.xml b/presto-benchmark/pom.xml index 43cbb2a1eb326..50a69466cde0f 100644 --- a/presto-benchmark/pom.xml +++ b/presto-benchmark/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-benchto-benchmarks/pom.xml b/presto-benchto-benchmarks/pom.xml index 120b775ac3942..d6e02bf909005 100644 --- a/presto-benchto-benchmarks/pom.xml +++ b/presto-benchto-benchmarks/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} false false + true diff --git a/presto-bigquery/pom.xml b/presto-bigquery/pom.xml index e8dd0450eb689..6eb883ea0ea2e 100644 --- a/presto-bigquery/pom.xml +++ b/presto-bigquery/pom.xml @@ -18,6 +18,7 @@ 1.33.1 1.11.0 1.46.3 + true diff --git a/presto-blackhole/pom.xml b/presto-blackhole/pom.xml index f0561fec998af..cddba23bf3c87 100644 --- a/presto-blackhole/pom.xml +++ b/presto-blackhole/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-bytecode/pom.xml b/presto-bytecode/pom.xml index 71636585e18c8..62b53fab7226d 100644 --- a/presto-bytecode/pom.xml +++ b/presto-bytecode/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-cache/pom.xml b/presto-cache/pom.xml index 0fa9de3fc4121..2a05eb8e02893 100644 --- a/presto-cache/pom.xml +++ b/presto-cache/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-cassandra/pom.xml b/presto-cassandra/pom.xml index 377564d5d2187..a60da04059960 100644 --- a/presto-cassandra/pom.xml +++ b/presto-cassandra/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-cli/pom.xml b/presto-cli/pom.xml index 416b9a6fef8e0..c6d898a5aab61 100644 --- a/presto-cli/pom.xml +++ b/presto-cli/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} com.facebook.presto.cli.Presto + true diff --git a/presto-clickhouse/pom.xml b/presto-clickhouse/pom.xml index 88d0aff77b058..58684f4df7f39 100644 --- a/presto-clickhouse/pom.xml +++ b/presto-clickhouse/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-client/pom.xml b/presto-client/pom.xml index 19f5dda0c31b0..35ce5c8b5cd26 100644 --- a/presto-client/pom.xml +++ b/presto-client/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-cluster-ttl-providers/pom.xml b/presto-cluster-ttl-providers/pom.xml index 038744ebe34f6..9c0d2063eb275 100644 --- a/presto-cluster-ttl-providers/pom.xml +++ b/presto-cluster-ttl-providers/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-common/pom.xml b/presto-common/pom.xml index 9ab578e4edba6..f3e54ef63fe57 100644 --- a/presto-common/pom.xml +++ b/presto-common/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-delta/pom.xml b/presto-delta/pom.xml index ed920f0503bea..b628c290ec1f8 100644 --- a/presto-delta/pom.xml +++ b/presto-delta/pom.xml @@ -17,6 +17,7 @@ true 3.2.0 17 + true diff --git a/presto-docs/pom.xml b/presto-docs/pom.xml index 28c7ba95ccb8e..03388aa190447 100644 --- a/presto-docs/pom.xml +++ b/presto-docs/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-druid/pom.xml b/presto-druid/pom.xml index fcfc4cb9d7627..e196153b0ed5c 100644 --- a/presto-druid/pom.xml +++ b/presto-druid/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 2.24.3 17 + true diff --git a/presto-elasticsearch/pom.xml b/presto-elasticsearch/pom.xml index add7c895d62b9..45d26e475dab5 100644 --- a/presto-elasticsearch/pom.xml +++ b/presto-elasticsearch/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 7.17.27 2.24.3 + true diff --git a/presto-example-http/pom.xml b/presto-example-http/pom.xml index 8c3f1f8f9b868..d1ca7b1393ab6 100644 --- a/presto-example-http/pom.xml +++ b/presto-example-http/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-expressions/pom.xml b/presto-expressions/pom.xml index d2a89562e3f33..13fd54fc8110a 100644 --- a/presto-expressions/pom.xml +++ b/presto-expressions/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-function-namespace-managers-common/pom.xml b/presto-function-namespace-managers-common/pom.xml index 2fda95e8621c5..6df0ee742cd3f 100644 --- a/presto-function-namespace-managers-common/pom.xml +++ b/presto-function-namespace-managers-common/pom.xml @@ -11,6 +11,7 @@ ${project.parent.basedir} 8 + true presto-function-namespace-managers-common diff --git a/presto-function-namespace-managers/pom.xml b/presto-function-namespace-managers/pom.xml index d7d8008a6197e..3001239f9825b 100644 --- a/presto-function-namespace-managers/pom.xml +++ b/presto-function-namespace-managers/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-function-server/pom.xml b/presto-function-server/pom.xml index 981d1a2dbc6c6..0aeb9796c61d5 100644 --- a/presto-function-server/pom.xml +++ b/presto-function-server/pom.xml @@ -14,6 +14,7 @@ 17 + true diff --git a/presto-geospatial-toolkit/pom.xml b/presto-geospatial-toolkit/pom.xml index 6ea2332967dcd..fa63ba0c4ec90 100644 --- a/presto-geospatial-toolkit/pom.xml +++ b/presto-geospatial-toolkit/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-google-sheets/pom.xml b/presto-google-sheets/pom.xml index f1e477011c882..4c66baecd571b 100644 --- a/presto-google-sheets/pom.xml +++ b/presto-google-sheets/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-grpc-api/pom.xml b/presto-grpc-api/pom.xml index 1d8806228edac..e515d699280ac 100644 --- a/presto-grpc-api/pom.xml +++ b/presto-grpc-api/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-grpc-testing-udf-server/pom.xml b/presto-grpc-testing-udf-server/pom.xml index d39607c07ff74..dfabcd14dedc4 100644 --- a/presto-grpc-testing-udf-server/pom.xml +++ b/presto-grpc-testing-udf-server/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} com.facebook.presto.udf.thrift.TestingThriftUdfServer + true diff --git a/presto-hana/pom.xml b/presto-hana/pom.xml index 75fe6127667e6..5a5e082758353 100644 --- a/presto-hana/pom.xml +++ b/presto-hana/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-hdfs-core/pom.xml b/presto-hdfs-core/pom.xml index faf33cef20074..5f106b5d95079 100644 --- a/presto-hdfs-core/pom.xml +++ b/presto-hdfs-core/pom.xml @@ -10,6 +10,7 @@ ${project.parent.basedir} + true presto-hdfs-core diff --git a/presto-hive-common/pom.xml b/presto-hive-common/pom.xml index 9de477bac05be..3236c2a74fef7 100644 --- a/presto-hive-common/pom.xml +++ b/presto-hive-common/pom.xml @@ -10,6 +10,7 @@ ${project.parent.basedir} + true presto-hive-common diff --git a/presto-hive-function-namespace/pom.xml b/presto-hive-function-namespace/pom.xml index 0a0d370dbcdac..fda65e7fa80b5 100644 --- a/presto-hive-function-namespace/pom.xml +++ b/presto-hive-function-namespace/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-hive-hadoop2/pom.xml b/presto-hive-hadoop2/pom.xml index e53bbd131bf2d..2391d11b5c1b1 100644 --- a/presto-hive-hadoop2/pom.xml +++ b/presto-hive-hadoop2/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-hive-metastore/pom.xml b/presto-hive-metastore/pom.xml index 584c890325c12..a98bffeec25be 100644 --- a/presto-hive-metastore/pom.xml +++ b/presto-hive-metastore/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml index 24d1225755302..62599f72f97fe 100644 --- a/presto-hive/pom.xml +++ b/presto-hive/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 5g 17 + true diff --git a/presto-hudi/pom.xml b/presto-hudi/pom.xml index 9581be57ab9d6..63c0ced3bd811 100644 --- a/presto-hudi/pom.xml +++ b/presto-hudi/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-i18n-functions/pom.xml b/presto-i18n-functions/pom.xml index 2152a31f48803..fd6ad2420772d 100644 --- a/presto-i18n-functions/pom.xml +++ b/presto-i18n-functions/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml index 6871247d7d3d4..63162301fe89b 100644 --- a/presto-iceberg/pom.xml +++ b/presto-iceberg/pom.xml @@ -16,6 +16,7 @@ 17 1.5.0 0.95.0 + true diff --git a/presto-jdbc/pom.xml b/presto-jdbc/pom.xml index a970c0a9b1719..3e2787b6e2bb4 100644 --- a/presto-jdbc/pom.xml +++ b/presto-jdbc/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} com.facebook.presto.jdbc.internal + true diff --git a/presto-jmx/pom.xml b/presto-jmx/pom.xml index 83478ca779bc7..7274e34e0c772 100644 --- a/presto-jmx/pom.xml +++ b/presto-jmx/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-kafka/pom.xml b/presto-kafka/pom.xml index 2d750614cbadf..e2657cb928860 100644 --- a/presto-kafka/pom.xml +++ b/presto-kafka/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 2.12.2 + true diff --git a/presto-kudu/pom.xml b/presto-kudu/pom.xml index 23c7653ecedec..fa46817f2b9a1 100644 --- a/presto-kudu/pom.xml +++ b/presto-kudu/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 1.12.0 + true diff --git a/presto-lark-sheets/pom.xml b/presto-lark-sheets/pom.xml index ecd72087bec5d..3d3f48f22ff87 100644 --- a/presto-lark-sheets/pom.xml +++ b/presto-lark-sheets/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-local-file/pom.xml b/presto-local-file/pom.xml index 0a6afd612b434..2b77cf8af5e78 100644 --- a/presto-local-file/pom.xml +++ b/presto-local-file/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-main-base/pom.xml b/presto-main-base/pom.xml index cce4c22c4a064..c88c021e1bd6c 100644 --- a/presto-main-base/pom.xml +++ b/presto-main-base/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-main/pom.xml b/presto-main/pom.xml index 7dafeb7419874..bc9b405650919 100644 --- a/presto-main/pom.xml +++ b/presto-main/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-matching/pom.xml b/presto-matching/pom.xml index a6c49f18cf7be..f2d2c8e3bc2f1 100644 --- a/presto-matching/pom.xml +++ b/presto-matching/pom.xml @@ -27,6 +27,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-memory-context/pom.xml b/presto-memory-context/pom.xml index 8ffd0fba14ee0..27341f7917bd8 100644 --- a/presto-memory-context/pom.xml +++ b/presto-memory-context/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-memory/pom.xml b/presto-memory/pom.xml index 630afbc6cecdc..9c912cf2eeb04 100644 --- a/presto-memory/pom.xml +++ b/presto-memory/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-ml/pom.xml b/presto-ml/pom.xml index cef4195f2af28..110e307f6416e 100644 --- a/presto-ml/pom.xml +++ b/presto-ml/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-mongodb/pom.xml b/presto-mongodb/pom.xml index 28524b2c7e1ae..92f3009e8ee1c 100644 --- a/presto-mongodb/pom.xml +++ b/presto-mongodb/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 3.6.0 1.5.0 + true diff --git a/presto-mysql/pom.xml b/presto-mysql/pom.xml index 63c424e18582e..59af1ad5ed4fd 100644 --- a/presto-mysql/pom.xml +++ b/presto-mysql/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-native-execution/pom.xml b/presto-native-execution/pom.xml index c0023f8678b42..b50afa658dc0a 100644 --- a/presto-native-execution/pom.xml +++ b/presto-native-execution/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} src/checkstyle/presto-checks.xml 17 + true diff --git a/presto-native-sidecar-plugin/pom.xml b/presto-native-sidecar-plugin/pom.xml index cd35eaa347f48..e2901734d5148 100644 --- a/presto-native-sidecar-plugin/pom.xml +++ b/presto-native-sidecar-plugin/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-native-tests/pom.xml b/presto-native-tests/pom.xml index 538b4c8343d01..8a37347bdd675 100644 --- a/presto-native-tests/pom.xml +++ b/presto-native-tests/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-node-ttl-fetchers/pom.xml b/presto-node-ttl-fetchers/pom.xml index 1b2d3758be4e5..997901a2879cc 100644 --- a/presto-node-ttl-fetchers/pom.xml +++ b/presto-node-ttl-fetchers/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-open-telemetry/pom.xml b/presto-open-telemetry/pom.xml index a44a9155504f4..85260e23ff396 100644 --- a/presto-open-telemetry/pom.xml +++ b/presto-open-telemetry/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-openapi/pom.xml b/presto-openapi/pom.xml index f98756b3b6cc2..1b2369ab8b40b 100644 --- a/presto-openapi/pom.xml +++ b/presto-openapi/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-oracle/pom.xml b/presto-oracle/pom.xml index 6e7fd89cc84de..85f2ad2762d6a 100644 --- a/presto-oracle/pom.xml +++ b/presto-oracle/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-orc/pom.xml b/presto-orc/pom.xml index ac1cbe89f3058..3a1c773fc4e8a 100644 --- a/presto-orc/pom.xml +++ b/presto-orc/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-parquet/pom.xml b/presto-parquet/pom.xml index 8397aee7900d1..6ce44ccb22e48 100644 --- a/presto-parquet/pom.xml +++ b/presto-parquet/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-parser/pom.xml b/presto-parser/pom.xml index fbff41c9efe7a..ea8a3cf23f2cb 100644 --- a/presto-parser/pom.xml +++ b/presto-parser/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-password-authenticators/pom.xml b/presto-password-authenticators/pom.xml index 05a3e084593dd..7e5f3e87811a2 100644 --- a/presto-password-authenticators/pom.xml +++ b/presto-password-authenticators/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-pinot-toolkit/pom.xml b/presto-pinot-toolkit/pom.xml index 335d50f30a128..eec2b128e05a0 100644 --- a/presto-pinot-toolkit/pom.xml +++ b/presto-pinot-toolkit/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 1.38.0 17 + true diff --git a/presto-pinot/pom.xml b/presto-pinot/pom.xml index 1c8e1247d2807..a54c4b07b0b2e 100644 --- a/presto-pinot/pom.xml +++ b/presto-pinot/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-plugin-toolkit/pom.xml b/presto-plugin-toolkit/pom.xml index 26a0ba7bcbba8..f0aa2edb9267a 100644 --- a/presto-plugin-toolkit/pom.xml +++ b/presto-plugin-toolkit/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-postgresql/pom.xml b/presto-postgresql/pom.xml index 2ec12a1003116..09d1d66350676 100644 --- a/presto-postgresql/pom.xml +++ b/presto-postgresql/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-product-tests/pom.xml b/presto-product-tests/pom.xml index bdde63c95993d..82be42992dbd2 100644 --- a/presto-product-tests/pom.xml +++ b/presto-product-tests/pom.xml @@ -17,6 +17,7 @@ true 2.12.2 17 + true diff --git a/presto-prometheus/pom.xml b/presto-prometheus/pom.xml index 46bf760af3265..9ddbbcf120161 100644 --- a/presto-prometheus/pom.xml +++ b/presto-prometheus/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 17 + true diff --git a/presto-proxy/pom.xml b/presto-proxy/pom.xml index b0e49cddfde26..404f11fd4d5bb 100644 --- a/presto-proxy/pom.xml +++ b/presto-proxy/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} com.facebook.presto.proxy.PrestoProxy 17 + true diff --git a/presto-rcfile/pom.xml b/presto-rcfile/pom.xml index 30b79d578af4e..0fbb657a9ab1f 100644 --- a/presto-rcfile/pom.xml +++ b/presto-rcfile/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-record-decoder/pom.xml b/presto-record-decoder/pom.xml index 03af128eb25d3..2e50641e05f8f 100644 --- a/presto-record-decoder/pom.xml +++ b/presto-record-decoder/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-redis/pom.xml b/presto-redis/pom.xml index 350be928c4f22..596e464ef4164 100644 --- a/presto-redis/pom.xml +++ b/presto-redis/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-redshift/pom.xml b/presto-redshift/pom.xml index a56d962e20a77..c0ea409f6dcf9 100644 --- a/presto-redshift/pom.xml +++ b/presto-redshift/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-resource-group-managers/pom.xml b/presto-resource-group-managers/pom.xml index c19ea1541e85e..9e159708f6708 100644 --- a/presto-resource-group-managers/pom.xml +++ b/presto-resource-group-managers/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-router/pom.xml b/presto-router/pom.xml index 60886e69b07ff..5fcafd95eeb3d 100644 --- a/presto-router/pom.xml +++ b/presto-router/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} com.facebook.presto.router.PrestoRouter 17 + true diff --git a/presto-server/pom.xml b/presto-server/pom.xml index bc19364baf70d..9f79458020224 100644 --- a/presto-server/pom.xml +++ b/presto-server/pom.xml @@ -25,6 +25,7 @@ ${project.artifactId} false + true @@ -57,7 +58,8 @@ true - + true + diff --git a/presto-session-property-managers/pom.xml b/presto-session-property-managers/pom.xml index 08b6a74223d70..db460ae3ff7b2 100644 --- a/presto-session-property-managers/pom.xml +++ b/presto-session-property-managers/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-singlestore/pom.xml b/presto-singlestore/pom.xml index 58ecf462372eb..b866d3249f0f6 100644 --- a/presto-singlestore/pom.xml +++ b/presto-singlestore/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} ${env.SINGLESTORE_LICENSE} + true diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index 170a624f083c7..41f4c46300457 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -12,6 +12,7 @@ ${project.parent.basedir} + true diff --git a/presto-spark-classloader-interface/pom.xml b/presto-spark-classloader-interface/pom.xml index 2615b3220645c..cc42a97c56ba6 100644 --- a/presto-spark-classloader-interface/pom.xml +++ b/presto-spark-classloader-interface/pom.xml @@ -12,6 +12,7 @@ ${project.parent.basedir} + true diff --git a/presto-spark-common/pom.xml b/presto-spark-common/pom.xml index 9db981d55e5f9..7f66f0245cd89 100644 --- a/presto-spark-common/pom.xml +++ b/presto-spark-common/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-spark-launcher/pom.xml b/presto-spark-launcher/pom.xml index 8b8ec893530df..be5bae5b73055 100644 --- a/presto-spark-launcher/pom.xml +++ b/presto-spark-launcher/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} com.facebook.presto.spark.launcher.internal com.facebook.presto.spark.launcher.PrestoSparkLauncher + true diff --git a/presto-spark-package/pom.xml b/presto-spark-package/pom.xml index 4ba3bd2c9c70c..84ee9009f0bd7 100644 --- a/presto-spark-package/pom.xml +++ b/presto-spark-package/pom.xml @@ -18,6 +18,7 @@ true true true + true diff --git a/presto-spark-testing/pom.xml b/presto-spark-testing/pom.xml index 4bdee1dc8fbde..8bea2ea617713 100644 --- a/presto-spark-testing/pom.xml +++ b/presto-spark-testing/pom.xml @@ -12,6 +12,7 @@ ${project.parent.basedir} + true diff --git a/presto-spark/pom.xml b/presto-spark/pom.xml index fcf6cdd8b6ed9..107558524e94a 100644 --- a/presto-spark/pom.xml +++ b/presto-spark/pom.xml @@ -12,6 +12,7 @@ ${project.parent.basedir} + true diff --git a/presto-spi/pom.xml b/presto-spi/pom.xml index bcb8a4bc7a76d..c01a6c5c56885 100644 --- a/presto-spi/pom.xml +++ b/presto-spi/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-sqlserver/pom.xml b/presto-sqlserver/pom.xml index 16ccef778bf5e..4b6fa6975911b 100644 --- a/presto-sqlserver/pom.xml +++ b/presto-sqlserver/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-teradata-functions/pom.xml b/presto-teradata-functions/pom.xml index c4e7043d64685..e1fd134d18169 100644 --- a/presto-teradata-functions/pom.xml +++ b/presto-teradata-functions/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-test-coverage/pom.xml b/presto-test-coverage/pom.xml index cd28a2768531a..dc812c9675e32 100644 --- a/presto-test-coverage/pom.xml +++ b/presto-test-coverage/pom.xml @@ -19,6 +19,7 @@ true true true + true diff --git a/presto-testing-docker/pom.xml b/presto-testing-docker/pom.xml index 42c846095869f..7b982921a12b2 100644 --- a/presto-testing-docker/pom.xml +++ b/presto-testing-docker/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-testing-server-launcher/pom.xml b/presto-testing-server-launcher/pom.xml index 864b87c9a7b61..67acac907c506 100644 --- a/presto-testing-server-launcher/pom.xml +++ b/presto-testing-server-launcher/pom.xml @@ -15,6 +15,7 @@ com.facebook.presto.server.testing.TestingPrestoServerLauncher ${project.parent.basedir} 17 + true diff --git a/presto-testng-services/pom.xml b/presto-testng-services/pom.xml index 777f4abbf2ea5..426de228c16f0 100644 --- a/presto-testng-services/pom.xml +++ b/presto-testng-services/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-tests/pom.xml b/presto-tests/pom.xml index 14146307183db..40e55989aecbc 100644 --- a/presto-tests/pom.xml +++ b/presto-tests/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 5g 17 + true diff --git a/presto-thrift-api/pom.xml b/presto-thrift-api/pom.xml index 043db712f30eb..7392a92950ecc 100644 --- a/presto-thrift-api/pom.xml +++ b/presto-thrift-api/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-thrift-connector/pom.xml b/presto-thrift-connector/pom.xml index b40d56d9f4df5..f00985834c9ab 100644 --- a/presto-thrift-connector/pom.xml +++ b/presto-thrift-connector/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} + true diff --git a/presto-thrift-spec/pom.xml b/presto-thrift-spec/pom.xml index a9989c90c48fd..d18e524dafd81 100644 --- a/presto-thrift-spec/pom.xml +++ b/presto-thrift-spec/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-thrift-testing-server/pom.xml b/presto-thrift-testing-server/pom.xml index 05afb8b65205a..004555bed0e4f 100644 --- a/presto-thrift-testing-server/pom.xml +++ b/presto-thrift-testing-server/pom.xml @@ -16,6 +16,7 @@ ${project.parent.basedir} com.facebook.presto.connector.thrift.server.ThriftTpchServer 17 + true diff --git a/presto-thrift-testing-udf-server/pom.xml b/presto-thrift-testing-udf-server/pom.xml index 28e89423f8ff8..a8785e585f9de 100644 --- a/presto-thrift-testing-udf-server/pom.xml +++ b/presto-thrift-testing-udf-server/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} com.facebook.presto.udf.thrift.TestingThriftUdfServer + true diff --git a/presto-tpcds/pom.xml b/presto-tpcds/pom.xml index 897a7f2a5ad24..8f68ca81d8b16 100644 --- a/presto-tpcds/pom.xml +++ b/presto-tpcds/pom.xml @@ -14,6 +14,7 @@ ${project.parent.basedir} + true diff --git a/presto-tpch/pom.xml b/presto-tpch/pom.xml index b1c9a6690d0aa..6261c9b55f22e 100644 --- a/presto-tpch/pom.xml +++ b/presto-tpch/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} 8 + true diff --git a/presto-ui/pom.xml b/presto-ui/pom.xml index 3f759a7137f31..48795de494f40 100644 --- a/presto-ui/pom.xml +++ b/presto-ui/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} + true diff --git a/presto-verifier/pom.xml b/presto-verifier/pom.xml index bb9ad5c47c984..85d017696a2ea 100644 --- a/presto-verifier/pom.xml +++ b/presto-verifier/pom.xml @@ -16,6 +16,7 @@ com.facebook.presto.verifier.PrestoVerifier ${project.artifactId} 17 + true diff --git a/redis-hbo-provider/pom.xml b/redis-hbo-provider/pom.xml index 99171c8b4f5ed..fe9d1993878f2 100644 --- a/redis-hbo-provider/pom.xml +++ b/redis-hbo-provider/pom.xml @@ -12,6 +12,7 @@ ${project.parent.basedir} 6.5.1.RELEASE 17 + true redis-hbo-provider From 6a167b21bdb6a2587647ffbd097ad260fae703aa Mon Sep 17 00:00:00 2001 From: auden-woolfson Date: Mon, 14 Apr 2025 10:28:03 -0700 Subject: [PATCH 09/27] Fix testValidation due to new error message --- .../com/facebook/presto/password/ldap/TestLdapConfig.java | 4 ++-- .../base/security/TestFileBasedAccessControlConfig.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java b/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java index 0a8bb77594e12..5f85fc9086bbe 100644 --- a/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java +++ b/presto-password-authenticators/src/test/java/com/facebook/presto/password/ldap/TestLdapConfig.java @@ -76,7 +76,7 @@ public void testValidation() assertFailsValidation(new LdapConfig().setLdapUrl("localhost"), "ldapUrl", "LDAP without SSL/TLS unsupported. Expected ldaps://", Pattern.class); assertFailsValidation(new LdapConfig().setLdapUrl("ldaps:/localhost"), "ldapUrl", "LDAP without SSL/TLS unsupported. Expected ldaps://", Pattern.class); - assertFailsValidation(new LdapConfig(), "ldapUrl", "may not be null", NotNull.class); - assertFailsValidation(new LdapConfig(), "userBindSearchPattern", "may not be null", NotNull.class); + assertFailsValidation(new LdapConfig(), "ldapUrl", "must not be null", NotNull.class); + assertFailsValidation(new LdapConfig(), "userBindSearchPattern", "must not be null", NotNull.class); } } diff --git a/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java b/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java index 991907692a2ac..0fdb00b5ed122 100644 --- a/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java +++ b/presto-plugin-toolkit/src/test/java/com/facebook/presto/plugin/base/security/TestFileBasedAccessControlConfig.java @@ -59,7 +59,7 @@ public void testValidation() { assertThatThrownBy(() -> newInstance(ImmutableMap.of(SECURITY_REFRESH_PERIOD, "1ms"))) .isInstanceOf(ConfigurationException.class) - .hasMessageContaining("security.config-file: may not be null "); + .hasMessageContaining("security.config-file: must not be null "); assertThatThrownBy(() -> newInstance(ImmutableMap.of( SECURITY_CONFIG_FILE, "/test.json", From cc3d3d314052be9e7a7c3e7eade8414e76066c0b Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Tue, 15 Apr 2025 09:42:50 -0700 Subject: [PATCH 10/27] Fix presto-on-spark tests - Spark requires certain versions of jersey, javax.rs.ws-api and javax.serlet-api in order to run. This change ensures that we use the correct library versions at runtime. The versions chosen correspond to those used in Spark 2.4.4 which is the spark version inside of Presto's spark-core dependency - Use java 17 bytecode for PoS integration tests --- presto-spark-base/pom.xml | 50 +++++++++++++++++++ ...estoSparkLauncherIntegrationSmokeTest.java | 24 +-------- .../src/test/resources/docker-compose.yml | 20 ++++++-- 3 files changed, 66 insertions(+), 28 deletions(-) diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index 41f4c46300457..94f69b8a22b39 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -15,6 +15,19 @@ true + + + + + org.glassfish.jersey + jersey-bom + 2.22.2 + pom + import + + + + @@ -204,6 +217,21 @@ commons-text + + + javax.ws.rs + javax.ws.rs-api + test + + + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + com.facebook.drift drift-codec @@ -271,6 +299,24 @@ com.facebook.presto presto-tests test + + + javax.inject + javax.inject + + + + + + org.glassfish.jersey.containers + jersey-container-servlet + test + + + org.glassfish.hk2.external + aopalliance-repackaged + + @@ -333,6 +379,10 @@ it.unimi.dsi:fastutil com.facebook.airlift:log-manager + + javax.ws.rs:javax.ws.rs-api + javax.servlet:javax.servlet-api + diff --git a/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java b/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java index d8ca2cc8d9304..4d73d96734caf 100644 --- a/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java +++ b/presto-spark-testing/src/test/java/com/facebook/presto/spark/testing/TestPrestoSparkLauncherIntegrationSmokeTest.java @@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.hash.Hashing; import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -242,27 +241,6 @@ private static void importTablesBucketed(LocalQueryRunner localQueryRunner, List } } - /** - * Spark has to deploy Presto on Spark package to every worker for every query. - * Unfortunately Spark doesn't try to eagerly delete application data from the workers, and after running - * a couple of queries the disk space utilization spikes. - * While this might not be an issue when testing locally the disk space is usually very limited on CI environments. - * To avoid issues when running on a CI environment we have to drop temporary application data eagerly after each test. - */ - @AfterMethod(alwaysRun = true) - public void cleanupSparkWorkDirectory() - throws Exception - { - if (sparkWorkDirectory != null) { - // Docker containers are run with a different user id. Run "rm" in a container to avoid permission related issues. - int exitCode = dockerCompose.run( - "-v", format("%s:/spark/work", sparkWorkDirectory.getAbsolutePath()), - "spark-submit", - "/bin/bash", "-c", "rm -rf /spark/work/*"); - assertEquals(exitCode, 0); - } - } - @AfterClass(alwaysRun = true) public void tearDown() throws Exception @@ -300,7 +278,7 @@ private void executeOnSpark(String query) "-v", format("%s:/presto/etc/session-property-config.properties", sessionPropertyConfig.getAbsolutePath()), "-v", format("%s:/presto/etc/session-property-config.json", sessionPropertyConfigJsonFile.getAbsolutePath()), "spark-submit", - "/spark/bin/spark-submit", + "/opt/spark/bin/spark-submit", "--executor-memory", "512m", "--executor-cores", "4", "--conf", "spark.task.cpus=4", diff --git a/presto-spark-testing/src/test/resources/docker-compose.yml b/presto-spark-testing/src/test/resources/docker-compose.yml index fea09b3fb098d..6a30de5c80aa0 100644 --- a/presto-spark-testing/src/test/resources/docker-compose.yml +++ b/presto-spark-testing/src/test/resources/docker-compose.yml @@ -1,25 +1,35 @@ services: spark-master: - image: spydernaz/spark-master:2.4.3 + image: spark:3.5.5-java17 environment: - "TZ=America/Bahia_Banderas" - "SPARK_LOCAL_IP=spark-master" + - "SPARK_NO_DAEMONIZE=true" + depends_on: + - hadoop-master + command: /opt/spark/sbin/start-master.sh volumes: - ./work:/spark/work spark-worker: - image: spydernaz/spark-worker:2.4.3 + image: spark:3.5.5-java17 depends_on: - spark-master + command: /opt/spark/sbin/start-worker.sh spark://spark-master:7077 environment: - "TZ=America/Bahia_Banderas" - - SPARK_MASTER=spark://spark-master:7077 - - SPARK_DRIVER_MEMORY=512m + - SPARK_DRIVER_MEMORY=1G - SPARK_WORKER_CORES=4 - SPARK_WORKER_MEMORY=1G + # We need to clean up app work directories aggressively because CI + # machines do not have much disk space. To prevent running out of space, + # We add the below options to tell the worker to quickly clean up + # completed app work directories + - "SPARK_WORKER_OPTS=-Dspark.worker.cleanup.enabled=true -Dspark.worker.cleanup.interval=5 -Dspark.worker.cleanup.appDataTtl=10" + - SPARK_NO_DAEMONIZE=true volumes: - ./work:/spark/work spark-submit: - image: spydernaz/spark-submit:2.4.3 + image: spark:3.5.5-java17 environment: - "TZ=America/Bahia_Banderas" hadoop-master: From 731f16b80f95bf23c9fe9a800acf5bc914f7d647 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Thu, 17 Apr 2025 17:55:55 -0400 Subject: [PATCH 11/27] Add missing runtime dependencies for native tests --- presto-native-sidecar-plugin/pom.xml | 27 +++++++++++++++++++---- presto-native-tests/pom.xml | 16 +++++++++++++- presto-plan-checker-router-plugin/pom.xml | 20 ++++++++++++++++- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/presto-native-sidecar-plugin/pom.xml b/presto-native-sidecar-plugin/pom.xml index e2901734d5148..153ad18295f8c 100644 --- a/presto-native-sidecar-plugin/pom.xml +++ b/presto-native-sidecar-plugin/pom.xml @@ -164,7 +164,7 @@ presto-tests test test-jar - 0.295-SNAPSHOT + ${project.version} @@ -173,12 +173,31 @@ test + + com.facebook.presto + presto-hive-metastore + test + + + + com.facebook.presto + presto-hive + test + test-jar + + + + com.facebook.presto + presto-hive + test + + com.facebook.presto presto-native-execution test test-jar - 0.295-SNAPSHOT + ${project.version} @@ -264,13 +283,13 @@ - + org.basepom.maven duplicate-finder-maven-plugin - parquet.thrift + parquet.thrift about.html mozilla/public-suffix-list.txt iceberg-build.properties diff --git a/presto-native-tests/pom.xml b/presto-native-tests/pom.xml index 8a37347bdd675..e90785cbb6940 100644 --- a/presto-native-tests/pom.xml +++ b/presto-native-tests/pom.xml @@ -15,6 +15,7 @@ ${project.parent.basedir} true + 4g @@ -126,6 +127,12 @@ test + + com.facebook.presto + presto-hive-metastore + test + + com.facebook.presto presto-common @@ -159,6 +166,14 @@ test + + com.facebook.presto + presto-hive + ${project.version} + test + test-jar + + com.facebook.presto presto-router @@ -217,7 +232,6 @@ org.apache.maven.plugins maven-surefire-plugin - -Xms4g -Xmx4g 1 false remote-function,textfile_reader diff --git a/presto-plan-checker-router-plugin/pom.xml b/presto-plan-checker-router-plugin/pom.xml index f28a3060deb81..60e34e4147d19 100644 --- a/presto-plan-checker-router-plugin/pom.xml +++ b/presto-plan-checker-router-plugin/pom.xml @@ -17,7 +17,7 @@ ${project.parent.basedir} - -Xms4g -Xmx4g + 4g 17 @@ -155,6 +155,18 @@ test + + com.facebook.presto + presto-hive + test + + + + com.facebook.presto + presto-hive + test-jar + test + com.facebook.presto @@ -205,6 +217,12 @@ presto-main test + + + com.facebook.presto + presto-hive-metastore + test + From a6495d50b4021fab7ec52330084960d3fe9453dc Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Mon, 21 Apr 2025 22:56:51 -0400 Subject: [PATCH 12/27] Run tempto with Java 17 This change expands the OVERRIDE_JDK_DIR environment configuration to the tempto runner in addition to the existing behavior for the presto coordinator and workers inside of the product tests suite. run_tempto.sh was updated to detect the overridden jdk volume when executing in order to make the tests run on a compatible JDK since product tests compiles to java 17 bytecode by default --- presto-product-tests/conf/docker/common/kerberos.yml | 3 +++ presto-product-tests/conf/docker/common/standard.yml | 1 + presto-product-tests/conf/docker/files/run-tempto.sh | 10 ++++++++++ .../docker/multinode-tls-kerberos/docker-compose.yml | 2 ++ .../conf/docker/multinode-tls/docker-compose.yml | 2 ++ .../conf/docker/singlenode-ldap/docker-compose.yml | 2 ++ 6 files changed, 20 insertions(+) diff --git a/presto-product-tests/conf/docker/common/kerberos.yml b/presto-product-tests/conf/docker/common/kerberos.yml index 144ae610a40e2..e962d3a378c5c 100644 --- a/presto-product-tests/conf/docker/common/kerberos.yml +++ b/presto-product-tests/conf/docker/common/kerberos.yml @@ -23,6 +23,9 @@ services: application-runner: image: '${HADOOP_BASE_IMAGE}-kerberized:${DOCKER_IMAGES_VERSION}' + volumes: + - ${OVERRIDE_JDK_DIR}:/docker/volumes/overridejdk environment: - TEMPTO_PROFILE_CONFIG_FILE=/docker/volumes/conf/tempto/tempto-configuration-for-docker-kerberos.yaml - CLI_ARGUMENTS=--server https://presto-master.docker.cluster:7778 --keystore-path /docker/volumes/conf/presto/etc/docker.cluster.jks --keystore-password 123456 --krb5-config-path /etc/krb5.conf --krb5-principal presto-client/presto-master.docker.cluster@LABS.TERADATA.COM --krb5-keytab-path /etc/presto/conf/presto-client.keytab --krb5-remote-service-name presto-server --krb5-disable-remote-service-hostname-canonicalization + - ${OVERRIDE_JDK_DIR}:/docker/volumes/overridejdk diff --git a/presto-product-tests/conf/docker/common/standard.yml b/presto-product-tests/conf/docker/common/standard.yml index c15ad89190fa3..0a7142cf7011b 100644 --- a/presto-product-tests/conf/docker/common/standard.yml +++ b/presto-product-tests/conf/docker/common/standard.yml @@ -53,6 +53,7 @@ services: - ../../../conf/tempto/tempto-configuration-for-docker-default.yaml:/docker/volumes/tempto/tempto-configuration-local.yaml - ../../../target/test-reports:/docker/volumes/test-reports - /tmp/presto_history_docker:/root/.presto_history + - ${OVERRIDE_JDK_DIR}:/docker/volumes/overridejdk environment: - PRESTO_JDBC_DRIVER_CLASS - TEMPTO_EXTRA_CONFIG_FILE diff --git a/presto-product-tests/conf/docker/files/run-tempto.sh b/presto-product-tests/conf/docker/files/run-tempto.sh index 7410a52a3fa3a..8377e97e48d62 100755 --- a/presto-product-tests/conf/docker/files/run-tempto.sh +++ b/presto-product-tests/conf/docker/files/run-tempto.sh @@ -2,6 +2,16 @@ set -euo pipefail +# If we have an overriden JDK volume mount, use it +# This is set to /dev/null ignore +if [ -d /docker/volumes/overridejdk ]; then + export JAVA_HOME=/docker/volumes/overridejdk + export PATH=$JAVA_HOME/bin:$PATH +fi + +echo "Starting TemptoProductTestRunner with java set to :" +java -version + DOCKER_TEMPTO_CONF_DIR="/docker/volumes/conf/tempto" TEMPTO_CONFIG_FILES="tempto-configuration.yaml" # this comes from classpath TEMPTO_CONFIG_FILES="${TEMPTO_CONFIG_FILES},${DOCKER_TEMPTO_CONF_DIR}/tempto-configuration-for-docker-default.yaml" diff --git a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml index 63e90275d47f3..90eaa4def97da 100644 --- a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml +++ b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml @@ -50,6 +50,8 @@ services: - presto-master application-runner: + volumes: + - ${OVERRIDE_JDK_DIR}:/docker/volumes/overridejdk environment: - TEMPTO_PROFILE_CONFIG_FILE=/docker/volumes/conf/tempto/tempto-configuration-for-docker-kerberos.yaml - CLI_ARGUMENTS=--server https://presto-master.docker.cluster:7778 --keystore-path /docker/volumes/conf/presto/etc/docker.cluster.jks --keystore-password 123456 --krb5-config-path /etc/krb5.conf --krb5-principal presto-client/presto-master.docker.cluster@LABS.TERADATA.COM --krb5-keytab-path /etc/presto/conf/presto-client.keytab --krb5-remote-service-name presto-server --krb5-disable-remote-service-hostname-canonicalization diff --git a/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml index 505be8a520d55..aa78a4d37f98e 100644 --- a/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml +++ b/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml @@ -46,6 +46,8 @@ services: - presto-master application-runner: + volumes: + - ${OVERRIDE_JDK_DIR}:/docker/volumes/overridejdk environment: - TEMPTO_PROFILE_CONFIG_FILE=/docker/volumes/conf/tempto/tempto-configuration-for-docker-tls.yaml - CLI_ARGUMENTS=--server https://presto-master.docker.cluster:7778 --keystore-path /docker/volumes/conf/presto/etc/docker.cluster.jks --keystore-password 123456 diff --git a/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml index b170d7d873dcb..fc800c6fd77d6 100644 --- a/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml +++ b/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml @@ -13,6 +13,8 @@ services: application-runner: image: 'prestodb/centos6-oj8-openldap:${DOCKER_IMAGES_VERSION}' + volumes: + - ${OVERRIDE_JDK_DIR}:/docker/volumes/overridejdk environment: - TEMPTO_PROFILE_CONFIG_FILE=/docker/volumes/conf/tempto/tempto-configuration-for-docker-ldap.yaml - CLI_ARGUMENTS=--server https://presto-master:8443 --keystore-path /etc/openldap/certs/coordinator.jks --keystore-password testldap From 303e95f3232b59f6b8e1176e624c8cbc1666ad37 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Mon, 21 Apr 2025 22:58:09 -0400 Subject: [PATCH 13/27] Fix URI compliance for Iceberg nested NS tests This makes URI compliance checks in the REST catalog server more lax during tests in order to comply with the request URIs generated by the Iceberg rest catalog spec --- .../facebook/presto/iceberg/rest/IcebergRestTestUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java index 1bc9de237b57a..34a88837ce696 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/IcebergRestTestUtil.java @@ -14,6 +14,7 @@ package com.facebook.presto.iceberg.rest; import com.facebook.airlift.bootstrap.Bootstrap; +import com.facebook.airlift.http.server.HttpServerConfig; import com.facebook.airlift.http.server.TheServlet; import com.facebook.airlift.http.server.testing.TestingHttpServer; import com.facebook.airlift.http.server.testing.TestingHttpServerModule; @@ -43,6 +44,8 @@ import java.util.Map; import java.util.concurrent.ThreadLocalRandom; +import static com.facebook.airlift.configuration.ConfigBinder.configBinder; +import static com.facebook.airlift.http.server.UriCompliance.LEGACY; import static com.facebook.presto.iceberg.IcebergDistributedTestBase.getHdfsEnvironment; import static java.util.Objects.requireNonNull; import static org.apache.iceberg.CatalogProperties.URI; @@ -124,6 +127,11 @@ private class RestHttpServerModule @Override public void configure(Binder binder) { + configBinder(binder) + .bindConfigDefaults(HttpServerConfig.class, config -> { + // This is required to support nested namespace URI paths + config.setUriComplianceMode(LEGACY); + }); binder.bind(new TypeLiteral>() {}).annotatedWith(TheServlet.class).toInstance(ImmutableMap.of()); binder.bind(jakarta.servlet.Servlet.class).annotatedWith(TheServlet.class).toInstance(new IcebergRestCatalogServlet(adapter)); binder.bind(NodeInfo.class).toInstance(new NodeInfo("test")); From c467637aa9095f5f88e04d40b9b13ed96ec0053c Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 9 Apr 2025 16:14:26 -0700 Subject: [PATCH 14/27] Force testng provider in surefire plugin Due to plugin and dependency updates, some modules' surefire execution picks up a junit runner instead of the testng one. This changes forces the use of testng in all presto modules. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 88986852f6076..1a7a97b5aa39f 100644 --- a/pom.xml +++ b/pom.xml @@ -2785,6 +2785,13 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M7 + + + org.apache.maven.surefire + surefire-testng + 3.5.1 + + **/Test*.java From ae638c690f0c43f4a561441f9ac508e5e5a24cbe Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 23 Apr 2025 17:53:50 -0700 Subject: [PATCH 15/27] Fix compilation for presto-testing-mysql with io.airlift.units presto-testing-mysql still depends on io.airlift:units instead of com.facebook.airlift:units. This causes issues for the tests which set MySqlOptions since the builder type only accepts units. Rather than include the io.airlift:units dependency, this commit removes the use of the builder options which accept a Duration type in order to allow the project to compile. This commit can be reverted if we release a new version of presto-testing-mysql with the new com.facebook.airlift:units dependency. --- .../presto/plugin/mysql/TestMySqlDistributedQueries.java | 3 --- .../presto/plugin/mysql/TestMySqlIntegrationMixedCaseTest.java | 3 --- .../presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java | 3 --- .../com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java | 3 --- .../java/com/facebook/presto/verifier/VerifierTestUtil.java | 3 --- 5 files changed, 15 deletions(-) diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java index 906997a293c6d..e78193aaebf6a 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java @@ -13,7 +13,6 @@ */ package com.facebook.presto.plugin.mysql; -import com.facebook.airlift.units.Duration; import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.QueryRunner; import com.facebook.presto.testing.mysql.MySqlOptions; @@ -32,14 +31,12 @@ import static com.facebook.presto.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner; import static com.facebook.presto.testing.MaterializedResult.resultBuilder; import static com.facebook.presto.testing.assertions.Assert.assertEquals; -import static java.util.concurrent.TimeUnit.SECONDS; @Test(singleThreaded = true) public class TestMySqlDistributedQueries extends AbstractTestDistributedQueries { private static final MySqlOptions MY_SQL_OPTIONS = MySqlOptions.builder() - .setCommandTimeout(new Duration(90, SECONDS)) .build(); private final TestingMySqlServer mysqlServer; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationMixedCaseTest.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationMixedCaseTest.java index 16be5f5f981ad..842c35920e321 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationMixedCaseTest.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationMixedCaseTest.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.tpch.TpchTable; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; @@ -36,7 +35,6 @@ import static com.facebook.presto.plugin.mysql.MySqlQueryRunner.createMySqlQueryRunner; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.testing.assertions.Assert.assertEquals; -import static java.util.concurrent.TimeUnit.SECONDS; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -45,7 +43,6 @@ public class TestMySqlIntegrationMixedCaseTest extends AbstractTestQueryFramework { private static final MySqlOptions MY_SQL_OPTIONS = MySqlOptions.builder() - .setCommandTimeout(new Duration(90, SECONDS)) .build(); private final TestingMySqlServer mysqlServer; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java index e173298708c5b..b17a1c6741619 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java @@ -13,7 +13,6 @@ */ package com.facebook.presto.plugin.mysql; -import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.testing.MaterializedResult; import com.facebook.presto.testing.MaterializedRow; @@ -42,7 +41,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static io.airlift.tpch.TpchTable.ORDERS; import static java.lang.String.format; -import static java.util.concurrent.TimeUnit.SECONDS; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -51,7 +49,6 @@ public class TestMySqlIntegrationSmokeTest extends AbstractTestIntegrationSmokeTest { private static final MySqlOptions MY_SQL_OPTIONS = MySqlOptions.builder() - .setCommandTimeout(new Duration(90, SECONDS)) .build(); private final TestingMySqlServer mysqlServer; diff --git a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java index e22ae0fe43fc0..f64b69564ca89 100644 --- a/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java +++ b/presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java @@ -13,7 +13,6 @@ */ package com.facebook.presto.plugin.mysql; -import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.type.TimeZoneKey; import com.facebook.presto.common.type.VarcharType; @@ -56,7 +55,6 @@ import static com.google.common.base.Strings.repeat; import static com.google.common.base.Verify.verify; import static java.lang.String.format; -import static java.util.concurrent.TimeUnit.SECONDS; @Test public class TestMySqlTypeMapping @@ -64,7 +62,6 @@ public class TestMySqlTypeMapping { private static final String CHARACTER_SET_UTF8 = "CHARACTER SET utf8"; private static final MySqlOptions MY_SQL_OPTIONS = MySqlOptions.builder() - .setCommandTimeout(new Duration(90, SECONDS)) .build(); private final TestingMySqlServer mysqlServer; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java index f163dda4ab386..edf978d8248ba 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java @@ -13,7 +13,6 @@ */ package com.facebook.presto.verifier; -import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.plugin.memory.MemoryPlugin; @@ -53,7 +52,6 @@ import static com.facebook.presto.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.facebook.presto.verifier.framework.ClusterType.CONTROL; -import static java.util.concurrent.TimeUnit.SECONDS; public class VerifierTestUtil { @@ -75,7 +73,6 @@ public class VerifierTestUtil false); private static final MySqlOptions MY_SQL_OPTIONS = MySqlOptions.builder() - .setCommandTimeout(new Duration(90, SECONDS)) .build(); private VerifierTestUtil() {} From ab07206e343be1e43970bedb3231ade306a2c0a8 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Thu, 24 Apr 2025 08:51:16 -0700 Subject: [PATCH 16/27] Fix ambiguous URIs in function server API Airlift's HttpUriBuilder expects that uris passed to it are not yet encoded. However, because we use a semicolon ';' to delimit function names and parameters in the function server the semicolon which is encoded to %3B gets double-encoded to %253B by the URI builder (% encodes to %25). Older versions of Jetty allow this sequence in the URI. Newer servers however reject this request encoded with %25xxx with an error stating "AMBIGUOUS_PATH_PARAMETER". If we avoid using the HttpUriBuilder, we don't double-encode the semicolon, and the requests will work against the new server --- .../rest/RestSqlFunctionExecutor.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java index 66b72ea267321..a2d530c425030 100644 --- a/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java +++ b/presto-function-namespace-managers/src/main/java/com/facebook/presto/functionNamespace/rest/RestSqlFunctionExecutor.java @@ -14,7 +14,6 @@ package com.facebook.presto.functionNamespace.rest; import com.facebook.airlift.http.client.HttpClient; -import com.facebook.airlift.http.client.HttpUriBuilder; import com.facebook.airlift.http.client.Request; import com.facebook.airlift.http.client.Response; import com.facebook.airlift.http.client.ResponseHandler; @@ -48,7 +47,6 @@ import static com.facebook.airlift.concurrent.MoreFutures.failedFuture; import static com.facebook.airlift.concurrent.MoreFutures.toCompletableFuture; -import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; import static com.facebook.airlift.http.client.Request.Builder.preparePost; import static com.facebook.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator; import static com.facebook.presto.functionNamespace.rest.RestErrorCode.REST_SERVER_BAD_RESPONSE; @@ -142,14 +140,13 @@ private URI getExecutionEndpoint(RestFunctionHandle restFunctionHandle, SqlFunct // Use execution endpoint from handle if present, otherwise use default URI baseUri = restFunctionHandle.getExecutionEndpoint() .orElse(URI.create(restBasedFunctionNamespaceManagerConfig.getRestUrl())); + String path = format("/v1/functions/%s/%s/%s/%s", + functionId.getFunctionName().getSchemaName(), + functionId.getFunctionName().getObjectName(), + encodedFunctionId, + functionVersion); - HttpUriBuilder uri = uriBuilderFrom(baseUri) - .appendPath(format("/v1/functions/%s/%s/%s/%s", - functionId.getFunctionName().getSchemaName(), - functionId.getFunctionName().getObjectName(), - encodedFunctionId, - functionVersion)); - return uri.build(); + return URI.create(String.format("%s%s", baseUri, path)); } public static class SqlFunctionResultResponseHandler From e9061a9de607dbd09574dc6c6f3d9791dd0eab54 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Thu, 24 Apr 2025 08:51:34 -0700 Subject: [PATCH 17/27] Fix TestRangerBasedAccessControlConfig --- .../security/ranger/TestRangerBasedAccessControlConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java b/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java index 52a15eba17030..9ef96f279cadc 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControlConfig.java @@ -87,7 +87,7 @@ public void testValidation() RANGER_REST_USER_GROUPS_AUTH_USERNAME, "admin", RANGER_REST_USER_GROUPS_AUTH_PASSWORD, "admin"))) .isInstanceOf(ConfigurationException.class) - .hasMessageContaining("Invalid configuration property hive.ranger.rest-endpoint: may not be null"); + .hasMessageContaining("Invalid configuration property hive.ranger.rest-endpoint: must not be null"); assertThatThrownBy(() -> newInstance(ImmutableMap.of( RANGER_POLICY_REFRESH_PERIOD, "120s", @@ -95,7 +95,7 @@ public void testValidation() RANGER_REST_USER_GROUPS_AUTH_USERNAME, "admin", RANGER_REST_USER_GROUPS_AUTH_PASSWORD, "admin"))) .isInstanceOf(ConfigurationException.class) - .hasMessageContaining("Invalid configuration property hive.ranger.policy.hive-servicename: may not be null"); + .hasMessageContaining("Invalid configuration property hive.ranger.policy.hive-servicename: must not be null"); } private static RangerBasedAccessControlConfig newInstance(Map properties) From 000b15a562295e28987975f9baf3ff556752f574 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Thu, 24 Apr 2025 13:10:07 -0700 Subject: [PATCH 18/27] Fix product tests - remove airline from classpath by excluding it from com.teradata.tpcds:tpcds - force presto-product-tests to shade airline by disabling the generation of the dependency-reduced-pom - change message() to body() in StatementClient to get correct error messages --- pom.xml | 6 +++++- presto-cli/pom.xml | 1 + .../java/com/facebook/presto/client/StatementClientV1.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a7a97b5aa39f..6544b3e52d391 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.13.1 - 1.54 + 1.55 7.5 8.11.3 3.8.0 @@ -1332,6 +1332,10 @@ com.google.code.findbugs annotations + + io.airlift + airline + diff --git a/presto-cli/pom.xml b/presto-cli/pom.xml index c6d898a5aab61..8d2bcb99858b6 100644 --- a/presto-cli/pom.xml +++ b/presto-cli/pom.xml @@ -142,6 +142,7 @@ true executable + false diff --git a/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java b/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java index c06f041b90143..918b1b369ca05 100644 --- a/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java +++ b/presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java @@ -498,7 +498,7 @@ private RuntimeException requestFailedException(String task, Request request, Js if (!response.hasValue()) { if (response.getStatusCode() == HTTP_UNAUTHORIZED) { return new ClientException("Authentication failed" + - Optional.ofNullable(response.getStatusMessage()) + Optional.ofNullable(response.getResponseBody()) .map(message -> ": " + message) .orElse("")); } From 02de7ff3ad794e658007a59a44a3852c8f9796af Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Tue, 29 Apr 2025 15:24:43 -0700 Subject: [PATCH 19/27] Update documentation for Java 17 support --- CONTRIBUTING.md | 2 +- README.md | 6 +++--- presto-docs/src/main/sphinx/admin/spill.rst | 5 ----- .../main/sphinx/installation/deployment.rst | 9 +++++--- presto-docs/src/main/sphinx/security/cli.rst | 2 -- .../main/sphinx/security/jce-policy.fragment | 21 ------------------- .../src/main/sphinx/security/server.rst | 2 -- 7 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 presto-docs/src/main/sphinx/security/jce-policy.fragment diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79f4af3092b0e..32a61b22ccef3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -284,7 +284,7 @@ We recommend you use IntelliJ as your IDE. The code style template for the proje .map(OriginalExpressionUtils::castToExpression) ``` -* When appropriate use Java 8 Stream API +* When appropriate use Java Stream API * Categorize errors when throwing an exception * **Tests** * Avoid adding `Thread.sleep` in tests--these can fail due to environmental conditions, such as garbage collection or noisy neighbors in the CI environment. diff --git a/README.md b/README.md index 004cbe80ad6b3..383325b241f6e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ See [PrestoDB: Mission and Architecture](ARCHITECTURE.md). ## Requirements * Mac OS X or Linux -* Java 8 Update 151 or higher (8u151+), 64-bit. Both Oracle JDK and OpenJDK are supported. +* Java 17 64-bit. Both Oracle JDK and OpenJDK are supported. * Maven 3.6.3+ (for building) * Python 2.4+ (for running with the launcher script) @@ -38,8 +38,8 @@ After building Presto for the first time, you can load the project into your IDE After opening the project in IntelliJ, double check that the Java SDK is properly configured for the project: * Open the File menu and select Project Structure -* In the SDKs section, ensure that a 1.8 JDK is selected (create one if none exist) -* In the Project section, ensure the Project language level is set to 8.0 as Presto makes use of several Java 8 language features +* In the SDKs section, ensure that a distribution of JDK 17 is selected (create one if none exist) +* In the Project section, ensure the Project language level is set to at least 8.0. Presto comes with sample configuration that should work out-of-the-box for development. Use the following options to create a run configuration: diff --git a/presto-docs/src/main/sphinx/admin/spill.rst b/presto-docs/src/main/sphinx/admin/spill.rst index 3dd6f1dec22de..f0c51e751dd21 100644 --- a/presto-docs/src/main/sphinx/admin/spill.rst +++ b/presto-docs/src/main/sphinx/admin/spill.rst @@ -107,11 +107,6 @@ When spill encryption is enabled (``spill-encryption-enabled`` property in (per spill file) secret key. Enabling this will decrease the performance of spilling to disk but can protect spilled data from being recovered from the files written to disk. -**Note**: Some distributions of Java ship with policy files that limit the strength -of the cryptographic keys that can be used. Spill encryption uses -256-bit AES keys and may require Unlimited Strength :abbr:`JCE (Java Cryptography Extension)` -policy files to work correctly. - Supported Operations -------------------- diff --git a/presto-docs/src/main/sphinx/installation/deployment.rst b/presto-docs/src/main/sphinx/installation/deployment.rst index a67cc5fb027c2..d3437a38793b4 100644 --- a/presto-docs/src/main/sphinx/installation/deployment.rst +++ b/presto-docs/src/main/sphinx/installation/deployment.rst @@ -301,8 +301,11 @@ See :doc:`/connector` for more information about configuring connectors. Running Presto -------------- -The installation directory contains the launcher script in ``bin/launcher``. -Presto can be started as a daemon by running the following: +Presto requires Java 17 to run both the coordinator and workers. Please ensure +that your system has a valid Java 17 installation before starting Presto. + +The installation directory contains the launcher script +in ``bin/launcher``. Presto can be started as a daemon by running the following: .. code-block:: none @@ -496,7 +499,7 @@ and specify an entry point to run the server. .. code-block:: docker - FROM openjdk:8-jre + FROM openjdk:17-jre # Presto version will be passed in at build time ARG PRESTO_VERSION diff --git a/presto-docs/src/main/sphinx/security/cli.rst b/presto-docs/src/main/sphinx/security/cli.rst index aead5094a55f2..ccbeb86added0 100644 --- a/presto-docs/src/main/sphinx/security/cli.rst +++ b/presto-docs/src/main/sphinx/security/cli.rst @@ -33,8 +33,6 @@ principal. .. include:: ktadd-note.fragment -.. include:: jce-policy.fragment - Java Keystore File for TLS ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/presto-docs/src/main/sphinx/security/jce-policy.fragment b/presto-docs/src/main/sphinx/security/jce-policy.fragment deleted file mode 100644 index d5cdfab6ae004..0000000000000 --- a/presto-docs/src/main/sphinx/security/jce-policy.fragment +++ /dev/null @@ -1,21 +0,0 @@ -Java Cryptography Extension Policy Files -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The Java Runtime Environment is shipped with policy files that limit the -strength of the cryptographic keys that can be used. Kerberos, by default, uses -keys that are larger than those supported by the included policy files. There -are two possible solutions to the problem: - -* Update the :abbr:`JCE (Java Cryptography Extension)` policy files. -* Configure Kerberos to use reduced-strength keys. - -Of the two options, updating the JCE policy files is recommended. The JCE -policy files can be downloaded from Oracle. Note that the JCE policy files vary -based on the major version of Java you are running. Java 6 policy files will -not work with Java 8, for example. - -The Java 8 policy files are available `here -`_. -Instructions for installing the policy files are included in a ``README`` file in -the ZIP archive. You will need administrative access to install the policy -files if you are installing them in a system JRE. diff --git a/presto-docs/src/main/sphinx/security/server.rst b/presto-docs/src/main/sphinx/security/server.rst index 14dd21a1c3375..bc1b81f1246b1 100644 --- a/presto-docs/src/main/sphinx/security/server.rst +++ b/presto-docs/src/main/sphinx/security/server.rst @@ -47,8 +47,6 @@ In addition, the Presto coordinator needs a `keytab file .. include:: ktadd-note.fragment -.. include:: jce-policy.fragment - Java Keystore File for TLS ^^^^^^^^^^^^^^^^^^^^^^^^^^ When using Kerberos authentication, access to the Presto coordinator should be From 0814d6b768079f0c495f72fa6ce51ee4b5353d6b Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Tue, 29 Apr 2025 15:30:04 -0700 Subject: [PATCH 20/27] Update docker image for JDK 17 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 97215ce404d8b..d44de58d549b9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ ARG JMX_PROMETHEUS_JAVAAGENT_VERSION=0.20.0 ENV PRESTO_HOME="/opt/presto-server" RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ - dnf install -y java-11-openjdk less procps python3 \ + dnf install -y java-17-openjdk less procps python3 \ && ln -s $(which python3) /usr/bin/python \ # clean cache jobs && mv /etc/yum/protected.d/systemd.conf /etc/yum/protected.d/systemd.conf.bak From 6c41e9a013a666c3f14fa78c53972eb7a9acd739 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Tue, 29 Apr 2025 15:30:20 -0700 Subject: [PATCH 21/27] Update jvm.config files for java 17 --- docker/etc/jvm.config.example | 17 +++++++++++++++++ presto-main/etc/jvm.config | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docker/etc/jvm.config.example b/docker/etc/jvm.config.example index 8436145168343..b6956996878c0 100644 --- a/docker/etc/jvm.config.example +++ b/docker/etc/jvm.config.example @@ -7,3 +7,20 @@ -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -Djdk.attach.allowAttachSelf=true +--add-opens=java.base/java.io=ALL-UNNAMED +--add-opens=java.base/java.lang=ALL-UNNAMED +--add-opens=java.base/java.lang.ref=ALL-UNNAMED +--add-opens=java.base/java.lang.reflect=ALL-UNNAMED +--add-opens=java.base/java.net=ALL-UNNAMED +--add-opens=java.base/java.nio=ALL-UNNAMED +--add-opens=java.base/java.security=ALL-UNNAMED +--add-opens=java.base/javax.security.auth=ALL-UNNAMED +--add-opens=java.base/javax.security.auth.login=ALL-UNNAMED +--add-opens=java.base/java.text=ALL-UNNAMED +--add-opens=java.base/java.util=ALL-UNNAMED +--add-opens=java.base/java.util.concurrent=ALL-UNNAMED +--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED +--add-opens=java.base/java.util.regex=ALL-UNNAMED +--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED +--add-opens=java.base/sun.security.action=ALL-UNNAMED +--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED diff --git a/presto-main/etc/jvm.config b/presto-main/etc/jvm.config index 311a1e242079d..1f7dfb2b10503 100644 --- a/presto-main/etc/jvm.config +++ b/presto-main/etc/jvm.config @@ -6,5 +6,20 @@ # # Required for Java 17 runtime -#--add-opens=java.base/java.lang=ALL-UNNAMED -#--add-opens=java.base/java.lang.reflect=ALL-UNNAMED +--add-opens=java.base/java.io=ALL-UNNAMED +--add-opens=java.base/java.lang=ALL-UNNAMED +--add-opens=java.base/java.lang.ref=ALL-UNNAMED +--add-opens=java.base/java.lang.reflect=ALL-UNNAMED +--add-opens=java.base/java.net=ALL-UNNAMED +--add-opens=java.base/java.nio=ALL-UNNAMED +--add-opens=java.base/java.security=ALL-UNNAMED +--add-opens=java.base/javax.security.auth=ALL-UNNAMED +--add-opens=java.base/javax.security.auth.login=ALL-UNNAMED +--add-opens=java.base/java.text=ALL-UNNAMED +--add-opens=java.base/java.util=ALL-UNNAMED +--add-opens=java.base/java.util.concurrent=ALL-UNNAMED +--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED +--add-opens=java.base/java.util.regex=ALL-UNNAMED +--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED +--add-opens=java.base/sun.security.action=ALL-UNNAMED +--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED From eaf93baef892306f6b7225df0302688dbe669bd8 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Tue, 29 Apr 2025 15:30:32 -0700 Subject: [PATCH 22/27] Update PrestoSystemRequirements for Java 17 --- .../facebook/presto/server/PrestoSystemRequirements.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PrestoSystemRequirements.java b/presto-main-base/src/main/java/com/facebook/presto/server/PrestoSystemRequirements.java index daae41fe39933..b2870934a0bc0 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/server/PrestoSystemRequirements.java +++ b/presto-main-base/src/main/java/com/facebook/presto/server/PrestoSystemRequirements.java @@ -98,15 +98,11 @@ private static void verifyJavaVersion() } JavaVersion version = JavaVersion.parse(javaVersion); - if (version.getMajor() == 8 && version.getUpdate().isPresent() && version.getUpdate().getAsInt() >= 151) { + if (version.getMajor() >= 17) { return; } - if (version.getMajor() >= 9) { - return; - } - - failRequirement("Presto requires Java 8u151+ (found %s)", javaVersion); + failRequirement("Presto requires Java 17 (found %s)", javaVersion); } private static void verifyUsingG1Gc() From 905ba51f73308937c8d3a57123bdf79b5a71f789 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 9 Jul 2025 22:09:18 -0700 Subject: [PATCH 23/27] Upgrade airbase and airlift downgrade guice to 6.0.0 for Java 8 compat --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6544b3e52d391..6756d2bd9debe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.facebook.airlift airbase - 105 + 107 com.facebook.presto @@ -44,7 +44,7 @@ 3.3.9 4.7.1 - 0.219 + 0.220 ${dep.airlift.version} 0.38 0.6 @@ -87,7 +87,7 @@ 2.0 2.12.1 3.18.0 - 7.0.0 + 6.0.0 17.0.0 - - - - - - - - - + + + + + + + + + + diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java index e2e84f59f58c6..f91bbac8f2c2c 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ExpireSnapshotsProcedure.java @@ -23,10 +23,11 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.apache.iceberg.ExpireSnapshots; import org.apache.iceberg.Table; +import javax.inject.Provider; + import java.lang.invoke.MethodHandle; import java.util.List; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java index 05e968b42eaaf..3cadc073ef1d8 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/FastForwardBranchProcedure.java @@ -20,9 +20,10 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.apache.iceberg.Table; +import javax.inject.Provider; + import java.lang.invoke.MethodHandle; import static com.facebook.presto.common.block.MethodHandleUtil.methodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java index c6eefd10c64f2..1f3eb2f708eb6 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/ManifestFileCacheInvalidationProcedure.java @@ -18,7 +18,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java index fb77b1263a75c..e00216f5a9867 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RegisterTableProcedure.java @@ -26,11 +26,12 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import javax.inject.Provider; + import java.io.IOException; import java.lang.invoke.MethodHandle; import java.util.Optional; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java index 1c8812f61c5fc..2d88d01c14501 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocatedFileStatus; import org.apache.hadoop.fs.Path; @@ -41,6 +40,8 @@ import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; +import javax.inject.Provider; + import java.io.IOException; import java.lang.invoke.MethodHandle; import java.util.ArrayList; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java index ad52946b839c5..f1b622a6f5977 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToSnapshotProcedure.java @@ -20,7 +20,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java index 2cd28239b8b01..77ba3a8144a5e 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RollbackToTimestampProcedure.java @@ -22,7 +22,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java index 70806fe4c5461..abf9185b7071a 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetCurrentSnapshotProcedure.java @@ -20,10 +20,11 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.apache.iceberg.SnapshotRef; import org.apache.iceberg.Table; +import javax.inject.Provider; + import java.lang.invoke.MethodHandle; import static com.facebook.presto.common.block.MethodHandleUtil.methodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java index e68a151b5627c..76bdb75fb7acd 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/SetTablePropertyProcedure.java @@ -25,9 +25,10 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.apache.iceberg.Table; +import javax.inject.Provider; + import java.lang.invoke.MethodHandle; import static com.facebook.presto.common.block.MethodHandleUtil.methodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java index 8aa23bd603298..6e91c57b53cf3 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/StatisticsFileCacheInvalidationProcedure.java @@ -18,7 +18,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java index 25c76b16fe3a1..62709b89923c1 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/UnregisterTableProcedure.java @@ -22,7 +22,8 @@ import com.facebook.presto.spi.procedure.Procedure; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.invoke.MethodHandle; diff --git a/presto-jdbc/pom.xml b/presto-jdbc/pom.xml index 3e2787b6e2bb4..7099d5ea4bb80 100644 --- a/presto-jdbc/pom.xml +++ b/presto-jdbc/pom.xml @@ -364,6 +364,10 @@ javax.annotation ${shadeBase}.javax.annotation + + javax.inject + ${shadeBase}.javax.inject + jakarta.inject ${shadeBase}.jakarta.inject diff --git a/presto-jmx/pom.xml b/presto-jmx/pom.xml index 7274e34e0c772..06e8d3398d50d 100644 --- a/presto-jmx/pom.xml +++ b/presto-jmx/pom.xml @@ -74,6 +74,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.facebook.presto @@ -155,7 +160,6 @@ - @@ -164,6 +168,7 @@ com.fasterxml.jackson.core:jackson-databind + javax.inject:javax.inject diff --git a/presto-kafka/pom.xml b/presto-kafka/pom.xml index e2657cb928860..3ff4483b6d383 100644 --- a/presto-kafka/pom.xml +++ b/presto-kafka/pom.xml @@ -98,6 +98,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.fasterxml.jackson.core jackson-core @@ -168,7 +173,6 @@ runtime - com.101tec zkclient diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java index 966f1f3cbb4d2..07216e82fd895 100644 --- a/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java +++ b/presto-kafka/src/main/java/com/facebook/presto/kafka/schema/file/FileTableDescriptionSupplier.java @@ -26,7 +26,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.io.File; import java.io.IOException; diff --git a/presto-local-file/pom.xml b/presto-local-file/pom.xml index 2b77cf8af5e78..a3a7b172d3bb5 100644 --- a/presto-local-file/pom.xml +++ b/presto-local-file/pom.xml @@ -49,6 +49,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.facebook.presto @@ -99,7 +104,6 @@ test - com.facebook.airlift json @@ -124,4 +128,18 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + javax.inject:javax.inject + + + + + diff --git a/presto-main-base/pom.xml b/presto-main-base/pom.xml index c88c021e1bd6c..f724e286320a5 100644 --- a/presto-main-base/pom.xml +++ b/presto-main-base/pom.xml @@ -256,6 +256,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.google.inject guice diff --git a/presto-pinot-toolkit/pom.xml b/presto-pinot-toolkit/pom.xml index eec2b128e05a0..88367dbd9fde3 100644 --- a/presto-pinot-toolkit/pom.xml +++ b/presto-pinot-toolkit/pom.xml @@ -96,7 +96,7 @@ org.glassfish.hk2.external - aopalliance-repackaged + aopalliance-repackaged com.google.errorprone @@ -466,6 +466,11 @@ jmxutils + + javax.inject + javax.inject + + jakarta.inject jakarta.inject-api @@ -709,6 +714,9 @@ io.grpc::: commons-codec:commons-codec:: + + javax.inject:javax.inject + diff --git a/presto-prometheus/pom.xml b/presto-prometheus/pom.xml index 9ddbbcf120161..70a22b905fee7 100644 --- a/presto-prometheus/pom.xml +++ b/presto-prometheus/pom.xml @@ -90,6 +90,11 @@ jakarta.validation-api + + javax.inject + javax.inject + + com.facebook.airlift http-client @@ -218,6 +223,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + javax.inject:javax.inject + + + @@ -237,5 +251,5 @@ - + diff --git a/presto-redis/pom.xml b/presto-redis/pom.xml index 596e464ef4164..398d59d621684 100644 --- a/presto-redis/pom.xml +++ b/presto-redis/pom.xml @@ -85,6 +85,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.fasterxml.jackson.core jackson-core @@ -214,6 +219,7 @@ com.fasterxml.jackson.core:jackson-core + javax.inject:javax.inject diff --git a/presto-resource-group-managers/pom.xml b/presto-resource-group-managers/pom.xml index 9e159708f6708..838538606bc21 100644 --- a/presto-resource-group-managers/pom.xml +++ b/presto-resource-group-managers/pom.xml @@ -86,6 +86,11 @@ true + + javax.inject + javax.inject + + jakarta.inject jakarta.inject-api diff --git a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java index f822ca74d7b5d..5b905f06bb3b1 100644 --- a/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java +++ b/presto-resource-group-managers/src/main/java/com/facebook/presto/resourceGroups/db/MysqlDaoProvider.java @@ -15,10 +15,11 @@ import com.mysql.cj.jdbc.MysqlDataSource; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; +import javax.inject.Provider; + import static java.util.Objects.requireNonNull; public class MysqlDaoProvider diff --git a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java index ec7260e4eb5f4..3c044966a2f28 100644 --- a/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java +++ b/presto-resource-group-managers/src/test/java/com/facebook/presto/resourceGroups/db/H2DaoProvider.java @@ -14,11 +14,12 @@ package com.facebook.presto.resourceGroups.db; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.h2.jdbcx.JdbcDataSource; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; +import javax.inject.Provider; + import static java.util.Objects.requireNonNull; public class H2DaoProvider diff --git a/presto-router/pom.xml b/presto-router/pom.xml index 5fcafd95eeb3d..3a55686a187f2 100644 --- a/presto-router/pom.xml +++ b/presto-router/pom.xml @@ -140,6 +140,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.google.errorprone error_prone_annotations diff --git a/presto-session-property-managers/pom.xml b/presto-session-property-managers/pom.xml index db460ae3ff7b2..6386c244b92e5 100644 --- a/presto-session-property-managers/pom.xml +++ b/presto-session-property-managers/pom.xml @@ -44,6 +44,11 @@ guice + + javax.inject + javax.inject + + jakarta.inject jakarta.inject-api diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index 94f69b8a22b39..b353250a3609f 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -152,6 +152,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.facebook.airlift concurrent @@ -316,6 +321,10 @@ org.glassfish.hk2.external aopalliance-repackaged + + org.glassfish.hk2.external + javax.inject + diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java index 1277bc07dd24c..72b6ee6e8b001 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/PrestoSparkSessionPropertyManagerProvider.java @@ -20,7 +20,8 @@ import com.facebook.presto.sql.analyzer.JavaFeaturesConfig; import com.google.common.collect.Streams; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.util.Map; diff --git a/presto-tests/pom.xml b/presto-tests/pom.xml index 40e55989aecbc..3623dd0991913 100644 --- a/presto-tests/pom.xml +++ b/presto-tests/pom.xml @@ -70,7 +70,6 @@ presto-tpch - com.facebook.presto presto-function-namespace-managers @@ -152,6 +151,11 @@ testing + + javax.inject + javax.inject + + jakarta.inject jakarta.inject-api diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java b/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java index 8430cea7d87e9..292b401411f2b 100644 --- a/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java +++ b/presto-tests/src/main/java/com/facebook/presto/tests/H2ConnectionModule.java @@ -21,10 +21,11 @@ import com.google.inject.TypeLiteral; import jakarta.annotation.PreDestroy; import jakarta.inject.Inject; -import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; +import javax.inject.Provider; + import java.sql.DriverManager; import static com.facebook.presto.functionNamespace.mysql.MySqlConnectionModule.createJdbi; diff --git a/presto-thrift-connector/pom.xml b/presto-thrift-connector/pom.xml index f00985834c9ab..16710e7e317ca 100644 --- a/presto-thrift-connector/pom.xml +++ b/presto-thrift-connector/pom.xml @@ -95,6 +95,11 @@ jakarta.inject-api + + javax.inject + javax.inject + + com.facebook.airlift configuration diff --git a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java index bcb2e6c06a2a9..abd4517721c07 100644 --- a/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java +++ b/presto-thrift-connector/src/main/java/com/facebook/presto/connector/thrift/location/ExtendedSimpleAddressSelectorBinder.java @@ -21,7 +21,8 @@ import com.google.inject.Injector; import com.google.inject.Key; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.annotation.Annotation; import java.util.Objects; diff --git a/presto-verifier/pom.xml b/presto-verifier/pom.xml index 85d017696a2ea..fa1a823018c7a 100644 --- a/presto-verifier/pom.xml +++ b/presto-verifier/pom.xml @@ -189,6 +189,11 @@ jakarta.annotation-api + + javax.inject + javax.inject + + jakarta.inject jakarta.inject-api diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java index fa959b3c5701d..e0739328ad769 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/ChecksumValidator.java @@ -31,7 +31,8 @@ import com.facebook.presto.verifier.framework.Column.Category; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java index 29a3d0bfc21de..f58d4eafc0e6e 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/checksum/RowColumnValidator.java @@ -23,7 +23,8 @@ import com.facebook.presto.verifier.framework.Column; import com.google.common.collect.ImmutableList; import jakarta.inject.Inject; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java index d9c7dad6501f7..d3aa548725450 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java @@ -52,9 +52,10 @@ import com.google.inject.Scopes; import com.google.inject.TypeLiteral; import com.google.inject.multibindings.MapBinder; -import jakarta.inject.Provider; import jakarta.inject.Singleton; +import javax.inject.Provider; + import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java index 6f529c0481c80..c582b04c8d466 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/prestoaction/QueryActionsModule.java @@ -25,7 +25,8 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; -import jakarta.inject.Provider; + +import javax.inject.Provider; import java.lang.annotation.Annotation; import java.util.Set; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java index 1a5ddf922472f..80978c1b12f4a 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQueryConsumer.java @@ -14,10 +14,11 @@ package com.facebook.presto.verifier.source; import com.facebook.presto.verifier.framework.SnapshotQuery; -import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; +import javax.inject.Provider; + import static java.util.Objects.requireNonNull; public abstract class AbstractJdbiSnapshotQueryConsumer diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java index f5211aa7c0cd6..1a642f8085063 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSnapshotQuerySupplier.java @@ -16,10 +16,11 @@ import com.facebook.presto.verifier.framework.SnapshotQuery; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; +import javax.inject.Provider; + import java.util.List; import java.util.Map; diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java index 06d631dd41218..d7f719ab16f28 100644 --- a/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java +++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/source/AbstractJdbiSourceQuerySupplier.java @@ -15,10 +15,11 @@ import com.facebook.presto.verifier.framework.SourceQuery; import com.google.common.collect.ImmutableList; -import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; +import javax.inject.Provider; + import java.util.List; import static java.util.Objects.requireNonNull; diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java index edf978d8248ba..0a11f0705e5ad 100644 --- a/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java +++ b/presto-verifier/src/test/java/com/facebook/presto/verifier/VerifierTestUtil.java @@ -37,11 +37,12 @@ import com.facebook.presto.verifier.source.VerifierDao; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import jakarta.inject.Provider; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; +import javax.inject.Provider; + import java.util.HashMap; import java.util.Map; import java.util.Optional; From 61ae1ccbe00ad110159e7320e256c627e7d2723f Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Wed, 9 Jul 2025 22:17:08 -0700 Subject: [PATCH 25/27] Fix build errors after downgrade --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index d3c2b1c8bb4a6..d12e4433bf117 100644 --- a/pom.xml +++ b/pom.xml @@ -2296,6 +2296,10 @@ com.google.inject.extensions guice-multibindings + + com.google.inject + guice + org.testng testng @@ -2316,6 +2320,10 @@ org.testng testng + + com.google.inject + guice + @@ -2336,6 +2344,10 @@ org.testng testng + + com.google.inject + guice + @@ -2352,6 +2364,10 @@ org.testng testng + + com.google.inject + guice + From 025f231d91e6a3e57c345588d2f2b6905730662a Mon Sep 17 00:00:00 2001 From: Shrinidhi Joshi Date: Wed, 16 Jul 2025 13:52:25 -0700 Subject: [PATCH 26/27] [pos][native] Make pos native compatible with Java17 upgrade This diff contains multiple changes that go together 1. We remove the dependency on presto-main module as it is targetted to compile for JDK17 but presto-on-spark* modules compile to JDK8/11. 2. Removing dependency on presto-main means that we have to figure out a solution to provide the missing functionality on which we depended. The only way to to do this is to duplicate the necessary classes and their dependencies 3. Next, we now have to override http-client,http-server and discovery to be compatible with JDK8/11. For this we pin the airlift version to 0.216 and the corresponding jetty version to 9.8.45.vXXXXX 4. Next we still need to do some amount of migration of classes as we moved from using javax -> jakarta and from io.airlift to com.facebook.airlift. Note that because for some of the airlift jars we still use 0.216 so it expects old io.airlift classes. So we retain both io.airlift and com.facebook.airlift 5. To manage the duplication we also exclude some classes from duplicate class check as the signature of the classes is the same --- presto-native-execution/pom.xml | 1 + presto-spark-base/pom.xml | 53 +++- .../http/PrestoSparkHttpServerClient.java | 6 +- .../http/PrestoSparkHttpTaskClient.java | 16 +- ...HttpAndThriftRpcShuffleClientProvider.java | 55 ++++ .../http/operator/HttpRpcShuffleClient.java | 255 ++++++++++++++++++ .../operator/HttpShuffleClientProvider.java | 41 +++ .../http/operator/ThriftRpcShuffleClient.java | 94 +++++++ .../operator/ThriftShuffleClientProvider.java | 42 +++ .../http/server/RequestErrorTracker.java | 173 ++++++++++++ .../execution/http/server/RequestHelpers.java | 84 ++++++ .../server/SimpleHttpResponseHandler.java | 107 ++++++++ .../smile/AdaptingJsonResponseHandler.java | 59 ++++ .../http/server/smile/BaseResponse.java | 44 +++ .../smile/FullSmileResponseHandler.java | 201 ++++++++++++++ .../server/smile/JsonResponseWrapper.java | 99 +++++++ .../DetachedNativeExecutionProcess.java | 2 +- ...DetachedNativeExecutionProcessFactory.java | 2 +- .../HttpNativeExecutionTaskInfoFetcher.java | 2 +- .../HttpNativeExecutionTaskResultFetcher.java | 4 +- .../nativeprocess/NativeExecutionModule.java | 6 +- .../nativeprocess/NativeExecutionProcess.java | 6 +- .../NativeExecutionProcessFactory.java | 2 +- .../PrestoSparkNativeTaskExecutorFactory.java | 4 +- .../execution/TestNativeExecutionProcess.java | 2 +- .../http/TestPrestoSparkHttpClient.java | 8 +- ...estHttpNativeExecutionTaskInfoFetcher.java | 2 +- presto-spark/pom.xml | 49 ++++ 28 files changed, 1385 insertions(+), 34 deletions(-) create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpAndThriftRpcShuffleClientProvider.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpRpcShuffleClient.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpShuffleClientProvider.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftRpcShuffleClient.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftShuffleClientProvider.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestErrorTracker.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestHelpers.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/SimpleHttpResponseHandler.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/AdaptingJsonResponseHandler.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/BaseResponse.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/FullSmileResponseHandler.java create mode 100644 presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/JsonResponseWrapper.java diff --git a/presto-native-execution/pom.xml b/presto-native-execution/pom.xml index b50afa658dc0a..a26a3392688fa 100644 --- a/presto-native-execution/pom.xml +++ b/presto-native-execution/pom.xml @@ -51,6 +51,7 @@ com.google.inject guice + test diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index b353250a3609f..19a81ef862d8b 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -13,6 +13,7 @@ ${project.parent.basedir} true + 9.4.55.v20240627 @@ -25,6 +26,26 @@ pom import + + com.facebook.airlift + http-client + 0.216 + + + com.facebook.airlift + http-server + 0.216 + + + com.facebook.airlift + event + 0.216 + + + com.facebook.airlift + discovery + 0.216 + @@ -84,8 +105,13 @@ presto-main-base - com.facebook.presto - presto-main + com.facebook.airlift.drift + drift-transport-spi + + + + com.facebook.airlift.drift + drift-client com.facebook.presto @@ -127,6 +153,18 @@ http-client + + com.facebook.airlift + http-server + provided + + + + com.facebook.airlift + event + provided + + com.fasterxml.jackson.core jackson-annotations @@ -156,7 +194,14 @@ javax.inject javax.inject - + + javax.annotation + javax.annotation-api + + + com.google.code.findbugs + jsr305 + com.facebook.airlift concurrent @@ -376,6 +421,8 @@ com.esotericsoftware.minlog.Log com.esotericsoftware.reflectasm.* META-INF.versions.9.module-info + com.facebook.drift.* + io.jsonwebtoken.* diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpServerClient.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpServerClient.java index 219b012f5244c..70af7435310ff 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpServerClient.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpServerClient.java @@ -18,7 +18,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; import com.facebook.presto.client.ServerInfo; -import com.facebook.presto.server.smile.BaseResponse; +import com.facebook.presto.spark.execution.http.server.smile.BaseResponse; import com.google.common.util.concurrent.ListenableFuture; import javax.annotation.concurrent.ThreadSafe; @@ -27,8 +27,8 @@ import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; import static com.facebook.airlift.http.client.Request.Builder.prepareGet; -import static com.facebook.presto.server.RequestHelpers.setContentTypeHeaders; -import static com.facebook.presto.server.smile.AdaptingJsonResponseHandler.createAdaptingJsonResponseHandler; +import static com.facebook.presto.spark.execution.http.server.RequestHelpers.setContentTypeHeaders; +import static com.facebook.presto.spark.execution.http.server.smile.AdaptingJsonResponseHandler.createAdaptingJsonResponseHandler; import static java.util.Objects.requireNonNull; /** diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpTaskClient.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpTaskClient.java index a013632ec06cd..1f9e56f92bafb 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpTaskClient.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/PrestoSparkHttpTaskClient.java @@ -19,20 +19,22 @@ import com.facebook.airlift.http.client.Response; import com.facebook.airlift.http.client.ResponseHandler; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.execution.TaskSource; import com.facebook.presto.execution.buffer.OutputBuffers; import com.facebook.presto.execution.scheduler.TableWriteInfo; -import com.facebook.presto.operator.HttpRpcShuffleClient.PageResponseHandler; import com.facebook.presto.operator.PageBufferClient.PagesResponse; -import com.facebook.presto.server.RequestErrorTracker; import com.facebook.presto.server.SimpleHttpResponseCallback; -import com.facebook.presto.server.SimpleHttpResponseHandler; import com.facebook.presto.server.SimpleHttpResponseHandlerStats; import com.facebook.presto.server.TaskUpdateRequest; -import com.facebook.presto.server.smile.BaseResponse; +import com.facebook.presto.spark.execution.http.operator.HttpRpcShuffleClient.PageResponseHandler; +import com.facebook.presto.spark.execution.http.server.RequestErrorTracker; +import com.facebook.presto.spark.execution.http.server.SimpleHttpResponseHandler; +import com.facebook.presto.spark.execution.http.server.smile.BaseResponse; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.sql.planner.PlanFragment; import com.google.common.collect.ImmutableListMultimap; @@ -42,8 +44,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import javax.annotation.concurrent.ThreadSafe; @@ -64,8 +64,8 @@ import static com.facebook.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator; import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_SIZE; import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_WAIT; -import static com.facebook.presto.server.RequestHelpers.setContentTypeHeaders; -import static com.facebook.presto.server.smile.AdaptingJsonResponseHandler.createAdaptingJsonResponseHandler; +import static com.facebook.presto.spark.execution.http.server.RequestHelpers.setContentTypeHeaders; +import static com.facebook.presto.spark.execution.http.server.smile.AdaptingJsonResponseHandler.createAdaptingJsonResponseHandler; import static com.facebook.presto.spi.StandardErrorCode.NATIVE_EXECUTION_TASK_ERROR; import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_ERROR; import static com.google.common.util.concurrent.Futures.addCallback; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpAndThriftRpcShuffleClientProvider.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpAndThriftRpcShuffleClientProvider.java new file mode 100644 index 0000000000000..8202c85b18216 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpAndThriftRpcShuffleClientProvider.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 com.facebook.presto.spark.execution.http.operator; + +import com.facebook.presto.operator.ForExchange; +import com.facebook.presto.operator.RpcShuffleClient; +import com.facebook.presto.operator.RpcShuffleClientProvider; +import com.facebook.presto.spi.PrestoException; +import com.google.inject.Inject; + +import java.net.URI; +import java.util.Locale; + +import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; + +public class HttpAndThriftRpcShuffleClientProvider + implements RpcShuffleClientProvider +{ + private final HttpShuffleClientProvider httpShuffleClientProvider; + private final ThriftShuffleClientProvider thriftShuffleClientProvider; + + @Inject + public HttpAndThriftRpcShuffleClientProvider( + @ForExchange HttpShuffleClientProvider httpShuffleClientProvider, + @ForExchange ThriftShuffleClientProvider thriftShuffleClientProvider) + { + this.httpShuffleClientProvider = httpShuffleClientProvider; + this.thriftShuffleClientProvider = thriftShuffleClientProvider; + } + + @Override + public RpcShuffleClient get(URI location) + { + switch (location.getScheme().toLowerCase(Locale.getDefault())) { + case "https": + case "http": + return httpShuffleClientProvider.get(location); + case "thrift": + return thriftShuffleClientProvider.get(location); + default: + throw new PrestoException(GENERIC_INTERNAL_ERROR, "unsupported task result client scheme " + location.getScheme()); + } + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpRpcShuffleClient.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpRpcShuffleClient.java new file mode 100644 index 0000000000000..91e0ef8b02e54 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpRpcShuffleClient.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 com.facebook.presto.spark.execution.http.operator; + +import com.facebook.airlift.http.client.HttpClient; +import com.facebook.airlift.http.client.HttpStatus; +import com.facebook.airlift.http.client.Request; +import com.facebook.airlift.http.client.Response; +import com.facebook.airlift.http.client.ResponseHandler; +import com.facebook.airlift.http.client.ResponseTooLargeException; +import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.presto.operator.PageBufferClient.PagesResponse; +import com.facebook.presto.operator.PageTooLargeException; +import com.facebook.presto.operator.PageTransportErrorException; +import com.facebook.presto.operator.RpcShuffleClient; +import com.facebook.presto.spi.HostAddress; +import com.facebook.presto.spi.page.SerializedPage; +import com.google.common.collect.ImmutableList; +import com.google.common.net.MediaType; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; +import io.airlift.slice.InputStreamSliceInput; +import io.airlift.slice.SliceInput; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URI; +import java.util.List; + +import static com.facebook.airlift.http.client.HttpStatus.familyForStatusCode; +import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; +import static com.facebook.airlift.http.client.Request.Builder.prepareDelete; +import static com.facebook.airlift.http.client.Request.Builder.prepareGet; +import static com.facebook.airlift.http.client.ResponseHandlerUtils.propagate; +import static com.facebook.airlift.http.client.StatusResponseHandler.createStatusResponseHandler; +import static com.facebook.presto.PrestoMediaTypes.PRESTO_PAGES_TYPE; +import static com.facebook.presto.client.PrestoHeaders.PRESTO_BUFFER_COMPLETE; +import static com.facebook.presto.client.PrestoHeaders.PRESTO_MAX_SIZE; +import static com.facebook.presto.client.PrestoHeaders.PRESTO_PAGE_NEXT_TOKEN; +import static com.facebook.presto.client.PrestoHeaders.PRESTO_PAGE_TOKEN; +import static com.facebook.presto.client.PrestoHeaders.PRESTO_TASK_INSTANCE_ID; +import static com.facebook.presto.operator.PageBufferClient.PagesResponse.createEmptyPagesResponse; +import static com.facebook.presto.operator.PageBufferClient.PagesResponse.createPagesResponse; +import static com.facebook.presto.spi.page.PagesSerdeUtil.readSerializedPages; +import static com.google.common.net.HttpHeaders.CONTENT_TYPE; +import static java.lang.String.format; +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.Objects.requireNonNull; + +@ThreadSafe +public final class HttpRpcShuffleClient + implements RpcShuffleClient +{ + private static final Logger log = Logger.get(HttpRpcShuffleClient.class); + + private final HttpClient httpClient; + private final URI location; + + public HttpRpcShuffleClient(HttpClient httpClient, URI location) + { + this.httpClient = requireNonNull(httpClient, "httpClient is null"); + this.location = requireNonNull(location, "location is null"); + } + + @Override + public ListenableFuture getResults(long token, DataSize maxResponseSize) + { + URI uri = uriBuilderFrom(location).appendPath(String.valueOf(token)).build(); + return httpClient.executeAsync( + prepareGet() + .setHeader(PRESTO_MAX_SIZE, maxResponseSize.toString()) + .setUri(uri).build(), + new PageResponseHandler()); + } + + @Override + public void acknowledgeResultsAsync(long nextToken) + { + URI uri = uriBuilderFrom(location).appendPath(String.valueOf(nextToken)).appendPath("acknowledge").build(); + httpClient.executeAsync(prepareGet().setUri(uri).build(), new ResponseHandler() + { + @Override + public Void handleException(Request request, Exception exception) + { + log.debug(exception, "Acknowledge request failed: %s", uri); + return null; + } + + @Override + public Void handle(Request request, Response response) + { + if (familyForStatusCode(response.getStatusCode()) != HttpStatus.Family.SUCCESSFUL) { + log.debug("Unexpected acknowledge response code: %s", response.getStatusCode()); + } + return null; + } + }); + } + + @Override + public ListenableFuture abortResults() + { + return httpClient.executeAsync(prepareDelete().setUri(location).build(), createStatusResponseHandler()); + } + + @Override + public Throwable rewriteException(Throwable throwable) + { + if (throwable instanceof ResponseTooLargeException) { + return new PageTooLargeException(throwable); + } + return throwable; + } + + public static class PageResponseHandler + implements ResponseHandler + { + @Override + public PagesResponse handleException(Request request, Exception exception) + { + throw propagate(request, exception); + } + + @Override + public PagesResponse handle(Request request, Response response) + { + try { + // no content means no content was created within the wait period, but query is still ok + // if job is finished, complete is set in the response + if (response.getStatusCode() == HttpStatus.NO_CONTENT.code()) { + return createEmptyPagesResponse( + getTaskInstanceId(request, response), + getToken(request, response), + getNextToken(request, response), + getComplete(request, response)); + } + + // otherwise we must have gotten an OK response, everything else is considered fatal + if (response.getStatusCode() != HttpStatus.OK.code()) { + StringBuilder body = new StringBuilder(); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(response.getInputStream(), UTF_8))) { + // Get up to 1000 lines for debugging + for (int i = 0; i < 1000; i++) { + String line = reader.readLine(); + // Don't output more than 100KB + if (line == null || body.length() + line.length() > 100 * 1024) { + break; + } + body.append(line + "\n"); + } + } + catch (RuntimeException | IOException e) { + // Ignored. Just return whatever message we were able to decode + } + throw new PageTransportErrorException( + HostAddress.fromUri(request.getUri()), + format("Expected response code to be 200, but was %s:%n%s", + response.getStatusCode(), + body.toString())); + } + + // invalid content type can happen when an error page is returned, but is unlikely given the above 200 + String contentType = response.getHeader(CONTENT_TYPE); + if (contentType == null) { + throw new PageTransportErrorException( + HostAddress.fromUri(request.getUri()), + format("%s header is not set: %s", CONTENT_TYPE, response)); + } + if (!mediaTypeMatches(contentType, PRESTO_PAGES_TYPE)) { + throw new PageTransportErrorException( + HostAddress.fromUri(request.getUri()), + format("Expected %s response from server but got %s", PRESTO_PAGES_TYPE, contentType)); + } + + String taskInstanceId = getTaskInstanceId(request, response); + long token = getToken(request, response); + long nextToken = getNextToken(request, response); + boolean complete = getComplete(request, response); + + try (SliceInput input = new InputStreamSliceInput(response.getInputStream())) { + List pages = ImmutableList.copyOf(readSerializedPages(input)); + return createPagesResponse(taskInstanceId, token, nextToken, pages, complete); + } + catch (IOException e) { + throw new RuntimeException(e); + } + } + catch (PageTransportErrorException e) { + throw new PageTransportErrorException( + e.getRemoteHost(), + "Error fetching " + request.getUri().toASCIIString(), + e); + } + } + + private static String getTaskInstanceId(Request request, Response response) + { + String taskInstanceId = response.getHeader(PRESTO_TASK_INSTANCE_ID); + if (taskInstanceId == null) { + throw new PageTransportErrorException(HostAddress.fromUri(request.getUri()), format("Expected %s header", PRESTO_TASK_INSTANCE_ID)); + } + return taskInstanceId; + } + + private static long getToken(Request request, Response response) + { + String tokenHeader = response.getHeader(PRESTO_PAGE_TOKEN); + if (tokenHeader == null) { + throw new PageTransportErrorException(HostAddress.fromUri(request.getUri()), format("Expected %s header", PRESTO_PAGE_TOKEN)); + } + return Long.parseLong(tokenHeader); + } + + private static long getNextToken(Request request, Response response) + { + String nextTokenHeader = response.getHeader(PRESTO_PAGE_NEXT_TOKEN); + if (nextTokenHeader == null) { + throw new PageTransportErrorException(HostAddress.fromUri(request.getUri()), format("Expected %s header", PRESTO_PAGE_NEXT_TOKEN)); + } + return Long.parseLong(nextTokenHeader); + } + + private static boolean getComplete(Request request, Response response) + { + String bufferComplete = response.getHeader(PRESTO_BUFFER_COMPLETE); + if (bufferComplete == null) { + throw new PageTransportErrorException(HostAddress.fromUri(request.getUri()), format("Expected %s header", PRESTO_BUFFER_COMPLETE)); + } + return Boolean.parseBoolean(bufferComplete); + } + + private static boolean mediaTypeMatches(String value, MediaType range) + { + try { + return MediaType.parse(value).is(range); + } + catch (IllegalArgumentException | IllegalStateException e) { + return false; + } + } + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpShuffleClientProvider.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpShuffleClientProvider.java new file mode 100644 index 0000000000000..74a6f43c5a8a8 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/HttpShuffleClientProvider.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 com.facebook.presto.spark.execution.http.operator; + +import com.facebook.airlift.http.client.HttpClient; +import com.facebook.presto.operator.ForExchange; +import com.facebook.presto.operator.RpcShuffleClient; +import com.facebook.presto.operator.RpcShuffleClientProvider; +import com.google.inject.Inject; + +import java.net.URI; + +import static java.util.Objects.requireNonNull; + +public class HttpShuffleClientProvider + implements RpcShuffleClientProvider +{ + private final HttpClient httpClient; + + @Inject + public HttpShuffleClientProvider(@ForExchange HttpClient httpClient) + { + this.httpClient = requireNonNull(httpClient, "httpClient is null"); + } + + public RpcShuffleClient get(URI location) + { + return new HttpRpcShuffleClient(httpClient, location); + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftRpcShuffleClient.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftRpcShuffleClient.java new file mode 100644 index 0000000000000..27483e941fce1 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftRpcShuffleClient.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 com.facebook.presto.spark.execution.http.operator; + +import com.facebook.airlift.units.DataSize; +import com.facebook.drift.client.DriftClient; +import com.facebook.drift.transport.client.MessageTooLargeException; +import com.facebook.presto.execution.TaskId; +import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId; +import com.facebook.presto.execution.buffer.ThriftBufferResult; +import com.facebook.presto.operator.PageBufferClient.PagesResponse; +import com.facebook.presto.operator.PageTooLargeException; +import com.facebook.presto.operator.RpcShuffleClient; +import com.facebook.presto.server.thrift.ThriftTaskClient; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.ThreadSafe; + +import java.net.URI; +import java.util.Optional; + +import static com.facebook.presto.operator.PageBufferClient.PagesResponse.createPagesResponse; +import static com.google.common.util.concurrent.MoreExecutors.directExecutor; +import static java.util.Objects.requireNonNull; + +@ThreadSafe +public final class ThriftRpcShuffleClient + implements RpcShuffleClient +{ + private final ThriftTaskClient thriftClient; + private final TaskId taskId; + private final OutputBufferId outputBufferId; + + public ThriftRpcShuffleClient(DriftClient driftClient, URI location) + { + requireNonNull(location, "location is null"); + + this.thriftClient = requireNonNull(driftClient, "thriftClient is null").get(Optional.of(location.getAuthority())); + + // TODO: refactor the entire LocationFactory interfaces to completely replace URI with more efficient/expressive data structures + // location format: thrift://{ipAddress}:{thriftPort}/v1/task/{taskId}/results/{bufferId}/ + String[] paths = location.getPath().split("/"); + this.taskId = TaskId.valueOf(paths[3]); + this.outputBufferId = OutputBufferId.fromString(paths[5]); + } + + @Override + public ListenableFuture getResults(long token, DataSize maxResponseSize) + { + ListenableFuture future = thriftClient.getResults(taskId, outputBufferId, token, maxResponseSize.toBytes()); + return Futures.transform( + future, + result -> createPagesResponse( + result.getTaskInstanceId(), + result.getToken(), + result.getNextToken(), + result.getSerializedPages(), + result.isBufferComplete()), + directExecutor()); + } + + @Override + public void acknowledgeResultsAsync(long nextToken) + { + // no need to handle the future + thriftClient.acknowledgeResults(taskId, outputBufferId, nextToken); + } + + @Override + public ListenableFuture abortResults() + { + return thriftClient.abortResults(taskId, outputBufferId); + } + + @Override + public Throwable rewriteException(Throwable throwable) + { + if (throwable instanceof MessageTooLargeException) { + return new PageTooLargeException(throwable); + } + return throwable; + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftShuffleClientProvider.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftShuffleClientProvider.java new file mode 100644 index 0000000000000..198338ca3d71c --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/operator/ThriftShuffleClientProvider.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 com.facebook.presto.spark.execution.http.operator; + +import com.facebook.drift.client.DriftClient; +import com.facebook.presto.operator.ForExchange; +import com.facebook.presto.operator.RpcShuffleClient; +import com.facebook.presto.operator.RpcShuffleClientProvider; +import com.facebook.presto.server.thrift.ThriftTaskClient; +import com.google.inject.Inject; + +import java.net.URI; + +import static java.util.Objects.requireNonNull; + +public class ThriftShuffleClientProvider + implements RpcShuffleClientProvider +{ + private final DriftClient httpClient; + + @Inject + public ThriftShuffleClientProvider(@ForExchange DriftClient httpClient) + { + this.httpClient = requireNonNull(httpClient, "httpClient is null"); + } + + public RpcShuffleClient get(URI location) + { + return new ThriftRpcShuffleClient(httpClient, location); + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestErrorTracker.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestErrorTracker.java new file mode 100644 index 0000000000000..e5820de90fbb4 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestErrorTracker.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 com.facebook.presto.spark.execution.http.server; + +import com.facebook.airlift.event.client.ServiceUnavailableException; +import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; +import com.facebook.presto.execution.TaskId; +import com.facebook.presto.server.remotetask.Backoff; +import com.facebook.presto.spi.ErrorCodeSupplier; +import com.facebook.presto.spi.PrestoException; +import com.facebook.presto.spi.PrestoTransportException; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableFutureTask; +import com.google.errorprone.annotations.ThreadSafe; + +import java.io.EOFException; +import java.net.SocketException; +import java.net.SocketTimeoutException; +import java.net.URI; +import java.util.Queue; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeoutException; + +import static com.facebook.presto.spi.HostAddress.fromUri; +import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_ERROR; +import static com.facebook.presto.spi.StandardErrorCode.TOO_MANY_REQUESTS_FAILED; +import static com.facebook.presto.util.Failures.WORKER_NODE_ERROR; +import static java.lang.String.format; +import static java.util.Objects.requireNonNull; +import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; + +@ThreadSafe +public class RequestErrorTracker +{ + private static final Logger log = Logger.get(RequestErrorTracker.class); + + private final Object id; + private final URI uri; + private ErrorCodeSupplier errorCode; + private String nodeErrorMessage; + private final ScheduledExecutorService scheduledExecutor; + private final String jobDescription; + private final Backoff backoff; + + private final Queue errorsSinceLastSuccess = new ConcurrentLinkedQueue<>(); + + public RequestErrorTracker(Object id, URI uri, ErrorCodeSupplier errorCode, String nodeErrorMessage, Duration maxErrorDuration, ScheduledExecutorService scheduledExecutor, String jobDescription) + { + this.id = requireNonNull(id, "id is null"); + this.uri = requireNonNull(uri, "uri is null"); + this.errorCode = requireNonNull(errorCode, "errorCode is null"); + this.nodeErrorMessage = requireNonNull(nodeErrorMessage, "nodeErrorMessage is null"); + this.scheduledExecutor = requireNonNull(scheduledExecutor, "scheduledExecutor is null"); + this.backoff = new Backoff(requireNonNull(maxErrorDuration, "maxErrorDuration is null")); + this.jobDescription = requireNonNull(jobDescription, "jobDescription is null"); + } + + public static RequestErrorTracker taskRequestErrorTracker(TaskId taskId, URI taskUri, Duration maxErrorDuration, ScheduledExecutorService scheduledExecutor, String jobDescription) + { + return new RequestErrorTracker(taskId, taskUri, REMOTE_TASK_ERROR, WORKER_NODE_ERROR, maxErrorDuration, scheduledExecutor, jobDescription); + } + + public ListenableFuture acquireRequestPermit() + { + long delayNanos = backoff.getBackoffDelayNanos(); + + if (delayNanos == 0) { + return Futures.immediateFuture(null); + } + + ListenableFutureTask futureTask = ListenableFutureTask.create(() -> null); + scheduledExecutor.schedule(futureTask, delayNanos, NANOSECONDS); + return futureTask; + } + + public void startRequest() + { + // before scheduling a new request clear the error timer + // we consider a request to be "new" if there are no current failures + if (backoff.getFailureCount() == 0) { + requestSucceeded(); + } + backoff.startRequest(); + } + + public void requestSucceeded() + { + backoff.success(); + errorsSinceLastSuccess.clear(); + } + + public void requestFailed(Throwable reason) + throws PrestoException + { + // cancellation is not a failure + if (reason instanceof CancellationException) { + return; + } + + if (reason instanceof RejectedExecutionException) { + if (reason.getMessage() == null) { + throw new PrestoException(errorCode, reason); + } + + // We want to do exponential backoff to allow OOT killer to kill queries and not fail immediately. + if (!reason.getMessage().contains("Max requests queued per destination")) { + throw new PrestoException(errorCode, reason); + } + } + + // log failure message + if (isExpectedError(reason)) { + // don't print a stack for a known errors + log.warn("Error " + jobDescription + " %s: %s: %s", id, reason.getMessage(), uri); + } + else { + log.warn(reason, "Error " + jobDescription + " %s: %s", id, uri); + } + + // remember the first 10 errors + if (errorsSinceLastSuccess.size() < 10) { + errorsSinceLastSuccess.add(reason); + } + + // fail the operation, if we have more than X failures in a row and more than Y seconds have passed since the last request + if (backoff.failure()) { + // it is weird to mark the task failed locally and then cancel the remote task, but there is no way to tell a remote task that it is failed + PrestoException exception = new PrestoTransportException(TOO_MANY_REQUESTS_FAILED, + fromUri(uri), + format("%s (%s %s - %s failures, failure duration %s, total failed request time %s)", + nodeErrorMessage, + jobDescription, + uri, + backoff.getFailureCount(), + backoff.getFailureDuration().convertTo(SECONDS), + backoff.getFailureRequestTimeTotal().convertTo(SECONDS))); + errorsSinceLastSuccess.forEach(exception::addSuppressed); + throw exception; + } + } + + public static boolean isExpectedError(Throwable t) + { + while (t != null) { + if ((t instanceof SocketException) || + (t instanceof SocketTimeoutException) || + (t instanceof EOFException) || + (t instanceof TimeoutException) || + (t instanceof ServiceUnavailableException)) { + return true; + } + t = t.getCause(); + } + return false; + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestHelpers.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestHelpers.java new file mode 100644 index 0000000000000..7f00d6fc0dd08 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/RequestHelpers.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 com.facebook.presto.spark.execution.http.server; + +import com.facebook.airlift.http.client.Request.Builder; + +import static com.facebook.airlift.http.client.thrift.ThriftRequestUtils.APPLICATION_THRIFT_BINARY; +import static com.facebook.presto.PrestoMediaTypes.APPLICATION_JACKSON_SMILE; +import static com.google.common.net.HttpHeaders.ACCEPT; +import static com.google.common.net.HttpHeaders.CONTENT_TYPE; +import static com.google.common.net.MediaType.JSON_UTF_8; + +public class RequestHelpers +{ + private RequestHelpers() + { + } + + /** + * Sets the request Content-Type/Accept headers for JSON or SMILE encoding based on the + * given isBinaryTransportEnabled argument. + */ + public static Builder setContentTypeHeaders(boolean isBinaryTransportEnabled, Builder requestBuilder) + { + if (isBinaryTransportEnabled) { + return getBinaryTransportBuilder(requestBuilder); + } + return getJsonTransportBuilder(requestBuilder); + } + + public static Builder setTaskUpdateRequestContentTypeHeaders(boolean isTaskUpdateRequestThriftTransportEnabled, boolean isBinaryTransportEnabled, Builder requestBuilder) + { + if (isTaskUpdateRequestThriftTransportEnabled) { + requestBuilder.setHeader(CONTENT_TYPE, APPLICATION_THRIFT_BINARY); + } + else if (isBinaryTransportEnabled) { + requestBuilder.setHeader(CONTENT_TYPE, APPLICATION_JACKSON_SMILE); + } + else { + requestBuilder.setHeader(CONTENT_TYPE, JSON_UTF_8.toString()); + } + + return requestBuilder; + } + + public static Builder setTaskInfoAcceptTypeHeaders(boolean isTaskInfoThriftTransportEnabled, boolean isBinaryTransportEnabled, Builder requestBuilder) + { + if (isTaskInfoThriftTransportEnabled) { + requestBuilder.setHeader(ACCEPT, APPLICATION_THRIFT_BINARY); + } + else if (isBinaryTransportEnabled) { + requestBuilder.setHeader(ACCEPT, APPLICATION_JACKSON_SMILE); + } + else { + requestBuilder.setHeader(ACCEPT, JSON_UTF_8.toString()); + } + return requestBuilder; + } + + public static Builder getBinaryTransportBuilder(Builder requestBuilder) + { + return requestBuilder + .setHeader(CONTENT_TYPE, APPLICATION_JACKSON_SMILE) + .setHeader(ACCEPT, APPLICATION_JACKSON_SMILE); + } + + public static Builder getJsonTransportBuilder(Builder requestBuilder) + { + return requestBuilder + .setHeader(CONTENT_TYPE, JSON_UTF_8.toString()) + .setHeader(ACCEPT, JSON_UTF_8.toString()); + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/SimpleHttpResponseHandler.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/SimpleHttpResponseHandler.java new file mode 100644 index 0000000000000..32ad25586c84d --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/SimpleHttpResponseHandler.java @@ -0,0 +1,107 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.facebook.presto.spark.execution.http.server; + +import com.facebook.airlift.http.client.HttpStatus; +import com.facebook.presto.server.ServiceUnavailableException; +import com.facebook.presto.server.SimpleHttpResponseCallback; +import com.facebook.presto.server.SimpleHttpResponseHandlerStats; +import com.facebook.presto.spark.execution.http.server.smile.BaseResponse; +import com.facebook.presto.spark.execution.http.server.smile.JsonResponseWrapper; +import com.facebook.presto.spi.ErrorCodeSupplier; +import com.facebook.presto.spi.PrestoException; +import com.google.common.util.concurrent.FutureCallback; + +import java.net.URI; + +import static com.facebook.airlift.http.client.HttpStatus.OK; +import static com.facebook.presto.spark.execution.http.server.smile.JsonResponseWrapper.unwrapJsonResponse; +import static java.lang.String.format; +import static java.util.Objects.requireNonNull; + +public class SimpleHttpResponseHandler + implements FutureCallback> +{ + private final SimpleHttpResponseCallback callback; + + private final URI uri; + private final SimpleHttpResponseHandlerStats stats; + private final ErrorCodeSupplier errorCode; + + public SimpleHttpResponseHandler(SimpleHttpResponseCallback callback, URI uri, SimpleHttpResponseHandlerStats stats, ErrorCodeSupplier errorCode) + { + this.callback = callback; + this.uri = uri; + this.stats = requireNonNull(stats, "stats is null"); + this.errorCode = requireNonNull(errorCode, "errorCode is null"); + } + + @Override + public void onSuccess(BaseResponse response) + { + stats.updateSuccess(); + stats.responseSize(response.getResponseSize()); + try { + if (response.getStatusCode() == OK.code() && response.hasValue()) { + callback.success(response.getValue()); + } + else if (response.getStatusCode() == HttpStatus.SERVICE_UNAVAILABLE.code()) { + callback.failed(new ServiceUnavailableException(uri)); + } + else { + // Something is broken in the server or the client, so fail immediately (includes 500 errors) + Exception cause = response.getException(); + if (cause == null) { + if (response.getStatusCode() == OK.code()) { + cause = new PrestoException(errorCode, format("Expected response from %s is empty", uri)); + } + else { + cause = new PrestoException(errorCode, createErrorMessage(response)); + } + } + else { + cause = new PrestoException(errorCode, format("Unexpected response from %s", uri), cause); + } + callback.fatal(cause); + } + } + catch (Throwable t) { + // this should never happen + callback.fatal(t); + } + } + + private String createErrorMessage(BaseResponse response) + { + if (response instanceof JsonResponseWrapper) { + return format("Expected response code from %s to be %s, but was %s: %n%s", + uri, + OK.code(), + response.getStatusCode(), + unwrapJsonResponse(response).getResponseBody()); + } + return format("Expected response code from %s to be %s, but was %s: %n%s", + uri, + OK.code(), + response.getStatusCode(), + new String(response.getResponseBytes())); + } + + @Override + public void onFailure(Throwable t) + { + stats.updateFailure(); + callback.failed(t); + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/AdaptingJsonResponseHandler.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/AdaptingJsonResponseHandler.java new file mode 100644 index 0000000000000..9716dc168d5a7 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/AdaptingJsonResponseHandler.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 com.facebook.presto.spark.execution.http.server.smile; + +import com.facebook.airlift.http.client.FullJsonResponseHandler; +import com.facebook.airlift.http.client.Request; +import com.facebook.airlift.http.client.Response; +import com.facebook.airlift.http.client.ResponseHandler; +import com.facebook.airlift.json.JsonCodec; + +import static com.facebook.airlift.http.client.FullJsonResponseHandler.createFullJsonResponseHandler; +import static com.facebook.presto.spark.execution.http.server.smile.JsonResponseWrapper.wrapJsonResponse; +import static java.util.Objects.requireNonNull; + +/** + * This response handler helps clients convert responses of type `JsonResponse` + * to `BaseResponse`, which simplifies the client code for handling both + * JSON and SMILE responses. + */ +public class AdaptingJsonResponseHandler + implements ResponseHandler, RuntimeException> +{ + private final FullJsonResponseHandler jsonResponseHandler; + + private AdaptingJsonResponseHandler(FullJsonResponseHandler jsonResponseHandler) + { + this.jsonResponseHandler = requireNonNull(jsonResponseHandler, "jsonResponseHandler is null"); + } + + public static AdaptingJsonResponseHandler createAdaptingJsonResponseHandler(JsonCodec jsonCodec) + { + return new AdaptingJsonResponseHandler<>(createFullJsonResponseHandler(jsonCodec)); + } + + @Override + public BaseResponse handleException(Request request, Exception exception) + throws RuntimeException + { + return wrapJsonResponse(jsonResponseHandler.handleException(request, exception)); + } + + @Override + public BaseResponse handle(Request request, Response response) + throws RuntimeException + { + return wrapJsonResponse(jsonResponseHandler.handle(request, response)); + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/BaseResponse.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/BaseResponse.java new file mode 100644 index 0000000000000..a25eb551d537c --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/BaseResponse.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 com.facebook.presto.spark.execution.http.server.smile; + +import com.facebook.airlift.http.client.HeaderName; +import com.google.common.collect.ListMultimap; + +import java.util.List; + +/** + * This interface helps simplifying the client code when treating + * both the JSON and SMILE responses. + */ +public interface BaseResponse +{ + int getStatusCode(); + + String getHeader(String name); + + List getHeaders(String name); + + ListMultimap getHeaders(); + + boolean hasValue(); + + T getValue(); + + int getResponseSize(); + + byte[] getResponseBytes(); + + Exception getException(); +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/FullSmileResponseHandler.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/FullSmileResponseHandler.java new file mode 100644 index 0000000000000..36d10d8768186 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/FullSmileResponseHandler.java @@ -0,0 +1,201 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.facebook.presto.spark.execution.http.server.smile; + +import com.facebook.airlift.http.client.HeaderName; +import com.facebook.airlift.http.client.Request; +import com.facebook.airlift.http.client.Response; +import com.facebook.airlift.http.client.ResponseHandler; +import com.facebook.airlift.json.smile.SmileCodec; +import com.google.common.collect.ImmutableListMultimap; +import com.google.common.collect.ListMultimap; +import com.google.common.net.MediaType; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.List; + +import static com.facebook.airlift.http.client.ResponseHandlerUtils.propagate; +import static com.google.common.base.MoreObjects.toStringHelper; +import static com.google.common.io.ByteStreams.toByteArray; +import static com.google.common.net.HttpHeaders.CONTENT_TYPE; +import static java.util.Objects.requireNonNull; + +public class FullSmileResponseHandler + implements ResponseHandler, RuntimeException> +{ + private static final MediaType MEDIA_TYPE_SMILE = MediaType.create("application", "x-jackson-smile"); + + public static FullSmileResponseHandler createFullSmileResponseHandler(SmileCodec smileCodec) + { + return new FullSmileResponseHandler<>(smileCodec); + } + + private final SmileCodec smileCodec; + + private FullSmileResponseHandler(SmileCodec smileCodec) + { + this.smileCodec = smileCodec; + } + + @Override + public SmileResponse handleException(Request request, Exception exception) + { + throw propagate(request, exception); + } + + @Override + public SmileResponse handle(Request request, Response response) + { + byte[] bytes = readResponseBytes(response); + String contentType = response.getHeader(CONTENT_TYPE); + if ((contentType == null) || !MediaType.parse(contentType).is(MEDIA_TYPE_SMILE)) { + return new SmileResponse<>(response.getStatusCode(), response.getHeaders(), bytes); + } + return new SmileResponse<>(response.getStatusCode(), response.getHeaders(), smileCodec, bytes); + } + + private static byte[] readResponseBytes(Response response) + { + try { + return toByteArray(response.getInputStream()); + } + catch (IOException e) { + throw new UncheckedIOException("Error reading response from server", e); + } + } + + public static class SmileResponse + implements BaseResponse + { + private final int statusCode; + private final ListMultimap headers; + private final boolean hasValue; + private final byte[] smileBytes; + private final byte[] responseBytes; + private final T value; + private final IllegalArgumentException exception; + + public SmileResponse(int statusCode, ListMultimap headers, byte[] responseBytes) + { + this.statusCode = statusCode; + this.headers = ImmutableListMultimap.copyOf(headers); + + this.hasValue = false; + this.smileBytes = null; + this.responseBytes = requireNonNull(responseBytes, "responseBytes is null"); + this.value = null; + this.exception = null; + } + + @SuppressWarnings("ThrowableInstanceNeverThrown") + public SmileResponse(int statusCode, ListMultimap headers, SmileCodec smileCodec, byte[] smileBytes) + { + this.statusCode = statusCode; + this.headers = ImmutableListMultimap.copyOf(headers); + + this.smileBytes = requireNonNull(smileBytes, "smileBytes is null"); + this.responseBytes = smileBytes; + + T value = null; + IllegalArgumentException exception = null; + try { + value = smileCodec.fromSmile(smileBytes); + } + catch (IllegalArgumentException e) { + exception = new IllegalArgumentException("Unable to create " + smileCodec.getType() + " from SMILE response", e); + } + + this.hasValue = (exception == null); + this.value = value; + this.exception = exception; + } + + @Override + public int getStatusCode() + { + return statusCode; + } + + @Override + public String getHeader(String name) + { + List values = getHeaders().get(HeaderName.of(name)); + if (values.isEmpty()) { + return null; + } + return values.get(0); + } + + @Override + public List getHeaders(String name) + { + return headers.get(HeaderName.of(name)); + } + + @Override + public ListMultimap getHeaders() + { + return headers; + } + + @Override + public boolean hasValue() + { + return hasValue; + } + + public T getValue() + { + if (!hasValue) { + throw new IllegalStateException("Response does not contain a SMILE value", exception); + } + return value; + } + + public byte[] getSmileBytes() + { + return (smileBytes == null) ? null : smileBytes.clone(); + } + + @Override + public int getResponseSize() + { + return responseBytes.length; + } + + @Override + public byte[] getResponseBytes() + { + return responseBytes.clone(); + } + + @Override + public IllegalArgumentException getException() + { + return exception; + } + + @Override + public String toString() + { + return toStringHelper(this) + .add("statusCode", statusCode) + .add("headers", headers) + .add("hasValue", hasValue) + .add("value", value) + .toString(); + } + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/JsonResponseWrapper.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/JsonResponseWrapper.java new file mode 100644 index 0000000000000..857ff38e87d58 --- /dev/null +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/http/server/smile/JsonResponseWrapper.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 com.facebook.presto.spark.execution.http.server.smile; + +import com.facebook.airlift.http.client.FullJsonResponseHandler.JsonResponse; +import com.facebook.airlift.http.client.HeaderName; +import com.google.common.collect.ListMultimap; + +import java.util.List; + +import static com.google.common.base.Verify.verify; +import static java.util.Objects.requireNonNull; + +public class JsonResponseWrapper + implements BaseResponse +{ + private final JsonResponse jsonResponse; + + private JsonResponseWrapper(JsonResponse jsonResponse) + { + this.jsonResponse = requireNonNull(jsonResponse, "jsonResponse is null"); + } + + public static JsonResponseWrapper wrapJsonResponse(JsonResponse response) + { + return new JsonResponseWrapper<>(response); + } + + public static JsonResponse unwrapJsonResponse(BaseResponse response) + { + verify(response instanceof JsonResponseWrapper); + return ((JsonResponseWrapper) response).jsonResponse; + } + + @Override + public int getStatusCode() + { + return jsonResponse.getStatusCode(); + } + + @Override + public String getHeader(String name) + { + return jsonResponse.getHeader(name); + } + + @Override + public List getHeaders(String name) + { + return jsonResponse.getHeaders(name); + } + + @Override + public ListMultimap getHeaders() + { + return jsonResponse.getHeaders(); + } + + @Override + public boolean hasValue() + { + return jsonResponse.hasValue(); + } + + @Override + public T getValue() + { + return jsonResponse.getValue(); + } + + @Override + public int getResponseSize() + { + return jsonResponse.getResponseSize(); + } + + @Override + public byte[] getResponseBytes() + { + return jsonResponse.getResponseBytes(); + } + + @Override + public Exception getException() + { + return jsonResponse.getException(); + } +} diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcess.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcess.java index 8fce1cd3cc276..a921853394ab7 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcess.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcess.java @@ -16,10 +16,10 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ServerInfo; import com.facebook.presto.spark.execution.property.WorkerProperty; -import io.airlift.units.Duration; import java.io.IOException; import java.util.concurrent.ExecutionException; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcessFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcessFactory.java index 30727ba857aa2..1b2d8faa396ea 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcessFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/DetachedNativeExecutionProcessFactory.java @@ -15,6 +15,7 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ServerInfo; import com.facebook.presto.spark.execution.property.WorkerProperty; @@ -22,7 +23,6 @@ import com.facebook.presto.spi.PrestoException; import com.facebook.presto.sql.analyzer.FeaturesConfig; import com.google.inject.Inject; -import io.airlift.units.Duration; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskInfoFetcher.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskInfoFetcher.java index 2f77b0f787832..66ba162b54b25 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskInfoFetcher.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskInfoFetcher.java @@ -14,10 +14,10 @@ package com.facebook.presto.spark.execution.nativeprocess; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.spark.execution.http.PrestoSparkHttpTaskClient; import com.google.common.annotations.VisibleForTesting; -import io.airlift.units.Duration; import javax.annotation.concurrent.GuardedBy; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskResultFetcher.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskResultFetcher.java index f94674948b04a..f97e7c9c3eae2 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskResultFetcher.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/HttpNativeExecutionTaskResultFetcher.java @@ -14,13 +14,13 @@ package com.facebook.presto.spark.execution.nativeprocess; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.operator.PageBufferClient; import com.facebook.presto.spark.execution.http.PrestoSparkHttpTaskClient; import com.facebook.presto.spi.HostAddress; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.page.SerializedPage; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import java.util.List; import java.util.Optional; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionModule.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionModule.java index a1544c2e8de51..97b8e78ac10eb 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionModule.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionModule.java @@ -28,13 +28,11 @@ import com.google.inject.Module; import com.google.inject.Scopes; import com.google.inject.TypeLiteral; -import io.airlift.units.Duration; import java.util.Optional; import static com.facebook.airlift.http.client.HttpClientBinder.httpClientBinder; import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder; -import static java.util.concurrent.TimeUnit.SECONDS; public class NativeExecutionModule implements Module @@ -87,7 +85,9 @@ protected void bindHttpClient(Binder binder) httpClientBinder(binder) .bindHttpClient("nativeExecution", ForNativeExecutionTask.class) .withConfigDefaults(config -> { - config.setRequestTimeout(new Duration(10, SECONDS)); + // We cannot currently use com.facebook.airlift.units as we are using http-client 0.216 + // We need to use io.airlift.units.Duration() but that needs more work + // config.setRequestTimeout(new io.airlift.units.Duration(10, SECONDS)); config.setMaxConnectionsPerServer(250); }); } diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcess.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcess.java index 055da7b5cd65a..99157ff93280f 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcess.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcess.java @@ -16,12 +16,13 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ServerInfo; -import com.facebook.presto.server.RequestErrorTracker; -import com.facebook.presto.server.smile.BaseResponse; import com.facebook.presto.spark.classloader_interface.PrestoSparkFatalException; import com.facebook.presto.spark.execution.http.PrestoSparkHttpServerClient; +import com.facebook.presto.spark.execution.http.server.RequestErrorTracker; +import com.facebook.presto.spark.execution.http.server.smile.BaseResponse; import com.facebook.presto.spark.execution.property.WorkerProperty; import com.facebook.presto.spi.PrestoException; import com.google.common.annotations.VisibleForTesting; @@ -29,7 +30,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.airlift.units.Duration; import org.apache.spark.SparkEnv$; import org.apache.spark.SparkFiles; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcessFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcessFactory.java index cb3b677630b50..6b64bbe6f8a37 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcessFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/nativeprocess/NativeExecutionProcessFactory.java @@ -15,13 +15,13 @@ import com.facebook.airlift.http.client.HttpClient; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ServerInfo; import com.facebook.presto.spark.execution.property.WorkerProperty; import com.facebook.presto.spark.execution.task.ForNativeExecutionTask; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.sql.analyzer.FeaturesConfig; -import io.airlift.units.Duration; import javax.annotation.PreDestroy; import javax.inject.Inject; diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkNativeTaskExecutorFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkNativeTaskExecutorFactory.java index 48acd0bbce25b..55ceefb8844e9 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkNativeTaskExecutorFactory.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/task/PrestoSparkNativeTaskExecutorFactory.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.Codec; import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.common.RuntimeUnit; import com.facebook.presto.common.block.BlockEncodingManager; @@ -73,7 +74,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.sun.management.OperatingSystemMXBean; -import io.airlift.units.Duration; import org.apache.spark.broadcast.Broadcast; import org.apache.spark.util.CollectionAccumulator; import scala.Tuple2; @@ -94,6 +94,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static com.facebook.airlift.units.DataSize.succinctBytes; import static com.facebook.presto.operator.ExchangeOperator.REMOTE_CONNECTOR_ID; import static com.facebook.presto.spark.PrestoSparkSessionProperties.getNativeExecutionBroadcastBasePath; import static com.facebook.presto.spark.PrestoSparkSessionProperties.getNativeTerminateWithCoreTimeout; @@ -108,7 +109,6 @@ import static com.facebook.presto.sql.planner.optimizations.PlanNodeSearcher.searchFrom; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static io.airlift.units.DataSize.succinctBytes; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/TestNativeExecutionProcess.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/TestNativeExecutionProcess.java index 36dbd84327de5..c2911cbc6f5a0 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/TestNativeExecutionProcess.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/TestNativeExecutionProcess.java @@ -14,6 +14,7 @@ package com.facebook.presto.spark.execution; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.Session; import com.facebook.presto.client.ServerInfo; import com.facebook.presto.execution.TaskId; @@ -27,7 +28,6 @@ import com.facebook.presto.spark.execution.property.NativeExecutionVeloxConfig; import com.facebook.presto.spark.execution.property.PrestoSparkWorkerProperty; import com.facebook.presto.sql.analyzer.FeaturesConfig; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.concurrent.ScheduledExecutorService; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/http/TestPrestoSparkHttpClient.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/http/TestPrestoSparkHttpClient.java index f3f516aede37d..cbd640725c65b 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/http/TestPrestoSparkHttpClient.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/http/TestPrestoSparkHttpClient.java @@ -21,6 +21,8 @@ import com.facebook.airlift.http.client.Response; import com.facebook.airlift.http.client.ResponseHandler; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.DataSize; +import com.facebook.airlift.units.Duration; import com.facebook.presto.client.ServerInfo; import com.facebook.presto.execution.QueryManagerConfig; import com.facebook.presto.execution.TaskId; @@ -33,7 +35,7 @@ import com.facebook.presto.operator.PageBufferClient; import com.facebook.presto.operator.PageTransportErrorException; import com.facebook.presto.operator.TaskStats; -import com.facebook.presto.server.smile.BaseResponse; +import com.facebook.presto.spark.execution.http.server.smile.BaseResponse; import com.facebook.presto.spark.execution.nativeprocess.HttpNativeExecutionTaskInfoFetcher; import com.facebook.presto.spark.execution.nativeprocess.HttpNativeExecutionTaskResultFetcher; import com.facebook.presto.spark.execution.nativeprocess.NativeExecutionProcess; @@ -64,8 +66,6 @@ import io.airlift.slice.DynamicSliceOutput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; -import io.airlift.units.DataSize; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -84,6 +84,7 @@ import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilder; import static com.facebook.airlift.http.client.HttpUriBuilder.uriBuilderFrom; +import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE; import static com.facebook.presto.PrestoMediaTypes.PRESTO_PAGES_TYPE; import static com.facebook.presto.client.NodeVersion.UNKNOWN; import static com.facebook.presto.client.PrestoHeaders.PRESTO_BUFFER_COMPLETE; @@ -96,7 +97,6 @@ import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; import static com.facebook.presto.testing.TestingSession.testSessionBuilder; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static io.airlift.units.DataSize.Unit.MEGABYTE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newScheduledThreadPool; diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/nativeprocess/TestHttpNativeExecutionTaskInfoFetcher.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/nativeprocess/TestHttpNativeExecutionTaskInfoFetcher.java index 68acb4bdb50e5..7f4b47a280dc6 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/nativeprocess/TestHttpNativeExecutionTaskInfoFetcher.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/execution/nativeprocess/TestHttpNativeExecutionTaskInfoFetcher.java @@ -14,13 +14,13 @@ package com.facebook.presto.spark.execution.nativeprocess; import com.facebook.airlift.json.JsonCodec; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.TaskId; import com.facebook.presto.execution.TaskInfo; import com.facebook.presto.spark.execution.http.BatchTaskUpdateRequest; import com.facebook.presto.spark.execution.http.PrestoSparkHttpTaskClient; import com.facebook.presto.spark.execution.http.TestPrestoSparkHttpClient; import com.facebook.presto.sql.planner.PlanFragment; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.net.URI; diff --git a/presto-spark/pom.xml b/presto-spark/pom.xml index 107558524e94a..070b5f9a99740 100644 --- a/presto-spark/pom.xml +++ b/presto-spark/pom.xml @@ -13,13 +13,62 @@ ${project.parent.basedir} true + 9.4.55.v20240627 + + + + com.facebook.airlift + http-client + 0.216 + + + com.facebook.airlift + http-server + 0.216 + + + com.facebook.airlift + event + 0.216 + + + com.facebook.airlift + discovery + 0.216 + + + com.facebook.presto presto-spark-base runtime + + com.facebook.airlift + http-server + provided + + + com.facebook.airlift + event + provided + + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + com.facebook.drift.* + io.jsonwebtoken.* + + + + + From cdf76657ad15202c6fda2047670329c06191d962 Mon Sep 17 00:00:00 2001 From: Zac Blanco Date: Mon, 11 Aug 2025 14:57:59 -0700 Subject: [PATCH 27/27] Upgrade to airlift 221, fix drift conflicts --- pom.xml | 2 +- .../presto/testing/LocalQueryRunner.java | 2 +- presto-main/pom.xml | 6 ++++ .../remotetask/ReactorNettyHttpClient.java | 2 +- .../ReactorNettyHttpClientConfig.java | 5 ++- .../TestReactorNettyHttpClient.java | 2 +- .../TestReactorNettyHttpClientConfig.java | 2 +- presto-native-execution/pom.xml | 20 +++++++++-- presto-spark-base/pom.xml | 36 +++++++++++++++++-- presto-spark-testing/pom.xml | 1 + presto-tpcds/pom.xml | 17 ++++----- 11 files changed, 75 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index d12e4433bf117..35983917d94a4 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 3.3.9 4.7.1 - 0.220 + 0.221 ${dep.airlift.version} 0.38 0.6 diff --git a/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java b/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java index d4acc6900c3c5..d3c7044fc6df1 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java +++ b/presto-main-base/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java @@ -14,8 +14,8 @@ package com.facebook.presto.testing; import com.facebook.airlift.node.NodeInfo; -import com.facebook.drift.codec.ThriftCodecManager; import com.facebook.airlift.units.Duration; +import com.facebook.drift.codec.ThriftCodecManager; import com.facebook.presto.ClientRequestFilterManager; import com.facebook.presto.GroupByHashPageIndexerFactory; import com.facebook.presto.PagesIndexPageSorter; diff --git a/presto-main/pom.xml b/presto-main/pom.xml index bc9b405650919..277a3126aab40 100644 --- a/presto-main/pom.xml +++ b/presto-main/pom.xml @@ -320,6 +320,11 @@ netty-handler + + javax.inject + javax.inject + + io.netty @@ -436,6 +441,7 @@ com.facebook.airlift.drift:drift-protocol io.netty:netty-buffer + javax.inject:javax.inject diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClient.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClient.java index 0a1eb83299ec9..bd071f81ffd47 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClient.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClient.java @@ -20,12 +20,12 @@ import com.facebook.airlift.http.client.ResponseHandler; import com.facebook.airlift.http.client.StaticBodyGenerator; import com.facebook.airlift.log.Logger; +import com.facebook.airlift.units.Duration; import com.google.common.base.Splitter; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.util.concurrent.SettableFuture; import com.google.inject.Inject; -import io.airlift.units.Duration; import io.micrometer.core.instrument.Metrics; import io.micrometer.jmx.JmxMeterRegistry; import io.netty.channel.ChannelOption; diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClientConfig.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClientConfig.java index 727ab057445f2..ab068ca31988a 100644 --- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClientConfig.java +++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ReactorNettyHttpClientConfig.java @@ -15,9 +15,8 @@ import com.facebook.airlift.configuration.Config; import com.facebook.airlift.configuration.ConfigDescription; -import io.airlift.units.Duration; - -import javax.validation.constraints.Min; +import com.facebook.airlift.units.Duration; +import jakarta.validation.constraints.Min; import java.util.Optional; diff --git a/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClient.java b/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClient.java index db44e1777b045..a49b69f6f8644 100644 --- a/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClient.java +++ b/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClient.java @@ -18,6 +18,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.airlift.json.JsonCodecFactory; import com.facebook.airlift.json.JsonObjectMapperProvider; +import com.facebook.airlift.units.Duration; import com.facebook.presto.execution.TaskStatus; import com.facebook.presto.server.remotetask.ReactorNettyHttpClient; import com.facebook.presto.server.remotetask.ReactorNettyHttpClientConfig; @@ -25,7 +26,6 @@ import com.facebook.presto.server.smile.JsonResponseWrapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.units.Duration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClientConfig.java b/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClientConfig.java index 1f485b298832d..60d78542769d6 100644 --- a/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClientConfig.java +++ b/presto-main/src/test/java/com/facebook/presto/remotetask/TestReactorNettyHttpClientConfig.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.remotetask; +import com.facebook.airlift.units.Duration; import com.facebook.presto.server.remotetask.ReactorNettyHttpClientConfig; import com.google.common.collect.ImmutableMap; -import io.airlift.units.Duration; import org.testng.annotations.Test; import java.util.Map; diff --git a/presto-native-execution/pom.xml b/presto-native-execution/pom.xml index a26a3392688fa..ab6d81aba382b 100644 --- a/presto-native-execution/pom.xml +++ b/presto-native-execution/pom.xml @@ -236,21 +236,37 @@ com.facebook.presto presto-spark-base test + + + com.facebook.drift + * + + com.facebook.presto.spark spark-core test + + + com.facebook.drift + * + + - com.facebook.presto presto-spark-base test-jar test + + + com.facebook.drift + * + + - com.facebook.airlift log diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml index 19a81ef862d8b..fa2b74e4452ff 100644 --- a/presto-spark-base/pom.xml +++ b/presto-spark-base/pom.xml @@ -46,6 +46,21 @@ discovery 0.216 + + com.facebook.drift + drift-codec + 1.46 + + + com.facebook.drift + drift-client + 1.46 + + + com.facebook.drift + drift-transport-spi + 1.46 + @@ -61,6 +76,12 @@ com.facebook.presto presto-client + + + com.facebook.airlift.drift + * + + @@ -103,14 +124,21 @@ com.facebook.presto presto-main-base + + + com.facebook.airlift.drift + * + + + - com.facebook.airlift.drift + com.facebook.drift drift-transport-spi - com.facebook.airlift.drift + com.facebook.drift drift-client @@ -330,6 +358,10 @@ org.roaringbitmap RoaringBitmap + + com.facebook.airlift.drift + * + diff --git a/presto-spark-testing/pom.xml b/presto-spark-testing/pom.xml index 8bea2ea617713..6ecb44edc0a25 100644 --- a/presto-spark-testing/pom.xml +++ b/presto-spark-testing/pom.xml @@ -145,6 +145,7 @@ shaded.parquet.it.unimi.dsi.fastutil.* module-info META-INF.versions.9.module-info + com.facebook.drift.* diff --git a/presto-tpcds/pom.xml b/presto-tpcds/pom.xml index 8f68ca81d8b16..5afffcbc8ac7a 100644 --- a/presto-tpcds/pom.xml +++ b/presto-tpcds/pom.xml @@ -44,12 +44,12 @@ - com.facebook.drift + com.facebook.airlift.drift drift-codec - com.facebook.drift + com.facebook.airlift.drift drift-protocol @@ -79,7 +79,7 @@ - io.airlift + com.facebook.airlift units provided @@ -90,6 +90,11 @@ provided + + com.facebook.airlift + log + + com.facebook.presto @@ -127,11 +132,6 @@ test - - com.facebook.airlift - log - test - com.facebook.airlift @@ -154,6 +154,7 @@ com.facebook.airlift:json + com.facebook.airlift:log