[3/6] phoenix git commit: PHOENIX-4981 Add tests for ORDER BY, GROUP BY and salted tables using phoenix-spark
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6053ee63/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index 578a3af..792d08f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -17,17 +17,7 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.ROW1;
-import static org.apache.phoenix.util.TestUtil.ROW2;
-import static org.apache.phoenix.util.TestUtil.ROW3;
-import static org.apache.phoenix.util.TestUtil.ROW4;
-import static org.apache.phoenix.util.TestUtil.ROW5;
-import static org.apache.phoenix.util.TestUtil.ROW6;
-import static org.apache.phoenix.util.TestUtil.ROW7;
-import static org.apache.phoenix.util.TestUtil.ROW8;
-import static org.apache.phoenix.util.TestUtil.ROW9;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.apache.phoenix.util.TestUtil.assertResultSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -40,83 +30,10 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
-public class OrderByIT extends ParallelStatsDisabledIT {
-
-@Test
-public void testMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string, entity_id";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
-
-
-@Test
-public void testDescMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string || entity_id desc";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
+public class OrderByIT extends BaseOrderByIT {
@Test
public void testOrderByWithPosition() throws Exception {
@@ -151,8 +68,8 @@ public class OrderByIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(1,rs.getInt(1));
assertTrue(rs.next());
-assertEquals(1,rs.getInt(1));
-assertFalse(rs.next());
+
[3/6] phoenix git commit: PHOENIX-4981 Add tests for ORDER BY, GROUP BY and salted tables using phoenix-spark
http://git-wip-us.apache.org/repos/asf/phoenix/blob/51d38d7f/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index 578a3af..792d08f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -17,17 +17,7 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.ROW1;
-import static org.apache.phoenix.util.TestUtil.ROW2;
-import static org.apache.phoenix.util.TestUtil.ROW3;
-import static org.apache.phoenix.util.TestUtil.ROW4;
-import static org.apache.phoenix.util.TestUtil.ROW5;
-import static org.apache.phoenix.util.TestUtil.ROW6;
-import static org.apache.phoenix.util.TestUtil.ROW7;
-import static org.apache.phoenix.util.TestUtil.ROW8;
-import static org.apache.phoenix.util.TestUtil.ROW9;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.apache.phoenix.util.TestUtil.assertResultSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -40,83 +30,10 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
-public class OrderByIT extends ParallelStatsDisabledIT {
-
-@Test
-public void testMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string, entity_id";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
-
-
-@Test
-public void testDescMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string || entity_id desc";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
+public class OrderByIT extends BaseOrderByIT {
@Test
public void testOrderByWithPosition() throws Exception {
@@ -151,8 +68,8 @@ public class OrderByIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(1,rs.getInt(1));
assertTrue(rs.next());
-assertEquals(1,rs.getInt(1));
-assertFalse(rs.next());
+
[3/6] phoenix git commit: PHOENIX-4981 Add tests for ORDER BY, GROUP BY and salted tables using phoenix-spark
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bfaf183/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index 578a3af..792d08f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -17,17 +17,7 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.ROW1;
-import static org.apache.phoenix.util.TestUtil.ROW2;
-import static org.apache.phoenix.util.TestUtil.ROW3;
-import static org.apache.phoenix.util.TestUtil.ROW4;
-import static org.apache.phoenix.util.TestUtil.ROW5;
-import static org.apache.phoenix.util.TestUtil.ROW6;
-import static org.apache.phoenix.util.TestUtil.ROW7;
-import static org.apache.phoenix.util.TestUtil.ROW8;
-import static org.apache.phoenix.util.TestUtil.ROW9;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.apache.phoenix.util.TestUtil.assertResultSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -40,83 +30,10 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
-public class OrderByIT extends ParallelStatsDisabledIT {
-
-@Test
-public void testMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string, entity_id";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
-
-
-@Test
-public void testDescMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string || entity_id desc";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
+public class OrderByIT extends BaseOrderByIT {
@Test
public void testOrderByWithPosition() throws Exception {
@@ -151,8 +68,8 @@ public class OrderByIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(1,rs.getInt(1));
assertTrue(rs.next());
-assertEquals(1,rs.getInt(1));
-assertFalse(rs.next());
+
[3/6] phoenix git commit: PHOENIX-4981 Add tests for ORDER BY, GROUP BY and salted tables using phoenix-spark
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c509d58f/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index 578a3af..792d08f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -17,17 +17,7 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.ROW1;
-import static org.apache.phoenix.util.TestUtil.ROW2;
-import static org.apache.phoenix.util.TestUtil.ROW3;
-import static org.apache.phoenix.util.TestUtil.ROW4;
-import static org.apache.phoenix.util.TestUtil.ROW5;
-import static org.apache.phoenix.util.TestUtil.ROW6;
-import static org.apache.phoenix.util.TestUtil.ROW7;
-import static org.apache.phoenix.util.TestUtil.ROW8;
-import static org.apache.phoenix.util.TestUtil.ROW9;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.apache.phoenix.util.TestUtil.assertResultSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -40,83 +30,10 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
-public class OrderByIT extends ParallelStatsDisabledIT {
-
-@Test
-public void testMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string, entity_id";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
-
-
-@Test
-public void testDescMultiOrderByExpr() throws Exception {
-String tenantId = getOrganizationId();
-String tableName = initATableValues(tenantId,
getDefaultSplits(tenantId), getUrl());
-String query = "SELECT entity_id FROM " + tableName + " ORDER BY
b_string || entity_id desc";
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-try {
-PreparedStatement statement = conn.prepareStatement(query);
-ResultSet rs = statement.executeQuery();
-assertTrue (rs.next());
-assertEquals(ROW9,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW6,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW3,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW8,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW5,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW2,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW7,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW4,rs.getString(1));
-assertTrue (rs.next());
-assertEquals(ROW1,rs.getString(1));
-
-assertFalse(rs.next());
-} finally {
-conn.close();
-}
-}
+public class OrderByIT extends BaseOrderByIT {
@Test
public void testOrderByWithPosition() throws Exception {
@@ -151,8 +68,8 @@ public class OrderByIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(1,rs.getInt(1));
assertTrue(rs.next());
-assertEquals(1,rs.getInt(1));
-assertFalse(rs.next());
+
