Add test against Pinot 1.1.0 server

plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotConnectorTest.java

@@ -0,0 +1,151 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.plugin.pinot;
+
+import io.trino.testing.BaseConnectorTest;
+import io.trino.testing.MaterializedResult;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.TestingConnectorBehavior;
+import io.trino.testing.kafka.TestingKafka;
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+
+import static io.trino.spi.type.VarcharType.VARCHAR;
+import static io.trino.testing.MaterializedResult.resultBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+
+abstract class BasePinotConnectorTest
+        extends BaseConnectorTest
+{
+    abstract String serverVersionUnderTest();
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        TestingKafka kafka = closeAfterClass(TestingKafka.createWithSchemaRegistry());
+        kafka.start();
+        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(serverVersionUnderTest(), kafka.getNetwork(), false));
+        pinot.start();
+
+        return PinotQueryRunner.builder()
+                .setKafka(kafka)
+                .setPinot(pinot)
+                .setInitialTables(REQUIRED_TPCH_TABLES)
+                .build();
+    }
+
+    @Override
+    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
+    {
+        return switch (connectorBehavior) {
+            case SUPPORTS_ADD_COLUMN,
+                 SUPPORTS_ARRAY,
+                 SUPPORTS_COMMENT_ON_COLUMN,
+                 SUPPORTS_COMMENT_ON_TABLE,
+                 SUPPORTS_CREATE_MATERIALIZED_VIEW,
+                 SUPPORTS_CREATE_SCHEMA,
+                 SUPPORTS_CREATE_TABLE,
+                 SUPPORTS_CREATE_VIEW,
+                 SUPPORTS_DELETE,
+                 SUPPORTS_INSERT,
+                 SUPPORTS_MERGE,
+                 SUPPORTS_RENAME_COLUMN,
+                 SUPPORTS_RENAME_TABLE,
+                 SUPPORTS_ROW_TYPE,
+                 SUPPORTS_SET_COLUMN_TYPE,
+                 SUPPORTS_TOPN_PUSHDOWN,
+                 SUPPORTS_UPDATE -> false;
+            default -> super.hasBehavior(connectorBehavior);
+        };
+    }
+
+    @Override // Override because updated_at_seconds column exists
+    protected MaterializedResult getDescribeOrdersResult()
+    {
+        return resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .row("updated_at_seconds", "bigint", "", "")
+                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
+                .row("comment", "varchar", "", "")
+                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
+                .row("orderdate", "date", "", "")
+                .row("orderkey", "bigint", "", "")
+                .row("orderpriority", "varchar", "", "")
+                .row("orderstatus", "varchar", "", "")
+                .row("shippriority", "integer", "", "")
+                .row("totalprice", "double", "", "")
+                .build();
+    }
+
+    @Test
+    @Override // Override because updated_at_seconds column exists
+    public void testShowColumns()
+    {
+        assertThat(query("SHOW COLUMNS FROM orders")).result().matches(getDescribeOrdersResult());
+    }
+
+    @Test
+    @Override // Override because updated_at_seconds column exists
+    public void testSelectAll()
+    {
+        assertQuery("SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment FROM orders");
+    }
+
+    @Override
+    protected @Language("SQL") String getOrdersTableWithColumns()
+    {
+        return """
+                VALUES
+                    ('orders', 'orderkey'),
+                    ('orders', 'custkey'),
+                    ('orders', 'orderstatus'),
+                    ('orders', 'totalprice'),
+                    ('orders', 'orderdate'),
+                    ('orders', 'updated_at_seconds'),
+                    ('orders', 'orderpriority'),
+                    ('orders', 'clerk'),
+                    ('orders', 'shippriority'),
+                    ('orders', 'comment')
+                """;
+    }
+
+    @Test
+    @Override // Override because updated_at_seconds column exists
+    public void testShowCreateTable()
+    {
+        assertThat(computeActual("SHOW CREATE TABLE orders").getOnlyValue())
+                .isEqualTo("""
+                        CREATE TABLE pinot.default.orders (
+                           clerk varchar,
+                           comment varchar,
+                           custkey bigint,
+                           orderdate date,
+                           orderkey bigint,
+                           orderpriority varchar,
+                           orderstatus varchar,
+                           shippriority integer,
+                           totalprice double,
+                           updated_at_seconds bigint
+                        )""");
+    }
+
+    @Test
+    @Override // Override because the regexp is different from the base test
+    public void testPredicateReflectedInExplain()
+    {
+        assertExplain(
+                "EXPLAIN SELECT name FROM nation WHERE nationkey = 42",
+                "columnName=nationkey", "dataType=bigint", "\\s\\{\\[42\\]\\}");
+    }
+}

plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java

@@ -32,6 +32,7 @@
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.trino.plugin.base.util.Closables.closeAllSuppress;
 import static io.trino.plugin.pinot.PinotTpchTables.createTpchTables;
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.tpch.TpchTable.CUSTOMER;
 import static io.trino.tpch.TpchTable.NATION;
@@ -130,7 +131,7 @@ public static void main(String[] args)
     {
         TestingKafka kafka = TestingKafka.createWithSchemaRegistry();
         kafka.start();
-        TestingPinotCluster pinot = new TestingPinotCluster(kafka.getNetwork(), false);
+        TestingPinotCluster pinot = new TestingPinotCluster(PINOT_LATEST_IMAGE_NAME, kafka.getNetwork(), false);
         pinot.start();
         QueryRunner queryRunner = builder()
                 .setKafka(kafka)

plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotConnectorSmokeTest.java

@@ -82,6 +82,7 @@
 import static com.google.common.io.Resources.getResource;
 import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG;
 import static io.trino.SystemSessionProperties.DISTINCT_AGGREGATIONS_STRATEGY;
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.RealType.REAL;
 import static java.lang.String.format;
@@ -133,7 +134,7 @@ protected QueryRunner createQueryRunner()
     {
         TestingKafka kafka = closeAfterClass(TestingKafka.createWithSchemaRegistry());
         kafka.start();
-        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(kafka.getNetwork(), false));
+        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(PINOT_LATEST_IMAGE_NAME, kafka.getNetwork(), false));
         pinot.start();
 
         createAndPopulateAllTypesTopic(kafka, pinot, ALL_TYPES_TABLE);

plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotConnectorTest.java

@@ -13,137 +13,14 @@
  */
 package io.trino.plugin.pinot;
 
-import io.trino.testing.BaseConnectorTest;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.QueryRunner;
-import io.trino.testing.TestingConnectorBehavior;
-import io.trino.testing.kafka.TestingKafka;
-import org.intellij.lang.annotations.Language;
-import org.junit.jupiter.api.Test;
-
-import static io.trino.spi.type.VarcharType.VARCHAR;
-import static io.trino.testing.MaterializedResult.resultBuilder;
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
 
 public class TestPinotConnectorTest
-        extends BaseConnectorTest
+        extends BasePinotConnectorTest
 {
     @Override
-    protected QueryRunner createQueryRunner()
-            throws Exception
-    {
-        TestingKafka kafka = closeAfterClass(TestingKafka.createWithSchemaRegistry());
-        kafka.start();
-        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(kafka.getNetwork(), false));
-        pinot.start();
-
-        return PinotQueryRunner.builder()
-                .setKafka(kafka)
-                .setPinot(pinot)
-                .setInitialTables(REQUIRED_TPCH_TABLES)
-                .build();
-    }
-
-    @Override
-    protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
-    {
-        return switch (connectorBehavior) {
-            case SUPPORTS_ADD_COLUMN,
-                 SUPPORTS_ARRAY,
-                 SUPPORTS_COMMENT_ON_COLUMN,
-                 SUPPORTS_COMMENT_ON_TABLE,
-                 SUPPORTS_CREATE_MATERIALIZED_VIEW,
-                 SUPPORTS_CREATE_SCHEMA,
-                 SUPPORTS_CREATE_TABLE,
-                 SUPPORTS_CREATE_VIEW,
-                 SUPPORTS_DELETE,
-                 SUPPORTS_INSERT,
-                 SUPPORTS_MERGE,
-                 SUPPORTS_RENAME_COLUMN,
-                 SUPPORTS_RENAME_TABLE,
-                 SUPPORTS_ROW_TYPE,
-                 SUPPORTS_SET_COLUMN_TYPE,
-                 SUPPORTS_TOPN_PUSHDOWN,
-                 SUPPORTS_UPDATE -> false;
-            default -> super.hasBehavior(connectorBehavior);
-        };
-    }
-
-    @Override // Override because updated_at_seconds column exists
-    protected MaterializedResult getDescribeOrdersResult()
-    {
-        return resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                .row("updated_at_seconds", "bigint", "", "")
-                .row("clerk", "varchar", "", "") // String columns are reported only as varchar
-                .row("comment", "varchar", "", "")
-                .row("custkey", "bigint", "", "") // Long columns are reported as bigint
-                .row("orderdate", "date", "", "")
-                .row("orderkey", "bigint", "", "")
-                .row("orderpriority", "varchar", "", "")
-                .row("orderstatus", "varchar", "", "")
-                .row("shippriority", "integer", "", "")
-                .row("totalprice", "double", "", "")
-                .build();
-    }
-
-    @Test
-    @Override // Override because updated_at_seconds column exists
-    public void testShowColumns()
-    {
-        assertThat(query("SHOW COLUMNS FROM orders")).result().matches(getDescribeOrdersResult());
-    }
-
-    @Test
-    @Override // Override because updated_at_seconds column exists
-    public void testSelectAll()
-    {
-        assertQuery("SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment FROM orders");
-    }
-
-    @Override
-    protected @Language("SQL") String getOrdersTableWithColumns()
-    {
-        return """
-                VALUES
-                    ('orders', 'orderkey'),
-                    ('orders', 'custkey'),
-                    ('orders', 'orderstatus'),
-                    ('orders', 'totalprice'),
-                    ('orders', 'orderdate'),
-                    ('orders', 'updated_at_seconds'),
-                    ('orders', 'orderpriority'),
-                    ('orders', 'clerk'),
-                    ('orders', 'shippriority'),
-                    ('orders', 'comment')
-                """;
-    }
-
-    @Test
-    @Override // Override because updated_at_seconds column exists
-    public void testShowCreateTable()
-    {
-        assertThat(computeActual("SHOW CREATE TABLE orders").getOnlyValue())
-                .isEqualTo("""
-                        CREATE TABLE pinot.default.orders (
-                           clerk varchar,
-                           comment varchar,
-                           custkey bigint,
-                           orderdate date,
-                           orderkey bigint,
-                           orderpriority varchar,
-                           orderstatus varchar,
-                           shippriority integer,
-                           totalprice double,
-                           updated_at_seconds bigint
-                        )""");
-    }
-
-    @Test
-    @Override // Override because the regexp is different from the base test
-    public void testPredicateReflectedInExplain()
+    String serverVersionUnderTest()
     {
-        assertExplain(
-                "EXPLAIN SELECT name FROM nation WHERE nationkey = 42",
-                "columnName=nationkey", "dataType=bigint", "\\s\\{\\[42\\]\\}");
+        return PINOT_LATEST_IMAGE_NAME;
     }
 }

plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotPasswordAuthentication.java

@@ -20,6 +20,7 @@
 import io.trino.testing.kafka.TestingKafka;
 import org.junit.jupiter.api.Test;
 
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
 import static io.trino.tpch.TpchTable.REGION;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,7 +33,7 @@ protected QueryRunner createQueryRunner()
     {
         TestingKafka kafka = closeAfterClass(TestingKafka.createWithSchemaRegistry());
         kafka.start();
-        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(kafka.getNetwork(), true));
+        TestingPinotCluster pinot = closeAfterClass(new TestingPinotCluster(PINOT_LATEST_IMAGE_NAME, kafka.getNetwork(), true));
         pinot.start();
 
         return PinotQueryRunner.builder()

plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotPreviousConnectorTest.java

@@ -0,0 +1,26 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.plugin.pinot;
+
+import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_PREVIOUS_IMAGE_NAME;
+
+public class TestPinotPreviousConnectorTest
+        extends BasePinotConnectorTest
+{
+    @Override
+    String serverVersionUnderTest()
+    {
+        return PINOT_PREVIOUS_IMAGE_NAME;
+    }
+}