Add dedicated test for queries with caching

plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcCachingQueries.java

@@ -0,0 +1,120 @@
+/*
+ * 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.jdbc;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.AbstractTestDistributedQueries;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.JdbcSqlExecutor;
+import io.trino.testing.sql.TestTable;
+import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+
+import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
+
+public class TestJdbcCachingQueries
+        // TODO define shorter tests set that exercises various read and write scenarios (a.k.a. "a smoke test")
+        extends AbstractTestDistributedQueries
+{
+    private Map<String, String> properties;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        properties = ImmutableMap.<String, String>builder()
+                .putAll(TestingH2JdbcModule.createProperties())
+                .put("metadata.cache-ttl", "10m")
+                .put("metadata.cache-missing", "true")
+                .put("allow-drop-table", "true")
+                .build();
+        return createH2QueryRunner(TpchTable.getTables(), properties);
+    }
+
+    @Override
+    protected boolean supportsDelete()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsViews()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsArrays()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnTable()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnColumn()
+    {
+        return false;
+    }
+
+    @Override
+    public void testLargeIn(int valuesCount)
+    {
+        throw new SkipException("This test should pass with H2, but takes too long (currently over a mninute) and is not that important");
+    }
+
+    @Override
+    protected TestTable createTableWithDefaultColumns()
+    {
+        return new TestTable(
+                getSqlExecutor(),
+                "tpch.table",
+                "(col_required BIGINT NOT NULL," +
+                        "col_nullable BIGINT," +
+                        "col_default BIGINT DEFAULT 43," +
+                        "col_nonnull_default BIGINT NOT NULL DEFAULT 42," +
+                        "col_required2 BIGINT NOT NULL)");
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeBaseName = dataMappingTestSetup.getTrinoTypeName().replaceAll("\\([^()]*\\)", "");
+        switch (typeBaseName) {
+            case "boolean":
+            case "decimal":
+            case "char":
+            case "varbinary":
+            case "time":
+            case "timestamp":
+            case "timestamp with time zone":
+                return Optional.of(dataMappingTestSetup.asUnsupported());
+        }
+
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    private JdbcSqlExecutor getSqlExecutor()
+    {
+        return new JdbcSqlExecutor(properties.get("connection-url"), new Properties());
+    }
+}

plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcDistributedQueries.java

@@ -13,24 +13,105 @@
  */
 package io.trino.plugin.jdbc;
 
-import io.trino.testing.AbstractTestQueries;
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.AbstractTestDistributedQueries;
 import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.JdbcSqlExecutor;
+import io.trino.testing.sql.TestTable;
 import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
 
 import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
 
 public class TestJdbcDistributedQueries
-        extends AbstractTestQueries
+        extends AbstractTestDistributedQueries
 {
+    private Map<String, String> properties;
+
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        return createH2QueryRunner(TpchTable.getTables());
+        properties = ImmutableMap.<String, String>builder()
+                .putAll(TestingH2JdbcModule.createProperties())
+                .put("allow-drop-table", "true")
+                .build();
+        return createH2QueryRunner(TpchTable.getTables(), properties);
+    }
+
+    @Override
+    protected boolean supportsDelete()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsViews()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsArrays()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnTable()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnColumn()
+    {
+        return false;
     }
 
     @Override
     public void testLargeIn(int valuesCount)
     {
+        throw new SkipException("This test should pass with H2, but takes too long (currently over a mninute) and is not that important");
+    }
+
+    @Override
+    protected TestTable createTableWithDefaultColumns()
+    {
+        return new TestTable(
+                getSqlExecutor(),
+                "tpch.table",
+                "(col_required BIGINT NOT NULL," +
+                        "col_nullable BIGINT," +
+                        "col_default BIGINT DEFAULT 43," +
+                        "col_nonnull_default BIGINT NOT NULL DEFAULT 42," +
+                        "col_required2 BIGINT NOT NULL)");
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeBaseName = dataMappingTestSetup.getTrinoTypeName().replaceAll("\\([^()]*\\)", "");
+        switch (typeBaseName) {
+            case "boolean":
+            case "decimal":
+            case "char":
+            case "varbinary":
+            case "time":
+            case "timestamp":
+            case "timestamp with time zone":
+                return Optional.of(dataMappingTestSetup.asUnsupported());
+        }
+
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    private JdbcSqlExecutor getSqlExecutor()
+    {
+        return new JdbcSqlExecutor(properties.get("connection-url"), new Properties());
     }
 }