You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/10 05:21:44 UTC
[13/36] git commit: Pass hbase version through
ParallelWriterIndexCommitter for testing
Pass hbase version through ParallelWriterIndexCommitter for testing
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/3931fc90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/3931fc90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/3931fc90
Branch: refs/heads/4.0
Commit: 3931fc90a6a3659ee7b4961b1c7ec3988a3dfee6
Parents: f95a97f
Author: James Taylor <ja...@apache.org>
Authored: Thu Mar 6 09:24:50 2014 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Thu Mar 6 09:24:50 2014 -0800
----------------------------------------------------------------------
.../write/ParallelWriterIndexCommitter.java | 8 ++++++++
.../hbase/index/write/TestIndexWriter.java | 21 +++++++++-----------
.../index/write/TestParalleIndexWriter.java | 15 +++++++-------
.../write/TestParalleWriterIndexCommitter.java | 15 +++++++-------
4 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/3931fc90/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/ParallelWriterIndexCommitter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/ParallelWriterIndexCommitter.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/ParallelWriterIndexCommitter.java
index d4a4d68..aa65cfc 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/ParallelWriterIndexCommitter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/ParallelWriterIndexCommitter.java
@@ -70,6 +70,14 @@ public class ParallelWriterIndexCommitter implements IndexCommitter {
private QuickFailingTaskRunner pool;
private KeyValueBuilder kvBuilder;
+ public ParallelWriterIndexCommitter() {
+ }
+
+ // For testing
+ public ParallelWriterIndexCommitter(String hbaseVersion) {
+ kvBuilder = KeyValueBuilder.get(hbaseVersion);
+ }
+
@Override
public void setup(IndexWriter parent, RegionCoprocessorEnvironment env, String name) {
Configuration conf = env.getConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/3931fc90/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
index 56a9ab8..68aeba1 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
@@ -44,20 +44,17 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
+import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.phoenix.hbase.index.StubAbortable;
import org.apache.phoenix.hbase.index.TableName;
import org.apache.phoenix.hbase.index.exception.IndexWriteException;
import org.apache.phoenix.hbase.index.exception.SingleIndexWriteFailureException;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.hbase.index.write.IndexWriter;
-import org.apache.phoenix.hbase.index.write.KillServerOnFailurePolicy;
-import org.apache.phoenix.hbase.index.write.ParallelWriterIndexCommitter;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
public class TestIndexWriter {
private static final Log LOG = LogFactory.getLog(TestIndexWriter.class);
@@ -119,7 +116,7 @@ public class TestIndexWriter {
tables.put(new ImmutableBytesPtr(tableName), table);
// setup the writer and failure policy
- ParallelWriterIndexCommitter committer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter committer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
committer.setup(factory, exec, abort, stop, 2);
KillServerOnFailurePolicy policy = new KillServerOnFailurePolicy();
policy.setup(stop, abort);
@@ -192,7 +189,7 @@ public class TestIndexWriter {
tables.put(new ImmutableBytesPtr(tableName), table);
tables.put(new ImmutableBytesPtr(tableName2), table2);
- ParallelWriterIndexCommitter committer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter committer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
committer.setup(factory, exec, abort, stop, 2);
KillServerOnFailurePolicy policy = new KillServerOnFailurePolicy();
policy.setup(stop, abort);
@@ -259,7 +256,7 @@ public class TestIndexWriter {
indexUpdates.add(new Pair<Mutation, byte[]>(m, tableName));
// setup the writer
- ParallelWriterIndexCommitter committer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter committer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
committer.setup(factory, exec, abort, stop, 2);
KillServerOnFailurePolicy policy = new KillServerOnFailurePolicy();
policy.setup(stop, abort);
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/3931fc90/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
index b6331cd..f8b2f3b 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
@@ -33,6 +33,11 @@ import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.VersionInfo;
+import org.apache.phoenix.hbase.index.StubAbortable;
+import org.apache.phoenix.hbase.index.TableName;
+import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
+import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mockito;
@@ -42,12 +47,6 @@ import org.mockito.stubbing.Answer;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
-import org.apache.phoenix.hbase.index.StubAbortable;
-import org.apache.phoenix.hbase.index.TableName;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
-import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.hbase.index.write.ParallelWriterIndexCommitter;
-
public class TestParalleIndexWriter {
private static final Log LOG = LogFactory.getLog(TestParalleIndexWriter.class);
@@ -60,7 +59,7 @@ public class TestParalleIndexWriter {
ExecutorService exec = Executors.newFixedThreadPool(1);
FakeTableFactory factory = new FakeTableFactory(
Collections.<ImmutableBytesPtr, HTableInterface> emptyMap());
- ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
Abortable mockAbort = Mockito.mock(Abortable.class);
Stoppable mockStop = Mockito.mock(Stoppable.class);
// create a simple writer
@@ -107,7 +106,7 @@ public class TestParalleIndexWriter {
tables.put(tableName, table);
// setup the writer and failure policy
- ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
writer.setup(factory, exec, abort, stop, 1);
writer.write(indexUpdates);
assertTrue("Writer returned before the table batch completed! Likely a race condition tripped",
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/3931fc90/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
index 7a09d4a..9f2630a 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
@@ -33,6 +33,11 @@ import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.VersionInfo;
+import org.apache.phoenix.hbase.index.StubAbortable;
+import org.apache.phoenix.hbase.index.TableName;
+import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
+import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mockito;
@@ -42,12 +47,6 @@ import org.mockito.stubbing.Answer;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
-import org.apache.phoenix.hbase.index.StubAbortable;
-import org.apache.phoenix.hbase.index.TableName;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
-import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.hbase.index.write.ParallelWriterIndexCommitter;
-
public class TestParalleWriterIndexCommitter {
private static final Log LOG = LogFactory.getLog(TestParalleWriterIndexCommitter.class);
@@ -60,7 +59,7 @@ public class TestParalleWriterIndexCommitter {
ExecutorService exec = Executors.newFixedThreadPool(1);
FakeTableFactory factory = new FakeTableFactory(
Collections.<ImmutableBytesPtr, HTableInterface> emptyMap());
- ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
Abortable mockAbort = Mockito.mock(Abortable.class);
Stoppable mockStop = Mockito.mock(Stoppable.class);
// create a simple writer
@@ -107,7 +106,7 @@ public class TestParalleWriterIndexCommitter {
tables.put(tableName, table);
// setup the writer and failure policy
- ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter();
+ ParallelWriterIndexCommitter writer = new ParallelWriterIndexCommitter(VersionInfo.getVersion());
writer.setup(factory, exec, abort, stop, 1);
writer.write(indexUpdates);
assertTrue("Writer returned before the table batch completed! Likely a race condition tripped",