You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/05/01 17:58:22 UTC
phoenix git commit: Comment back in delete test now that delete works
correctly
Repository: phoenix
Updated Branches:
refs/heads/txn c89119576 -> 929ea1cb2
Comment back in delete test now that delete works correctly
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/929ea1cb
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/929ea1cb
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/929ea1cb
Branch: refs/heads/txn
Commit: 929ea1cb2d72c157f630ad85d07f0b322af5a412
Parents: c891195
Author: James Taylor <jt...@salesforce.com>
Authored: Fri May 1 08:58:18 2015 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Fri May 1 08:58:18 2015 -0700
----------------------------------------------------------------------
.../org/apache/phoenix/transactions/TransactionIT.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/929ea1cb/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
index a60ff32..78b7875 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
@@ -137,21 +137,17 @@ public class TransactionIT extends BaseHBaseManagedTimeIT {
assertEquals(2, rowsDeleted);
// Delete and second upsert not committed yet, so there should be one row.
- // FIXME: aggregate queries don't appear to honor the transaction information
- // rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + FULL_TABLE_NAME);
- rs = conn2.createStatement().executeQuery("SELECT * FROM " + FULL_TABLE_NAME);
+ rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + FULL_TABLE_NAME);
assertTrue(rs.next());
- // FIXME: (see above)
- // assertEquals(1, rs.getInt(1));
- assertFalse(rs.next());
+ assertEquals(1, rs.getInt(1));
conn1.commit();
// verify rows are deleted after commit
// FIXME: this is failing, I think because Tephra isn't handling deletes like we need it to
// TODO: confirm this works once we get the patch from Gary.
- // rs = conn1.createStatement().executeQuery(selectSQL);
- // assertFalse(rs.next());
+ rs = conn1.createStatement().executeQuery(selectSQL);
+ assertFalse(rs.next());
}
finally {
conn1.close();