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 02187a7..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 @@ -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 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 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