Repository: ignite Updated Branches: refs/heads/ignite-2.5 24161ae18 -> 303bd3569
IGNITE-8561 SingleSegmentLogicalRecordsIterator is broken Signed-off-by: Ivan Rakov <[email protected]> (cherry picked from commit 21678bc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/303bd356 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/303bd356 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/303bd356 Branch: refs/heads/ignite-2.5 Commit: 303bd35693da2ef15371baa31a23d075be262378 Parents: 24161ae Author: Anton Kalashnikov <[email protected]> Authored: Wed May 23 12:24:51 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Wed May 23 20:12:35 2018 +0300 ---------------------------------------------------------------------- .../persistence/wal/SingleSegmentLogicalRecordsIterator.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/303bd356/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java index d5c10cf..36e5b0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java @@ -47,9 +47,6 @@ public class SingleSegmentLogicalRecordsIterator extends AbstractWalRecordsItera /** Segment initialized flag. */ private boolean segmentInitialized; - /** Archived segment index. */ - private long archivedSegIdx; - /** Archive directory. */ private File archiveDir; @@ -76,7 +73,7 @@ public class SingleSegmentLogicalRecordsIterator extends AbstractWalRecordsItera ) throws IgniteCheckedException { super(log, sharedCtx, initLogicalRecordsSerializerFactory(sharedCtx), ioFactory, bufSize); - this.archivedSegIdx = archivedSegIdx; + curWalSegmIdx = archivedSegIdx; this.archiveDir = archiveDir; this.advanceC = advanceC; @@ -106,7 +103,7 @@ public class SingleSegmentLogicalRecordsIterator extends AbstractWalRecordsItera segmentInitialized = true; FileWriteAheadLogManager.FileDescriptor fd = new FileWriteAheadLogManager.FileDescriptor( - new File(archiveDir, FileWriteAheadLogManager.FileDescriptor.fileName(archivedSegIdx))); + new File(archiveDir, FileWriteAheadLogManager.FileDescriptor.fileName(curWalSegmIdx))); try { return initReadHandle(fd, null);
