Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-23087 Remove the deprecated bulkload method in AsyncClusterConnection (#670) 

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
This commit is contained in:
Duo Zhang 2019-09-29 09:26:40 +08:00 committed by GitHub
parent 836368189a
commit c1a476c492
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hbase-server/src/main/java/org/apache/hadoop/hbase/client/AsyncClusterConnection.java
View File

@ -75,22 +75,11 @@ public interface AsyncClusterConnection extends AsyncConnection {
CompletableFuture<String> prepareBulkLoad(TableName tableName); CompletableFuture<String> prepareBulkLoad(TableName tableName);
/** /**
* @deprecated Use bulkLoad(TableName tableName, List<Pair<byte[], String>> familyPaths, * Securely bulk load a list of HFiles, passing additional list of clusters ids tracking clusters
* byte[] row, boolean assignSeqNum, Token<?> userToken, String bulkToken, * where the given bulk load has already been processed (important for bulk loading replication).
* boolean copyFiles, List<String> clusterIds) * <p/>
*/ * Defined as default here to avoid breaking callers who rely on the bulkLoad version that does
@Deprecated * not expect additional clusterIds param.
CompletableFuture<Boolean> bulkLoad(TableName tableName, List<Pair<byte[], String>> familyPaths,
byte[] row, boolean assignSeqNum, Token<?> userToken, String bulkToken, boolean copyFiles);
/**
* Securely bulk load a list of HFiles, passing additional list of clusters ids tracking
* clusters where the given bulk load has already been processed
* (important for bulk loading replication).
*
* Defined as default here to avoid breaking callers who rely on the bulkLoad version that
* does not expect additional clusterIds param.
*
* @param tableName the target table * @param tableName the target table
* @param familyPaths hdfs path for the the table family dirs containg files to be loaded * @param familyPaths hdfs path for the the table family dirs containg files to be loaded
* @param row row key * @param row row key
@ -99,13 +88,10 @@ public interface AsyncClusterConnection extends AsyncConnection {
* @param bulkToken bulk load token * @param bulkToken bulk load token
* @param copyFiles flag for copying the loaded hfiles * @param copyFiles flag for copying the loaded hfiles
* @param clusterIds list of cluster ids where the given bulk load has already been processed. * @param clusterIds list of cluster ids where the given bulk load has already been processed.
* @return
*/ */
default CompletableFuture<Boolean> bulkLoad(TableName tableName, List<Pair<byte[], CompletableFuture<Boolean> bulkLoad(TableName tableName, List<Pair<byte[], String>> familyPaths,
String>> familyPaths, byte[] row, boolean assignSeqNum, Token<?> userToken, String bulkToken, byte[] row, boolean assignSeqNum, Token<?> userToken, String bulkToken, boolean copyFiles,
boolean copyFiles, List<String> clusterIds) { List<String> clusterIds);
return null;
}
/** /**
* Clean up after finishing bulk load, no matter success or not. * Clean up after finishing bulk load, no matter success or not.

8
hbase-server/src/main/java/org/apache/hadoop/hbase/client/AsyncClusterConnectionImpl.java
View File

@ -106,14 +106,6 @@ class AsyncClusterConnectionImpl extends AsyncConnectionImpl implements AsyncClu
.call(); .call();
} }
@Override
public CompletableFuture<Boolean> bulkLoad(TableName tableName,
List<Pair<byte[], String>> familyPaths, byte[] row, boolean assignSeqNum, Token<?> userToken,
String bulkToken, boolean copyFiles) {
return bulkLoad(tableName, familyPaths, row, assignSeqNum,
userToken, bulkToken, copyFiles, null);
}
@Override @Override
public CompletableFuture<Boolean> bulkLoad(TableName tableName, public CompletableFuture<Boolean> bulkLoad(TableName tableName,
List<Pair<byte[], String>> familyPaths, byte[] row, boolean assignSeqNum, Token<?> userToken, List<Pair<byte[], String>> familyPaths, byte[] row, boolean assignSeqNum, Token<?> userToken,

2
hbase-server/src/test/java/org/apache/hadoop/hbase/client/DummyAsyncClusterConnection.java
View File

@ -144,7 +144,7 @@ public class DummyAsyncClusterConnection implements AsyncClusterConnection {
@Override @Override
public CompletableFuture<Boolean> bulkLoad(TableName tableName, public CompletableFuture<Boolean> bulkLoad(TableName tableName,
List<Pair<byte[], String>> familyPaths, byte[] row, boolean assignSeqNum, Token<?> userToken, List<Pair<byte[], String>> familyPaths, byte[] row, boolean assignSeqNum, Token<?> userToken,
String bulkToken, boolean copyFiles) { String bulkToken, boolean copyFiles, List<String> clusterIds) {
return null; return null;
} }