You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/05/01 22:34:45 UTC
[1/6] hbase git commit: HBASE-13122 Improve efficiency for return
codes of some filters (Shuaifeng Zhou)
Repository: hbase
Updated Branches:
refs/heads/0.98 3b8aab5b8 -> 052150ee6
refs/heads/branch-1 62da795dd -> d16c8ab71
refs/heads/branch-1.0 aee1c0aae -> cb66e00f0
refs/heads/branch-1.1 6e546a516 -> 9d679f6b8
HBASE-13122 Improve efficiency for return codes of some filters (Shuaifeng Zhou)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/63281f8e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/63281f8e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/63281f8e
Branch: refs/heads/0.98
Commit: 63281f8e797c88e91169c58a7300dcc5ba4a500c
Parents: 3b8aab5
Author: tedyu <yu...@gmail.com>
Authored: Mon Mar 2 07:47:33 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 13:07:58 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/63281f8e/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
index bd2581a..3e6ebfe 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
@@ -133,7 +133,7 @@ public class ColumnRangeFilter extends FilterBase {
}
if (!this.minColumnInclusive && cmpMin == 0) {
- return ReturnCode.SKIP;
+ return ReturnCode.NEXT_COL;
}
if (this.maxColumn == null) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/63281f8e/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java
index c7b0b66..2f40302 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java
@@ -65,7 +65,7 @@ public class FamilyFilter extends CompareFilter {
if (familyLength > 0) {
if (doCompare(this.compareOp, this.comparator, v.getFamilyArray(),
v.getFamilyOffset(), familyLength)) {
- return ReturnCode.SKIP;
+ return ReturnCode.NEXT_ROW;
}
}
return ReturnCode.INCLUDE;
[6/6] hbase git commit: HBASE-13325 Protocol Buffers 2.5 no longer
available for download on code.google.com
Posted by ap...@apache.org.
HBASE-13325 Protocol Buffers 2.5 no longer available for download on code.google.com
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d16c8ab7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d16c8ab7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d16c8ab7
Branch: refs/heads/branch-1
Commit: d16c8ab71b546e557eb781ea9702386aaae14beb
Parents: 62da795
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Mar 25 09:27:12 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 13:31:40 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/protobuf/package.html | 2 +-
hbase-protocol/README.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d16c8ab7/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
index 292cac5..d324653 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
@@ -20,7 +20,7 @@
<head />
<body bgcolor="white">
-Holds classes generated from <a href="http://code.google.com/apis/protocolbuffers/">protobuf</a>
+Holds classes generated from <a href="https://developers.google.com/protocol-buffers/">protobuf</a>
<code>src/main/protobuf</code> definition files.
<p>See under <code>src/main/protobuf</code> for instruction on how to generate the content under
http://git-wip-us.apache.org/repos/asf/hbase/blob/d16c8ab7/hbase-protocol/README.txt
----------------------------------------------------------------------
diff --git a/hbase-protocol/README.txt b/hbase-protocol/README.txt
index b67f0c3..e651411 100644
--- a/hbase-protocol/README.txt
+++ b/hbase-protocol/README.txt
@@ -5,7 +5,7 @@ and then checked in. The reasoning is that they change infrequently.
To regenerate the classes after making definition file changes, ensure first that
the protobuf protoc tool is in your $PATH (You may need to download it and build
it first; its part of the protobuf package obtainable from here:
-http://code.google.com/p/protobuf/downloads/list).
+https://github.com/google/protobuf/releases/tag/v2.5.0).
HBase uses hadoop-maven-plugins:protoc goal to invoke the protoc command. You can
compile the protoc definitions by invoking maven with profile compile-protobuf or
[3/6] hbase git commit: HBASE-13325 Protocol Buffers 2.5 no longer
available for download on code.google.com
Posted by ap...@apache.org.
HBASE-13325 Protocol Buffers 2.5 no longer available for download on code.google.com
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/052150ee
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/052150ee
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/052150ee
Branch: refs/heads/0.98
Commit: 052150ee610bacd08bc100ba7818c001b6d9c725
Parents: 586a606
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Mar 25 09:27:12 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 13:29:29 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/protobuf/package.html | 2 +-
hbase-protocol/README.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/052150ee/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
index 292cac5..d324653 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
@@ -20,7 +20,7 @@
<head />
<body bgcolor="white">
-Holds classes generated from <a href="http://code.google.com/apis/protocolbuffers/">protobuf</a>
+Holds classes generated from <a href="https://developers.google.com/protocol-buffers/">protobuf</a>
<code>src/main/protobuf</code> definition files.
<p>See under <code>src/main/protobuf</code> for instruction on how to generate the content under
http://git-wip-us.apache.org/repos/asf/hbase/blob/052150ee/hbase-protocol/README.txt
----------------------------------------------------------------------
diff --git a/hbase-protocol/README.txt b/hbase-protocol/README.txt
index b67f0c3..e651411 100644
--- a/hbase-protocol/README.txt
+++ b/hbase-protocol/README.txt
@@ -5,7 +5,7 @@ and then checked in. The reasoning is that they change infrequently.
To regenerate the classes after making definition file changes, ensure first that
the protobuf protoc tool is in your $PATH (You may need to download it and build
it first; its part of the protobuf package obtainable from here:
-http://code.google.com/p/protobuf/downloads/list).
+https://github.com/google/protobuf/releases/tag/v2.5.0).
HBase uses hadoop-maven-plugins:protoc goal to invoke the protoc command. You can
compile the protoc definitions by invoking maven with profile compile-protobuf or
[2/6] hbase git commit: HBASE-13132 Improve RemoveColumn action debug
message
Posted by ap...@apache.org.
HBASE-13132 Improve RemoveColumn action debug message
Conflicts:
hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/586a6060
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/586a6060
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/586a6060
Branch: refs/heads/0.98
Commit: 586a60606e915a775c746de2e2842f0528f22d9b
Parents: 63281f8
Author: Jonathan M Hsieh <jm...@apache.org>
Authored: Mon Mar 2 10:31:24 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 13:17:03 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/586a6060/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
index 9251100..709e066 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
@@ -64,9 +64,10 @@ public class RemoveColumnAction extends Action {
protectedColumns.contains(columnDescriptors[index].getNameAsString())) {
index = random.nextInt(columnDescriptors.length);
}
- LOG.debug("Performing action: Removing " + columnDescriptors[index].getName() + " from "
- + tableNameString);
- tableDescriptor.removeFamily(columnDescriptors[index].getName());
+ byte[] colDescName = columnDescriptors[index].getName();
+ LOG.debug("Performing action: Removing " + Bytes.toString(colDescName)+ " from "
+ + Bytes.toString(tableName));
+ tableDescriptor.removeFamily(colDescName);
admin.modifyTable(tableName, tableDescriptor);
}
[4/6] hbase git commit: HBASE-13325 Protocol Buffers 2.5 no longer
available for download on code.google.com
Posted by ap...@apache.org.
HBASE-13325 Protocol Buffers 2.5 no longer available for download on code.google.com
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9d679f6b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9d679f6b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9d679f6b
Branch: refs/heads/branch-1.1
Commit: 9d679f6b84f41b0a44db3f5a66613397667dbcaa
Parents: 6e546a5
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Mar 25 09:27:12 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 13:31:07 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/protobuf/package.html | 2 +-
hbase-protocol/README.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9d679f6b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
index 292cac5..d324653 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
@@ -20,7 +20,7 @@
<head />
<body bgcolor="white">
-Holds classes generated from <a href="http://code.google.com/apis/protocolbuffers/">protobuf</a>
+Holds classes generated from <a href="https://developers.google.com/protocol-buffers/">protobuf</a>
<code>src/main/protobuf</code> definition files.
<p>See under <code>src/main/protobuf</code> for instruction on how to generate the content under
http://git-wip-us.apache.org/repos/asf/hbase/blob/9d679f6b/hbase-protocol/README.txt
----------------------------------------------------------------------
diff --git a/hbase-protocol/README.txt b/hbase-protocol/README.txt
index b67f0c3..e651411 100644
--- a/hbase-protocol/README.txt
+++ b/hbase-protocol/README.txt
@@ -5,7 +5,7 @@ and then checked in. The reasoning is that they change infrequently.
To regenerate the classes after making definition file changes, ensure first that
the protobuf protoc tool is in your $PATH (You may need to download it and build
it first; its part of the protobuf package obtainable from here:
-http://code.google.com/p/protobuf/downloads/list).
+https://github.com/google/protobuf/releases/tag/v2.5.0).
HBase uses hadoop-maven-plugins:protoc goal to invoke the protoc command. You can
compile the protoc definitions by invoking maven with profile compile-protobuf or
[5/6] hbase git commit: HBASE-13325 Protocol Buffers 2.5 no longer
available for download on code.google.com
Posted by ap...@apache.org.
HBASE-13325 Protocol Buffers 2.5 no longer available for download on code.google.com
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cb66e00f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cb66e00f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cb66e00f
Branch: refs/heads/branch-1.0
Commit: cb66e00f0dfc1767a45a20fb08d19feba8c5601b
Parents: aee1c0a
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Mar 25 09:27:12 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 13:31:23 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/protobuf/package.html | 2 +-
hbase-protocol/README.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/cb66e00f/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
index 292cac5..d324653 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/package.html
@@ -20,7 +20,7 @@
<head />
<body bgcolor="white">
-Holds classes generated from <a href="http://code.google.com/apis/protocolbuffers/">protobuf</a>
+Holds classes generated from <a href="https://developers.google.com/protocol-buffers/">protobuf</a>
<code>src/main/protobuf</code> definition files.
<p>See under <code>src/main/protobuf</code> for instruction on how to generate the content under
http://git-wip-us.apache.org/repos/asf/hbase/blob/cb66e00f/hbase-protocol/README.txt
----------------------------------------------------------------------
diff --git a/hbase-protocol/README.txt b/hbase-protocol/README.txt
index b67f0c3..e651411 100644
--- a/hbase-protocol/README.txt
+++ b/hbase-protocol/README.txt
@@ -5,7 +5,7 @@ and then checked in. The reasoning is that they change infrequently.
To regenerate the classes after making definition file changes, ensure first that
the protobuf protoc tool is in your $PATH (You may need to download it and build
it first; its part of the protobuf package obtainable from here:
-http://code.google.com/p/protobuf/downloads/list).
+https://github.com/google/protobuf/releases/tag/v2.5.0).
HBase uses hadoop-maven-plugins:protoc goal to invoke the protoc command. You can
compile the protoc definitions by invoking maven with profile compile-protobuf or