You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pr...@apache.org on 2017/10/04 20:59:29 UTC
[2/6] drill git commit: DRILL-5752 this change includes:
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java
index 41414c9..5ca071e 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java
@@ -24,6 +24,7 @@ import java.util.BitSet;
import org.apache.calcite.adapter.java.JavaTypeFactory;
import org.apache.calcite.jdbc.JavaTypeFactoryImpl;
+import org.apache.drill.categories.PlannerTest;
import org.apache.drill.exec.planner.logical.partition.FindPartitionConditions;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rex.RexBuilder;
@@ -31,7 +32,9 @@ import org.apache.calcite.rex.RexNode;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.type.SqlTypeName;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(PlannerTest.class)
public class FilterSplitTest {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FilterSplitTest.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java
index 4db59eb..631cabd 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java
@@ -17,14 +17,17 @@
package org.apache.drill.exec.planner.logical;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* DRILL-4906
* Tests for handling nullable types in CASE function
*/
+@Category(SqlTest.class)
public class TestCaseNullableTypes extends BaseTestQuery {
@Test
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestConvertCountToDirectScan.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestConvertCountToDirectScan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestConvertCountToDirectScan.java
index 04fe913..87c2c1c 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestConvertCountToDirectScan.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestConvertCountToDirectScan.java
@@ -18,9 +18,12 @@
package org.apache.drill.exec.planner.logical;
import org.apache.drill.PlanTestBase;
+import org.apache.drill.categories.PlannerTest;
import org.apache.drill.exec.ExecConstants;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(PlannerTest.class)
public class TestConvertCountToDirectScan extends PlanTestBase {
@Test
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/TestDrillSQLWorker.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/TestDrillSQLWorker.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/TestDrillSQLWorker.java
index 3a6a7de..cddc3ae 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/TestDrillSQLWorker.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/TestDrillSQLWorker.java
@@ -22,9 +22,12 @@ import static org.junit.Assert.assertEquals;
import org.apache.calcite.avatica.util.Quoting;
import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
import org.apache.drill.exec.planner.physical.PlannerSettings;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SqlTest.class)
public class TestDrillSQLWorker extends BaseTestQuery {
private void validateFormattedIs(String sql, SqlParserPos pos, String expected) {
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java
index a84fe05..59d3c78 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java
@@ -19,6 +19,7 @@ package org.apache.drill.exec.pop;
import java.util.List;
+import org.apache.drill.categories.PlannerTest;
import org.apache.drill.exec.planner.PhysicalPlanReader;
import org.apache.drill.exec.planner.PhysicalPlanReaderTestFactory;
import org.apache.drill.exec.planner.fragment.Fragment;
@@ -35,9 +36,11 @@ import org.apache.drill.exec.work.QueryWorkUnit;
import org.junit.Test;
import com.google.common.collect.Lists;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
+@Category(PlannerTest.class)
public class TestFragmentChecker extends PopUnitTestBase{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestFragmentChecker.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java
index 6a49116..fb753d1 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java
@@ -23,13 +23,16 @@ import static org.junit.Assert.assertNull;
import java.io.IOException;
+import org.apache.drill.categories.PlannerTest;
import org.apache.drill.exec.exception.FragmentSetupException;
import org.apache.drill.exec.planner.PhysicalPlanReader;
import org.apache.drill.exec.planner.PhysicalPlanReaderTestFactory;
import org.apache.drill.exec.planner.fragment.Fragment;
import org.apache.drill.exec.work.foreman.ForemanSetupException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(PlannerTest.class)
public class TestFragmenter extends PopUnitTestBase {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestFragmenter.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java
index d184a12..2637a84 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import java.util.List;
+import org.apache.drill.categories.PlannerTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.util.FileUtils;
import org.apache.drill.exec.ExecTest;
@@ -35,7 +36,9 @@ import org.junit.Test;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
+import org.junit.experimental.categories.Category;
+@Category(PlannerTest.class)
public class TestInjectionValue extends ExecTest {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestInjectionValue.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java
index 2847696..7f6929f 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java
@@ -25,6 +25,7 @@ import mockit.Mock;
import mockit.MockUp;
import mockit.NonStrictExpectations;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.expression.ErrorCollector;
import org.apache.drill.common.expression.ErrorCollectorImpl;
@@ -49,7 +50,9 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Range;
+import org.junit.experimental.categories.Category;
+@Category(VectorTest.class)
public class ExpressionTreeMaterializerTest extends ExecTest {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ExpressionTreeMaterializerTest.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java
index 0ea552f..193ec97 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java
@@ -17,6 +17,7 @@
*/
package org.apache.drill.exec.record;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.types.TypeProtos;
import org.apache.drill.common.types.Types;
@@ -24,7 +25,9 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(VectorTest.class)
public class TestMaterializedField {
private static final String PARENT_NAME = "parent";
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java
index fb71b3d..b3dd4c7 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java
@@ -24,12 +24,12 @@ import static org.junit.Assert.assertTrue;
import com.google.common.collect.Lists;
import mockit.Injectable;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.util.FileUtils;
import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.ops.OpProfileDef;
-import org.apache.drill.exec.ops.OperatorContext;
import org.apache.drill.exec.ops.OperatorStats;
import org.apache.drill.exec.ops.OperatorUtilities;
import org.apache.drill.exec.physical.PhysicalPlan;
@@ -49,9 +49,11 @@ import org.junit.Test;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
+import org.junit.experimental.categories.Category;
import java.util.List;
+@Category(VectorTest.class)
public class TestRecordIterator extends PopUnitTestBase {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestRecordIterator.class);
DrillConfig c = DrillConfig.create();
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java
index 930e2a8..b17bf18 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java
@@ -19,9 +19,8 @@ package org.apache.drill.exec.record;
import static org.junit.Assert.*;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.types.TypeProtos.MinorType;
-import org.apache.drill.exec.record.BatchSchema;
-import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode;
import org.apache.drill.test.DrillTest;
import org.apache.drill.test.OperatorFixture;
import org.apache.drill.test.rowSet.RowSet;
@@ -31,7 +30,9 @@ import org.apache.drill.test.rowSet.SchemaBuilder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(VectorTest.class)
public class TestVectorContainer extends DrillTest {
// TODO: Replace the following with an extension of SubOperatorTest class
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java
index a2401e8..930bbbc 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import java.util.List;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.util.FileUtils;
import org.apache.drill.exec.client.DrillClient;
import org.apache.drill.exec.pop.PopUnitTestBase;
@@ -32,15 +33,18 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch;
import org.apache.drill.exec.server.Drillbit;
import org.apache.drill.exec.server.RemoteServiceSet;
import org.apache.drill.exec.vector.ValueVector;
+import org.apache.drill.categories.SlowTest;
import org.junit.Test;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
+import org.junit.experimental.categories.Category;
/* This class tests the existing date types. Simply using date types
* by casting from VarChar, performing basic functions and converting
* back to VarChar.
*/
+@Category({SlowTest.class, VectorTest.class})
public class TestDateTypes extends PopUnitTestBase {
// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestDateTypes.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestLoad.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestLoad.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestLoad.java
index 0dc4149..4febe1d 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestLoad.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestLoad.java
@@ -23,6 +23,7 @@ import io.netty.buffer.DrillBuf;
import java.util.List;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.types.TypeProtos;
import org.apache.drill.common.types.TypeProtos.MinorType;
@@ -42,7 +43,9 @@ import org.apache.drill.exec.vector.VarCharVector;
import org.junit.Test;
import com.google.common.collect.Lists;
+import org.junit.experimental.categories.Category;
+@Category(VectorTest.class)
public class TestLoad extends ExecTest {
private final DrillConfig drillConfig = DrillConfig.create();
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java
index 5191f5f..8119a85 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.nio.charset.Charset;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.AutoCloseables;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.types.TypeProtos;
@@ -67,7 +68,9 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import io.netty.buffer.DrillBuf;
+import org.junit.experimental.categories.Category;
+@Category(VectorTest.class)
public class TestValueVector extends ExecTest {
//private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestValueVector.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java
index 3d6f507..12cd823 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java
@@ -27,6 +27,7 @@ import mockit.Mock;
import mockit.MockUp;
import mockit.NonStrictExpectations;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SecurityTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.config.DrillProperties;
import org.apache.drill.common.exceptions.UserRemoteException;
@@ -66,6 +67,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -78,6 +80,7 @@ import static junit.framework.TestCase.fail;
import static org.junit.Assert.assertTrue;
@Ignore("See DRILL-5387")
+@Category(SecurityTest.class)
public class TestBitBitKerberos extends BaseTestQuery {
//private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestBitBitKerberos.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java
index 9ebaf4b..b4c0eb2 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java
@@ -19,6 +19,7 @@ package org.apache.drill.exec.rpc.user.security;
import com.typesafe.config.ConfigValueFactory;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SecurityTest;
import org.apache.drill.common.config.DrillProperties;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.exec.ExecConstants;
@@ -26,6 +27,7 @@ import org.apache.drill.exec.rpc.RpcException;
import org.apache.drill.exec.rpc.user.security.testing.UserAuthenticatorTestImpl;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.Properties;
@@ -38,6 +40,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+@Category(SecurityTest.class)
public class TestCustomUserAuthenticator extends BaseTestQuery {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java
index 9da0d86..b1a6e98 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java
@@ -20,6 +20,7 @@ package org.apache.drill.exec.rpc.user.security;
import com.google.common.collect.Lists;
import com.typesafe.config.ConfigValueFactory;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SecurityTest;
import org.apache.drill.common.config.DrillProperties;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.exec.ExecConstants;
@@ -36,6 +37,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import javax.security.auth.Subject;
import java.lang.reflect.Field;
@@ -45,6 +47,7 @@ import java.util.Properties;
import static junit.framework.TestCase.assertTrue;
@Ignore("See DRILL-5387")
+@Category(SecurityTest.class)
public class TestUserBitKerberos extends BaseTestQuery {
//private static final org.slf4j.Logger logger =org.slf4j.LoggerFactory.getLogger(TestUserBitKerberos.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java
index b9c0de2..2ddbcef 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java
@@ -20,6 +20,7 @@ package org.apache.drill.exec.rpc.user.security;
import com.google.common.collect.Lists;
import com.typesafe.config.ConfigValueFactory;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SecurityTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.config.DrillProperties;
import org.apache.drill.exec.ExecConstants;
@@ -38,6 +39,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import javax.security.auth.Subject;
import java.lang.reflect.Field;
@@ -48,6 +50,7 @@ import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
@Ignore("See DRILL-5387")
+@Category(SecurityTest.class)
public class TestUserBitKerberosEncryption extends BaseTestQuery {
private static final org.slf4j.Logger logger =
org.slf4j.LoggerFactory.getLogger(TestUserBitKerberosEncryption.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
index a823820..bde6764 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
@@ -83,11 +83,13 @@ import org.apache.drill.exec.work.foreman.ForemanSetupException;
import org.apache.drill.exec.work.fragment.FragmentExecutor;
import org.apache.drill.test.DrillTest;
import org.apache.drill.test.OperatorFixture;
+import org.apache.drill.categories.SlowTest;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import com.google.common.base.Preconditions;
@@ -96,6 +98,7 @@ import com.google.common.base.Preconditions;
* Test how resilient drillbits are to throwing exceptions during various phases of query
* execution by injecting exceptions at various points, and to cancellations in various phases.
*/
+@Category(SlowTest.class)
public class TestDrillbitResilience extends DrillTest {
private static final Logger logger = org.slf4j.LoggerFactory.getLogger(TestDrillbitResilience.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java
index f707bad..00e356e 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java
@@ -18,14 +18,17 @@
package org.apache.drill.exec.server;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.OptionsTest;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.test.UserExceptionMatcher;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.apache.drill.exec.ExecConstants.ENABLE_VERBOSE_ERRORS_KEY;
import static org.apache.drill.exec.ExecConstants.SLICE_TARGET;
import static org.apache.drill.exec.proto.UserBitShared.DrillPBError.ErrorType.VALIDATION;
+@Category(OptionsTest.class)
public class TestOptions extends BaseTestQuery {
// static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestOptions.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java
index 95e251d..bf7578f 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java
@@ -38,7 +38,7 @@ public class StatusResourcesTest {
FixtureBuilder builder = ClusterFixture.builder().
configProperty(ExecConstants.HTTP_ENABLE, true).
- configProperty(OptionValidator.OPTION_DEFAULTS_ROOT + MOCK_PROPERTY, "a").
+ configProperty(ExecConstants.bootDefaultFor(MOCK_PROPERTY), "a").
configProperty(ExecConstants.HTTP_PORT_HUNT, true).
configProperty(ExecConstants.SYS_STORE_PROVIDER_LOCAL_ENABLE_WRITE, false).
putDefinition(optionDefinition);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java
index 26d81e2..2e3b796 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java
@@ -20,6 +20,8 @@ package org.apache.drill.exec.sql;
import com.google.common.collect.Maps;
import org.apache.commons.io.FileUtils;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
+import org.apache.drill.categories.UnlikelyTest;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.exec.proto.UserBitShared;
import org.apache.drill.exec.rpc.user.QueryDataBatch;
@@ -27,14 +29,17 @@ import org.apache.drill.exec.store.StorageStrategy;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Map;
import static org.junit.Assert.assertEquals;
+@Category(SqlTest.class)
public class TestCTAS extends BaseTestQuery {
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void withDuplicateColumnsInDef1() throws Exception {
ctasErrorTestHelper("CREATE TABLE %s.%s AS SELECT region_id, region_id FROM cp.`region.json`",
String.format("Duplicate column name [%s]", "region_id")
@@ -42,6 +47,7 @@ public class TestCTAS extends BaseTestQuery {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void withDuplicateColumnsInDef2() throws Exception {
ctasErrorTestHelper("CREATE TABLE %s.%s AS SELECT region_id, sales_city, sales_city FROM cp.`region.json`",
String.format("Duplicate column name [%s]", "sales_city")
@@ -49,6 +55,7 @@ public class TestCTAS extends BaseTestQuery {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void withDuplicateColumnsInDef3() throws Exception {
ctasErrorTestHelper(
"CREATE TABLE %s.%s(regionid, regionid) " +
@@ -58,6 +65,7 @@ public class TestCTAS extends BaseTestQuery {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void withDuplicateColumnsInDef4() throws Exception {
ctasErrorTestHelper(
"CREATE TABLE %s.%s(regionid, salescity, salescity) " +
@@ -67,6 +75,7 @@ public class TestCTAS extends BaseTestQuery {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void withDuplicateColumnsInDef5() throws Exception {
ctasErrorTestHelper(
"CREATE TABLE %s.%s(regionid, salescity, SalesCity) " +
@@ -94,6 +103,7 @@ public class TestCTAS extends BaseTestQuery {
}
@Test // DRILL-2422
+ @Category(UnlikelyTest.class)
public void createTableWhenATableWithSameNameAlreadyExists() throws Exception{
final String newTblName = "createTableWhenTableAlreadyExists";
@@ -111,6 +121,7 @@ public class TestCTAS extends BaseTestQuery {
}
@Test // DRILL-2422
+ @Category(UnlikelyTest.class)
public void createTableWhenAViewWithSameNameAlreadyExists() throws Exception{
final String newTblName = "createTableWhenAViewWithSameNameAlreadyExists";
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java
index 0a51f6d..904c0fe 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java
@@ -22,6 +22,7 @@ import mockit.Mock;
import mockit.MockUp;
import mockit.integration.junit4.JMockit;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.exceptions.UserRemoteException;
import org.apache.drill.exec.ExecConstants;
@@ -37,6 +38,7 @@ import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.fs.permission.FsPermission;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import java.io.IOException;
@@ -50,6 +52,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@RunWith(JMockit.class)
+@Category(SqlTest.class)
public class TestCTTAS extends BaseTestQuery {
private static final UUID session_id = UUID.nameUUIDFromBytes("sessionId".getBytes());
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java
index 541023a..00a7087 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
import org.apache.drill.TestBuilder;
import org.apache.drill.common.expression.SchemaPath;
import org.apache.drill.exec.record.RecordBatchLoader;
@@ -36,6 +37,7 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch;
import org.apache.drill.exec.store.dfs.FileSystemConfig;
import org.apache.drill.exec.vector.NullableVarCharVector;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.List;
import java.util.Map;
@@ -47,6 +49,7 @@ import java.util.Map;
* -- USE schema
* -- SHOW FILES
*/
+@Category(SqlTest.class)
public class TestInfoSchema extends BaseTestQuery {
private static final ObjectMapper mapper = new ObjectMapper().enable(INDENT_OUTPUT);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
index c5af557..ea64c7d 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
@@ -20,8 +20,10 @@ package org.apache.drill.exec.sql;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
import org.apache.drill.common.exceptions.UserRemoteException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import javax.annotation.Nullable;
import java.util.Arrays;
@@ -30,6 +32,7 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThat;
+@Category(SqlTest.class)
public class TestSimpleCastFunctions extends BaseTestQuery {
private static final List<Function<String, String>> inputFunctions = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java
index 0e9fdb7..f94c40e 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java
@@ -23,6 +23,7 @@ import org.apache.calcite.tools.FrameworkConfig;
import org.apache.calcite.tools.Frameworks;
import org.apache.calcite.tools.Planner;
+import org.apache.drill.categories.SqlTest;
import org.apache.drill.exec.planner.physical.PlannerSettings;
import org.apache.drill.exec.planner.sql.DrillConvertletTable;
import org.apache.drill.exec.planner.sql.parser.CompoundIdentifierConverter;
@@ -31,7 +32,9 @@ import org.apache.drill.test.DrillAssert;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParser;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SqlTest.class)
public class TestSqlBracketlessSyntax {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSqlBracketlessSyntax.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
index 92f5c91..c2bd215 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
@@ -19,12 +19,16 @@ package org.apache.drill.exec.sql;
import com.google.common.collect.ImmutableList;
import org.apache.commons.io.FileUtils;
+import org.apache.drill.categories.SqlTest;
+import org.apache.drill.categories.UnlikelyTest;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.List;
+@Category(SqlTest.class)
public class TestViewSupport extends TestBaseViewSupport {
@Test
public void referToSchemaInsideAndOutsideView() throws Exception {
@@ -239,6 +243,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-1015
+ @Category(UnlikelyTest.class)
public void viewWithCompoundIdentifiersInDef() throws Exception{
final String viewDef = "SELECT " +
"cast(columns[0] AS int) n_nationkey, " +
@@ -298,6 +303,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2422
+ @Category(UnlikelyTest.class)
public void createViewWhenATableWithSameNameAlreadyExists() throws Exception {
final String tableName = generateViewName();
@@ -404,6 +410,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-1114
+ @Category(UnlikelyTest.class)
public void viewResolvingTablesInWorkspaceSchema() throws Exception {
final String viewName = generateViewName();
@@ -436,6 +443,7 @@ public class TestViewSupport extends TestBaseViewSupport {
// DRILL-2341, View schema verification where view's field is not specified is already tested in
// TestViewSupport.infoSchemaWithView.
@Test
+ @Category(UnlikelyTest.class)
public void viewSchemaWhenSelectFieldsInDef_SelectFieldsInView() throws Exception {
final String viewName = generateViewName();
@@ -463,6 +471,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithDuplicateColumnsInDef1() throws Exception {
createViewErrorTestHelper(
"CREATE VIEW %s.%s AS SELECT region_id, region_id FROM cp.`region.json`",
@@ -471,6 +480,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithDuplicateColumnsInDef2() throws Exception {
createViewErrorTestHelper("CREATE VIEW %s.%s AS SELECT region_id, sales_city, sales_city FROM cp.`region.json`",
String.format("Duplicate column name [%s]", "sales_city")
@@ -478,6 +488,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithDuplicateColumnsInDef3() throws Exception {
createViewErrorTestHelper(
"CREATE VIEW %s.%s(regionid, regionid) AS SELECT region_id, sales_city FROM cp.`region.json`",
@@ -486,6 +497,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithDuplicateColumnsInDef4() throws Exception {
createViewErrorTestHelper(
"CREATE VIEW %s.%s(regionid, salescity, salescity) " +
@@ -495,6 +507,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithDuplicateColumnsInDef5() throws Exception {
createViewErrorTestHelper(
"CREATE VIEW %s.%s(regionid, salescity, SalesCity) " +
@@ -504,6 +517,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithDuplicateColumnsInDef6() throws Exception {
createViewErrorTestHelper(
"CREATE VIEW %s.%s " +
@@ -514,6 +528,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithUniqueColsInFieldListDuplicateColsInQuery1() throws Exception {
testViewHelper(
TEMP_SCHEMA,
@@ -528,6 +543,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWithUniqueColsInFieldListDuplicateColsInQuery2() throws Exception {
testViewHelper(
TEMP_SCHEMA,
@@ -543,6 +559,7 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2589
+ @Category(UnlikelyTest.class)
public void createViewWhenInEqualColumnCountInViewDefVsInViewQuery() throws Exception {
createViewErrorTestHelper(
"CREATE VIEW %s.%s(regionid, salescity) " +
@@ -566,18 +583,21 @@ public class TestViewSupport extends TestBaseViewSupport {
}
@Test // DRILL-2423
+ @Category(UnlikelyTest.class)
public void showProperMsgWhenDroppingNonExistentView() throws Exception{
errorMsgTestHelper("DROP VIEW dfs_test.tmp.nonExistentView",
"Unknown view [nonExistentView] in schema [dfs_test.tmp].");
}
@Test // DRILL-2423
+ @Category(UnlikelyTest.class)
public void showProperMsgWhenTryingToDropAViewInImmutableSchema() throws Exception{
errorMsgTestHelper("DROP VIEW cp.nonExistentView",
"Unable to create or drop tables/views. Schema [cp] is immutable.");
}
@Test // DRILL-2423
+ @Category(UnlikelyTest.class)
public void showProperMsgWhenTryingToDropANonViewTable() throws Exception{
final String testTableName = "testTableShowErrorMsg";
try {
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java
index 99b7c8f..b901120 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java
@@ -18,9 +18,12 @@
package org.apache.drill.exec.sql;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.SqlTest;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SqlTest.class)
public class TestWithClause extends BaseTestQuery {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestWithClause.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java
index 44bb8b6..4848a9d 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java
@@ -21,8 +21,10 @@ import com.google.common.collect.Lists;
import org.apache.drill.common.exceptions.UserException;
import org.apache.drill.common.util.TestTools;
import org.apache.drill.test.DrillTest;
+import org.apache.drill.categories.SlowTest;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.TestRule;
import java.io.IOException;
@@ -35,6 +37,7 @@ import static org.junit.Assert.assertThat;
/**
* Unit testing for {@link TimedRunnable}.
*/
+@Category(SlowTest.class)
public class TestTimedRunnable extends DrillTest {
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTimedRunnable.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java
index 8b4f7e7..59cb22b 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java
@@ -18,9 +18,12 @@
package org.apache.drill.exec.store.dfs;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.UnlikelyTest;
import org.apache.drill.common.util.TestTools;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(UnlikelyTest.class)
public class TestGlob extends BaseTestQuery {
String MULTILEVEL = TestTools.getWorkingPath() + "/../java-exec/src/test/resources/multilevel";
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java
index 5f5d2a3..6322224 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java
@@ -18,8 +18,11 @@
package org.apache.drill.exec.store.ischema;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.UnlikelyTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(UnlikelyTest.class)
public class Drill2283InfoSchemaVarchar1BugTest extends BaseTestQuery {
@Test
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java
index 342bea4..7f787b8 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java
@@ -18,12 +18,14 @@
package org.apache.drill.exec.store.json;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.UnlikelyTest;
import org.apache.drill.common.exceptions.UserException;
import org.apache.drill.exec.proto.UserBitShared;
import org.apache.drill.exec.ExecConstants;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.Assert;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -96,6 +98,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// DRILL-1832
public void testJsonWithNulls1() throws Exception {
final String query = "select * from cp.`jsoninput/twitter_43.json`";
@@ -104,6 +107,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// DRILL-1832
public void testJsonWithNulls2() throws Exception {
final String query = "select SUM(1) as `sum_Number_of_Records_ok` from cp.`/jsoninput/twitter_43.json` having (COUNT(1) > 0)";
@@ -167,6 +171,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// See DRILL-3476
public void testNestedFilter() throws Exception {
String query = "select a from cp.`jsoninput/nestedFilter.json` t where t.a.b = 1";
@@ -176,6 +181,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// See DRILL-4653
/* Test for CountingJSONReader */
public void testCountingQuerySkippingInvalidJSONRecords() throws Exception {
@@ -199,6 +205,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// See DRILL-4653
/* Test for CountingJSONReader */
public void testCountingQueryNotSkippingInvalidJSONRecords() throws Exception {
@@ -214,6 +221,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// See DRILL-4653
/* Test for JSONReader */
public void testNotCountingQuerySkippingInvalidJSONRecords() throws Exception {
@@ -238,6 +246,7 @@ public class TestJsonRecordReader extends BaseTestQuery {
}
@Test
+ @Category(UnlikelyTest.class)
// See DRILL-4653
/* Test for JSONReader */
public void testNotCountingQueryNotSkippingInvalidJSONRecords()
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetMetadataCache.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetMetadataCache.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetMetadataCache.java
index ca3328e..1be8352 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetMetadataCache.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetMetadataCache.java
@@ -23,6 +23,7 @@ import mockit.MockUp;
import mockit.integration.junit4.JMockit;
import com.google.common.collect.Lists;
import org.apache.drill.PlanTestBase;
+import org.apache.drill.categories.UnlikelyTest;
import org.apache.drill.common.util.TestTools;
import org.apache.commons.io.FileUtils;
import org.apache.drill.exec.store.dfs.MetadataContext;
@@ -32,6 +33,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import java.io.File;
@@ -93,6 +95,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-3917, positive test case for DRILL-4530
+ @Category(UnlikelyTest.class)
public void testPartitionPruningWithMetadataCache_2() throws Exception {
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName1));
checkForMetadataFile(tableName1);
@@ -112,6 +115,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-3937 (partitioning column is varchar)
+ @Category(UnlikelyTest.class)
public void testPartitionPruningWithMetadataCache_3() throws Exception {
String tableName = "orders_ctas_varchar";
test("use dfs_test.tmp");
@@ -133,6 +137,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-3937 (partitioning column is binary using convert_to)
+ @Category(UnlikelyTest.class)
public void testPartitionPruningWithMetadataCache_4() throws Exception {
String tableName = "orders_ctas_binary";
test("use dfs_test.tmp");
@@ -225,6 +230,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test //DRILL-4511
+ @Category(UnlikelyTest.class)
public void testTableDoesNotExistWithEmptyDirectory() throws Exception {
File path = new File(getTempDir("empty_directory"));
String pathString = path.toURI().getPath();
@@ -242,6 +248,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test //DRILL-4511
+ @Category(UnlikelyTest.class)
public void testTableDoesNotExistWithIncorrectTableName() throws Exception {
String tableName = "incorrect_table";
testBuilder()
@@ -264,6 +271,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4530 // single leaf level partition
+ @Category(UnlikelyTest.class)
public void testDrill4530_1() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -286,6 +294,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4530 // single non-leaf level partition
+ @Category(UnlikelyTest.class)
public void testDrill4530_2() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -308,6 +317,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4530 // only dir1 filter is present, no dir0, hence this maps to multiple partitions
+ @Category(UnlikelyTest.class)
public void testDrill4530_3() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -330,6 +340,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4530 // non-existent partition (1 subdirectory's cache file will still be read for schema)
+ @Category(UnlikelyTest.class)
public void testDrill4530_4() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -352,6 +363,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4794
+ @Category(UnlikelyTest.class)
public void testDrill4794() throws Exception {
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName1));
checkForMetadataFile(tableName1);
@@ -372,6 +384,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4786
+ @Category(UnlikelyTest.class)
public void testDrill4786_1() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -396,6 +409,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4786
+ @Category(UnlikelyTest.class)
public void testDrill4786_2() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -420,6 +434,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4877
+ @Category(UnlikelyTest.class)
public void testDrill4877() throws Exception {
// create metadata cache
test(String.format("refresh table metadata dfs_test.`%s/%s`", getDfsTestTmpSchemaLocation(), tableName2));
@@ -692,6 +707,7 @@ public class TestParquetMetadataCache extends PlanTestBase {
}
@Test // DRILL-4264
+ @Category(UnlikelyTest.class)
public void testMetadataCacheFieldWithDots() throws Exception {
final String tableWithDots = "dfs_test.tmp.`complex_table`";
try {
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java
index 632ffeb..dff1504 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java
@@ -18,9 +18,11 @@
package org.apache.drill.exec.store.sys;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.UnlikelyTest;
import org.apache.drill.exec.ExecConstants;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
public class TestSystemTable extends BaseTestQuery {
// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSystemTable.class);
@@ -53,6 +55,7 @@ public class TestSystemTable extends BaseTestQuery {
// DRILL-2670
@Test
+ @Category(UnlikelyTest.class)
public void optionsOrderBy() throws Exception {
test("select * from sys.options order by name");
}
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java
index d7fb963..bfc3cc2 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java
@@ -22,11 +22,13 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.UnlikelyTest;
import org.apache.drill.common.exceptions.UserRemoteException;
import org.apache.drill.common.util.FileUtils;
import org.apache.drill.exec.proto.UserBitShared.DrillPBError.ErrorType;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
public class TestNewTextReader extends BaseTestQuery {
@@ -65,6 +67,7 @@ public class TestNewTextReader extends BaseTestQuery {
}
@Test // see DRILL-3718
+ @Category(UnlikelyTest.class)
public void testTabSeparatedWithQuote() throws Exception {
final String root = FileUtils.getResourceAsFile("/store/text/WithQuote.tsv").toURI().toString();
final String query = String.format("select columns[0] as c0, columns[1] as c1, columns[2] as c2 \n" +
@@ -82,6 +85,7 @@ public class TestNewTextReader extends BaseTestQuery {
}
@Test // see DRILL-3718
+ @Category(UnlikelyTest.class)
public void testSpaceSeparatedWithQuote() throws Exception {
final String root = FileUtils.getResourceAsFile("/store/text/WithQuote.ssv").toURI().toString();
final String query = String.format("select columns[0] as c0, columns[1] as c1, columns[2] as c2 \n" +
@@ -99,6 +103,7 @@ public class TestNewTextReader extends BaseTestQuery {
}
@Test // see DRILL-3718
+ @Category(UnlikelyTest.class)
public void testPipSeparatedWithQuote() throws Exception {
final String root = FileUtils.getResourceAsFile("/store/text/WithQuote.tbl").toURI().toString();
final String query = String.format("select columns[0] as c0, columns[1] as c1, columns[2] as c2 \n" +
@@ -116,6 +121,7 @@ public class TestNewTextReader extends BaseTestQuery {
}
@Test // see DRILL-3718
+ @Category(UnlikelyTest.class)
public void testCrLfSeparatedWithQuote() throws Exception {
final String root = FileUtils.getResourceAsFile("/store/text/WithQuotedCrLf.tbl").toURI().toString();
final String query = String.format("select columns[0] as c0, columns[1] as c1, columns[2] as c2 \n" +
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
index 423ac01..14f10fa 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
@@ -17,10 +17,12 @@
*/
package org.apache.drill.exec.vector.accessor;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.exec.proto.UserBitShared;
import org.apache.drill.exec.vector.ValueVector;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -32,6 +34,7 @@ import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@Category(VectorTest.class)
public class GenericAccessorTest {
public static final Object NON_NULL_VALUE = "Non-null value";
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java
index 596bf77..4eabfe3 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.drill.BaseTestQuery;
+import org.apache.drill.categories.OptionsTest;
import org.apache.drill.exec.proto.UserProtos.CatalogMetadata;
import org.apache.drill.exec.proto.UserProtos.ColumnMetadata;
import org.apache.drill.exec.proto.UserProtos.GetCatalogsResp;
@@ -40,10 +41,12 @@ import org.apache.drill.exec.proto.UserProtos.SchemaMetadata;
import org.apache.drill.exec.proto.UserProtos.TableMetadata;
import org.apache.drill.exec.store.sys.SystemTable;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for metadata provider APIs.
*/
+@Category(OptionsTest.class)
public class TestMetadataProvider extends BaseTestQuery {
@Test
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/test/TestConfigLinkage.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/TestConfigLinkage.java b/exec/java-exec/src/test/java/org/apache/drill/test/TestConfigLinkage.java
index e23010c..19b8ed5 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/test/TestConfigLinkage.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/test/TestConfigLinkage.java
@@ -18,6 +18,7 @@
package org.apache.drill.test;
+import org.apache.drill.categories.OptionsTest;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.exec.server.options.OptionDefinition;
import org.apache.drill.exec.server.options.OptionMetaData;
@@ -27,6 +28,8 @@ import org.apache.drill.exec.server.options.TypeValidators;
import org.apache.drill.exec.store.sys.SystemTable;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import static org.junit.Assert.assertEquals;
/*
* Tests to test if the linkage between the two config option systems
@@ -37,6 +40,7 @@ import static org.junit.Assert.assertEquals;
* i.e., if the value is not set in system/session.
* */
+@Category(OptionsTest.class)
public class TestConfigLinkage {
public static final String MOCK_PROPERTY = "mock.prop";
@@ -49,7 +53,7 @@ public class TestConfigLinkage {
OptionDefinition optionDefinition = createMockPropOptionDefinition();
FixtureBuilder builder = ClusterFixture.builder().
- configProperty(OptionValidator.OPTION_DEFAULTS_ROOT + MOCK_PROPERTY, "a").
+ configProperty(ExecConstants.bootDefaultFor(MOCK_PROPERTY), "a").
putDefinition(optionDefinition);
try (ClusterFixture cluster = builder.build();
@@ -70,7 +74,7 @@ public class TestConfigLinkage {
FixtureBuilder builder = ClusterFixture.builder().
putDefinition(optionDefinition).
- configProperty(OptionValidator.OPTION_DEFAULTS_ROOT + MOCK_PROPERTY, "a");
+ configProperty(ExecConstants.bootDefaultFor(MOCK_PROPERTY), "a");
try (ClusterFixture cluster = builder.build();
ClientFixture client = cluster.clientFixture()) {
@@ -115,7 +119,7 @@ public class TestConfigLinkage {
FixtureBuilder builder = ClusterFixture.builder().
putDefinition(optionDefinition).
- configProperty(OptionValidator.OPTION_DEFAULTS_ROOT + MOCK_PROPERTY, "a").
+ configProperty(ExecConstants.bootDefaultFor(MOCK_PROPERTY), "a").
systemOption(MOCK_PROPERTY, "blah");
try (ClusterFixture cluster = builder.build();
@@ -293,7 +297,7 @@ public class TestConfigLinkage {
OptionDefinition optionDefinition = createMockPropOptionDefinition();
FixtureBuilder builder = ClusterFixture.builder().
- configProperty(OptionValidator.OPTION_DEFAULTS_ROOT + MOCK_PROPERTY, "a").
+ configProperty(ExecConstants.bootDefaultFor(MOCK_PROPERTY), "a").
putDefinition(optionDefinition);
try (ClusterFixture cluster = builder.build();
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java b/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java
index 266bff2..4da526e 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java
@@ -21,6 +21,7 @@ package org.apache.drill.vector;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.types.TypeProtos.DataMode;
import org.apache.drill.common.types.TypeProtos.MajorType;
import org.apache.drill.common.types.TypeProtos.MinorType;
@@ -39,7 +40,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import io.netty.buffer.DrillBuf;
+import org.junit.experimental.categories.Category;
+@Category(VectorTest.class)
public class TestFillEmpties extends DrillTest {
public static OperatorFixture fixture;
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/vector/TestVectorLimits.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/vector/TestVectorLimits.java b/exec/java-exec/src/test/java/org/apache/drill/vector/TestVectorLimits.java
index 86bd206..84961b1 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/vector/TestVectorLimits.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/vector/TestVectorLimits.java
@@ -19,6 +19,7 @@ package org.apache.drill.vector;
import static org.junit.Assert.*;
+import org.apache.drill.categories.VectorTest;
import org.apache.drill.common.types.TypeProtos.DataMode;
import org.apache.drill.common.types.TypeProtos.MajorType;
import org.apache.drill.common.types.TypeProtos.MinorType;
@@ -38,6 +39,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import io.netty.buffer.DrillBuf;
+import org.junit.experimental.categories.Category;
/**
* Test the setScalar() methods in the various generated vector
@@ -45,6 +47,7 @@ import io.netty.buffer.DrillBuf;
* rely on the fact that code is generated from a common template.
*/
+@Category(VectorTest.class)
public class TestVectorLimits extends DrillTest {
public static OperatorFixture fixture;
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
index ffea135..d11af95 100644
--- a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
+++ b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
@@ -44,6 +44,7 @@ public class ITTestShadedJar {
private static DrillbitClassLoader drillbitLoader;
private static URLClassLoader rootClassLoader;
+ private static int userPort;
private static URL getJdbcUrl() throws MalformedURLException {
return new URL(
@@ -85,7 +86,7 @@ public class ITTestShadedJar {
Class<?> clazz = loader.loadClass("org.apache.drill.jdbc.Driver");
try {
Driver driver = (Driver) clazz.newInstance();
- try (Connection c = driver.connect("jdbc:drill:drillbit=localhost:31010", null)) {
+ try (Connection c = driver.connect("jdbc:drill:drillbit=localhost:" + userPort, null)) {
DatabaseMetaData metadata = c.getMetaData();
assertEquals("Apache Drill JDBC Driver", metadata.getDriverName());
assertEquals("Apache Drill Server", metadata.getDatabaseProductName());
@@ -112,7 +113,7 @@ public class ITTestShadedJar {
Class<?> clazz = loader.loadClass("org.apache.drill.jdbc.Driver");
try {
Driver driver = (Driver) clazz.newInstance();
- try (Connection c = driver.connect("jdbc:drill:drillbit=localhost:31010", null)) {
+ try (Connection c = driver.connect("jdbc:drill:drillbit=localhost:" + userPort, null)) {
String path = Paths.get("").toAbsolutePath().toString() + "/src/test/resources/types.json";
printQuery(c, "select * from dfs.`" + path + "`");
}
@@ -135,8 +136,6 @@ public class ITTestShadedJar {
}
}
-
-
@BeforeClass
public static void setupDefaultTestCluster() throws Exception {
drillbitLoader = new DrillbitClassLoader();
@@ -148,6 +147,9 @@ public class ITTestShadedJar {
throw e;
}
+ Class<?> clazz = drillbitLoader.loadClass("org.apache.drill.BaseTestQuery");
+ userPort = (Integer) clazz.getMethod("getUserPort").invoke(null);
+
DrillbitStartThread.SEM.acquire();
}
@@ -235,6 +237,7 @@ public class ITTestShadedJar {
// execute a single query to make sure the drillbit is fully up
clazz.getMethod("testNoResult", String.class, new Object[] {}.getClass())
.invoke(null, "select * from (VALUES 1)", new Object[] {});
+
SEM.release();
}
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
index ac6d309..c24c2b8 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
@@ -18,7 +18,10 @@
package org.apache.drill.jdbc;
import org.apache.calcite.avatica.util.Quoting;
+import org.apache.drill.categories.JdbcTest;
+import org.apache.drill.categories.SlowTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -31,6 +34,7 @@ import static org.junit.Assert.assertThat;
/**
* Test for Drill's Properties in the JDBC URL connection string
*/
+@Category({SlowTest.class, JdbcTest.class})
public class ConnectionInfoTest extends JdbcTestBase {
private static Connection connection;
private static DatabaseMetaData dbmd;
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
index 09b75a6..c12bf7f 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
@@ -17,16 +17,18 @@
*/
package org.apache.drill.jdbc;
-
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import org.apache.drill.categories.JdbcTest;
+import org.apache.drill.exec.ExecConstants;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -35,15 +37,16 @@ import java.sql.ResultSet;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-
/**
* Test for Drill's implementation of Connection's methods (other than
* main transaction-related methods in {@link ConnectionTransactionMethodsTest}).
* TODO: When here will be more tests, they should be sorted according to the {@link Connection} methods order
*/
+@Category(JdbcTest.class)
public class ConnectionTest extends JdbcTestBase {
private static Connection connection;
@@ -57,7 +60,9 @@ public class ConnectionTest extends JdbcTestBase {
// Connection--and other JDBC objects--on test method failure, but this test
// class uses some objects across methods.)
Driver.load();
- connection = DriverManager.getConnection( "jdbc:drill:zk=local" );
+ Properties properties = new Properties();
+ properties.setProperty(ExecConstants.bootDefaultFor(ExecConstants.CREATE_PREPARE_STATEMENT_TIMEOUT_MILLIS), "30000");
+ connection = DriverManager.getConnection( "jdbc:drill:zk=local", properties);
executor = Executors.newSingleThreadExecutor();
}
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
index f79d447..d64af92 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
@@ -19,10 +19,11 @@ package org.apache.drill.jdbc;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.*;
-import org.apache.drill.jdbc.Driver;
+import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static java.sql.Connection.*;
import java.sql.Connection;
@@ -30,11 +31,11 @@ import java.sql.SQLFeatureNotSupportedException;
import java.sql.Savepoint;
import java.sql.SQLException;
-
/**
* Test for Drill's implementation of Connection's main transaction-related
* methods.
*/
+@Category(JdbcTest.class)
public class ConnectionTransactionMethodsTest {
private static Connection connection;
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
index 359b0bc..894abd9 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
@@ -36,10 +36,12 @@ import java.sql.Statement;
import java.sql.Types;
import org.apache.drill.jdbc.test.JdbcAssert;
+import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
// NOTE: TestInformationSchemaColumns and DatabaseMetaDataGetColumnsTest
// have identical sections. (Cross-maintain them for now; factor out later.)
@@ -81,6 +83,7 @@ import org.junit.Test;
* Based on JDBC 4.1 (Java 7).
* </p>
*/
+@Category(JdbcTest.class)
public class DatabaseMetaDataGetColumnsTest extends JdbcTestBase {
private static final String VIEW_SCHEMA = "dfs_test.tmp";
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
index ec04ab1..cd9803b 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
@@ -33,15 +33,18 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test for Drill's implementation of DatabaseMetaData's methods (other than
* those tested separately, e.g., {@code getColumn(...)}, tested in
* {@link DatabaseMetaDataGetColumnsTest})).
*/
+@Category(JdbcTest.class)
public class DatabaseMetaDataTest {
protected static Connection connection;
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillColumnMetaDataListTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillColumnMetaDataListTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillColumnMetaDataListTest.java
index be21d3b..f4e0363 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillColumnMetaDataListTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillColumnMetaDataListTest.java
@@ -36,13 +36,16 @@ import org.apache.drill.common.types.TypeProtos.MinorType;
import org.apache.drill.exec.record.BatchSchema;
import org.apache.drill.exec.record.MaterializedField;
import org.apache.drill.jdbc.impl.DrillColumnMetaDataList;
+import org.apache.drill.categories.JdbcTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+@Category(JdbcTest.class)
public class DrillColumnMetaDataListTest {
private DrillColumnMetaDataList emptyList;
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
index a417140..a522954 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
@@ -29,14 +29,17 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import org.apache.drill.categories.SlowTest;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.jdbc.test.JdbcAssert;
import org.apache.drill.test.DrillTest;
+import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category({SlowTest.class, JdbcTest.class})
public class DrillResultSetTest extends DrillTest {
// TODO: Move Jetty status server disabling to DrillTest.
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
index efd0f6a..36cb4fa 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
@@ -19,7 +19,6 @@ package org.apache.drill.jdbc;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
-//import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
@@ -33,16 +32,19 @@ import java.util.Properties;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.test.DrillTest;
+import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import com.google.common.io.Resources;
+import org.junit.experimental.categories.Category;
/**
* (Some) unit and integration tests for org.apache.drill.jdbc.Driver.
*/
+@Category(JdbcTest.class)
public class DriverTest extends DrillTest {
// TODO: Move Jetty status server disabling to DrillTest.
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java
index 52777c1..8763161 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java
@@ -30,11 +30,13 @@ import com.google.common.base.Strings;
import org.apache.drill.exec.ExecTest;
import org.apache.drill.jdbc.test.JdbcAssert;
+import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
@@ -42,6 +44,7 @@ import org.junit.runner.Description;
// TODO: Document this, especially what writers of unit tests need to know
// (e.g., the reusing of connections, the automatic interception of test
// failures and resetting of connections, etc.).
+@Category(JdbcTest.class)
public class JdbcTestBase extends ExecTest {
@SuppressWarnings("unused")
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JdbcTestBase.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
index fbd9379..993c3e3 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
@@ -25,12 +25,15 @@ import java.sql.Types;
import java.util.Properties;
import org.apache.drill.jdbc.test.JdbcAssert;
+import org.apache.drill.categories.JdbcTest;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test compatibility with older versions of the server
*/
+@Category(JdbcTest.class)
public class LegacyDatabaseMetaDataGetColumnsTest extends DatabaseMetaDataGetColumnsTest {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataTest.java
index ba5b700..31b9671 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataTest.java
@@ -20,11 +20,14 @@ package org.apache.drill.jdbc;
import java.sql.SQLException;
import java.util.Properties;
+import org.apache.drill.categories.JdbcTest;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
/**
* Test compatibility with older versions of the server
*/
+@Category(JdbcTest.class)
public class LegacyDatabaseMetaDataTest extends DatabaseMetaDataTest {
@BeforeClass
public static void setUpConnection() throws SQLException {
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
index b482835..193d2bc 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
@@ -35,14 +35,17 @@ import java.sql.Statement;
import java.util.Properties;
import org.apache.drill.exec.planner.physical.PlannerSettings;
+import org.apache.drill.categories.JdbcTest;
import org.hamcrest.Matcher;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test that prepared statements works even if not supported on server, to some extent.
*/
+@Category(JdbcTest.class)
public class LegacyPreparedStatementTest extends JdbcTestBase {
/** Fuzzy matcher for parameters-not-supported message assertions. (Based on
* current "Prepared-statement dynamic parameters are not supported.") */