Skip to content

PHOENIX-5692 - SCN verification breaks with non-default column families#686

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

Merged
gjacoby126 merged 1 commit into from
Jan 22, 2020
Merged

PHOENIX-5692 - SCN verification breaks with non-default column families #686

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
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/SCNIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ private String createTableWithTTL(int ttl) throws SQLException, InterruptedExcep
try (Connection conn = DriverManager.getConnection(getUrl())) {
conn.createStatement()
.execute(String.format("CREATE TABLE %s" +
"(k VARCHAR PRIMARY KEY, v VARCHAR) %s", fullTableName, ddlOptions));
"(k VARCHAR PRIMARY KEY, f.v VARCHAR) %s", fullTableName, ddlOptions));
conn.createStatement().execute("UPSERT INTO " + fullTableName + " VALUES('a','aa')");
conn.createStatement().execute("UPSERT INTO " + fullTableName + " VALUES('b','bb')");
conn.createStatement().execute("UPSERT INTO " + fullTableName + " VALUES('c','cc')");
Expand Down
9 changes: 6 additions & 3 deletions phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,10 +191,13 @@ private void verifySCN() throws SQLException {
//we can have a tableRef with an empty table, such as with sequences
if (tableQualifier.length > 0) {
HTableDescriptor td = conn.getQueryServices().getTableDescriptor(tableQualifier);
HColumnDescriptor cd = td.getFamily(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES);
HColumnDescriptor[] cds = td.getColumnFamilies();
now = EnvironmentEdgeManager.currentTimeMillis();
if (now - cd.getTimeToLive() * 1000L > scn) {
scnTooOldTableRefs.add(tableRef);
if (cds.length > 0){
//Phoenix only allows a single table level TTL, so any CF will do
if (now - cds[0].getTimeToLive() * 1000L > scn) {
scnTooOldTableRefs.add(tableRef);
}
}
}
}
Expand Down