Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 4909 popped up again. I applied PR 5451 liberally to all new Calcite test classes introduced in PR 9279 to fix (#9324)

This commit is contained in:
Lucas Capistrant 2020-02-17 00:29:43 -06:00 committed by GitHub
parent 3bb9e7e53a
commit 5befd40638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java
View File

@ -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.expression.SqlOperatorConversion;
import org.apache.druid.sql.calcite.schema.DruidSchemaName; import org.apache.druid.sql.calcite.schema.DruidSchemaName;
import org.apache.druid.sql.calcite.schema.NamedSchema; import org.apache.druid.sql.calcite.schema.NamedSchema;
import org.apache.druid.sql.calcite.util.CalciteTestBase;
import org.easymock.EasyMock; import org.easymock.EasyMock;
import org.easymock.EasyMockRunner; import org.easymock.EasyMockRunner;
import org.easymock.Mock; import org.easymock.Mock;
@ -49,7 +50,7 @@ import javax.validation.Validator;
import java.util.Set; import java.util.Set;
@RunWith(EasyMockRunner.class) @RunWith(EasyMockRunner.class)
public class CalcitePlannerModuleTest public class CalcitePlannerModuleTest extends CalciteTestBase
{ {
private static final String SCHEMA_1 = "SCHEMA_1"; private static final String SCHEMA_1 = "SCHEMA_1";
private static final String SCHEMA_2 = "SCHEMA_2"; private static final String SCHEMA_2 = "SCHEMA_2";

3
sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
View File

@ -42,6 +42,7 @@ import org.apache.druid.server.QueryLifecycleFactory;
import org.apache.druid.server.security.AuthorizerMapper; import org.apache.druid.server.security.AuthorizerMapper;
import org.apache.druid.server.security.Escalator; import org.apache.druid.server.security.Escalator;
import org.apache.druid.sql.calcite.planner.PlannerConfig; 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.apache.druid.sql.calcite.view.ViewManager;
import org.easymock.EasyMock; import org.easymock.EasyMock;
import org.easymock.EasyMockRunner; import org.easymock.EasyMockRunner;
@ -55,7 +56,7 @@ import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@RunWith(EasyMockRunner.class) @RunWith(EasyMockRunner.class)
public class DruidCalciteSchemaModuleTest public class DruidCalciteSchemaModuleTest extends CalciteTestBase
{ {
private static final String DRUID_SCHEMA_NAME = "druid"; private static final String DRUID_SCHEMA_NAME = "druid";

3
sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java
View File

@ -19,6 +19,7 @@
package org.apache.druid.sql.calcite.schema; package org.apache.druid.sql.calcite.schema;
import org.apache.druid.sql.calcite.util.CalciteTestBase;
import org.easymock.EasyMockRunner; import org.easymock.EasyMockRunner;
import org.easymock.Mock; import org.easymock.Mock;
import org.junit.Assert; import org.junit.Assert;
@ -27,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@RunWith(EasyMockRunner.class) @RunWith(EasyMockRunner.class)
public class NamedDruidSchemaTest public class NamedDruidSchemaTest extends CalciteTestBase
{ {
private static final String SCHEMA_NAME = "SCHEMA_NAME"; private static final String SCHEMA_NAME = "SCHEMA_NAME";

3
sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java
View File

@ -19,6 +19,7 @@
package org.apache.druid.sql.calcite.schema; package org.apache.druid.sql.calcite.schema;
import org.apache.druid.sql.calcite.util.CalciteTestBase;
import org.easymock.EasyMockRunner; import org.easymock.EasyMockRunner;
import org.easymock.Mock; import org.easymock.Mock;
import org.junit.Assert; import org.junit.Assert;
@ -27,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@RunWith(EasyMockRunner.class) @RunWith(EasyMockRunner.class)
public class NamedLookupSchemaTest public class NamedLookupSchemaTest extends CalciteTestBase
{ {
private static final String SCHEMA_NAME = "lookup"; private static final String SCHEMA_NAME = "lookup";

3
sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java
View File

@ -19,12 +19,13 @@
package org.apache.druid.sql.calcite.schema; package org.apache.druid.sql.calcite.schema;
import org.apache.druid.sql.calcite.util.CalciteTestBase;
import org.easymock.Mock; import org.easymock.Mock;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
public class NamedSystemSchemaTest public class NamedSystemSchemaTest extends CalciteTestBase
{ {
private static final String SCHEMA_NAME = "sys"; private static final String SCHEMA_NAME = "sys";

3
sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java
View File

@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet;
import org.apache.calcite.schema.Schema; import org.apache.calcite.schema.Schema;
import org.apache.calcite.schema.SchemaPlus; import org.apache.calcite.schema.SchemaPlus;
import org.apache.druid.java.util.common.ISE; import org.apache.druid.java.util.common.ISE;
import org.apache.druid.sql.calcite.util.CalciteTestBase;
import org.easymock.EasyMock; import org.easymock.EasyMock;
import org.easymock.EasyMockRunner; import org.easymock.EasyMockRunner;
import org.easymock.Mock; import org.easymock.Mock;
@ -34,7 +35,7 @@ import org.junit.runner.RunWith;
import java.util.Set; import java.util.Set;
@RunWith(EasyMockRunner.class) @RunWith(EasyMockRunner.class)
public class RootSchemaProviderTest public class RootSchemaProviderTest extends CalciteTestBase
{ {
private static final String SCHEMA_1 = "SCHEMA_1"; private static final String SCHEMA_1 = "SCHEMA_1";
private static final String SCHEMA_2 = "SCHEMA_2"; private static final String SCHEMA_2 = "SCHEMA_2";