[hbase] branch branch-2 updated: HBASE-24650 Change the return types of the new checkAndMutate methods introduced in HBASE-8458 (#2033)
This is an automated email from the ASF dual-hosted git repository.
brfrn169 pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new f771fd2 HBASE-24650 Change the return types of the new checkAndMutate
methods introduced in HBASE-8458 (#2033)
f771fd2 is described below
commit f771fd26b44929623ee31c866544cbc26dad3ffe
Author: Toshihiro Suzuki
AuthorDate: Wed Jul 8 08:00:48 2020 +0900
HBASE-24650 Change the return types of the new checkAndMutate methods
introduced in HBASE-8458 (#2033)
Signed-off-by: Duo Zhang
---
.../org/apache/hadoop/hbase/client/AsyncTable.java | 9 +-
.../apache/hadoop/hbase/client/AsyncTableImpl.java | 5 +-
.../hadoop/hbase/client/CheckAndMutateResult.java | 48 +++
.../org/apache/hadoop/hbase/client/HTable.java | 77 ++-
.../hadoop/hbase/client/RawAsyncTableImpl.java | 53 +++
.../java/org/apache/hadoop/hbase/client/Table.java | 12 +-
.../hbase/shaded/protobuf/ResponseConverter.java | 74 +++---
.../hadoop/hbase/rest/client/RemoteHTable.java | 6 +-
.../apache/hadoop/hbase/client/TestAsyncTable.java | 154 ++---
.../hadoop/hbase/client/TestAsyncTableBatch.java | 4 +-
.../hadoop/hbase/client/TestCheckAndMutate.java| 129 -
.../hadoop/hbase/client/TestFromClientSide3.java | 4 +-
.../hadoop/hbase/thrift2/client/ThriftTable.java | 5 +-
13 files changed, 342 insertions(+), 238 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java
index fd10603..25ea143 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java
@@ -367,7 +367,7 @@ public interface AsyncTable {
* @param checkAndMutate The CheckAndMutate object.
* @return A {@link CompletableFuture}s that represent the result for the
CheckAndMutate.
*/
- CompletableFuture checkAndMutate(CheckAndMutate checkAndMutate);
+ CompletableFuture checkAndMutate(CheckAndMutate
checkAndMutate);
/**
* Batch version of checkAndMutate. The specified CheckAndMutates are
batched only in the sense
@@ -378,15 +378,16 @@ public interface AsyncTable {
* @return A list of {@link CompletableFuture}s that represent the result
for each
* CheckAndMutate.
*/
- List> checkAndMutate(List
checkAndMutates);
+ List> checkAndMutate(
+List checkAndMutates);
/**
* A simple version of batch checkAndMutate. It will fail if there are any
failures.
*
* @param checkAndMutates The list of rows to apply.
- * @return A {@link CompletableFuture} that wrapper the result boolean list.
+ * @return A {@link CompletableFuture} that wrapper the result list.
*/
- default CompletableFuture> checkAndMutateAll(
+ default CompletableFuture> checkAndMutateAll(
List checkAndMutates) {
return allOf(checkAndMutate(checkAndMutates));
}
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableImpl.java
index 836c9b5..82e8cd5 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableImpl.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableImpl.java
@@ -205,12 +205,13 @@ class AsyncTableImpl implements
AsyncTable {
}
@Override
- public CompletableFuture checkAndMutate(CheckAndMutate
checkAndMutate) {
+ public CompletableFuture checkAndMutate(CheckAndMutate
checkAndMutate) {
return wrap(rawTable.checkAndMutate(checkAndMutate));
}
@Override
- public List> checkAndMutate(List
checkAndMutates) {
+ public List> checkAndMutate(
+List checkAndMutates) {
return rawTable.checkAndMutate(checkAndMutates).stream()
.map(this::wrap).collect(toList());
}
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutateResult.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutateResult.java
new file mode 100644
index 000..88b438a
--- /dev/null
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutateResult.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ *
[hbase] branch master updated (34e807a -> 90f4ff7)
This is an automated email from the ASF dual-hosted git repository. huaxiangsun pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/hbase.git. from 34e807a HBASE-24650 Change the return types of the new CheckAndMutate methods introduced in HBASE-8458 (#1991) add 90f4ff7 HBASE-24688 AssignRegionHandler uses EventType.M_RS_CLOSE_META instead of EventType.M_RS_OPEN_META for meta region (#2029) No new revisions were added by this update. Summary of changes: .../apache/hadoop/hbase/regionserver/handler/AssignRegionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[hbase-site] branch asf-site updated: INFRA-10751 Empty commit
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/hbase-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 0737ba2 INFRA-10751 Empty commit 0737ba2 is described below commit 0737ba2ed49cee89e4ab10d1dc0a5d2a126e72ad Author: jenkins AuthorDate: Tue Jul 7 14:46:17 2020 + INFRA-10751 Empty commit
[hbase] branch branch-2 updated: Revert "HBASE-24625 AsyncFSWAL.getLogFileSizeIfBeingWritten does not return the expected synced file length. (#1970)"
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 28602d6 Revert "HBASE-24625 AsyncFSWAL.getLogFileSizeIfBeingWritten
does not return the expected synced file length. (#1970)"
28602d6 is described below
commit 28602d6fdba250238ac40b306df9c44f9e2b93b8
Author: Duo Zhang
AuthorDate: Tue Jul 7 18:16:58 2020 +0800
Revert "HBASE-24625 AsyncFSWAL.getLogFileSizeIfBeingWritten does not return
the expected synced file length. (#1970)"
This reverts commit f8349199290a642c91908dd13037227f9eaebb35.
---
.../hadoop/hbase/io/asyncfs/AsyncFSOutput.java | 5 ---
.../io/asyncfs/FanOutOneBlockAsyncDFSOutput.java | 5 ---
.../hbase/io/asyncfs/WrapperAsyncFSOutput.java | 13 +-
.../hbase/regionserver/wal/AbstractFSWAL.java | 2 +-
.../regionserver/wal/AsyncProtobufLogWriter.java | 5 ---
.../hbase/regionserver/wal/ProtobufLogWriter.java | 11 -
.../org/apache/hadoop/hbase/wal/WALProvider.java | 17
.../regionserver/TestFailedAppendAndSync.java | 49 ++
.../hadoop/hbase/regionserver/TestHRegion.java | 5 ---
.../hadoop/hbase/regionserver/TestWALLockup.java | 10 -
.../hbase/regionserver/wal/TestAsyncFSWAL.java | 5 ---
.../regionserver/wal/TestAsyncFSWALDurability.java | 5 ---
.../regionserver/wal/TestFSHLogDurability.java | 5 ---
.../hbase/regionserver/wal/TestLogRolling.java | 10 -
14 files changed, 24 insertions(+), 123 deletions(-)
diff --git
a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
index 059ca00..3c520b8 100644
---
a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
+++
b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
@@ -89,9 +89,4 @@ public interface AsyncFSOutput extends Closeable {
*/
@Override
void close() throws IOException;
-
- /**
- * @return byteSize success synced to underlying filesystem.
- */
- long getSyncedLength();
}
diff --git
a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
index 457b7c1..ed5bbf0 100644
---
a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
+++
b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
@@ -574,9 +574,4 @@ public class FanOutOneBlockAsyncDFSOutput implements
AsyncFSOutput {
public boolean isBroken() {
return state == State.BROKEN;
}
-
- @Override
- public long getSyncedLength() {
-return this.ackedBlockLength;
- }
}
diff --git
a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
index 39f1f71..bbb4e54 100644
---
a/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
+++
b/hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
@@ -45,8 +45,6 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
private final ExecutorService executor;
- private volatile long syncedLength = 0;
-
public WrapperAsyncFSOutput(Path file, FSDataOutputStream out) {
this.out = out;
this.executor = Executors.newSingleThreadExecutor(new
ThreadFactoryBuilder().setDaemon(true)
@@ -93,11 +91,7 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
out.hflush();
}
}
- long pos = out.getPos();
- if(pos > this.syncedLength) {
-this.syncedLength = pos;
- }
- future.complete(pos);
+ future.complete(out.getPos());
} catch (IOException e) {
future.completeExceptionally(e);
return;
@@ -130,9 +124,4 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
public boolean isBroken() {
return false;
}
-
- @Override
- public long getSyncedLength() {
-return this.syncedLength;
- }
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
index a978dbe..bf53352 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
@@ -1061,7 +1061,7 @@ public abstract class AbstractFSWAL
implements WAL {
Path currentPath = getOldPath();
if (path.equals(currentPath)) {
W writer = this.writer;
-return
[hbase] branch branch-2.2 updated: Revert "HBASE-24625 AsyncFSWAL.getLogFileSizeIfBeingWritten does not return the expected synced file length. (#1970)"
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 160c229 Revert "HBASE-24625 AsyncFSWAL.getLogFileSizeIfBeingWritten
does not return the expected synced file length. (#1970)"
160c229 is described below
commit 160c2290bf6540a4a56df50eda6bfb77130a1351
Author: Duo Zhang
AuthorDate: Tue Jul 7 18:17:20 2020 +0800
Revert "HBASE-24625 AsyncFSWAL.getLogFileSizeIfBeingWritten does not return
the expected synced file length. (#1970)"
This reverts commit bf587fa2411940cb47d3e207a67714f598b0d228.
---
.../hadoop/hbase/io/asyncfs/AsyncFSOutput.java | 5 ---
.../io/asyncfs/FanOutOneBlockAsyncDFSOutput.java | 5 ---
.../hbase/io/asyncfs/WrapperAsyncFSOutput.java | 13 +-
.../hbase/regionserver/wal/AbstractFSWAL.java | 2 +-
.../regionserver/wal/AsyncProtobufLogWriter.java | 5 ---
.../hbase/regionserver/wal/ProtobufLogWriter.java | 11 -
.../org/apache/hadoop/hbase/wal/WALProvider.java | 17
.../regionserver/TestFailedAppendAndSync.java | 49 ++
.../hadoop/hbase/regionserver/TestHRegion.java | 5 ---
.../hadoop/hbase/regionserver/TestWALLockup.java | 10 -
.../hbase/regionserver/wal/TestAsyncFSWAL.java | 5 ---
.../regionserver/wal/TestAsyncFSWALDurability.java | 5 ---
.../regionserver/wal/TestFSHLogDurability.java | 5 ---
13 files changed, 24 insertions(+), 113 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
index 059ca00..3c520b8 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java
@@ -89,9 +89,4 @@ public interface AsyncFSOutput extends Closeable {
*/
@Override
void close() throws IOException;
-
- /**
- * @return byteSize success synced to underlying filesystem.
- */
- long getSyncedLength();
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
index 5f70cfb..ed9da5f 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java
@@ -577,9 +577,4 @@ public class FanOutOneBlockAsyncDFSOutput implements
AsyncFSOutput {
public boolean isBroken() {
return state == State.BROKEN;
}
-
- @Override
- public long getSyncedLength() {
-return this.ackedBlockLength;
- }
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
index 39f1f71..bbb4e54 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/WrapperAsyncFSOutput.java
@@ -45,8 +45,6 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
private final ExecutorService executor;
- private volatile long syncedLength = 0;
-
public WrapperAsyncFSOutput(Path file, FSDataOutputStream out) {
this.out = out;
this.executor = Executors.newSingleThreadExecutor(new
ThreadFactoryBuilder().setDaemon(true)
@@ -93,11 +91,7 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
out.hflush();
}
}
- long pos = out.getPos();
- if(pos > this.syncedLength) {
-this.syncedLength = pos;
- }
- future.complete(pos);
+ future.complete(out.getPos());
} catch (IOException e) {
future.completeExceptionally(e);
return;
@@ -130,9 +124,4 @@ public class WrapperAsyncFSOutput implements AsyncFSOutput {
public boolean isBroken() {
return false;
}
-
- @Override
- public long getSyncedLength() {
-return this.syncedLength;
- }
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
index 5621a19..2a7ebff 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
@@ -1014,7 +1014,7 @@ public abstract class AbstractFSWAL
implements WAL {
Path currentPath = getOldPath();
if (path.equals(currentPath)) {
W writer = this.writer;
-return writer != null ? OptionalLong.of(writer.getSyncedLength()) :
