From 942ffbaf5299889266de38130c785ec93ad01424 Mon Sep 17 00:00:00 2001 From: lanvendar Date: Tue, 4 Jun 2024 16:47:35 +0800 Subject: [PATCH 1/5] Update to paimon-0.8-SNAPSHOT And presto-0.287 --- paimon-presto-0.287/pom.xml | 132 ++++++++++++++++++ .../src/main/assembly/paimon.xml | 32 +++++ paimon-presto-common/pom.xml | 16 ++- pom.xml | 3 +- 4 files changed, 177 insertions(+), 6 deletions(-) create mode 100644 paimon-presto-0.287/pom.xml create mode 100644 paimon-presto-0.287/src/main/assembly/paimon.xml diff --git a/paimon-presto-0.287/pom.xml b/paimon-presto-0.287/pom.xml new file mode 100644 index 0000000..9af46b3 --- /dev/null +++ b/paimon-presto-0.287/pom.xml @@ -0,0 +1,132 @@ + + + + + org.apache.paimon + paimon-presto + 0.8-SNAPSHOT + + 4.0.0 + + paimon-presto-0.287 + Paimon : Presto : 0.287 + + + 0.287 + 2.7.4-12 + + + + + org.apache.paimon + paimon-presto-common + ${project.version} + + + com.facebook.presto + presto-spi + ${presto.version} + provided + + + + com.facebook.presto + presto-common + ${presto.version} + provided + + + + com.facebook.presto + presto-plugin-toolkit + ${presto.version} + provided + + + + com.facebook.presto + presto-client + ${presto.version} + test + + + + com.facebook.presto + presto-main + ${presto.version} + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-jdk14 + + + + + + com.facebook.presto + presto-tests + ${presto.version} + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + + + + + maven-assembly-plugin + 2.5.5 + + + src/main/assembly/paimon.xml + + + + + package + + attached + + + + + + + \ No newline at end of file diff --git a/paimon-presto-0.287/src/main/assembly/paimon.xml b/paimon-presto-0.287/src/main/assembly/paimon.xml new file mode 100644 index 0000000..c960607 --- /dev/null +++ b/paimon-presto-0.287/src/main/assembly/paimon.xml @@ -0,0 +1,32 @@ + + + + plugin + + tar.gz + + false + + + paimon + runtime + + + diff --git a/paimon-presto-common/pom.xml b/paimon-presto-common/pom.xml index 47efc2a..02187a7 100644 --- a/paimon-presto-common/pom.xml +++ b/paimon-presto-common/pom.xml @@ -25,7 +25,7 @@ under the License. paimon-presto org.apache.paimon - 0.7-SNAPSHOT + 0.8-SNAPSHOT jar @@ -34,10 +34,10 @@ under the License. Paimon : Presto : Common - 0.273 - 2.7.4-9 - 1.2.2-2 - 0.205 + 0.287 + 2.7.4-12 + 3.0.0-10 + 0.209 0.9.3 @@ -153,6 +153,12 @@ under the License. + + com.facebook.presto + presto-main + 0.273 + test + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4f8c960..d90a110 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ under the License. paimon-presto-0.236 paimon-prestosql-common paimon-prestosql-332 + paimon-presto-0.287 @@ -40,7 +41,7 @@ under the License. org.apache.paimon paimon-presto Paimon : Presto - 0.7-SNAPSHOT + 0.8-SNAPSHOT pom From e20690262e836e8ed5337ab78f734ad22a95d1a0 Mon Sep 17 00:00:00 2001 From: lanvendar Date: Tue, 4 Jun 2024 17:28:12 +0800 Subject: [PATCH 2/5] Update to paimon-0.8-SNAPSHOT And presto-0.287 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 016f30f..b6d8ceb 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ After the packaging is complete, you can choose the corresponding connector base |-----------------|-------------------------------------------------------------------------------| | [0.236, 0.268) | `./paimon-presto-0.236/target/paimon-presto-0.236-0.7-SNAPSHOT-plugin.tar.gz` | | [0.268, 0.273) | `./paimon-presto-0.268/target/paimon-presto-0.268-0.7-SNAPSHOT-plugin.tar.gz` | -| [0.273, latest] | `./paimon-presto-0.273/target/paimon-presto-0.273-0.7-SNAPSHOT-plugin.tar.gz` | +| [0.273, 0.287] | `./paimon-presto-0.273/target/paimon-presto-0.273-0.7-SNAPSHOT-plugin.tar.gz` | +| [0.287, latest] | `./paimon-presto-0.287/target/paimon-presto-0.287-0.8-SNAPSHOT-plugin.tar.gz` | Of course, we also support different versions of Hive and Hadoop. But note that we utilize Presto-shaded versions of Hive and Hadoop packages to address dependency conflicts. From dfa14abbef75d23ba5a99fb2d606d0395eac9f88 Mon Sep 17 00:00:00 2001 From: lanvendar Date: Tue, 4 Jun 2024 19:42:49 +0800 Subject: [PATCH 3/5] Update to paimon-0.8-SNAPSHOT And presto-0.287 --- paimon-presto-common/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/paimon-presto-common/pom.xml b/paimon-presto-common/pom.xml index 02187a7..f452388 100644 --- a/paimon-presto-common/pom.xml +++ b/paimon-presto-common/pom.xml @@ -61,6 +61,12 @@ under the License. com.facebook.presto presto-hive ${presto.version} + + + org.apache.hudi + hudi-presto-bundle + + @@ -153,12 +159,6 @@ under the License. - - com.facebook.presto - presto-main - 0.273 - test - \ No newline at end of file From 3efd283195faf9a5f0dcadf7623b12b941c2dd8f Mon Sep 17 00:00:00 2001 From: lanvendar Date: Tue, 30 Jul 2024 17:43:37 +0800 Subject: [PATCH 4/5] Update to paimon-0.8.2 And presto-0.287 --- paimon-presto-0.287/pom.xml | 2 +- paimon-presto-common/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/paimon-presto-0.287/pom.xml b/paimon-presto-0.287/pom.xml index 9af46b3..5bb2d73 100644 --- a/paimon-presto-0.287/pom.xml +++ b/paimon-presto-0.287/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.paimon paimon-presto - 0.8-SNAPSHOT + 0.8.2 4.0.0 diff --git a/paimon-presto-common/pom.xml b/paimon-presto-common/pom.xml index f452388..9abb8e2 100644 --- a/paimon-presto-common/pom.xml +++ b/paimon-presto-common/pom.xml @@ -25,7 +25,7 @@ under the License. paimon-presto org.apache.paimon - 0.8-SNAPSHOT + 0.8.2 jar diff --git a/pom.xml b/pom.xml index d90a110..b3863b2 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ under the License. org.apache.paimon paimon-presto Paimon : Presto - 0.8-SNAPSHOT + 0.8.2 pom From c818ba9a8ebb041900308d0cc8a8313d5560a3f9 Mon Sep 17 00:00:00 2001 From: lanvendar Date: Mon, 19 Aug 2024 14:29:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20presto-0.287=20paimon-?= =?UTF-8?q?0.8.2=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paimon/presto/PrestoDistributedQueryTest.java | 5 ----- .../org/apache/paimon/presto/PrestoQueryRunner.java | 2 +- .../paimon/presto/TestPrestoComputePushdown.java | 12 +++++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoDistributedQueryTest.java b/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoDistributedQueryTest.java index 655dbb7..e9c1b88 100644 --- a/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoDistributedQueryTest.java +++ b/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoDistributedQueryTest.java @@ -435,11 +435,6 @@ public void testDistinctLimitInternal(Session session) { throw new SkipException("TODO: test not implemented yet"); } - @Override - public void testDistinctLimitWithHashBasedDistinctLimitEnabled() { - throw new SkipException("TODO: test not implemented yet"); - } - @Override public void testDistinctLimitWithQuickDistinctLimitEnabled() { throw new SkipException("TODO: test not implemented yet"); diff --git a/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoQueryRunner.java b/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoQueryRunner.java index dfb4aa6..bc12f0f 100644 --- a/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoQueryRunner.java +++ b/paimon-presto-common/src/test/java/org/apache/paimon/presto/PrestoQueryRunner.java @@ -60,7 +60,7 @@ public static DistributedQueryRunner createPrestoQueryRunner( queryRunner.installPlugin(new TpchPlugin()); queryRunner.createCatalog("tpch", "tpch"); - Path dataDir = queryRunner.getCoordinator().getBaseDataDir().resolve("paimon_data"); + Path dataDir = queryRunner.getCoordinator().getDataDirectory().resolve("paimon_data"); Path catalogDir = dataDir.getParent().resolve("catalog"); queryRunner.installPlugin(new PrestoPlugin()); diff --git a/paimon-presto-common/src/test/java/org/apache/paimon/presto/TestPrestoComputePushdown.java b/paimon-presto-common/src/test/java/org/apache/paimon/presto/TestPrestoComputePushdown.java index 4ae1ce3..b6eeb58 100644 --- a/paimon-presto-common/src/test/java/org/apache/paimon/presto/TestPrestoComputePushdown.java +++ b/paimon-presto-common/src/test/java/org/apache/paimon/presto/TestPrestoComputePushdown.java @@ -27,6 +27,7 @@ import com.facebook.presto.spi.ConnectorId; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.TableHandle; +import com.facebook.presto.spi.VariableAllocator; import com.facebook.presto.spi.function.StandardFunctionResolution; import com.facebook.presto.spi.plan.FilterNode; import com.facebook.presto.spi.plan.PlanNode; @@ -42,7 +43,6 @@ import com.facebook.presto.spi.relation.VariableReferenceExpression; import com.facebook.presto.sql.TestingRowExpressionTranslator; import com.facebook.presto.sql.gen.RowExpressionPredicateCompiler; -import com.facebook.presto.sql.planner.PlanVariableAllocator; import com.facebook.presto.sql.planner.TypeProvider; import com.facebook.presto.sql.planner.planPrinter.RowExpressionFormatter; import com.facebook.presto.sql.relational.FunctionResolution; @@ -71,7 +71,9 @@ public class TestPrestoComputePushdown { public static final MetadataManager METADATA = MetadataManager.createTestMetadataManager(); public static final StandardFunctionResolution FUNCTION_RESOLUTION = - new FunctionResolution(FunctionAndTypeManager.createTestFunctionAndTypeManager()); + new FunctionResolution( + FunctionAndTypeManager.createTestFunctionAndTypeManager() + .getFunctionAndTypeResolver()); public static final RowExpressionService ROW_EXPRESSION_SERVICE = new RowExpressionService() { @@ -104,7 +106,7 @@ public String formatRowExpression( }; private TableScanNode createTableScan() { - PlanVariableAllocator variableAllocator = new PlanVariableAllocator(); + VariableAllocator variableAllocator = new VariableAllocator(); VariableReferenceExpression variableA = variableAllocator.newVariable("a", BIGINT); Map assignments = @@ -183,7 +185,7 @@ public void testOptimizeFilter() { ConnectorSession session = new TestingConnectorSession( prestoSessionProperties.getSessionProperties(), prestoSessionConfig); - PlanVariableAllocator variableAllocator = new PlanVariableAllocator(); + VariableAllocator variableAllocator = new VariableAllocator(); PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator(); // Call optimize @@ -233,7 +235,7 @@ public void testNotOptimizeFilter() { ConnectorSession session = new TestingConnectorSession( prestoSessionProperties.getSessionProperties(), prestoSessionConfig); - PlanVariableAllocator variableAllocator = new PlanVariableAllocator(); + VariableAllocator variableAllocator = new VariableAllocator(); PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator(); // Call optimize