From b3c5c5ed4e28d68b6a6479176baecf65be2f320d Mon Sep 17 00:00:00 2001 From: Sean Mackrory Date: Sun, 27 Aug 2017 00:30:04 +0800 Subject: [PATCH] HBASE-15947 Classes used only for tests included in main code base Signed-off-by: Chia-Ping Tsai --- .../apache/hadoop/hbase/util}/LoadTestKVGenerator.java | 4 +--- .../apache/hadoop/hbase/util}/RedundantKVGenerator.java | 8 ++------ .../apache/hadoop/hbase/util/TestLoadTestKVGenerator.java | 1 - .../apache/hadoop/hbase/IntegrationTestLazyCfLoading.java | 2 +- .../hbase/StripeCompactionsPerformanceEvaluation.java | 2 +- .../prefixtree/column/data/TestColumnDataRandom.java | 2 +- .../prefixtree/row/data/TestRowDataRandomKeyValues.java | 2 +- .../row/data/TestRowDataRandomKeyValuesWithTags.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestFastFail.java | 2 +- .../hadoop/hbase/io/encoding/TestDataBlockEncoders.java | 2 +- .../hadoop/hbase/io/encoding/TestEncodedSeekers.java | 2 +- .../hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java | 2 +- .../apache/hadoop/hbase/io/hfile/TestHFileEncryption.java | 2 +- .../normalizer/TestSimpleRegionNormalizerOnCluster.java | 3 +-- .../hadoop/hbase/util/LoadTestDataGeneratorWithMOB.java | 2 -- .../org/apache/hadoop/hbase/util/MultiThreadedAction.java | 1 - .../hadoop/hbase/util/test/LoadTestDataGenerator.java | 1 + 17 files changed, 15 insertions(+), 25 deletions(-) rename hbase-common/src/{main/java/org/apache/hadoop/hbase/util/test => test/java/org/apache/hadoop/hbase/util}/LoadTestKVGenerator.java (97%) rename hbase-common/src/{main/java/org/apache/hadoop/hbase/util/test => test/java/org/apache/hadoop/hbase/util}/RedundantKVGenerator.java (99%) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/LoadTestKVGenerator.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/LoadTestKVGenerator.java similarity index 97% rename from hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/LoadTestKVGenerator.java rename to hbase-common/src/test/java/org/apache/hadoop/hbase/util/LoadTestKVGenerator.java index 4edd270074a..2c4d897b715 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/LoadTestKVGenerator.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/LoadTestKVGenerator.java @@ -14,15 +14,13 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.apache.hadoop.hbase.util.test; +package org.apache.hadoop.hbase.util; import java.util.Random; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.MD5Hash; /** * A generator of random keys and values for load testing. Keys are generated diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/RedundantKVGenerator.java similarity index 99% rename from hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java rename to hbase-common/src/test/java/org/apache/hadoop/hbase/util/RedundantKVGenerator.java index 297571150de..4f167a4981b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/RedundantKVGenerator.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.apache.hadoop.hbase.util.test; +package org.apache.hadoop.hbase.util; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.ByteBufferKeyValue; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.hbase.shaded.com.google.common.primitives.Bytes; @@ -469,10 +468,8 @@ public class RedundantKVGenerator { } return result; } - - + /************************ get/set ***********************************/ - public RedundantKVGenerator setCommonPrefix(byte[] prefix){ this.commonPrefix = prefix; return this; @@ -563,5 +560,4 @@ public class RedundantKVGenerator { this.timestampDiffSize = timestampDiffSize; return this; } - } diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java index cf74a3ed94f..f5db4c17f8e 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java @@ -25,7 +25,6 @@ import java.util.Set; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java index 6efe9d83a03..5a22ab6ee9b 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java @@ -43,7 +43,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.MultiThreadedWriter; import org.apache.hadoop.hbase.util.RegionSplitter; import org.apache.hadoop.hbase.util.test.LoadTestDataGenerator; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; +import org.apache.hadoop.hbase.util.LoadTestKVGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java index 073de77413d..2f1098995d2 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.util.MultiThreadedReader; import org.apache.hadoop.hbase.util.MultiThreadedWriter; import org.apache.hadoop.hbase.util.RegionSplitter; import org.apache.hadoop.hbase.util.test.LoadTestDataGenerator; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; +import org.apache.hadoop.hbase.util.LoadTestKVGenerator; import org.junit.Assert; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java index 77036be2fa8..0fdc616d1da 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java @@ -27,7 +27,7 @@ import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.SimpleMutableByteRange; import org.apache.hadoop.hbase.util.byterange.ByteRangeSet; import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet; -import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; +import org.apache.hadoop.hbase.util.RedundantKVGenerator; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java index 9ee9be8a7dc..7a58f2db6e8 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; +import org.apache.hadoop.hbase.util.RedundantKVGenerator; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java index 86bdf0274f3..bd15d3e240d 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; +import org.apache.hadoop.hbase.util.RedundantKVGenerator; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java index 465bdfb0426..154f6eb700a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java @@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.ipc.SimpleRpcScheduler; import org.apache.hadoop.hbase.testclassification.ClientTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; +import org.apache.hadoop.hbase.util.LoadTestKVGenerator; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java index dc15bf5dbaf..45d1a36a415 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java @@ -52,7 +52,7 @@ import org.apache.hadoop.hbase.nio.SingleByteBuff; import org.apache.hadoop.hbase.testclassification.IOTests; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; +import org.apache.hadoop.hbase.util.RedundantKVGenerator; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java index 1b5c630f310..efdf76584a1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.testclassification.IOTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; +import org.apache.hadoop.hbase.util.LoadTestKVGenerator; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java index ac939d1f772..bfd3a2b2d63 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java @@ -39,7 +39,7 @@ import org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext; import org.apache.hadoop.hbase.testclassification.IOTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.ChecksumType; -import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; +import org.apache.hadoop.hbase.util.RedundantKVGenerator; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java index 9a24074f9eb..2dd00731a4f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java @@ -50,7 +50,7 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.testclassification.IOTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; +import org.apache.hadoop.hbase.util.RedundantKVGenerator; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java index 8ff41af99e8..d733d2bc35f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java @@ -40,10 +40,9 @@ import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; +import org.apache.hadoop.hbase.util.LoadTestKVGenerator; 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; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestDataGeneratorWithMOB.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestDataGeneratorWithMOB.java index 006316ac1d2..8aefd424716 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestDataGeneratorWithMOB.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestDataGeneratorWithMOB.java @@ -19,8 +19,6 @@ package org.apache.hadoop.hbase.util; import java.util.Arrays; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; - /** * A load test data generator for MOB */ diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedAction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedAction.java index 6550baa7aff..6bfb23ea355 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedAction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedAction.java @@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType; import org.apache.hadoop.hbase.util.test.LoadTestDataGenerator; -import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; import org.apache.hadoop.util.StringUtils; /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/test/LoadTestDataGenerator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/test/LoadTestDataGenerator.java index 2deba0021c8..48d67834965 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/test/LoadTestDataGenerator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/test/LoadTestDataGenerator.java @@ -23,6 +23,7 @@ import java.util.Set; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Mutation; +import org.apache.hadoop.hbase.util.LoadTestKVGenerator; /** * A generator of random data (keys/cfs/columns/values) for load testing.