Repository: phoenix Updated Branches: refs/heads/master bff5ddae1 -> 039817861
http://git-wip-us.apache.org/repos/asf/phoenix/blob/03981786/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java index be85635..a4901cf 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java @@ -17,10 +17,6 @@ */ package org.apache.phoenix.schema; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - import org.apache.phoenix.util.SizedUtil; public class DelegateColumn extends DelegateDatum implements PColumn { http://git-wip-us.apache.org/repos/asf/phoenix/blob/03981786/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java b/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java index 265fc78..159e0c9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java @@ -17,12 +17,23 @@ */ package org.apache.phoenix.trace; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterators; -import org.apache.commons.configuration.Configuration; +import static org.apache.phoenix.metrics.MetricInfo.ANNOTATION; +import static org.apache.phoenix.metrics.MetricInfo.DESCRIPTION; +import static org.apache.phoenix.metrics.MetricInfo.END; +import static org.apache.phoenix.metrics.MetricInfo.HOSTNAME; +import static org.apache.phoenix.metrics.MetricInfo.PARENT; +import static org.apache.phoenix.metrics.MetricInfo.SPAN; +import static org.apache.phoenix.metrics.MetricInfo.START; +import static org.apache.phoenix.metrics.MetricInfo.TAG; +import static org.apache.phoenix.metrics.MetricInfo.TRACE; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + import org.apache.commons.configuration.SubsetConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,20 +42,15 @@ import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsSink; import org.apache.hadoop.metrics2.MetricsTag; -import org.apache.phoenix.metrics.*; +import org.apache.phoenix.metrics.MetricInfo; +import org.apache.phoenix.metrics.Metrics; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.trace.util.Tracing; import org.apache.phoenix.util.QueryUtil; -import javax.annotation.Nullable; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.*; - -import static org.apache.phoenix.metrics.MetricInfo.*; -import static org.apache.phoenix.metrics.MetricInfo.HOSTNAME; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; /** * Write the metrics to a phoenix table. http://git-wip-us.apache.org/repos/asf/phoenix/blob/03981786/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/03981786/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java index 3197676..1c3e650 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java @@ -23,9 +23,6 @@ import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_FAMILY_NAME; import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_NAME; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/phoenix/blob/03981786/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java deleted file mode 100644 index 4a205f9..0000000 --- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * 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.iterate; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; - -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.end2end.BaseClientManagedTimeIT; -import org.apache.phoenix.end2end.ClientManagedTimeTest; -import org.apache.phoenix.query.QueryServices; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - - -@Category(ClientManagedTimeTest.class) -public class SpooledTmpFileDeleteTest extends BaseClientManagedTimeIT { - 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/03981786/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/03981786/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/03981786/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/03981786/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/03981786/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java index 51b2478..0762c01 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java @@ -37,7 +37,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.jdbc.PhoenixDriver; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PhoenixRuntime; @@ -58,7 +57,6 @@ 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.base.Preconditions; @@ -66,7 +64,7 @@ import com.google.common.base.Preconditions; * * Test class to run all the integration tests against a virtual map reduce cluster. */ -@Category(NeedsOwnMiniClusterTest.class) + public class PhoenixHBaseLoaderIT { private static final Log LOG = LogFactory.getLog(PhoenixHBaseLoaderIT.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/03981786/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/03981786/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/03981786/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9d39f1e..a8d1f10 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 -->
