You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2014/03/05 22:55:54 UTC

git commit: Add tests with @Ignore for PHOENIX-110

Repository: incubator-phoenix
Updated Branches:
  refs/heads/master 3747e8afe -> 916f6a9a5


Add tests with @Ignore for PHOENIX-110


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/916f6a9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/916f6a9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/916f6a9a

Branch: refs/heads/master
Commit: 916f6a9a55018f3a5a926849a097c9f1d30817bc
Parents: 3747e8a
Author: Eli Levine <el...@apache.org>
Authored: Wed Mar 5 13:55:27 2014 -0800
Committer: Eli Levine <el...@apache.org>
Committed: Wed Mar 5 13:55:27 2014 -0800

----------------------------------------------------------------------
 .../phoenix/end2end/BaseTenantSpecificViewIndexTest.java       | 2 ++
 .../phoenix/end2end/TenantSpecificViewIndexSaltedTest.java     | 5 +++--
 .../apache/phoenix/end2end/TenantSpecificViewIndexTest.java    | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/916f6a9a/phoenix-core/src/test/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexTest.java b/phoenix-core/src/test/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexTest.java
index 444b669..c454104 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexTest.java
@@ -100,6 +100,8 @@ public class BaseTenantSpecificViewIndexTest extends BaseHBaseManagedTimeTest {
     
     private void createAndVerifyIndex(Connection conn, Integer saltBuckets, String tenantId, String valuePrefix) throws SQLException {
         conn.createStatement().execute("CREATE INDEX i ON v(v2)");
+        conn.createStatement().execute("UPSERT INTO v(k2,v1,v2) VALUES (-1, 'blah', 'superblah')"); // sanity check that we can upsert after index is there
+        conn.commit();
         ResultSet rs = conn.createStatement().executeQuery("EXPLAIN SELECT k1, k2, v2 FROM v WHERE v2='" + valuePrefix + "v2-1'");
         assertEquals(saltBuckets == null ? 
                 "CLIENT PARALLEL 1-WAY RANGE SCAN OVER I ['" + tenantId + "',-32768,'" + valuePrefix + "v2-1']" :

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/916f6a9a/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedTest.java b/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedTest.java
index 748fa3e..f6941fb 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedTest.java
@@ -1,16 +1,17 @@
 package org.apache.phoenix.end2end;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class TenantSpecificViewIndexSaltedTest extends BaseTenantSpecificViewIndexTest {
     private static final Integer SALT_BUCKETS = 3;
     
-    @Test
+    @Test @Ignore("PHOENIX-110")
     public void testUpdatableSaltedView() throws Exception {
         testUpdatableView(SALT_BUCKETS);
     }
     
-    @Test
+    @Test@Ignore("PHOENIX-110")
     public void testUpdatableViewsWithSameNameDifferentTenants() throws Exception {
         testUpdatableViewsWithSameNameDifferentTenants(SALT_BUCKETS);
     }

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/916f6a9a/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexTest.java b/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexTest.java
index 18d70d5..e4f2454 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/end2end/TenantSpecificViewIndexTest.java
@@ -17,15 +17,17 @@
  */
 package org.apache.phoenix.end2end;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class TenantSpecificViewIndexTest extends BaseTenantSpecificViewIndexTest {
-    @Test
+	
+    @Test @Ignore("PHOENIX-110")
     public void testUpdatableView() throws Exception {
         testUpdatableView(null);
     }
 
-    @Test
+    @Test @Ignore("PHOENIX-110")
     public void testUpdatableViewsWithSameNameDifferentTenants() throws Exception {
         testUpdatableViewsWithSameNameDifferentTenants(null);
     }