You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2020/11/17 08:56:37 UTC
[phoenix-omid] branch master updated: OMID-165 Adopt Omid packaging
to Phoenix standards (addenudum: fix javadoc problems that cause build
failure with the new plugin version)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new b554a69 OMID-165 Adopt Omid packaging to Phoenix standards (addenudum: fix javadoc problems that cause build failure with the new plugin version)
b554a69 is described below
commit b554a6944597be6b803d0a95fff291d4ebf84350
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Nov 17 09:54:58 2020 +0100
OMID-165 Adopt Omid packaging to Phoenix standards (addenudum: fix javadoc problems that cause build failure with the new plugin version)
---
hbase-client/src/main/java/org/apache/omid/transaction/TTable.java | 7 +++----
.../ipc/controller/InterRegionServerRpcControllerFactory.java | 2 +-
.../ipc/controller/InterRegionServerRpcControllerFactory.java | 2 +-
.../main/java/org/apache/omid/transaction/AbstractTransaction.java | 1 -
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
index 2e5925c..3311e48 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
@@ -359,7 +359,6 @@ public class TTable implements Closeable {
* @param put an instance of Put
* @param timestamp timestamp to be used as cells version
* @param commitTimestamp timestamp to be used as commit timestamp
- * @throws IOException if a remote or network exception occurs.
*/
static public Put markPutAsCommitted(Put put, long timestamp, long commitTimestamp) {
final Put tsput = new Put(put.getRow(), timestamp);
@@ -606,7 +605,7 @@ public class TTable implements Closeable {
*
* @param transaction an instance of transaction to be used
* @param puts List of puts
- * @param addShadowCell denotes whether to add the shadow cell
+ * @param addShadowCells denotes whether to add the shadow cell
* @throws IOException if a remote or network exception occurs
*/
public void put(Transaction transaction, List<Put> puts, boolean addShadowCells) throws IOException {
@@ -622,11 +621,11 @@ public class TTable implements Closeable {
}
/**
- * Transactional version of {@link Table#batch(List<? extends Row> rows)}
+ * Transactional version of Table#batch(List rows)
*
* @param transaction an instance of transaction to be used
* @param rows List of rows that must be instances of Put or Delete
- * @param addShadowCell denotes whether to add the shadow cell
+ * @param addShadowCells denotes whether to add the shadow cell
* @throws IOException if a remote or network exception occurs
*/
public void batch(Transaction transaction, List<? extends Row> rows, boolean addShadowCells) throws IOException {
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java b/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
index ed02abf..e6868e7 100644
--- a/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
+++ b/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
/**
* {@link RpcControllerFactory} that should only be used when making remote RPCs to the region
- * servers. This prevents deadlocks by having RS->RS traffic handled by higher priorities
+ * servers. This prevents deadlocks by having RS to RS traffic handled by higher priorities
* queues. This controller factory shouldn't be globally configured anywhere and is meant to be
* used only internally by Omid.
*/
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java b/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
index 90c5990..6001b29 100644
--- a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
+++ b/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
/**
* {@link RpcControllerFactory} that should only be used when making remote RPCs to the region
- * servers. This prevents deadlocks by having RS->RS traffic handled by higher priorities
+ * servers. This prevents deadlocks by having RS to RS traffic handled by higher priorities
* queues. This controller factory shouldn't be globally configured anywhere and is meant to be
* used only internally by Omid.
*/
diff --git a/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java b/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
index b821005..c067860 100644
--- a/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
+++ b/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
@@ -175,7 +175,6 @@ public abstract class AbstractTransaction<T extends CellId> implements Transacti
/**
* Creates a checkpoint and sets the visibility level to SNAPSHOT_EXCLUDE_CURRENT
* The number of checkpoints is bounded to NUM_CHECKPOINTS in order to make checkpoint a client side operation
- * @return true if a checkpoint was created and false otherwise
* @throws TransactionException
*/
public void checkpoint() throws TransactionException {