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 2019/10/07 19:34:52 UTC
[hbase] branch branch-1 updated (3966d0f -> 1d531f1)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a change to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 3966d0f Update POMs and CHANGES.txt for 1.5.0 RC4
new 0e8e5a3 HBASE-23128 Restore Region interface compatibility
new 1d531f1 Update CHANGES.txt for 1.5.0 RC4
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../org/apache/hadoop/hbase/regionserver/HRegion.java | 11 +++++++++++
.../org/apache/hadoop/hbase/regionserver/Region.java | 16 ++++++++++++++++
3 files changed, 28 insertions(+)
[hbase] 02/02: Update CHANGES.txt for 1.5.0 RC4
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 1d531f1adb4db96b81493eb33933a07a7e007ecd
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Mon Oct 7 12:23:52 2019 -0700
Update CHANGES.txt for 1.5.0 RC4
---
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a75b8b..819c673 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -108,6 +108,7 @@ Release Notes - HBase - Version 1.5.0 10/14/2019
* [HBASE-23019] - Handle --skip-errorprone on branch-1
* [HBASE-23086] - TestShell failing on branch-1 and branch-1.4
* [HBASE-23094] - Wrong log message in simpleRegionNormaliser while checking if merge is enabled.
+ * [HBASE-23128] - Restore Region interface compatibility
** New Feature
* [HBASE-15666] - shaded dependencies for hbase-testing-util
[hbase] 01/02: HBASE-23128 Restore Region interface compatibility
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 0e8e5a36dbaeec75ffb2e7ac29cf63ea2410d4cd
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Mon Oct 7 12:21:10 2019 -0700
HBASE-23128 Restore Region interface compatibility
Restore and deprecate Region#bulkLoadHFiles(Collection<Pair<byte[],String>>, boolean,
Region.BulkLoadListener).
Warn if invoked.
---
.../org/apache/hadoop/hbase/regionserver/HRegion.java | 11 +++++++++++
.../org/apache/hadoop/hbase/regionserver/Region.java | 16 ++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 6c27ad8..ad69248 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -684,6 +684,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
private final Durability durability;
private final boolean regionStatsEnabled;
+ private static final List<String> EMPTY_CLUSTERID_LIST = new ArrayList<String>();
+
/**
* HRegion constructor. This constructor should only be used for testing and
* extensions. Instances of HRegion should be instantiated with the
@@ -6038,6 +6040,15 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
@Override
+ @Deprecated
+ public boolean bulkLoadHFiles(Collection<Pair<byte[], String>> familyPaths, boolean assignSeqId,
+ BulkLoadListener bulkLoadListener) throws IOException {
+ LOG.warn("Deprecated bulkLoadHFiles invoked. This does not pass through source cluster ids." +
+ " This is probably not what you want. See HBASE-22380.");
+ return bulkLoadHFiles(familyPaths, assignSeqId, bulkLoadListener, EMPTY_CLUSTERID_LIST);
+ }
+
+ @Override
public boolean equals(Object o) {
return o instanceof HRegion && Bytes.equals(getRegionInfo().getRegionName(),
((HRegion) o).getRegionInfo().getRegionName());
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
index 9654e67..fcac452 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
@@ -562,6 +562,22 @@ public interface Region extends ConfigurationObserver {
boolean bulkLoadHFiles(Collection<Pair<byte[], String>> familyPaths, boolean assignSeqId,
BulkLoadListener bulkLoadListener, List<String> clusterIds) throws IOException;
+ /**
+ * Attempts to atomically load a group of hfiles. This is critical for loading
+ * rows with multiple column families atomically. Deprecated - do not use.
+ *
+ * @param familyPaths List of Pair<byte[] column family, String hfilePath>
+ * @param assignSeqId
+ * @param bulkLoadListener Internal hooks enabling massaging/preparation of a
+ * file about to be bulk loaded
+ * @return true if successful, false if failed recoverably
+ * @throws IOException if failed unrecoverably.
+ * @deprecated Do not use, see HBASE-22380
+ */
+ @Deprecated
+ boolean bulkLoadHFiles(Collection<Pair<byte[], String>> familyPaths, boolean assignSeqId,
+ BulkLoadListener bulkLoadListener) throws IOException;
+
///////////////////////////////////////////////////////////////////////////
// Coprocessors