Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
zurdoron committed Jul 25, 2020
1 parent 466f4ab commit 68cb89c
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,9 @@ long runCycle(

ReadStateHelper candidate = readStates.roundtrip(toVersion);
cycleStatus.readState(candidate.pending());
candidate = doIntegrityCheck ?
candidate = doIntegrityCheck ?
checkIntegrity(listeners, candidate, artifacts, schemaChangedFromPriorVersion) :
noIntegrityCheck(candidate, artifacts);
noIntegrityCheck(candidate, artifacts);

try {
validate(listeners, candidate.pending());
Expand Down Expand Up @@ -728,11 +728,11 @@ private ReadStateHelper checkIntegrity(
listeners.fireIntegrityCheckComplete(status);
}
}

private ReadStateHelper noIntegrityCheck(ReadStateHelper readStates, Artifacts artifacts) throws IOException {
ReadStateHelper result = readStates;

if(!readStates.hasCurrent() ||
if(!readStates.hasCurrent() ||
(!readStates.current().getStateEngine().hasIdenticalSchemas(getWriteEngine()) && artifacts.snapshot != null)) {
HollowReadStateEngine pending = readStates.pending().getStateEngine();
readSnapshot(artifacts.snapshot, pending);
Expand All @@ -745,7 +745,7 @@ private ReadStateHelper noIntegrityCheck(ReadStateHelper readStates, Artifacts a
}

applyDelta(artifacts.delta, current);

result = readStates.swap();
}
}
Expand Down Expand Up @@ -796,7 +796,7 @@ private void validate(ProducerListeners listeners, HollowProducer.ReadState read
}
}


private void announce(ProducerListeners listeners, HollowProducer.ReadState readState) {
if (announcer != null) {
Status.StageWithStateBuilder status = listeners.fireAnnouncementStart(readState);
Expand Down

0 comments on commit 68cb89c

Please sign in to comment.