You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2020/01/11 10:36:39 UTC

[calcite] branch master updated: Increase test coverage for regular CI jobs: move @Tag(slow) annotations to test methods

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new bbb37fc  Increase test coverage for regular CI jobs: move @Tag(slow) annotations to test methods
bbb37fc is described below

commit bbb37fc071ea51d9127aea69a260235ed14f2879
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Jan 11 13:24:01 2020 +0300

    Increase test coverage for regular CI jobs: move @Tag(slow) annotations to test methods
    
    Some of Materialization, Lattice, and PartiallyOrderedSet tests take less than a second,
    so it makes sense to execute them with a regular CI runs.
---
 .../org/apache/calcite/materialize/LatticeSuggesterTest.java  |  4 +++-
 .../java/org/apache/calcite/test/MaterializationTest.java     | 11 ++++++++++-
 .../java/org/apache/calcite/util/PartiallyOrderedSetTest.java |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/org/apache/calcite/materialize/LatticeSuggesterTest.java b/core/src/test/java/org/apache/calcite/materialize/LatticeSuggesterTest.java
index d94f206..b683a3f 100644
--- a/core/src/test/java/org/apache/calcite/materialize/LatticeSuggesterTest.java
+++ b/core/src/test/java/org/apache/calcite/materialize/LatticeSuggesterTest.java
@@ -62,7 +62,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 /**
  * Unit tests for {@link LatticeSuggester}.
  */
-@Tag("slow")
 public class LatticeSuggesterTest {
 
   /** Some basic query patterns on the Scott schema with "EMP" and "DEPT"
@@ -242,6 +241,7 @@ public class LatticeSuggesterTest {
     };
   }
 
+  @Tag("slow")
   @Test public void testSharedSnowflake() throws Exception {
     final Tester t = new Tester().foodmart();
     // foodmart query 5827 (also 5828, 5830, 5832) uses the "region" table
@@ -393,10 +393,12 @@ public class LatticeSuggesterTest {
     }
   }
 
+  @Tag("slow")
   @Test public void testFoodMartAll() throws Exception {
     checkFoodMartAll(false);
   }
 
+  @Tag("slow")
   @Test public void testFoodMartAllEvolve() throws Exception {
     checkFoodMartAll(true);
   }
diff --git a/core/src/test/java/org/apache/calcite/test/MaterializationTest.java b/core/src/test/java/org/apache/calcite/test/MaterializationTest.java
index d651347..a2646b7 100644
--- a/core/src/test/java/org/apache/calcite/test/MaterializationTest.java
+++ b/core/src/test/java/org/apache/calcite/test/MaterializationTest.java
@@ -85,7 +85,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * query and one or more materializations (what Oracle calls materialized views)
  * and checks that the materialization is used.
  */
-@Tag("slow")
 public class MaterializationTest {
   private static final Consumer<ResultSet> CONTAINS_M0 =
       CalciteAssert.checkResultContains(
@@ -427,6 +426,7 @@ public class MaterializationTest {
     }
   }
 
+  @Tag("slow")
   @Test public void testFilterQueryOnFilterView() {
     checkMaterialize(
         "select \"deptno\", \"empid\", \"name\" from \"emps\" where \"deptno\" = 10",
@@ -1074,6 +1074,7 @@ public class MaterializationTest {
     checkNoMaterialize(mv, query, HR_FKUK_MODEL, true);
   }
 
+  @Tag("slow")
   @Test public void testSwapJoin() {
     checkMaterialize(
         "select count(*) as c from \"foodmart\".\"sales_fact_1997\" as s join \"foodmart\".\"time_by_day\" as t on s.\"time_id\" = t.\"time_id\"",
@@ -1883,6 +1884,7 @@ public class MaterializationTest {
                 + "    EnumerableTableScan(table=[[hr, m0]])"));
   }
 
+  @Tag("slow")
   @Test public void testJoinAggregateMaterializationNoAggregateFuncs7() {
     checkMaterialize(
         "select \"depts\".\"deptno\", \"dependents\".\"empid\"\n"
@@ -1952,6 +1954,7 @@ public class MaterializationTest {
             "expr#13=[OR($t10, $t12)], expr#14=[AND($t6, $t8, $t13)]"));
   }
 
+  @Tag("slow")
   @Test public void testJoinAggregateMaterializationNoAggregateFuncs10() {
     checkMaterialize(
         "select \"depts\".\"name\", \"dependents\".\"name\" as \"name2\", "
@@ -2145,6 +2148,7 @@ public class MaterializationTest {
         HR_FKUK_MODEL);
   }
 
+  @Tag("slow")
   @Test public void testJoinAggregateMaterializationAggregateFuncs11() {
     checkMaterialize(
         "select \"depts\".\"deptno\", \"dependents\".\"empid\", count(\"emps\".\"salary\") as s\n"
@@ -2311,6 +2315,7 @@ public class MaterializationTest {
         CONTAINS_M0);
   }
 
+  @Tag("slow")
   @Test public void testJoinMaterialization10() {
     checkMaterialize(
         "select \"depts\".\"deptno\", \"dependents\".\"empid\"\n"
@@ -2341,6 +2346,7 @@ public class MaterializationTest {
             "PLAN=EnumerableTableScan(table=[[hr, m0]])"));
   }
 
+  @Tag("slow")
   @Test public void testJoinMaterialization12() {
     checkMaterialize(
         "select \"empid\", \"emps\".\"name\", \"emps\".\"deptno\", \"depts\".\"name\"\n"
@@ -2408,6 +2414,7 @@ public class MaterializationTest {
             "PLAN=EnumerableTableScan(table=[[hr, m0]])"));
   }
 
+  @Tag("slow")
   @Test public void testJoinMaterializationUKFK5() {
     checkMaterialize(
         "select \"emps\".\"empid\", \"emps\".\"deptno\" from \"emps\"\n"
@@ -2423,6 +2430,7 @@ public class MaterializationTest {
                 + "  EnumerableTableScan(table=[[hr, m0]])"));
   }
 
+  @Tag("slow")
   @Test public void testJoinMaterializationUKFK6() {
     checkMaterialize(
         "select \"emps\".\"empid\", \"emps\".\"deptno\" from \"emps\"\n"
@@ -2465,6 +2473,7 @@ public class MaterializationTest {
         HR_FKUK_MODEL);
   }
 
+  @Tag("slow")
   @Test public void testJoinMaterializationUKFK9() {
     checkMaterialize(
         "select * from \"emps\"\n"
diff --git a/core/src/test/java/org/apache/calcite/util/PartiallyOrderedSetTest.java b/core/src/test/java/org/apache/calcite/util/PartiallyOrderedSetTest.java
index d4f27f5..1ac0a26 100644
--- a/core/src/test/java/org/apache/calcite/util/PartiallyOrderedSetTest.java
+++ b/core/src/test/java/org/apache/calcite/util/PartiallyOrderedSetTest.java
@@ -39,7 +39,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Unit test for {@link PartiallyOrderedSet}.
  */
-@Tag("slow")
 public class PartiallyOrderedSetTest {
   private static final boolean DEBUG = false;
 
@@ -209,6 +208,7 @@ public class PartiallyOrderedSetTest {
     printValidate(poset);
   }
 
+  @Tag("slow")
   @Test public void testPosetBitsLarge() {
     // It takes 80 seconds, and the computations are exactly the same every time
     final PartiallyOrderedSet<Integer> poset =
@@ -216,6 +216,7 @@ public class PartiallyOrderedSetTest {
     checkPosetBitsLarge(poset, 30000, 2921, 164782);
   }
 
+  @Tag("slow")
   @Test public void testPosetBitsLarge2() {
     final int n = 30000;
     final PartiallyOrderedSet<Integer> poset =