hbase git commit: HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency
Repository: hbase Updated Branches: refs/heads/branch-2 84915bc68 -> c830a0f47 HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency Signed-off-by: Andrew PurtellProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c830a0f4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c830a0f4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c830a0f4 Branch: refs/heads/branch-2 Commit: c830a0f47f58d4892dd3300032c8244d6278aecc Parents: 84915bc Author: Alex Araujo Authored: Wed Jun 7 14:29:19 2017 -0500 Committer: Michael Stack Committed: Wed Jun 7 21:58:17 2017 -0700 -- .../java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/c830a0f4/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 91550e7..7c18537 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -785,6 +785,7 @@ public class TableMapReduceUtil { org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.class, // hbase-protocol-shaded org.apache.hadoop.hbase.client.Put.class, // hbase-client org.apache.hadoop.hbase.CompatibilityFactory.class,// hbase-hadoop-compat + org.apache.hadoop.hbase.mapreduce.JobUtil.class, // hbase-hadoop2-compat org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server org.apache.hadoop.hbase.metrics.impl.FastLongHistogram.class, // hbase-metrics org.apache.hadoop.hbase.metrics.Snapshot.class,// hbase-metrics-api
hbase git commit: HBASE-18191 Include hbase-metrics-* in assembly
Repository: hbase Updated Branches: refs/heads/master 3f891a66c -> 2846a7c90 HBASE-18191 Include hbase-metrics-* in assembly Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2846a7c9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2846a7c9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2846a7c9 Branch: refs/heads/master Commit: 2846a7c90eee2e5a7e32f303c6182c923311884c Parents: 3f891a6 Author: Michael StackAuthored: Wed Jun 7 21:56:47 2017 -0700 Committer: Michael Stack Committed: Wed Jun 7 21:57:35 2017 -0700 -- hbase-assembly/src/main/assembly/src.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/2846a7c9/hbase-assembly/src/main/assembly/src.xml -- diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml index 9f2fda3..befcce0 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -43,6 +43,8 @@ org.apache.hbase:hbase-hadoop2-compat org.apache.hbase:hbase-hadoop-compat org.apache.hbase:hbase-it +org.apache.hbase:hbase-metrics +org.apache.hbase:hbase-metrics-api org.apache.hbase:hbase-prefix-tree org.apache.hbase:hbase-procedure org.apache.hbase:hbase-protocol-shaded
hbase git commit: HBASE-18191 Include hbase-metrics-* in assembly
Repository: hbase Updated Branches: refs/heads/branch-2 adfb48eeb -> 84915bc68 HBASE-18191 Include hbase-metrics-* in assembly Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/84915bc6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/84915bc6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/84915bc6 Branch: refs/heads/branch-2 Commit: 84915bc681fba886d672c7c78182c44d00f331a8 Parents: adfb48e Author: Michael StackAuthored: Wed Jun 7 21:56:47 2017 -0700 Committer: Michael Stack Committed: Wed Jun 7 21:56:47 2017 -0700 -- hbase-assembly/src/main/assembly/src.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/84915bc6/hbase-assembly/src/main/assembly/src.xml -- diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml index 9f2fda3..befcce0 100644 --- a/hbase-assembly/src/main/assembly/src.xml +++ b/hbase-assembly/src/main/assembly/src.xml @@ -43,6 +43,8 @@ org.apache.hbase:hbase-hadoop2-compat org.apache.hbase:hbase-hadoop-compat org.apache.hbase:hbase-it +org.apache.hbase:hbase-metrics +org.apache.hbase:hbase-metrics-api org.apache.hbase:hbase-prefix-tree org.apache.hbase:hbase-procedure org.apache.hbase:hbase-protocol-shaded
hbase git commit: HBASE-18190 Set version in branch-2 to 2.0.0-alpha-1
Repository: hbase Updated Branches: refs/heads/branch-2 3d721798c -> adfb48eeb HBASE-18190 Set version in branch-2 to 2.0.0-alpha-1 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/adfb48ee Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/adfb48ee Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/adfb48ee Branch: refs/heads/branch-2 Commit: adfb48eeb89b37f57b5568623a93f84bf491b9fa Parents: 3d72179 Author: Michael StackAuthored: Wed Jun 7 21:10:01 2017 -0700 Committer: Michael Stack Committed: Wed Jun 7 21:10:01 2017 -0700 -- hbase-annotations/pom.xml| 2 +- hbase-archetypes/hbase-archetype-builder/pom.xml | 2 +- hbase-archetypes/hbase-client-project/pom.xml| 2 +- hbase-archetypes/hbase-shaded-client-project/pom.xml | 2 +- hbase-archetypes/pom.xml | 2 +- hbase-assembly/pom.xml | 2 +- hbase-checkstyle/pom.xml | 4 ++-- hbase-client/pom.xml | 2 +- hbase-common/pom.xml | 2 +- hbase-endpoint/pom.xml | 2 +- hbase-examples/pom.xml | 2 +- hbase-external-blockcache/pom.xml| 2 +- hbase-hadoop-compat/pom.xml | 2 +- hbase-hadoop2-compat/pom.xml | 2 +- hbase-it/pom.xml | 2 +- hbase-metrics-api/pom.xml| 2 +- hbase-metrics/pom.xml| 2 +- hbase-prefix-tree/pom.xml| 2 +- hbase-procedure/pom.xml | 2 +- hbase-protocol-shaded/pom.xml| 2 +- hbase-protocol/pom.xml | 2 +- hbase-resource-bundle/pom.xml| 2 +- hbase-rest/pom.xml | 2 +- hbase-rsgroup/pom.xml| 2 +- hbase-server/pom.xml | 2 +- hbase-shaded/hbase-shaded-client/pom.xml | 2 +- hbase-shaded/hbase-shaded-server/pom.xml | 2 +- hbase-shaded/pom.xml | 2 +- hbase-shell/pom.xml | 2 +- hbase-spark/pom.xml | 2 +- hbase-testing-util/pom.xml | 2 +- hbase-thrift/pom.xml | 2 +- pom.xml | 2 +- 33 files changed, 34 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/adfb48ee/hbase-annotations/pom.xml -- diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml index d9e0a44..2292203 100644 --- a/hbase-annotations/pom.xml +++ b/hbase-annotations/pom.xml @@ -23,7 +23,7 @@ hbase org.apache.hbase -2.0.0-SNAPSHOT +2.0.0-alpha-1 .. http://git-wip-us.apache.org/repos/asf/hbase/blob/adfb48ee/hbase-archetypes/hbase-archetype-builder/pom.xml -- diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml index 1672dea..32bdbdb 100644 --- a/hbase-archetypes/hbase-archetype-builder/pom.xml +++ b/hbase-archetypes/hbase-archetype-builder/pom.xml @@ -25,7 +25,7 @@ hbase-archetypes org.apache.hbase -2.0.0-SNAPSHOT +2.0.0-alpha-1 .. http://git-wip-us.apache.org/repos/asf/hbase/blob/adfb48ee/hbase-archetypes/hbase-client-project/pom.xml -- diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml index 486f3ee..b6474bf 100644 --- a/hbase-archetypes/hbase-client-project/pom.xml +++ b/hbase-archetypes/hbase-client-project/pom.xml @@ -26,7 +26,7 @@ hbase-archetypes org.apache.hbase -2.0.0-SNAPSHOT +2.0.0-alpha-1 .. hbase-client-project http://git-wip-us.apache.org/repos/asf/hbase/blob/adfb48ee/hbase-archetypes/hbase-shaded-client-project/pom.xml -- diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml index 6f73033..2890af4 100644 --- a/hbase-archetypes/hbase-shaded-client-project/pom.xml +++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml @@ -26,7 +26,7 @@ hbase-archetypes org.apache.hbase -2.0.0-SNAPSHOT +2.0.0-alpha-1 ..
hbase git commit: HBASE-18173 Append class - Addendum to fix formatting
Repository: hbase Updated Branches: refs/heads/HBASE-14850 eec122526 -> 58ec20cac HBASE-18173 Append class - Addendum to fix formatting Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/58ec20ca Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/58ec20ca Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/58ec20ca Branch: refs/heads/HBASE-14850 Commit: 58ec20cac0196450f0701817769594371f371653 Parents: eec1225 Author: Enis SoztutarAuthored: Wed Jun 7 17:49:47 2017 -0700 Committer: Enis Soztutar Committed: Wed Jun 7 17:49:47 2017 -0700 -- hbase-native-client/core/append-test.cc | 3 +- hbase-native-client/core/append.cc| 5 +- hbase-native-client/core/client-test.cc | 4 +- hbase-native-client/core/increment-test.cc| 2 +- hbase-native-client/core/increment.cc | 7 ++- hbase-native-client/core/raw-async-table.cc | 22 + hbase-native-client/core/request-converter.cc | 34 ++--- hbase-native-client/core/request-converter.h | 7 +-- hbase-native-client/utils/bytes-util.cc | 55 +++--- 9 files changed, 71 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/58ec20ca/hbase-native-client/core/append-test.cc -- diff --git a/hbase-native-client/core/append-test.cc b/hbase-native-client/core/append-test.cc index 619826c..2216034 100644 --- a/hbase-native-client/core/append-test.cc +++ b/hbase-native-client/core/append-test.cc @@ -19,8 +19,8 @@ #include #include -#include "core/mutation.h" #include "core/append.h" +#include "core/mutation.h" #include "utils/time-util.h" using hbase::Append; @@ -103,4 +103,3 @@ TEST(Append, Add) { EXPECT_EQ(2, append.FamilyMap().size()); EXPECT_EQ(1, append.FamilyMap().at("family-2").size()); } - http://git-wip-us.apache.org/repos/asf/hbase/blob/58ec20ca/hbase-native-client/core/append.cc -- diff --git a/hbase-native-client/core/append.cc b/hbase-native-client/core/append.cc index 18ee45a..95349ae 100644 --- a/hbase-native-client/core/append.cc +++ b/hbase-native-client/core/append.cc @@ -35,10 +35,9 @@ namespace hbase { * @param value value to append */ Append& Append::Add(const std::string& family, const std::string& qualifier, -const std::string& value) { +const std::string& value) { family_map_[family].push_back(std::move( -std::make_unique(row_, family, qualifier, timestamp_, value, -hbase::CellType::PUT))); + std::make_unique(row_, family, qualifier, timestamp_, value, hbase::CellType::PUT))); return *this; } Append& Append::Add(std::unique_ptr cell) { http://git-wip-us.apache.org/repos/asf/hbase/blob/58ec20ca/hbase-native-client/core/client-test.cc -- diff --git a/hbase-native-client/core/client-test.cc b/hbase-native-client/core/client-test.cc index 1ee0a83..4972e05 100644 --- a/hbase-native-client/core/client-test.cc +++ b/hbase-native-client/core/client-test.cc @@ -25,8 +25,8 @@ #include "core/configuration.h" #include "core/delete.h" #include "core/get.h" -#include "core/increment.h" #include "core/hbase-configuration-loader.h" +#include "core/increment.h" #include "core/put.h" #include "core/result.h" #include "core/table.h" @@ -244,7 +244,7 @@ TEST_F(ClientTest, Increment) { result = table->Increment(hbase::Increment{row}.AddColumn("d", "1", incr2)); EXPECT_EQ(row, result->Row()); - EXPECT_EQ(incr1+incr2, hbase::BytesUtil::ToInt64(*(result->Value("d", "1"; + EXPECT_EQ(incr1 + incr2, hbase::BytesUtil::ToInt64(*(result->Value("d", "1"; } TEST_F(ClientTest, PutGet) { http://git-wip-us.apache.org/repos/asf/hbase/blob/58ec20ca/hbase-native-client/core/increment-test.cc -- diff --git a/hbase-native-client/core/increment-test.cc b/hbase-native-client/core/increment-test.cc index 3d7b1d4..aa9b864 100644 --- a/hbase-native-client/core/increment-test.cc +++ b/hbase-native-client/core/increment-test.cc @@ -19,8 +19,8 @@ #include #include -#include "core/mutation.h" #include "core/increment.h" +#include "core/mutation.h" #include "core/put.h" #include "utils/time-util.h" http://git-wip-us.apache.org/repos/asf/hbase/blob/58ec20ca/hbase-native-client/core/increment.cc -- diff --git a/hbase-native-client/core/increment.cc b/hbase-native-client/core/increment.cc index 1a84266..a21a764 100644 --- a/hbase-native-client/core/increment.cc +++
[1/2] hbase git commit: HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency
Repository: hbase Updated Branches: refs/heads/branch-1 e94245331 -> ba3a81666 refs/heads/master 492c3f8e2 -> 3f891a66c HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency Signed-off-by: Andrew PurtellProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3f891a66 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f891a66 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f891a66 Branch: refs/heads/master Commit: 3f891a66ca6d329438b6a2b2e4a12f0c09f3e6be Parents: 492c3f8 Author: Alex Araujo Authored: Wed Jun 7 14:29:19 2017 -0500 Committer: Andrew Purtell Committed: Wed Jun 7 14:25:55 2017 -0700 -- .../java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/3f891a66/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 91550e7..7c18537 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -785,6 +785,7 @@ public class TableMapReduceUtil { org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.class, // hbase-protocol-shaded org.apache.hadoop.hbase.client.Put.class, // hbase-client org.apache.hadoop.hbase.CompatibilityFactory.class,// hbase-hadoop-compat + org.apache.hadoop.hbase.mapreduce.JobUtil.class, // hbase-hadoop2-compat org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server org.apache.hadoop.hbase.metrics.impl.FastLongHistogram.class, // hbase-metrics org.apache.hadoop.hbase.metrics.Snapshot.class,// hbase-metrics-api
[2/2] hbase git commit: HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency
HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency Signed-off-by: Andrew PurtellProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ba3a8166 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ba3a8166 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ba3a8166 Branch: refs/heads/branch-1 Commit: ba3a816663cc407ec4c4b6a9c6e9f66a8ab997d5 Parents: e942453 Author: Alex Araujo Authored: Wed Jun 7 14:29:19 2017 -0500 Committer: Andrew Purtell Committed: Wed Jun 7 14:26:08 2017 -0700 -- .../java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ba3a8166/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 9ba1f07..d31ab0a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -784,6 +784,7 @@ public class TableMapReduceUtil { org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol org.apache.hadoop.hbase.client.Put.class, // hbase-client org.apache.hadoop.hbase.CompatibilityFactory.class,// hbase-hadoop-compat + org.apache.hadoop.hbase.mapreduce.JobUtil.class, // hbase-hadoop2-compat org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server prefixTreeCodecClass, // hbase-prefix-tree (if null will be skipped) // pull necessary dependencies
[37/52] [partial] hbase-site git commit: HBASE-17876 Update 1.2 docs to 1.2.6.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a86ebd3c/1.2/apidocs/org/apache/hadoop/hbase/HRegionInfo.html -- diff --git a/1.2/apidocs/org/apache/hadoop/hbase/HRegionInfo.html b/1.2/apidocs/org/apache/hadoop/hbase/HRegionInfo.html index 43c1811..ed185a7 100644 --- a/1.2/apidocs/org/apache/hadoop/hbase/HRegionInfo.html +++ b/1.2/apidocs/org/apache/hadoop/hbase/HRegionInfo.html @@ -2,38 +2,28 @@ - -HRegionInfo (Apache HBase 1.2.4 API) +HRegionInfo (Apache HBase 1.2.6 API) - -var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":10,"i13":10,"i14":41,"i15":10,"i16":10,"i17":10,"i18":41,"i19":41,"i20":41,"i21":41,"i22":10,"i23":10,"i24":10,"i25":10,"i26":41,"i27":41,"i28":10,"i29":10,"i30":9,"i31":10,"i32":9,"i33":42,"i34":41,"i35":42,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":42,"i52":10,"i53":10,"i54":10,"i55":10,"i56":9,"i57":10,"i58":42}; -var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; -var altColor = "altColor"; -var rowColor = "rowColor"; -var tableTab = "tableTab"; -var activeTableTab = "activeTableTab"; JavaScript is disabled on your browser. - + - -Skip navigation links - + @@ -49,15 +39,15 @@ var activeTableTab = "activeTableTab"; -PrevClass -NextClass +Prev Class +Next Class Frames -NoFrames +No Frames -AllClasses +All Classes
[49/52] [partial] hbase-site git commit: HBASE-17876 Update 1.2 docs to 1.2.6.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a86ebd3c/1.2/apidocs/constant-values.html -- diff --git a/1.2/apidocs/constant-values.html b/1.2/apidocs/constant-values.html index 31f01d1..bf4769e 100644 --- a/1.2/apidocs/constant-values.html +++ b/1.2/apidocs/constant-values.html @@ -2,17 +2,15 @@ - -Constant Field Values (Apache HBase 1.2.4 API) +Constant Field Values (Apache HBase 1.2.6 API) - -