Git Push Summary
Repository: phoenix Updated Tags: refs/tags/v4.2.2 [created] 98ad88970
phoenix git commit: Set version to 4.2.3-SNAPSHOT after release
Repository: phoenix Updated Branches: refs/heads/4.2 5c6fc2f02 - 33252b06d Set version to 4.2.3-SNAPSHOT after release Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/33252b06 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/33252b06 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/33252b06 Branch: refs/heads/4.2 Commit: 33252b06ddfc06e48124519a2bb6c89c374dd672 Parents: 5c6fc2f Author: Mujtaba mujt...@apache.org Authored: Wed Dec 10 13:57:39 2014 -0800 Committer: Mujtaba mujt...@apache.org Committed: Wed Dec 10 13:57:39 2014 -0800 -- phoenix-assembly/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml| 2 +- phoenix-pig/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/33252b06/phoenix-assembly/pom.xml -- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index a0ff81c..71bf485 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.2.2/version +version4.2.3-SNAPSHOT/version /parent artifactIdphoenix-assembly/artifactId namePhoenix Assembly/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/33252b06/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 25a9ff6..10ed20b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.2.2/version +version4.2.3-SNAPSHOT/version /parent artifactIdphoenix-core/artifactId namePhoenix Core/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/33252b06/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index db7d6d9..528fd0b 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.2.2/version +version4.2.3-SNAPSHOT/version /parent artifactIdphoenix-flume/artifactId namePhoenix - Flume/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/33252b06/phoenix-pig/pom.xml -- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 932b8dd..dbe8035 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.2.2/version +version4.2.3-SNAPSHOT/version /parent artifactIdphoenix-pig/artifactId namePhoenix - Pig/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/33252b06/pom.xml -- diff --git a/pom.xml b/pom.xml index 18aebc3..b2b7bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ modelVersion4.0.0/modelVersion groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId - version4.2.2/version + version4.2.3-SNAPSHOT/version packagingpom/packaging nameApache Phoenix/name descriptionA SQL layer over HBase/description
phoenix git commit: Set version to 3.2.3-SNAPSHOT after release
Repository: phoenix Updated Branches: refs/heads/3.2 6473adb16 - 206a004ce Set version to 3.2.3-SNAPSHOT after release Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/206a004c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/206a004c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/206a004c Branch: refs/heads/3.2 Commit: 206a004ce35ef50ae8ba44e1c1efca575a4cf89b Parents: 6473adb Author: Mujtaba mujt...@apache.org Authored: Wed Dec 10 13:58:39 2014 -0800 Committer: Mujtaba mujt...@apache.org Committed: Wed Dec 10 13:58:39 2014 -0800 -- phoenix-assembly/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hadoop-compat/pom.xml | 2 +- phoenix-hadoop1-compat/pom.xml | 2 +- phoenix-hadoop2-compat/pom.xml | 2 +- phoenix-pig/pom.xml| 2 +- pom.xml| 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-assembly/pom.xml -- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 28236bc..bc3198f 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version +version3.2.3-SNAPSHOT/version /parent artifactIdphoenix-assembly/artifactId namePhoenix Assembly/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index cd374ac..fa649ae 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version +version3.2.3-SNAPSHOT/version /parent artifactIdphoenix-core/artifactId namePhoenix Core/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 7e5a4f0..3fac161 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version +version3.2.3-SNAPSHOT/version /parent artifactIdphoenix-flume/artifactId namePhoenix - Flume/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-hadoop-compat/pom.xml -- diff --git a/phoenix-hadoop-compat/pom.xml b/phoenix-hadoop-compat/pom.xml index da32d3e..1dc7b22 100644 --- a/phoenix-hadoop-compat/pom.xml +++ b/phoenix-hadoop-compat/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version +version3.2.3-SNAPSHOT/version /parent artifactIdphoenix-hadoop-compat/artifactId namePhoenix Hadoop Compatibility/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-hadoop1-compat/pom.xml -- diff --git a/phoenix-hadoop1-compat/pom.xml b/phoenix-hadoop1-compat/pom.xml index a0094cf..6398747 100644 --- a/phoenix-hadoop1-compat/pom.xml +++ b/phoenix-hadoop1-compat/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version +version3.2.3-SNAPSHOT/version /parent artifactIdphoenix-hadoop1-compat/artifactId namePhoenix Hadoop1 Compatibility/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-hadoop2-compat/pom.xml -- diff --git a/phoenix-hadoop2-compat/pom.xml b/phoenix-hadoop2-compat/pom.xml index cde7486..7fde97f 100644 --- a/phoenix-hadoop2-compat/pom.xml +++ b/phoenix-hadoop2-compat/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version +version3.2.3-SNAPSHOT/version /parent artifactIdphoenix-hadoop2-compat/artifactId namePhoenix Hadoop2 Compatibility/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/206a004c/phoenix-pig/pom.xml -- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index e05ed09..7fbdf35 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version3.2.2/version
phoenix git commit: PHOENIX-1498: Turn KEEP_DELETED_CELLS off by default
Repository: phoenix Updated Branches: refs/heads/master f84e5da33 - 5722a4d31 PHOENIX-1498: Turn KEEP_DELETED_CELLS off by default Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5722a4d3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5722a4d3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5722a4d3 Branch: refs/heads/master Commit: 5722a4d31318cb04473fed8bf72c5202b33d1e0d Parents: f84e5da Author: Jeffrey Zhong jeffr...@apache.org Authored: Mon Dec 8 18:30:08 2014 -0800 Committer: Jeffrey Zhong jeffr...@apache.org Committed: Wed Dec 10 14:22:02 2014 -0800 -- .../java/org/apache/phoenix/end2end/BaseQueryIT.java | 7 +++ .../java/org/apache/phoenix/end2end/GroupByIT.java | 15 +++ .../phoenix/end2end/QueryDatabaseMetaDataIT.java | 12 .../it/java/org/apache/phoenix/end2end/QueryIT.java | 13 + .../apache/phoenix/coprocessor/MetaDataProtocol.java | 2 ++ .../phoenix/query/ConnectionQueryServicesImpl.java | 5 - .../org/apache/phoenix/query/QueryConstants.java | 9 ++--- .../java/org/apache/phoenix/query/QueryServices.java | 1 + .../apache/phoenix/query/QueryServicesOptions.java | 1 + 9 files changed, 61 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5722a4d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java index e404c17..fc088ac 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java @@ -67,7 +67,14 @@ public abstract class BaseQueryIT extends BaseClientManagedTimeIT { @BeforeClass @Shadower(classBeingShadowed = BaseClientManagedTimeIT.class) public static void doSetup() throws Exception { +doSetup(null); +} + +protected static void doSetup(MapString,String customProps) throws Exception { MapString,String props = getDefaultProps(); +if(customProps != null) { + props.putAll(customProps); +} props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(5000)); props.put(IndexWriterUtils.HTABLE_THREAD_KEY, Integer.toString(100)); // Make a small batch size to test multiple calls to reserve sequences http://git-wip-us.apache.org/repos/asf/phoenix/blob/5722a4d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java index 55bce01..31a55a0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java @@ -33,6 +33,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.sql.Connection; +import java.sql.Date; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -40,16 +41,22 @@ import java.sql.Statement; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Properties; +import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; @RunWith(Parameterized.class) @@ -64,6 +71,14 @@ public class GroupByIT extends BaseQueryIT { return QueryIT.data(); } +@BeforeClass +@Shadower(classBeingShadowed = BaseQueryIT.class) +public static void doSetup() throws Exception { + MapString,String props = Maps.newHashMapWithExpectedSize(3); + props.put(QueryServices.DEFAULT_KEEP_DELETED_CELLS_ATTRIB, true); + BaseQueryIT.doSetup(props); +} + @SuppressWarnings(unchecked) @Test public void testGroupByCondition() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/5722a4d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java -- diff --git
phoenix git commit: PHOENIX-1498: Turn KEEP_DELETED_CELLS off by default
Repository: phoenix Updated Branches: refs/heads/4.0 b70f3abd2 - f01a8d808 PHOENIX-1498: Turn KEEP_DELETED_CELLS off by default Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f01a8d80 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f01a8d80 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f01a8d80 Branch: refs/heads/4.0 Commit: f01a8d8088e12be6be10cfb2c483a53cec96e3e8 Parents: b70f3ab Author: Jeffrey Zhong jeffr...@apache.org Authored: Mon Dec 8 18:30:08 2014 -0800 Committer: Jeffrey Zhong jeffr...@apache.org Committed: Wed Dec 10 14:25:39 2014 -0800 -- .../java/org/apache/phoenix/end2end/BaseQueryIT.java | 7 +++ .../java/org/apache/phoenix/end2end/GroupByIT.java | 15 +++ .../phoenix/end2end/QueryDatabaseMetaDataIT.java | 12 .../it/java/org/apache/phoenix/end2end/QueryIT.java | 13 + .../apache/phoenix/coprocessor/MetaDataProtocol.java | 2 ++ .../phoenix/query/ConnectionQueryServicesImpl.java | 5 - .../org/apache/phoenix/query/QueryConstants.java | 9 ++--- .../java/org/apache/phoenix/query/QueryServices.java | 1 + .../apache/phoenix/query/QueryServicesOptions.java | 1 + 9 files changed, 61 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f01a8d80/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java index e404c17..fc088ac 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java @@ -67,7 +67,14 @@ public abstract class BaseQueryIT extends BaseClientManagedTimeIT { @BeforeClass @Shadower(classBeingShadowed = BaseClientManagedTimeIT.class) public static void doSetup() throws Exception { +doSetup(null); +} + +protected static void doSetup(MapString,String customProps) throws Exception { MapString,String props = getDefaultProps(); +if(customProps != null) { + props.putAll(customProps); +} props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(5000)); props.put(IndexWriterUtils.HTABLE_THREAD_KEY, Integer.toString(100)); // Make a small batch size to test multiple calls to reserve sequences http://git-wip-us.apache.org/repos/asf/phoenix/blob/f01a8d80/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java index 55bce01..31a55a0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java @@ -33,6 +33,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.sql.Connection; +import java.sql.Date; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -40,16 +41,22 @@ import java.sql.Statement; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Properties; +import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; @RunWith(Parameterized.class) @@ -64,6 +71,14 @@ public class GroupByIT extends BaseQueryIT { return QueryIT.data(); } +@BeforeClass +@Shadower(classBeingShadowed = BaseQueryIT.class) +public static void doSetup() throws Exception { + MapString,String props = Maps.newHashMapWithExpectedSize(3); + props.put(QueryServices.DEFAULT_KEEP_DELETED_CELLS_ATTRIB, true); + BaseQueryIT.doSetup(props); +} + @SuppressWarnings(unchecked) @Test public void testGroupByCondition() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/f01a8d80/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java -- diff --git
phoenix git commit: PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement
Repository: phoenix Updated Branches: refs/heads/master 5722a4d31 - b093fcfb3 PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b093fcfb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b093fcfb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b093fcfb Branch: refs/heads/master Commit: b093fcfb3dd5ddf8976f02870e5fdbe993baa853 Parents: 5722a4d Author: maryannxue maryann...@apache.org Authored: Wed Dec 10 17:37:34 2014 -0500 Committer: maryannxue maryann...@apache.org Committed: Wed Dec 10 17:37:34 2014 -0500 -- .../org/apache/phoenix/end2end/SubqueryIT.java | 30 1 file changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b093fcfb/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java index 8e7e6e9..470ba9c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java @@ -995,6 +995,36 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT { } @Test +public void testSubqueryWithUpsert() throws Exception { +String tempTable = UPSERT_SUBQUERY_TABLE; +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(getUrl(), props); +conn.setAutoCommit(true); +try { +conn.createStatement().execute(CREATE TABLE + tempTable ++(item_id varchar not null primary key, ++ name varchar)); +conn.createStatement().execute(UPSERT INTO + tempTable + (item_id, name) ++SELECT \item_id\, name FROM + JOIN_ITEM_TABLE_FULL_NAME ++WHERE \item_id\ NOT IN (SELECT \item_id\ FROM + JOIN_ORDER_TABLE_FULL_NAME + )); + +String query = SELECT name FROM + tempTable + ORDER BY item_id; +PreparedStatement statement = conn.prepareStatement(query); +ResultSet rs = statement.executeQuery(); +assertTrue (rs.next()); +assertEquals(rs.getString(1), T4); +assertTrue (rs.next()); +assertEquals(rs.getString(1), T5); +assertTrue (rs.next()); +assertEquals(rs.getString(1), INVALID-1); + +assertFalse(rs.next()); +} finally { +conn.close(); +} +} + +@Test public void testSubqueryWithDelete() throws Exception { String tempTable = TEMP_SUBQUERY_TABLE; Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
phoenix git commit: PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement
Repository: phoenix Updated Branches: refs/heads/4.0 f01a8d808 - 20fed1fb7 PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/20fed1fb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/20fed1fb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/20fed1fb Branch: refs/heads/4.0 Commit: 20fed1fb70c169ab57427d5f807709c6d4edddc2 Parents: f01a8d8 Author: maryannxue maryann...@apache.org Authored: Wed Dec 10 17:41:53 2014 -0500 Committer: maryannxue maryann...@apache.org Committed: Wed Dec 10 17:41:53 2014 -0500 -- .../org/apache/phoenix/end2end/SubqueryIT.java | 30 1 file changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/20fed1fb/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java index 8e7e6e9..470ba9c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java @@ -995,6 +995,36 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT { } @Test +public void testSubqueryWithUpsert() throws Exception { +String tempTable = UPSERT_SUBQUERY_TABLE; +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(getUrl(), props); +conn.setAutoCommit(true); +try { +conn.createStatement().execute(CREATE TABLE + tempTable ++(item_id varchar not null primary key, ++ name varchar)); +conn.createStatement().execute(UPSERT INTO + tempTable + (item_id, name) ++SELECT \item_id\, name FROM + JOIN_ITEM_TABLE_FULL_NAME ++WHERE \item_id\ NOT IN (SELECT \item_id\ FROM + JOIN_ORDER_TABLE_FULL_NAME + )); + +String query = SELECT name FROM + tempTable + ORDER BY item_id; +PreparedStatement statement = conn.prepareStatement(query); +ResultSet rs = statement.executeQuery(); +assertTrue (rs.next()); +assertEquals(rs.getString(1), T4); +assertTrue (rs.next()); +assertEquals(rs.getString(1), T5); +assertTrue (rs.next()); +assertEquals(rs.getString(1), INVALID-1); + +assertFalse(rs.next()); +} finally { +conn.close(); +} +} + +@Test public void testSubqueryWithDelete() throws Exception { String tempTable = TEMP_SUBQUERY_TABLE; Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
svn commit: r1644534 [1/2] - in /phoenix/site: publish/ publish/css/ publish/images/ publish/language/ source/src/site/ source/src/site/markdown/ source/src/site/resources/css/ source/src/site/resourc
Author: mujtaba Date: Wed Dec 10 22:49:13 2014 New Revision: 1644534 URL: http://svn.apache.org/r1644534 Log: Phoenix web site update w/new logo Added: phoenix/site/publish/images/download.png (with props) phoenix/site/publish/images/jira.png (with props) phoenix/site/publish/images/phoenix-logo-small.png (with props) phoenix/site/publish/images/phoenix-logo-white.png (with props) phoenix/site/publish/images/scode.png (with props) phoenix/site/publish/images/search.png (with props) phoenix/site/publish/images/topbar-logo-blue.png (with props) phoenix/site/publish/images/topbar-logo-small-blue.png (with props) phoenix/site/publish/news.html phoenix/site/source/src/site/markdown/news.md phoenix/site/source/src/site/resources/images/download.png (with props) phoenix/site/source/src/site/resources/images/jira.png (with props) phoenix/site/source/src/site/resources/images/phoenix-logo-small.png (with props) phoenix/site/source/src/site/resources/images/phoenix-logo-white.png (with props) phoenix/site/source/src/site/resources/images/scode.png (with props) phoenix/site/source/src/site/resources/images/search.png (with props) phoenix/site/source/src/site/resources/images/topbar-logo-blue.png (with props) phoenix/site/source/src/site/resources/images/topbar-logo-small-blue.png (with props) Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/contributing.html phoenix/site/publish/css/site.css phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/images/phoenix-logo.png phoenix/site/publish/index.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/pig_integration.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/team.html phoenix/site/publish/tracing.html phoenix/site/publish/tuning.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrade_from_2_2.html phoenix/site/publish/views.html phoenix/site/source/src/site/markdown/index.md phoenix/site/source/src/site/markdown/source.md phoenix/site/source/src/site/resources/css/site.css phoenix/site/source/src/site/resources/images/phoenix-logo.png phoenix/site/source/src/site/site.xml Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1644534r1=1644533r2=1644534view=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Wed Dec 10 22:49:13 2014 @@ -1,7 +1,7 @@ !DOCTYPE html !-- - Generated by Apache Maven Doxia at 2014-11-18 + Generated by Apache Maven Doxia at 2014-12-10 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) -- html xml:lang=en lang=en @@ -13,7 +13,7 @@ meta name=description content= / meta http-equiv=content-language content=en / - link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/united/bootstrap.min.css; rel=stylesheet / + link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css; rel=stylesheet / link href=http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css; rel=stylesheet / link href=./css/bootswatch.css rel=stylesheet / link href=./css/reflow-skin.css rel=stylesheet / @@ -350,7 +350,7 @@ /ul /div div class=span3 bottom-description - form action=https://www.google.com/search; method=getinput value=phoenix.apache.org name=sitesearch
svn commit: r1644534 [2/2] - in /phoenix/site: publish/ publish/css/ publish/images/ publish/language/ source/src/site/ source/src/site/markdown/ source/src/site/resources/css/ source/src/site/resourc
Modified: phoenix/site/publish/tracing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/tracing.html?rev=1644534r1=1644533r2=1644534view=diff == --- phoenix/site/publish/tracing.html (original) +++ phoenix/site/publish/tracing.html Wed Dec 10 22:49:13 2014 @@ -1,7 +1,7 @@ !DOCTYPE html !-- - Generated by Apache Maven Doxia at 2014-11-18 + Generated by Apache Maven Doxia at 2014-12-10 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) -- html xml:lang=en lang=en @@ -13,7 +13,7 @@ meta name=description content= / meta http-equiv=content-language content=en / - link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/united/bootstrap.min.css; rel=stylesheet / + link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css; rel=stylesheet / link href=http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css; rel=stylesheet / link href=./css/bootswatch.css rel=stylesheet / link href=./css/reflow-skin.css rel=stylesheet / @@ -442,7 +442,7 @@ Connection conn = DriverManager.getConne /ul /div div class=span3 bottom-description - form action=https://www.google.com/search; method=getinput value=phoenix.apache.org name=sitesearch type=hiddeninput placeholder=Search the sitehellip; required=required style=width:170px; size=18 name=q id=query type=search/form + form action=http://search-hadoop.com/?; method=getinput value=Phoenix name=fc_project type=hiddeninput placeholder=Search Phoenixhellip; required=required style=width:170px; size=18 name=q id=query type=search/form /div /div /div Modified: phoenix/site/publish/tuning.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/tuning.html?rev=1644534r1=1644533r2=1644534view=diff == --- phoenix/site/publish/tuning.html (original) +++ phoenix/site/publish/tuning.html Wed Dec 10 22:49:13 2014 @@ -1,7 +1,7 @@ !DOCTYPE html !-- - Generated by Apache Maven Doxia at 2014-11-18 + Generated by Apache Maven Doxia at 2014-12-10 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) -- html xml:lang=en lang=en @@ -13,7 +13,7 @@ meta name=description content= / meta http-equiv=content-language content=en / - link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/united/bootstrap.min.css; rel=stylesheet / + link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css; rel=stylesheet / link href=http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css; rel=stylesheet / link href=./css/bootswatch.css rel=stylesheet / link href=./css/reflow-skin.css rel=stylesheet / @@ -550,7 +550,7 @@ /ul /div div class=span3 bottom-description - form action=https://www.google.com/search; method=getinput value=phoenix.apache.org name=sitesearch type=hiddeninput placeholder=Search the sitehellip; required=required style=width:170px; size=18 name=q id=query type=search/form + form action=http://search-hadoop.com/?; method=getinput value=Phoenix name=fc_project type=hiddeninput placeholder=Search Phoenixhellip; required=required style=width:170px; size=18 name=q id=query type=search/form /div /div /div Modified: phoenix/site/publish/update_statistics.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/update_statistics.html?rev=1644534r1=1644533r2=1644534view=diff == --- phoenix/site/publish/update_statistics.html (original) +++ phoenix/site/publish/update_statistics.html Wed Dec 10 22:49:13 2014 @@ -1,7 +1,7 @@ !DOCTYPE html !-- - Generated by Apache Maven Doxia at 2014-11-18 + Generated by Apache Maven Doxia at 2014-12-10 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) -- html xml:lang=en lang=en @@ -13,7 +13,7 @@ meta name=description content= / meta http-equiv=content-language content=en / - link href=http://netdna.bootstrapcdn.com/bootswatch/2.3.2/united/bootstrap.min.css; rel=stylesheet / +
phoenix git commit: PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement
Repository: phoenix Updated Branches: refs/heads/3.0 cabb16f7d - 042a85fb4 PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/042a85fb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/042a85fb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/042a85fb Branch: refs/heads/3.0 Commit: 042a85fb40ab49b1cdddc78775f3fb3335afe02a Parents: cabb16f Author: maryannxue maryann...@apache.org Authored: Wed Dec 10 17:44:07 2014 -0500 Committer: maryannxue maryann...@apache.org Committed: Wed Dec 10 17:44:07 2014 -0500 -- .../org/apache/phoenix/end2end/SubqueryIT.java | 30 1 file changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/042a85fb/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java index 5a022c6..f20bce2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java @@ -918,6 +918,36 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT { } @Test +public void testSubqueryWithUpsert() throws Exception { +String tempTable = UPSERT_SUBQUERY_TABLE; +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(getUrl(), props); +conn.setAutoCommit(true); +try { +conn.createStatement().execute(CREATE TABLE + tempTable ++(item_id varchar not null primary key, ++ name varchar)); +conn.createStatement().execute(UPSERT INTO + tempTable + (item_id, name) ++SELECT \item_id\, name FROM + JOIN_ITEM_TABLE_FULL_NAME ++WHERE \item_id\ NOT IN (SELECT \item_id\ FROM + JOIN_ORDER_TABLE_FULL_NAME + )); + +String query = SELECT name FROM + tempTable + ORDER BY item_id; +PreparedStatement statement = conn.prepareStatement(query); +ResultSet rs = statement.executeQuery(); +assertTrue (rs.next()); +assertEquals(rs.getString(1), T4); +assertTrue (rs.next()); +assertEquals(rs.getString(1), T5); +assertTrue (rs.next()); +assertEquals(rs.getString(1), INVALID-1); + +assertFalse(rs.next()); +} finally { +conn.close(); +} +} + +@Test public void testSubqueryWithDelete() throws Exception { String tempTable = TEMP_SUBQUERY_TABLE; Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Apache-Phoenix | Master | Build Successful
Master branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/ Changes [jeffreyz] PHOENIX-1498: Turn KEEP_DELETED_CELLS off by default [maryannxue] PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement
Apache-Phoenix | 4.0 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0/lastCompletedBuild/testReport/ Changes [jeffreyz] PHOENIX-1498: Turn KEEP_DELETED_CELLS off by default
Apache-Phoenix | 3.0 | Hadoop1 | Build Successful
3.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/ Changes [maryannxue] PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement
svn commit: r1644536 - in /phoenix/site: publish/favicon.ico source/src/site/resources/favicon.ico
Author: mujtaba Date: Wed Dec 10 23:27:59 2014 New Revision: 1644536 URL: http://svn.apache.org/r1644536 Log: Phoenix web site update w/new logo Modified: phoenix/site/publish/favicon.ico phoenix/site/source/src/site/resources/favicon.ico Modified: phoenix/site/publish/favicon.ico URL: http://svn.apache.org/viewvc/phoenix/site/publish/favicon.ico?rev=1644536r1=1644535r2=1644536view=diff == Binary files - no diff available. Modified: phoenix/site/source/src/site/resources/favicon.ico URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/favicon.ico?rev=1644536r1=1644535r2=1644536view=diff == Binary files - no diff available.
Apache-Phoenix | 4.0 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0/lastCompletedBuild/testReport/ Changes [maryannxue] PHOENIX-1393 Add test cases for sub-queries in UPSERT and DELETE statement