Skip to content

PHOENIX-1639 Enhance function/expression index tests #36

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
wants to merge 16 commits into from
Closed

PHOENIX-1639 Enhance function/expression index tests #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5aa273f
Enhance expression index tests
Feb 7, 2015
3ace0d9
minor
twdsilva Feb 10, 2015
2270319
Merge remote-tracking branch 'upstream/master' into func_tests
twdsilva Feb 10, 2015
0629f89
merged
twdsilva Feb 10, 2015
35cb312
minor
twdsilva Feb 11, 2015
cb7834b
more tests
Feb 12, 2015
8de3b45
added view tests
twdsilva Feb 13, 2015
5e30c7d
added negative tests
twdsilva Feb 13, 2015
e835386
minor
Feb 13, 2015
3dacd74
minor
Feb 13, 2015
4363d5d
Merge remote-tracking branch 'upstream/master' into func_tests
Feb 13, 2015
c6c91f4
fix test mistakes
Feb 14, 2015
e595cef
fix test
twdsilva Feb 17, 2015
ae8450c
Merge remote-tracking branch 'upstream/master' into func_tests
twdsilva Feb 17, 2015
29a9912
minor
twdsilva Feb 17, 2015
7248529
remove unnessecary check
twdsilva Feb 17, 2015
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
58 changes: 44 additions & 14 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ public void testDropIndexedColumn() throws Exception {

@Test
public void testDropCoveredColumn() throws Exception {
String query;
ResultSet rs;
PreparedStatement stmt;

Expand All @@ -320,19 +319,21 @@ public void testDropCoveredColumn() throws Exception {
conn.createStatement().execute(
"CREATE TABLE " + DATA_TABLE_FULL_NAME
+ " (k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR, v3 VARCHAR)");
query = "SELECT * FROM " + DATA_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(query);
String dataTableQuery = "SELECT * FROM " + DATA_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(dataTableQuery);
assertFalse(rs.next());

conn.createStatement().execute(
"CREATE INDEX " + INDEX_TABLE_NAME + " ON " + DATA_TABLE_FULL_NAME + " (v1) include (v2, v3)");
conn.createStatement().execute(
"CREATE LOCAL INDEX " + LOCAL_INDEX_TABLE_NAME + " ON " + DATA_TABLE_FULL_NAME + " (v1) include (v2, v3)");
query = "SELECT * FROM " + INDEX_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(query);
rs = conn.createStatement().executeQuery(dataTableQuery);
assertFalse(rs.next());
query = "SELECT * FROM " + LOCAL_INDEX_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(query);
String indexTableQuery = "SELECT * FROM " + INDEX_TABLE_NAME;
rs = conn.createStatement().executeQuery(indexTableQuery);
assertFalse(rs.next());
String localIndexTableQuery = "SELECT * FROM " + LOCAL_INDEX_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(localIndexTableQuery);
assertFalse(rs.next());

// load some data into the table
Expand All @@ -346,16 +347,31 @@ public void testDropCoveredColumn() throws Exception {

assertIndexExists(conn,true);
conn.createStatement().execute("ALTER TABLE " + DATA_TABLE_FULL_NAME + " DROP COLUMN v2");
// TODO: verify meta data that we get back to confirm our column was dropped
assertIndexExists(conn,true);

query = "SELECT * FROM " + DATA_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(query);
// verify data table rows
rs = conn.createStatement().executeQuery(dataTableQuery);
assertTrue(rs.next());
assertEquals("a",rs.getString(1));
assertEquals("x",rs.getString(2));
assertEquals("j",rs.getString(3));
assertFalse(rs.next());

Copy link
Contributor Author

@twdsilva twdsilva Feb 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test was not verify the index rows , so I added this.

// verify index table rows
rs = conn.createStatement().executeQuery(indexTableQuery);
assertTrue(rs.next());
assertEquals("x",rs.getString(1));
assertEquals("a",rs.getString(2));
assertEquals("j",rs.getString(3));
assertFalse(rs.next());

// verify local index table rows
rs = conn.createStatement().executeQuery(localIndexTableQuery);
assertTrue(rs.next());
assertEquals("x",rs.getString(1));
assertEquals("a",rs.getString(2));
assertEquals("j",rs.getString(3));
assertFalse(rs.next());

// load some data into the table
stmt = conn.prepareStatement("UPSERT INTO " + DATA_TABLE_FULL_NAME + " VALUES(?,?,?)");
Expand All @@ -365,13 +381,29 @@ public void testDropCoveredColumn() throws Exception {
stmt.execute();
conn.commit();

query = "SELECT * FROM " + DATA_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(query);
// verify data table rows
rs = conn.createStatement().executeQuery(dataTableQuery);
assertTrue(rs.next());
assertEquals("a",rs.getString(1));
assertEquals("y",rs.getString(2));
assertEquals("k",rs.getString(3));
assertFalse(rs.next());

// verify index table rows
rs = conn.createStatement().executeQuery(indexTableQuery);
assertTrue(rs.next());
assertEquals("y",rs.getString(1));
assertEquals("a",rs.getString(2));
assertEquals("k",rs.getString(3));
assertFalse(rs.next());

// verify local index table rows
rs = conn.createStatement().executeQuery(localIndexTableQuery);
assertTrue(rs.next());
assertEquals("y",rs.getString(1));
assertEquals("a",rs.getString(2));
assertEquals("k",rs.getString(3));
assertFalse(rs.next());
}

@Test
Expand Down Expand Up @@ -427,8 +459,6 @@ public void testAddPKColumnToTableWithIndex() throws Exception {
assertEquals(IndexUtil.INDEX_COLUMN_NAME_SEP + "K2",rs.getString("COLUMN_NAME"));
assertEquals(3, rs.getShort("KEY_SEQ"));

assertIndexExists(conn,true);

query = "SELECT * FROM " + DATA_TABLE_FULL_NAME;
rs = conn.createStatement().executeQuery(query);
assertTrue(rs.next());
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected void testUpdatableViewIndex(Integer saltBuckets, boolean localIndex) t
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
String queryPlan = QueryUtil.getExplainPlan(rs);
if (localIndex) {
assertEquals("CLIENT PARALLEL 3-WAY RANGE SCAN OVER _LOCAL_IDX_T [-32768,51]\n"
assertEquals("CLIENT PARALLEL "+ (saltBuckets == null ? 1 : saltBuckets) +"-WAY RANGE SCAN OVER _LOCAL_IDX_T [-32768,51]\n"
Copy link
Contributor Author

@twdsilva twdsilva Feb 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this so that I could add testNonSaltedUpdatableViewWithLocalIndex to ViewIT

+ " SERVER FILTER BY FIRST KEY ONLY\n"
+ "CLIENT MERGE SORT",
queryPlan);
Expand Down Expand Up @@ -166,7 +166,7 @@ protected void testUpdatableViewIndex(Integer saltBuckets, boolean localIndex) t
assertFalse(rs.next());
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
if (localIndex) {
assertEquals("CLIENT PARALLEL 3-WAY RANGE SCAN OVER _LOCAL_IDX_T [" + (Short.MIN_VALUE+1) + ",'foo']\n"
assertEquals("CLIENT PARALLEL "+ (saltBuckets == null ? 1 : saltBuckets) +"-WAY RANGE SCAN OVER _LOCAL_IDX_T [" + (Short.MIN_VALUE+1) + ",'foo']\n"
+ " SERVER FILTER BY FIRST KEY ONLY\n"
+ "CLIENT MERGE SORT",QueryUtil.getExplainPlan(rs));
} else {
Expand Down
5 changes: 5 additions & 0 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ public void testNonSaltedUpdatableViewWithIndex() throws Exception {
testUpdatableViewWithIndex(null, false);
}

@Test
public void testNonSaltedUpdatableViewWithLocalIndex() throws Exception {
Copy link
Contributor Author

@twdsilva twdsilva Feb 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test condition was missing so I added it

testUpdatableViewWithIndex(null, true);
}

@Test
public void testUpdatableOnUpdatableView() throws Exception {
testUpdatableView(null);
Expand Down
Loading