Skip to content

PHOENIX-6246 : Remove flakes from PointInTimeQueryIT#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
virajjasani wants to merge 1 commit into from
Closed

PHOENIX-6246 : Remove flakes from PointInTimeQueryIT #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public abstract class BaseQueryIT extends ParallelStatsDisabledIT {
+ " A_DATE)",
"CREATE LOCAL INDEX %s ON %s (a_integer) INCLUDE (" + " A_STRING, "
+ " B_STRING, " + " A_DATE)" };
protected static String[] INDEX_DDLS;
private static final String[] INDEX_DDLS;
static {
INDEX_DDLS = new String[GLOBAL_INDEX_DDLS.length + LOCAL_INDEX_DDLS.length];
int i = 0;
Expand All@@ -88,7 +88,8 @@ public abstract class BaseQueryIT extends ParallelStatsDisabledIT {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseQueryIT.class);

@BeforeParam
public static final void initTables(String idxDdl, boolean columnEncoded, boolean keepDeletedCells) throws Exception {
public static void initTables(String idxDdl, boolean columnEncoded,
boolean keepDeletedCells) throws Exception {
StringBuilder optionBuilder = new StringBuilder();
if (!columnEncoded) {
optionBuilder.append("COLUMN_ENCODED_BYTES=0");
Expand Down
130 changes: 2 additions & 128 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@
import static org.apache.phoenix.util.TestUtil.B_VALUE;
import static org.apache.phoenix.util.TestUtil.C_VALUE;
import static org.apache.phoenix.util.TestUtil.E_VALUE;
import static org.apache.phoenix.util.TestUtil.ROW1;
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;
Expand All@@ -36,18 +34,17 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Properties;

import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;

import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

@Category(NeedsOwnMiniClusterTest.class)
public class PointInTimeQueryIT extends BaseQueryIT {

@Parameters(name="PointInTimeQueryIT_{index},columnEncoded={1}")
Expand DownExpand Up@@ -122,120 +119,6 @@ public void testPointInTimeDeleteUngroupedAggregation() throws Exception {
assertFalse(rs.next());
}
}

@Test
public void testPointInTimeScan() throws Exception {
// Override value that was set at creation time
String url = getUrl();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
String upsertStmt =
"upsert into " + tableName +
" (" +
" ORGANIZATION_ID, " +
" ENTITY_ID, " +
" A_INTEGER) " +
"VALUES (?, ?, ?)";

try (Connection upsertConn = DriverManager.getConnection(url, props)) {

upsertConn.setAutoCommit(true); // Test auto commit
PreparedStatement stmt = upsertConn.prepareStatement(upsertStmt);
stmt.setString(1, tenantId);
stmt.setString(2, ROW4);
stmt.setInt(3, 5);
stmt.execute(); // should commit too
}
long upsert1Time = System.currentTimeMillis();
long timeDelta = 100;
Thread.sleep(timeDelta);

try(Connection upsertConn = DriverManager.getConnection(url, props)) {
upsertConn.setAutoCommit(true); // Test auto commit
PreparedStatement stmt = upsertConn.prepareStatement(upsertStmt);
stmt.setString(1, tenantId);
stmt.setString(2, ROW4);
stmt.setInt(3, 9);
stmt.execute(); // should commit too
upsertConn.close();
}

long queryTime = upsert1Time + timeDelta / 2;
String query = "SELECT organization_id, a_string AS a FROM " + tableName + " WHERE organization_id=? and a_integer = 5";
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(queryTime));
try(Connection conn = DriverManager.getConnection(getUrl(), props)) {
PreparedStatement statement = conn.prepareStatement(query);
statement.setString(1, tenantId);
ResultSet rs = statement.executeQuery();
assertTrue(rs.next());
assertEquals(tenantId, rs.getString(1));
assertEquals(A_VALUE, rs.getString("a"));
assertTrue(rs.next());
assertEquals(tenantId, rs.getString(1));
assertEquals(B_VALUE, rs.getString(2));
assertFalse(rs.next());
conn.close();
}
}

@SuppressWarnings("unchecked")
@Test
public void testPointInTimeLimitedScan() throws Exception {
// Override value that was set at creation time
String url = getUrl();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
String upsertStmt =
"upsert into " + tableName +
" (" +
" ORGANIZATION_ID, " +
" ENTITY_ID, " +
" A_INTEGER) " +
"VALUES (?, ?, ?)";
try(Connection upsertConn = DriverManager.getConnection(url, props)) {

upsertConn.setAutoCommit(true); // Test auto commit
// Insert all rows at ts
PreparedStatement stmt = upsertConn.prepareStatement(upsertStmt);
stmt.setString(1, tenantId);
stmt.setString(2, ROW1);
stmt.setInt(3, 6);
stmt.execute(); // should commit too
upsertConn.close();
}
long upsert1Time = System.currentTimeMillis();
long timeDelta = 100;
Thread.sleep(timeDelta);

url = getUrl();
try(Connection upsertConn = DriverManager.getConnection(url, props)) {
upsertConn.setAutoCommit(true); // Test auto commit
// Insert all rows at ts
PreparedStatement stmt = upsertConn.prepareStatement(upsertStmt);
stmt.setString(1, tenantId);
stmt.setString(2, ROW1);
stmt.setInt(3, 0);
stmt.execute(); // should commit too
upsertConn.close();
}

long queryTime = upsert1Time + timeDelta / 2;
String query = "SELECT a_integer,b_string FROM " + tableName + " WHERE organization_id=? and a_integer <= 5 limit 2";
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(queryTime));
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
PreparedStatement statement = conn.prepareStatement(query);
statement.setString(1, tenantId);
ResultSet rs = statement.executeQuery();
List<List<Object>> expectedResultsA = Lists.newArrayList(
Arrays.<Object>asList(2, C_VALUE),
Arrays.<Object>asList( 3, E_VALUE));
List<List<Object>> expectedResultsB = Lists.newArrayList(
Arrays.<Object>asList( 5, C_VALUE),
Arrays.<Object>asList(4, B_VALUE));
// Since we're not ordering and we may be using a descending index, we don't
// know which rows we'll get back.
assertOneOfValuesEqualsResultSet(rs, expectedResultsA,expectedResultsB);
conn.close();
}
}

@Test
public void TestPointInTimeGroupedAggregation() throws Exception {
Expand All@@ -248,7 +131,6 @@ public void TestPointInTimeGroupedAggregation() throws Exception {
upsertConn.setAutoCommit(true); // Test auto commit
Statement stmt = upsertConn.createStatement();
stmt.execute(updateStmt); // should commit too
upsertConn.close();
}

long upsert1Time = System.currentTimeMillis();
Expand All@@ -264,7 +146,6 @@ public void TestPointInTimeGroupedAggregation() throws Exception {
pstmt.setString(2, ROW5);
pstmt.setString(3, E_VALUE);
pstmt.execute(); // should commit too
upsertConn.close();
}

long queryTime = upsert1Time + timeDelta / 2;
Expand All@@ -285,7 +166,6 @@ public void TestPointInTimeGroupedAggregation() throws Exception {
assertEquals(C_VALUE, rs.getString(1));
assertEquals(2, rs.getInt(2));
assertFalse(rs.next());
conn.close();
}
}

Expand All@@ -310,7 +190,6 @@ public void TestPointInTimeUngroupedAggregation() throws Exception {
stmt.setString(3, E_VALUE);
stmt.execute();
upsertConn.commit();
upsertConn.close();
}
long upsert1Time = System.currentTimeMillis();
long timeDelta = 100;
Expand All@@ -323,7 +202,6 @@ public void TestPointInTimeUngroupedAggregation() throws Exception {
stmt.setString(2, ROW6);
stmt.setString(3, E_VALUE);
stmt.execute();
upsertConn.close();
}

long queryTime = upsert1Time + timeDelta / 2;
Expand All@@ -339,7 +217,6 @@ public void TestPointInTimeUngroupedAggregation() throws Exception {
assertTrue(rs.next());
assertEquals(2, rs.getLong(1));
assertFalse(rs.next());
conn.close();
}
}

Expand All@@ -363,7 +240,6 @@ public void TestPointInTimeUngroupedLimitedAggregation() throws Exception {
stmt.execute();
stmt.setString(3, B_VALUE);
stmt.execute();
upsertConn.close();
}
long upsert1Time = System.currentTimeMillis();
long timeDelta = 100;
Expand All@@ -376,7 +252,6 @@ public void TestPointInTimeUngroupedLimitedAggregation() throws Exception {
stmt.setString(2, ROW6);
stmt.setString(3, E_VALUE);
stmt.execute();
upsertConn.close();
}
long queryTime = upsert1Time + timeDelta / 2;
String query =
Expand All@@ -392,7 +267,6 @@ public void TestPointInTimeUngroupedLimitedAggregation() throws Exception {
assertTrue(rs.next());
assertEquals(4, rs.getLong(1)); // LIMIT applied at end, so all rows would be counted
assertFalse(rs.next());
conn.close();
}
}
}
Loading