You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by cw...@apache.org on 2020/02/17 06:30:01 UTC

[druid] branch master updated: Issue 4909 popped up again. I applied PR 5451 liberally to all new Calcite test classes introduced in PR 9279 to fix (#9324)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5befd40  Issue 4909 popped up again. I applied PR 5451 liberally to all new Calcite test classes introduced in PR 9279 to fix (#9324)
5befd40 is described below

commit 5befd406384c8717cec558fa3f7d3d86d18145f0
Author: Lucas Capistrant <ca...@users.noreply.github.com>
AuthorDate: Mon Feb 17 00:29:43 2020 -0600

    Issue 4909 popped up again. I applied PR 5451 liberally to all new Calcite test classes introduced in PR 9279 to fix (#9324)
---
 .../org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java | 3 ++-
 .../apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java  | 3 ++-
 .../java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java | 3 ++-
 .../org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java     | 3 ++-
 .../org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java     | 3 ++-
 .../org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java    | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java
index 694f435..e081e1f 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java
@@ -36,6 +36,7 @@ import org.apache.druid.sql.calcite.aggregation.SqlAggregator;
 import org.apache.druid.sql.calcite.expression.SqlOperatorConversion;
 import org.apache.druid.sql.calcite.schema.DruidSchemaName;
 import org.apache.druid.sql.calcite.schema.NamedSchema;
+import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.easymock.EasyMock;
 import org.easymock.EasyMockRunner;
 import org.easymock.Mock;
@@ -49,7 +50,7 @@ import javax.validation.Validator;
 import java.util.Set;
 
 @RunWith(EasyMockRunner.class)
-public class CalcitePlannerModuleTest
+public class CalcitePlannerModuleTest extends CalciteTestBase
 {
   private static final String SCHEMA_1 = "SCHEMA_1";
   private static final String SCHEMA_2 = "SCHEMA_2";
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
index 4f1fda0..edba60a 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
@@ -42,6 +42,7 @@ import org.apache.druid.server.QueryLifecycleFactory;
 import org.apache.druid.server.security.AuthorizerMapper;
 import org.apache.druid.server.security.Escalator;
 import org.apache.druid.sql.calcite.planner.PlannerConfig;
+import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.apache.druid.sql.calcite.view.ViewManager;
 import org.easymock.EasyMock;
 import org.easymock.EasyMockRunner;
@@ -55,7 +56,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 @RunWith(EasyMockRunner.class)
-public class DruidCalciteSchemaModuleTest
+public class DruidCalciteSchemaModuleTest extends CalciteTestBase
 {
   private static final String DRUID_SCHEMA_NAME = "druid";
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java
index eb63408..f4af22b 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.sql.calcite.schema;
 
+import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.easymock.EasyMockRunner;
 import org.easymock.Mock;
 import org.junit.Assert;
@@ -27,7 +28,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(EasyMockRunner.class)
-public class NamedDruidSchemaTest
+public class NamedDruidSchemaTest extends CalciteTestBase
 {
   private static final String SCHEMA_NAME = "SCHEMA_NAME";
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java
index f81cbd2..22aa9e9 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.sql.calcite.schema;
 
+import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.easymock.EasyMockRunner;
 import org.easymock.Mock;
 import org.junit.Assert;
@@ -27,7 +28,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(EasyMockRunner.class)
-public class NamedLookupSchemaTest
+public class NamedLookupSchemaTest extends CalciteTestBase
 {
   private static final String SCHEMA_NAME = "lookup";
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java
index 6488913..b4fa99f 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java
@@ -19,12 +19,13 @@
 
 package org.apache.druid.sql.calcite.schema;
 
+import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.easymock.Mock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class NamedSystemSchemaTest
+public class NamedSystemSchemaTest extends CalciteTestBase
 {
   private static final String SCHEMA_NAME = "sys";
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java
index 26b9ab1..71f1169 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet;
 import org.apache.calcite.schema.Schema;
 import org.apache.calcite.schema.SchemaPlus;
 import org.apache.druid.java.util.common.ISE;
+import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.easymock.EasyMock;
 import org.easymock.EasyMockRunner;
 import org.easymock.Mock;
@@ -34,7 +35,7 @@ import org.junit.runner.RunWith;
 import java.util.Set;
 
 @RunWith(EasyMockRunner.class)
-public class RootSchemaProviderTest
+public class RootSchemaProviderTest extends CalciteTestBase
 {
   private static final String SCHEMA_1 = "SCHEMA_1";
   private static final String SCHEMA_2 = "SCHEMA_2";


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org