You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2017/09/07 17:18:43 UTC
phoenix git commit: PHOENIX-4177 Convert TopNIT to extend
ParallelStatsDisabledIT
Repository: phoenix
Updated Branches:
refs/heads/master b46cbd375 -> 814276d4b
PHOENIX-4177 Convert TopNIT to extend ParallelStatsDisabledIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/814276d4
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/814276d4
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/814276d4
Branch: refs/heads/master
Commit: 814276d4b4b08be0681f1c402cfb3cc35f01fa0a
Parents: b46cbd3
Author: Samarth Jain <sa...@apache.org>
Authored: Thu Sep 7 10:17:55 2017 -0700
Committer: Samarth Jain <sa...@apache.org>
Committed: Thu Sep 7 10:18:40 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/end2end/TopNIT.java | 64 +++++++-------------
1 file changed, 21 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/814276d4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
index 39e8cb6..8c213d2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
@@ -26,8 +26,6 @@ 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.ATABLE_NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -36,25 +34,18 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.util.Properties;
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-public class TopNIT extends BaseClientManagedTimeIT {
+public class TopNIT extends ParallelStatsDisabledIT {
@Test
public void testMultiOrderByExpr() throws Exception {
- long ts = nextTimestamp();
String tenantId = getOrganizationId();
-
- initATableValues(ATABLE_NAME, tenantId, getDefaultSplits(tenantId), null, ts, getUrl(), null);
- String query = "SELECT entity_id FROM aTable ORDER BY b_string, entity_id LIMIT 5";
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(getUrl(), props);
+ String tableName = initATableValues(null, tenantId, getDefaultSplits(tenantId), null, null, getUrl(), null);
+ String query = "SELECT entity_id FROM " + tableName + " ORDER BY b_string, entity_id LIMIT 5";
+ Connection conn = DriverManager.getConnection(getUrl());
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -78,13 +69,10 @@ public class TopNIT extends BaseClientManagedTimeIT {
@Test
public void testDescMultiOrderByExpr() throws Exception {
- long ts = nextTimestamp();
String tenantId = getOrganizationId();
- initATableValues(ATABLE_NAME, tenantId, getDefaultSplits(tenantId), null, ts, getUrl(), null);
- String query = "SELECT entity_id FROM aTable ORDER BY b_string || entity_id desc LIMIT 5";
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(getUrl(), props);
+ String tableName = initATableValues(null, tenantId, getDefaultSplits(tenantId), null, null, getUrl(), null);
+ String query = "SELECT entity_id FROM " + tableName + " ORDER BY b_string || entity_id desc LIMIT 5";
+ Connection conn = DriverManager.getConnection(getUrl());
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -117,42 +105,32 @@ public class TopNIT extends BaseClientManagedTimeIT {
}
private void testTopNDelete(boolean autoCommit) throws Exception {
- long ts = nextTimestamp();
String tenantId = getOrganizationId();
- initATableValues(ATABLE_NAME, tenantId, getDefaultSplits(tenantId), null, ts, getUrl(), null);
- String query = "DELETE FROM aTable ORDER BY b_string, entity_id LIMIT 5";
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.setAutoCommit(autoCommit);
- try {
+ String tableName =
+ initATableValues(null, tenantId, getDefaultSplits(tenantId), null, null, getUrl(),
+ null);
+ String query = "DELETE FROM " + tableName + " ORDER BY b_string, entity_id LIMIT 5";
+ try (Connection conn = DriverManager.getConnection(getUrl())) {
+ conn.setAutoCommit(autoCommit);
PreparedStatement statement = conn.prepareStatement(query);
statement.execute();
- assertEquals(5,statement.getUpdateCount());
+ assertEquals(5, statement.getUpdateCount());
if (!autoCommit) {
conn.commit();
}
- } finally {
- conn.close();
- }
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 4)); // Execute at timestamp 4
- conn = DriverManager.getConnection(getUrl(), props);
- query = "SELECT entity_id FROM aTable ORDER BY b_string, x_decimal nulls last, 8-a_integer LIMIT 5";
- try {
- PreparedStatement statement = conn.prepareStatement(query);
+ query =
+ "SELECT entity_id FROM " + tableName + " ORDER BY b_string, x_decimal nulls last, 8-a_integer LIMIT 5";
+ statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
- assertTrue (rs.next());
+ assertTrue(rs.next());
assertEquals(ROW8, rs.getString(1));
- assertTrue (rs.next());
+ assertTrue(rs.next());
assertEquals(ROW9, rs.getString(1));
- assertTrue (rs.next());
+ assertTrue(rs.next());
assertEquals(ROW6, rs.getString(1));
- assertTrue (rs.next());
+ assertTrue(rs.next());
assertEquals(ROW3, rs.getString(1));
-
assertFalse(rs.next());
- } finally {
- conn.close();
}
}