Revert "Temporary fix for [PHOENIX-3357] Issue with column re-ordering in column family support for Calcite-Phoenix"
This reverts commit 68717c05418e115c35fd5e27e18e4f9188450c25. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b2296f1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b2296f1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b2296f1 Branch: refs/heads/calcite Commit: 7b2296f1538c11ccc17beb5698db9fd7a655a238 Parents: 0d3ff58 Author: maryannxue <maryann....@gmail.com> Authored: Mon Dec 19 21:45:12 2016 -0800 Committer: maryannxue <maryann....@gmail.com> Committed: Mon Dec 19 21:45:12 2016 -0800 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/end2end/OrderByIT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7b2296f1/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 ddddc84..457b38e 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 @@ -195,7 +195,7 @@ public class OrderByIT extends ParallelStatsDisabledIT { " (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer, col2 integer" + " CONSTRAINT pk PRIMARY KEY (a_string))\n"; createTestTable(getUrl(), ddl); - String dml = "UPSERT INTO " + tableName + "(a_string, a, b, col1, c, d, col2) VALUES(?,?,?,?,?,?,?)"; + String dml = "UPSERT INTO " + tableName + " VALUES(?,?,?,?,?,?,?)"; PreparedStatement stmt = conn.prepareStatement(dml); stmt.setString(1, "a"); stmt.setInt(2, 40); @@ -223,7 +223,7 @@ public class OrderByIT extends ParallelStatsDisabledIT { stmt.execute(); conn.commit(); - String query = "select a_string, a, b, col1, c, d, col2 from " + tableName + " order by 2, 5"; + String query = "select * from " + tableName + " order by 2, 5"; ResultSet rs = conn.createStatement().executeQuery(query); assertTrue(rs.next()); assertEquals("c",rs.getString(1)); @@ -251,7 +251,7 @@ public class OrderByIT extends ParallelStatsDisabledIT { assertEquals(1,rs.getInt(7)); assertFalse(rs.next()); - query = "select a_string, a, b, col1, c, d, col2 from " + tableName + " order by 7"; + query = "select * from " + tableName + " order by 7"; rs = conn.createStatement().executeQuery(query); assertTrue(rs.next()); assertEquals("a",rs.getString(1));
