You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2017/05/10 18:04:02 UTC
[03/46] phoenix git commit: Remove redundant spaces
Remove redundant spaces
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/acfc9d52
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/acfc9d52
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/acfc9d52
Branch: refs/heads/omid
Commit: acfc9d52875dcb3e1653d22e58f78ad150494355
Parents: 1d32eb2
Author: Ohad Shacham <oh...@yahoo-inc.com>
Authored: Thu Feb 9 16:33:20 2017 +0200
Committer: Ohad Shacham <oh...@yahoo-inc.com>
Committed: Thu Feb 9 16:33:20 2017 +0200
----------------------------------------------------------------------
.../transaction/OmidTransactionTable.java | 2 +-
.../transaction/PhoenixTransactionContext.java | 40 ++++++++++----------
.../transaction/PhoenixTransactionalTable.java | 34 ++++++++---------
3 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/acfc9d52/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index 5a5291c..f15fdd3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -18,7 +18,7 @@ public class OmidTransactionTable implements PhoenixTransactionalTable {
public OmidTransactionTable(PhoenixTransactionContext ctx) {
// TODO Auto-generated constructor stub
}
-
+
@Override
public Result get(Get get) throws IOException {
// TODO Auto-generated method stub
http://git-wip-us.apache.org/repos/asf/phoenix/blob/acfc9d52/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java
index 3ac0ae3..f07640e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java
@@ -9,43 +9,43 @@ public interface PhoenixTransactionContext {
/**
* Starts a transaction
- *
+ *
* @throws SQLException
*/
public void begin() throws SQLException;
-
+
/**
* Commits a transaction
- *
+ *
* @throws SQLException
*/
public void commit() throws SQLException;
-
+
/**
* Rollback a transaction
- *
+ *
* @throws SQLException
*/
public void abort() throws SQLException;
/**
* Rollback a transaction
- *
- * @param e
+ *
+ * @param e
* @throws SQLException
*/
public void abort(SQLException e) throws SQLException;
-
+
/**
* Create a checkpoint in a transaction as defined in [TEPHRA-96]
* @throws SQLException
*/
public void checkpoint() throws SQLException;
-
+
/**
- * Commit DDL to guarantee that no transaction started before create index
+ * Commit DDL to guarantee that no transaction started before create index
* and committed afterwards, as explained in [PHOENIX-2478], [TEPHRA-157] and [OMID-56].
- *
+ *
* @param dataTable the table that the DDL command works on
* @throws SQLException
* @throws InterruptedException
@@ -53,22 +53,22 @@ public interface PhoenixTransactionContext {
*/
public void commitDDLFence(PTable dataTable)
throws SQLException, InterruptedException, TimeoutException;
-
+
/**
- * mark DML with table information for conflict detection of concurrent
+ * mark DML with table information for conflict detection of concurrent
* DDL operation, as explained in [PHOENIX-2478], [TEPHRA-157] and [OMID-56].
- *
+ *
* @param table the table that the DML command works on
*/
public void markDMLFence(PTable table);
-
+
/**
* Augment the current context with ctx modified keys
- *
+ *
* @param ctx
*/
public void join(PhoenixTransactionContext ctx);
-
+
/**
* Is there a transaction in flight?
*/
@@ -78,12 +78,12 @@ public interface PhoenixTransactionContext {
* Reset transaction state
*/
public void reset();
-
- /**
+
+ /**
* Returns transaction unique identifier
*/
long getTransactionId();
-
+
/**
* Returns transaction snapshot id
*/
http://git-wip-us.apache.org/repos/asf/phoenix/blob/acfc9d52/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionalTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionalTable.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionalTable.java
index 2316dc4..ff2632c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionalTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionalTable.java
@@ -19,7 +19,7 @@ public interface PhoenixTransactionalTable {
/**
* Transaction version of {@link HTableInterface#get(Get get)}
* @param get
- * @return
+ * @return
* @throws IOException
*/
public Result get(Get get) throws IOException;
@@ -34,25 +34,25 @@ public interface PhoenixTransactionalTable {
/**
* Transactional version of {@link HTableInterface#delete(Delete delete)}
*
- * @param delete
- * @throws IOException
+ * @param delete
+ * @throws IOException
*/
public void delete(Delete delete) throws IOException;
-
+
/**
* Transactional version of {@link HTableInterface#getScanner(Scan scan)}
*
- * @param scan
+ * @param scan
* @return ResultScanner
* @throws IOException
*/
public ResultScanner getScanner(Scan scan) throws IOException;
-
+
/**
* Returns Htable name
*/
public byte[] getTableName();
-
+
/**
* Returns Htable configuration object
*/
@@ -60,7 +60,7 @@ public interface PhoenixTransactionalTable {
/**
* Returns HTableDescriptor of Htable
- * @throws IOException
+ * @throws IOException
*/
public HTableDescriptor getTableDescriptor() throws IOException;
@@ -69,28 +69,28 @@ public interface PhoenixTransactionalTable {
* @throws IOException
*/
public boolean exists(Get get) throws IOException;
-
+
/**
* Transactional version of {@link HTableInterface#get(List gets)}
- * @throws IOException
+ * @throws IOException
*/
public Result[] get(List<Get> gets) throws IOException;
-
+
/**
* Transactional version of {@link HTableInterface#getScanner(byte[] family)}
- * @throws IOException
+ * @throws IOException
*/
public ResultScanner getScanner(byte[] family) throws IOException;
/**
* Transactional version of {@link HTableInterface#getScanner(byte[] family, byte[] qualifier)}
- * @throws IOException
+ * @throws IOException
*/
public ResultScanner getScanner(byte[] family, byte[] qualifier) throws IOException;
/**
* Transactional version of {@link HTableInterface#put(List puts)}
- * @throws IOException
+ * @throws IOException
*/
public void put(List<Put> puts) throws IOException;
@@ -99,7 +99,7 @@ public interface PhoenixTransactionalTable {
* @throws IOException
*/
public void delete(List<Delete> deletes) throws IOException;
-
+
/**
* Return the underling htable
*/
@@ -129,10 +129,10 @@ public interface PhoenixTransactionalTable {
* Delegates to see HTable.flushCommits()
*/
public void flushCommits() throws IOException;
-
+
/**
* Releases resources
- * @throws IOException
+ * @throws IOException
*/
public void close() throws IOException;
}