Repository: phoenix Updated Branches: refs/heads/4.0 0fdf78e7c -> 850272502
http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java new file mode 100644 index 0000000..a117c51 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java @@ -0,0 +1,124 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable + * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" + * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License + * for the specific language governing permissions and limitations under the License. + */ +package org.apache.phoenix.end2end; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileFilter; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.apache.phoenix.query.QueryServices; +import org.junit.Before; +import org.junit.Test; + + + +public class SpooledTmpFileDeleteIT extends BaseHBaseManagedTimeIT { + private Connection conn = null; + private Properties props = null; + + @Before + public void setup() throws SQLException { + props = new Properties(); + props.put(QueryServices.SPOOL_DIRECTORY, "/tmp"); + props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1)); + conn = DriverManager.getConnection(getUrl(), props); + Statement stmt = conn.createStatement(); + stmt.execute("CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')"); + stmt.execute("UPSERT INTO test VALUES ('AA')"); + stmt.execute("UPSERT INTO test VALUES ('EB')"); + stmt.execute("UPSERT INTO test VALUES ('FA')"); + stmt.close(); + conn.commit(); + } + + @Test + public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable { + File dir = new File("/tmp"); + File[] files = null; + + class FilenameFilter implements FileFilter { + @Override + public boolean accept(File dir) { + return dir.getName().toLowerCase().endsWith(".bin") && + dir.getName().startsWith("ResultSpooler"); + } + } + + FilenameFilter fnameFilter = new FilenameFilter(); + + // clean up first + files = dir.listFiles(fnameFilter); + for (File file : files) { + file.delete(); + } + + String query = "select * from TEST"; + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + assertTrue(rs.next()); + files = dir.listFiles(fnameFilter); + assertTrue(files.length > 0); + List<String> fileNames = new ArrayList<String>(); + for (File file : files) { + fileNames.add(file.getName()); + } + + String preparedQuery = "select * from test where id = ?"; + PreparedStatement pstmt = conn.prepareStatement(preparedQuery); + pstmt.setString(1, "EB"); + ResultSet prs = pstmt.executeQuery(preparedQuery); + assertTrue(prs.next()); + files = dir.listFiles(fnameFilter); + assertTrue(files.length > 0); + for (File file : files) { + fileNames.add(file.getName()); + } + + Connection conn2 = DriverManager.getConnection(getUrl(), props); + String query2 = "select * from TEST"; + Statement statement2 = conn2.createStatement(); + ResultSet rs2 = statement2.executeQuery(query2); + assertTrue(rs2.next()); + files = dir.listFiles(fnameFilter); + assertTrue(files.length > 0); + + String preparedQuery2 = "select * from test where id = ?"; + PreparedStatement pstmt2 = conn2.prepareStatement(preparedQuery2); + pstmt2.setString(1, "EB"); + ResultSet prs2 = pstmt2.executeQuery(preparedQuery2); + assertTrue(prs2.next()); + files = dir.listFiles(fnameFilter); + assertTrue(files.length > 0); + + conn.close(); + + files = dir.listFiles(fnameFilter); + + for (File file : files) { + assertFalse(fileNames.contains(file.getName())); + } + conn2.close(); + files = dir.listFiles(fnameFilter); + assertTrue(files.length == 0); + } + +} http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java index 9c9f2c6..70246f9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java @@ -30,14 +30,13 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * End-to-End tests on various statement hints. */ -@Category(HBaseManagedTimeTest.class) + public class StatementHintsIT extends BaseHBaseManagedTimeIT { private static void initTableValues() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java index cc16911..ca8ab81 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java @@ -49,11 +49,10 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { private static final String STATS_TEST_TABLE_NAME = "S"; private static final byte[] STATS_TEST_TABLE_BYTES = Bytes.toBytes(STATS_TEST_TABLE_NAME); http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java index f3fef4b..c00b770 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java @@ -29,8 +29,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class StddevIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java index 4f3ca16..0e5dcc0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java @@ -57,14 +57,13 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + @RunWith(Parameterized.class) public class SubqueryIT extends BaseHBaseManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java index 42fe5b8..4d0b45d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java @@ -56,9 +56,8 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java index 248de0f..dbe767b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java @@ -37,9 +37,8 @@ import org.apache.phoenix.schema.TableNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java index 094222b..83f2e4d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java @@ -32,9 +32,8 @@ import org.apache.phoenix.schema.ColumnNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java index da500fe..ca61b77 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java @@ -22,9 +22,7 @@ package org.apache.phoenix.end2end; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) public class TenantSpecificViewIndexSaltedIT extends BaseTenantSpecificViewIndexIT { private static final Integer SALT_BUCKETS = 3; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java index e3c4776..54bbe9c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java @@ -17,17 +17,18 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; + import org.apache.phoenix.schema.IllegalDataException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class TimezoneOffsetFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java index 1fa88f5..52b5207 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java @@ -41,7 +41,6 @@ import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for the TO_CHAR built-in function. @@ -50,7 +49,7 @@ import org.junit.experimental.categories.Category; * * @since 0.1 */ -@Category(ClientManagedTimeTest.class) + public class ToCharFunctionIT extends BaseClientManagedTimeIT { public static final String TO_CHAR_TABLE_NAME = "TO_CHAR_TABLE"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java index 431cbda..daf2c63 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java @@ -41,7 +41,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for the TO_NUMBER built-in function. @@ -50,7 +49,7 @@ import org.junit.experimental.categories.Category; * * @since 0.1 */ -@Category(ClientManagedTimeTest.class) + public class ToNumberFunctionIT extends BaseClientManagedTimeIT { // This test changes to locale to en_US, and saves the previous locale here http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java index 8d3a706..618680d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java @@ -40,9 +40,8 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class TopNIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java index bed5146..4cd263e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java @@ -39,9 +39,8 @@ import java.util.Properties; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.util.DateUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class TruncateFunctionIT extends BaseClientManagedTimeIT { private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_MS_DATE_FORMAT); private static final String DS1 = "1970-01-10 00:58:01.587"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java index e1ce962..3d1bb4a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java @@ -28,9 +28,8 @@ import java.sql.ResultSet; import java.util.Properties; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class UpsertBigValuesIT extends BaseHBaseManagedTimeIT { private static final long INTEGER_MIN_MINUS_ONE = (long)Integer.MIN_VALUE - 1; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java index e39619c..4b4f215 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java @@ -35,9 +35,8 @@ import java.util.Properties; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class UpsertSelectAutoCommitIT extends BaseHBaseManagedTimeIT { public UpsertSelectAutoCommitIT() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java index ac54fe4..c1a960f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java @@ -53,9 +53,8 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class UpsertSelectIT extends BaseClientManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java index 043bba9..6389088 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java @@ -43,9 +43,8 @@ import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class UpsertValuesIT extends BaseClientManagedTimeIT { @Test public void testGroupByWithLimitOverRowKey() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java index 6800379..07d6b32 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java @@ -47,10 +47,9 @@ import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class VariableLengthPKIT extends BaseClientManagedTimeIT { private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT); private static final String DS1 = "1970-01-01 00:58:00"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java index 63beeed..bc6f20d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java @@ -35,9 +35,8 @@ import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.schema.ReadOnlyTableException; import org.apache.phoenix.schema.TableNotFoundException; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class ViewIT extends BaseViewIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java index 88c88bd..d77ee2a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java @@ -18,11 +18,9 @@ package org.apache.phoenix.end2end.index; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.SchemaUtil; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class BaseIndexIT extends BaseHBaseManagedTimeIT { public static final String SCHEMA_NAME = ""; public static final String DATA_TABLE_NAME = "T"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java index f2a3578..279baa1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java @@ -27,12 +27,10 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Properties; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.TestUtil; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class BaseMutableIndexIT extends BaseIndexIT { public BaseMutableIndexIT() { } http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java index 811aee8..3be3bcf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java @@ -34,7 +34,6 @@ import java.sql.SQLException; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryConstants; @@ -42,9 +41,8 @@ import org.apache.phoenix.schema.PTableKey; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ImmutableIndexIT extends BaseHBaseManagedTimeIT { // Populate the test table with data. private static void populateTestTable() throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java index fb4b827..26878f8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java @@ -37,7 +37,6 @@ import java.util.Properties; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryConstants; @@ -51,9 +50,8 @@ import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class IndexMetadataIT extends BaseHBaseManagedTimeIT { private enum Order {ASC, DESC}; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java index f03d053..b1f4a3c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java @@ -58,9 +58,9 @@ import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixPreparedStatement; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.PTable.IndexType; -import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTableKey; import org.apache.phoenix.schema.PTableType; import org.apache.phoenix.schema.TableNotFoundException; @@ -156,9 +156,11 @@ public class LocalIndexIT extends BaseIndexIT { HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin(); HTableDescriptor htd = admin.getTableDescriptor(TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME))); assertEquals(IndexRegionSplitPolicy.class.getName(), htd.getValue(HTableDescriptor.SPLIT_POLICY)); - HTable userTable = new HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME)); - HTable indexTable = new HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME))); - assertArrayEquals("Both user table and index table should have same split keys.", userTable.getStartKeys(), indexTable.getStartKeys()); + try (HTable userTable = new HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME))) { + try (HTable indexTable = new HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)))) { + assertArrayEquals("Both user table and index table should have same split keys.", userTable.getStartKeys(), indexTable.getStartKeys()); + } + } } @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java index acece20..d11c059 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java @@ -82,6 +82,7 @@ import org.junit.experimental.categories.Category; * * @since 2.1 */ + @Category(NeedsOwnMiniClusterTest.class) public class MutableIndexFailureIT extends BaseTest { private static final int NUM_SLAVES = 4; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java index b4cbf9b..d3d8322 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java @@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.FromCompiler; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.parse.NamedTableNode; @@ -51,12 +50,11 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; import com.google.common.primitives.Doubles; -@Category(HBaseManagedTimeTest.class) + public class MutableIndexIT extends BaseMutableIndexIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java index 15465d1..a4f4682 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java @@ -72,6 +72,7 @@ import com.google.common.collect.Maps; * HBase 0.98.5 * </p> */ + @Category(NeedsOwnMiniClusterTest.class) public class MutableIndexReplicationIT extends BaseTest { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java index 0279283..112e4d3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; @@ -40,11 +39,10 @@ import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + public class SaltedIndexIT extends BaseIndexIT { private static final int TABLE_SPLITS = 3; private static final int INDEX_SPLITS = 4; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java index d4ceff4..da6eb16 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.MetaDataUtil; @@ -35,11 +34,10 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + public class ViewIndexIT extends BaseIndexIT { private String VIEW_NAME = "MY_VIEW"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java index a1cf5d1..06e63b2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java @@ -32,18 +32,16 @@ import java.sql.SQLException; import java.util.Properties; import org.apache.phoenix.end2end.BaseClientManagedTimeIT; -import org.apache.phoenix.end2end.ClientManagedTimeTest; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for table with transparent salting. */ -@Category(ClientManagedTimeTest.class) + public class SaltedTableIT extends BaseClientManagedTimeIT { private static void initTableValues(byte[][] splits, long ts) throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java index 8015cbc..0a11ec7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java @@ -32,12 +32,10 @@ import java.sql.SQLException; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class SaltedTableUpsertSelectIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java index db517a6..53b267c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java @@ -30,12 +30,10 @@ import java.sql.ResultSet; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class SaltedTableVarLengthRowKeyIT extends BaseHBaseManagedTimeIT { private static void initTableValues() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java index 2a322fe..1cf6b5c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java @@ -858,6 +858,7 @@ private HTable createSetupTables(ColumnGroup... groups) throws IOException { // setup the primary table String indexedTableName = Bytes.toString(TestTable.getTableName()); + @SuppressWarnings("deprecation") HTableDescriptor pTable = new HTableDescriptor(indexedTableName); pTable.addFamily(new HColumnDescriptor(FAM)); pTable.addFamily(new HColumnDescriptor(FAM2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java index 38aeb88..016c59e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java @@ -23,17 +23,15 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec; import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec; -import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.IndexTestingUtils; import org.apache.phoenix.hbase.index.Indexer; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; /** * Test secondary indexing from an end-to-end perspective (client to server to index table). */ -@Category(NeedsOwnMiniClusterTest.class) + public class EndtoEndIndexingWithCompressionIT extends EndToEndCoveredIndexingIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java index 99c8bc3..96e1646 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java @@ -37,7 +37,6 @@ import org.apache.hadoop.metrics2.impl.ExposedMetricCounterLong; import org.apache.hadoop.metrics2.impl.ExposedMetricsRecordImpl; import org.apache.hadoop.metrics2.lib.ExposedMetricsInfoImpl; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.metrics.MetricInfo; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.TableNotFoundException; @@ -46,13 +45,12 @@ import org.apache.phoenix.trace.util.Tracing.Frequency; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Before; -import org.junit.experimental.categories.Category; /** * Base test for tracing tests - helps manage getting tracing/non-tracing * connections, as well as any supporting utils. */ -@Category(HBaseManagedTimeTest.class) + public class BaseTracingTestIT extends BaseHBaseManagedTimeIT { @Before public void resetTracingTableIfExists() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java index d75e281..1308c13 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java @@ -17,32 +17,35 @@ */ package org.apache.phoenix.trace; +import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsTag; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.metrics.MetricInfo; import org.apache.phoenix.trace.TraceReader.SpanInfo; import org.apache.phoenix.trace.TraceReader.TraceHolder; import org.cloudera.htrace.Span; import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.util.*; - -import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; /** * Test that the {@link TraceReader} will correctly read traces written by the * {@link org.apache.phoenix.trace.PhoenixMetricsSink} */ -@Category(HBaseManagedTimeTest.class) + public class PhoenixTraceReaderIT extends BaseTracingTestIT { private static final Log LOG = LogFactory.getLog(PhoenixTraceReaderIT.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java index f4cf0d1..201de38 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java @@ -17,38 +17,41 @@ */ package org.apache.phoenix.trace; -import com.google.common.collect.ImmutableMap; +import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collection; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.metrics2.MetricsSource; import org.apache.phoenix.coprocessor.BaseScannerRegionObserver; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.metrics.Metrics; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.trace.TraceReader.SpanInfo; import org.apache.phoenix.trace.TraceReader.TraceHolder; -import org.cloudera.htrace.*; +import org.cloudera.htrace.Sampler; +import org.cloudera.htrace.Span; +import org.cloudera.htrace.SpanReceiver; +import org.cloudera.htrace.Trace; +import org.cloudera.htrace.TraceScope; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collection; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.google.common.collect.ImmutableMap; /** * Test that the logging sink stores the expected metrics/stats */ -@Category(HBaseManagedTimeTest.class) + public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { private static final Log LOG = LogFactory.getLog(PhoenixTracingEndToEndIT.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java index 3c8a6df..375b754 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java @@ -56,7 +56,6 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; -import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.IndexTestingUtils; import org.apache.phoenix.hbase.index.Indexer; import org.apache.phoenix.hbase.index.TableName; @@ -72,7 +71,6 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Multimap; @@ -81,7 +79,7 @@ import com.google.common.collect.Multimap; * region was present on the same server, we have to make a best effort to not kill the server for * not succeeding on index writes while the index region is coming up. */ -@Category(NeedsOwnMiniClusterTest.class) + public class TestWALRecoveryCaching { private static final Log LOG = LogFactory.getLog(TestWALRecoveryCaching.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java index 5cb34b8..4622959 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java @@ -17,6 +17,8 @@ */ package org.apache.phoenix.trace; +import static org.junit.Assert.assertTrue; + import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsRecordBuilder; @@ -28,9 +30,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - /** * Test that the @{link TraceMetricSource} correctly handles different kinds of traces */ http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java index 48929ed..182eb56 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.sql.Connection; import java.sql.Types; import java.util.Properties; @@ -31,8 +30,6 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; -import javax.management.Query; - public class QueryUtilTest { private static final ColumnInfo ID_COLUMN = new ColumnInfo("ID", Types.BIGINT); http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java ---------------------------------------------------------------------- diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java index a4b3655..7d4f7af 100644 --- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java +++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java @@ -30,15 +30,13 @@ import org.apache.flume.lifecycle.LifecycleState; import org.apache.flume.sink.DefaultSinkFactory; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.flume.serializer.EventSerializers; import org.apache.phoenix.flume.sink.PhoenixSink; import org.apache.phoenix.util.TestUtil; import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class PhoenixSinkIT extends BaseHBaseManagedTimeIT { private Context sinkContext; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java ---------------------------------------------------------------------- diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java index f86f039..0952747 100644 --- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java +++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java @@ -41,18 +41,16 @@ import org.apache.flume.event.EventBuilder; import org.apache.flume.lifecycle.LifecycleState; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.flume.serializer.EventSerializers; import org.apache.phoenix.flume.sink.PhoenixSink; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT { private Context sinkContext; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java index e0021d9..67abf62 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java @@ -21,9 +21,9 @@ package org.apache.phoenix.pig; import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR; import static org.apache.phoenix.util.TestUtil.LOCALHOST; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertArrayEquals; import java.sql.Connection; import java.sql.DriverManager; @@ -33,7 +33,6 @@ import java.util.Collection; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.pig.ExecType; import org.apache.pig.PigServer; import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS; @@ -48,11 +47,10 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(HBaseManagedTimeTest.class) + public class PhoenixHBaseStorerIT extends BaseHBaseManagedTimeIT { private static TupleFactory tupleFactory; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java index a6f6efd..efbfbf8 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java @@ -30,14 +30,12 @@ import java.util.Properties; import org.apache.hadoop.conf.Configuration; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class PhoenixPigConfigurationIT extends BaseHBaseManagedTimeIT { private static final String zkQuorum = TestUtil.LOCALHOST + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM; http://git-wip-us.apache.org/repos/asf/phoenix/blob/85027250/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 36ece49..b5e9ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -106,16 +106,16 @@ <!-- Test Dependencies --> <mockito-all.version>1.8.5</mockito-all.version> - <junit.version>4.11</junit.version> + <junit.version>4.12-beta-3</junit.version> <!-- Plugin versions --> - <maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version> - <maven-build-helper-plugin.version>1.7</maven-build-helper-plugin.version> - <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version> + <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> + <maven-build-helper-plugin.version>1.9.1</maven-build-helper-plugin.version> + <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version> <maven-dependency-plugin.version>2.1</maven-dependency-plugin.version> - <maven.assembly.version>2.4</maven.assembly.version> + <maven.assembly.version>2.5.2</maven.assembly.version> <maven.rat.version>0.8</maven.rat.version> <!-- Plugin options -->
