hbase git commit: HBASE-13089 Fix test compilation error on building against htrace-3.2.0-incubating
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 e7c137aa0 - 83cf5e11f
HBASE-13089 Fix test compilation error on building against
htrace-3.2.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/83cf5e11
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/83cf5e11
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/83cf5e11
Branch: refs/heads/branch-1.0
Commit: 83cf5e11f718c6fa31d9be5f2921022dcf6c1713
Parents: e7c137a
Author: Esteban Gutierrez este...@apache.org
Authored: Fri Jul 24 15:34:40 2015 -0700
Committer: Enis Soztutar e...@apache.org
Committed: Tue Aug 11 11:07:09 2015 +0300
--
.../apache/hadoop/hbase/trace/TestHTraceHooks.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/83cf5e11/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
index eba30a8..eeda043 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -48,9 +49,19 @@ public class TestHTraceHooks {
private static final byte[] FAMILY_BYTES = family.getBytes();
private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
private static POJOSpanReceiver rcvr;
+ private static long ROOT_SPAN_ID = 0;
@BeforeClass
public static void before() throws Exception {
+
+// Find out what the right value to use fo SPAN_ROOT_ID after HTRACE-111.
We use HTRACE-32
+// to find out to detect if we are using HTrace 3.2 or not.
+try {
+Method m = Span.class.getMethod(addKVAnnotation, String.class,
String.class);
+} catch (NoSuchMethodException e) {
+ ROOT_SPAN_ID = 0x74aceL; // Span.SPAN_ROOT_ID pre HTrace-3.2
+}
+
TEST_UTIL.startMiniCluster(2, 3);
rcvr = new POJOSpanReceiver(new
HBaseHTraceConfiguration(TEST_UTIL.getConfiguration()));
Trace.addReceiver(rcvr);
@@ -86,7 +97,7 @@ public class TestHTraceHooks {
CollectionSpan spans = rcvr.getSpans();
TraceTree traceTree = new TraceTree(spans);
-CollectionSpan roots =
traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+CollectionSpan roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(1, roots.size());
Span createTableRoot = roots.iterator().next();
@@ -117,7 +128,7 @@ public class TestHTraceHooks {
spans = rcvr.getSpans();
traceTree = new TraceTree(spans);
-roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(2, roots.size());
Span putRoot = null;
hbase git commit: HBASE-13089 Fix test compilation error on building against htrace-3.2.0-incubating
Repository: hbase
Updated Branches:
refs/heads/branch-1.1 111620f5c - b043d27f5
HBASE-13089 Fix test compilation error on building against
htrace-3.2.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b043d27f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b043d27f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b043d27f
Branch: refs/heads/branch-1.1
Commit: b043d27f59a2c1d025ae3558052f499a554be179
Parents: 111620f
Author: Esteban Gutierrez este...@apache.org
Authored: Fri Jul 24 15:34:40 2015 -0700
Committer: Enis Soztutar e...@apache.org
Committed: Tue Aug 11 11:04:17 2015 +0300
--
.../apache/hadoop/hbase/trace/TestHTraceHooks.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/b043d27f/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
index eba30a8..eeda043 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -48,9 +49,19 @@ public class TestHTraceHooks {
private static final byte[] FAMILY_BYTES = family.getBytes();
private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
private static POJOSpanReceiver rcvr;
+ private static long ROOT_SPAN_ID = 0;
@BeforeClass
public static void before() throws Exception {
+
+// Find out what the right value to use fo SPAN_ROOT_ID after HTRACE-111.
We use HTRACE-32
+// to find out to detect if we are using HTrace 3.2 or not.
+try {
+Method m = Span.class.getMethod(addKVAnnotation, String.class,
String.class);
+} catch (NoSuchMethodException e) {
+ ROOT_SPAN_ID = 0x74aceL; // Span.SPAN_ROOT_ID pre HTrace-3.2
+}
+
TEST_UTIL.startMiniCluster(2, 3);
rcvr = new POJOSpanReceiver(new
HBaseHTraceConfiguration(TEST_UTIL.getConfiguration()));
Trace.addReceiver(rcvr);
@@ -86,7 +97,7 @@ public class TestHTraceHooks {
CollectionSpan spans = rcvr.getSpans();
TraceTree traceTree = new TraceTree(spans);
-CollectionSpan roots =
traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+CollectionSpan roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(1, roots.size());
Span createTableRoot = roots.iterator().next();
@@ -117,7 +128,7 @@ public class TestHTraceHooks {
spans = rcvr.getSpans();
traceTree = new TraceTree(spans);
-roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(2, roots.size());
Span putRoot = null;
hbase git commit: HBASE-13089 Fix test compilation error on building against htrace-3.2.0-incubating
Repository: hbase
Updated Branches:
refs/heads/branch-1 4a041fd83 - 8764b9fd8
HBASE-13089 Fix test compilation error on building against
htrace-3.2.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8764b9fd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8764b9fd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8764b9fd
Branch: refs/heads/branch-1
Commit: 8764b9fd8068385dc339f6f81d4e50c5b5882abe
Parents: 4a041fd
Author: Esteban Gutierrez este...@apache.org
Authored: Fri Jul 24 15:34:40 2015 -0700
Committer: Sean Busbey bus...@cloudera.com
Committed: Tue Jul 28 10:07:48 2015 -0500
--
.../apache/hadoop/hbase/trace/TestHTraceHooks.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/8764b9fd/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
index eba30a8..eeda043 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -48,9 +49,19 @@ public class TestHTraceHooks {
private static final byte[] FAMILY_BYTES = family.getBytes();
private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
private static POJOSpanReceiver rcvr;
+ private static long ROOT_SPAN_ID = 0;
@BeforeClass
public static void before() throws Exception {
+
+// Find out what the right value to use fo SPAN_ROOT_ID after HTRACE-111.
We use HTRACE-32
+// to find out to detect if we are using HTrace 3.2 or not.
+try {
+Method m = Span.class.getMethod(addKVAnnotation, String.class,
String.class);
+} catch (NoSuchMethodException e) {
+ ROOT_SPAN_ID = 0x74aceL; // Span.SPAN_ROOT_ID pre HTrace-3.2
+}
+
TEST_UTIL.startMiniCluster(2, 3);
rcvr = new POJOSpanReceiver(new
HBaseHTraceConfiguration(TEST_UTIL.getConfiguration()));
Trace.addReceiver(rcvr);
@@ -86,7 +97,7 @@ public class TestHTraceHooks {
CollectionSpan spans = rcvr.getSpans();
TraceTree traceTree = new TraceTree(spans);
-CollectionSpan roots =
traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+CollectionSpan roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(1, roots.size());
Span createTableRoot = roots.iterator().next();
@@ -117,7 +128,7 @@ public class TestHTraceHooks {
spans = rcvr.getSpans();
traceTree = new TraceTree(spans);
-roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(2, roots.size());
Span putRoot = null;
hbase git commit: HBASE-13089 Fix test compilation error on building against htrace-3.2.0-incubating
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 a692295e2 - 1e348def0
HBASE-13089 Fix test compilation error on building against
htrace-3.2.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e348def
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e348def
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e348def
Branch: refs/heads/branch-1.2
Commit: 1e348def023673423e2990894716fb10df377ba3
Parents: a692295
Author: Esteban Gutierrez este...@apache.org
Authored: Fri Jul 24 15:34:40 2015 -0700
Committer: Esteban Gutierrez este...@apache.org
Committed: Mon Jul 27 13:06:37 2015 -0700
--
.../apache/hadoop/hbase/trace/TestHTraceHooks.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1e348def/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
index eba30a8..eeda043 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -48,9 +49,19 @@ public class TestHTraceHooks {
private static final byte[] FAMILY_BYTES = family.getBytes();
private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
private static POJOSpanReceiver rcvr;
+ private static long ROOT_SPAN_ID = 0;
@BeforeClass
public static void before() throws Exception {
+
+// Find out what the right value to use fo SPAN_ROOT_ID after HTRACE-111.
We use HTRACE-32
+// to find out to detect if we are using HTrace 3.2 or not.
+try {
+Method m = Span.class.getMethod(addKVAnnotation, String.class,
String.class);
+} catch (NoSuchMethodException e) {
+ ROOT_SPAN_ID = 0x74aceL; // Span.SPAN_ROOT_ID pre HTrace-3.2
+}
+
TEST_UTIL.startMiniCluster(2, 3);
rcvr = new POJOSpanReceiver(new
HBaseHTraceConfiguration(TEST_UTIL.getConfiguration()));
Trace.addReceiver(rcvr);
@@ -86,7 +97,7 @@ public class TestHTraceHooks {
CollectionSpan spans = rcvr.getSpans();
TraceTree traceTree = new TraceTree(spans);
-CollectionSpan roots =
traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+CollectionSpan roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(1, roots.size());
Span createTableRoot = roots.iterator().next();
@@ -117,7 +128,7 @@ public class TestHTraceHooks {
spans = rcvr.getSpans();
traceTree = new TraceTree(spans);
-roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(2, roots.size());
Span putRoot = null;
hbase git commit: HBASE-13089 Fix test compilation error on building against htrace-3.2.0-incubating
Repository: hbase
Updated Branches:
refs/heads/master 3f80e0ea4 - 1566ec5fd
HBASE-13089 Fix test compilation error on building against
htrace-3.2.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1566ec5f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1566ec5f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1566ec5f
Branch: refs/heads/master
Commit: 1566ec5fdc751897b2e931b2b0920c6d503c85ce
Parents: 3f80e0e
Author: Esteban Gutierrez este...@apache.org
Authored: Fri Jul 24 15:34:40 2015 -0700
Committer: Esteban Gutierrez este...@apache.org
Committed: Mon Jul 27 12:57:03 2015 -0700
--
.../apache/hadoop/hbase/trace/TestHTraceHooks.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1566ec5f/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
index 7a47f52..65dff1b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -49,9 +50,19 @@ public class TestHTraceHooks {
private static final byte[] FAMILY_BYTES = family.getBytes();
private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
private static POJOSpanReceiver rcvr;
+ private static long ROOT_SPAN_ID = 0;
@BeforeClass
public static void before() throws Exception {
+
+// Find out what the right value to use fo SPAN_ROOT_ID after HTRACE-111.
We use HTRACE-32
+// to find out to detect if we are using HTrace 3.2 or not.
+try {
+Method m = Span.class.getMethod(addKVAnnotation, String.class,
String.class);
+} catch (NoSuchMethodException e) {
+ ROOT_SPAN_ID = 0x74aceL; // Span.SPAN_ROOT_ID pre HTrace-3.2
+}
+
TEST_UTIL.startMiniCluster(2, 3);
rcvr = new POJOSpanReceiver(new
HBaseHTraceConfiguration(TEST_UTIL.getConfiguration()));
Trace.addReceiver(rcvr);
@@ -87,7 +98,7 @@ public class TestHTraceHooks {
CollectionSpan spans = rcvr.getSpans();
TraceTree traceTree = new TraceTree(spans);
-CollectionSpan roots =
traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+CollectionSpan roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(1, roots.size());
Span createTableRoot = roots.iterator().next();
@@ -118,7 +129,7 @@ public class TestHTraceHooks {
spans = rcvr.getSpans();
traceTree = new TraceTree(spans);
-roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(2, roots.size());
Span putRoot = null;
