Skip to content

PHOENIX-7833 CDCBaseIT/CDCQueryIT keep manual edge installed after applyMutations #2450

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

Open
apurtell wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −1
Open

PHOENIX-7833 CDCBaseIT/CDCQueryIT keep manual edge installed after applyMutations #2450

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
19 changes: 18 additions & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCBaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,15 +396,25 @@ protected void applyMutations(CommitAdapter committer, String schemaName, String
String datatableName, String tid, List<Set<ChangeRow>> batches, String cdcName)
throws Exception {
EnvironmentEdgeManager.injectEdge(injectEdge);
long latestChangeTS = injectEdge.currentTime();
try (Connection conn = committer.getConnection(tid)) {
for (Set<ChangeRow> batch : batches) {
for (ChangeRow changeRow : batch) {
addChange(conn, tableName, changeRow);
if (changeRow.changeTS > latestChangeTS) {
latestChangeTS = changeRow.changeTS;
}
}
committer.commit(conn);
}
}
committer.reset();
// Keep the manual edge installed for the remainder of the test so
// EnvironmentEdgeManager.currentTimeMillis() does not silently revert
// to the wall clock and trip QueryCompiler.verifySCN against the
// configured max-lookback age. Pin to the latest changeTS so SCN-bounded
// reads of the just-applied mutations remain in-window. Per-test
// cleanup is the responsibility of the suite's @After hook.
injectEdge.setValue(latestChangeTS);

// For debug: uncomment to see the exact HBase cells.
dumpCells(schemaName, tableName, datatableName, cdcName);
Expand Down Expand Up @@ -950,6 +960,13 @@ void init() {
EnvironmentEdgeManager.injectEdge(injectEdge);
}

/**
* Uninstall the manual time edge. Callers should NOT invoke this from inside test bodies that
* still need to issue SCN-bounded reads of the just-applied mutations: doing so reverts
* {@link EnvironmentEdgeManager#currentTimeMillis()} to the wall clock and may push the SCN
* outside the configured max-lookback window. Per-test cleanup belongs in an {@code @After}
* hook instead (see {@code CDCQueryIT#afterTest}).
*/
public void reset() {
EnvironmentEdgeManager.reset();
}
Expand Down
9 changes: 9 additions & 0 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand Down Expand Up @@ -145,6 +146,14 @@ public void beforeTest() {
injectEdge.setValue(EnvironmentEdgeManager.currentTimeMillis());
}

@After
public void afterTest() {
// CDCBaseIT.applyMutations intentionally leaves the manual edge installed so
// SCN-bounded reads in the test body remain inside the max-lookback window.
// Restore the real clock here so per-test isolation is preserved.
EnvironmentEdgeManager.reset();
}

private void cdcIndexShouldNotBeUsedForDataTableQueries(Connection conn, String dataTableName,
String cdcName) throws Exception {
ResultSet rs = conn.createStatement().executeQuery(
Expand Down