timoninmaxim commented on code in PR #10798:
URL: https://github.com/apache/ignite/pull/10798#discussion_r1254574971
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/ByteBufferBackedDataInputImpl.java:
##########
@@ -44,22 +44,22 @@ public ByteBufferBackedDataInput buffer(ByteBuffer buf) {
/** {@inheritDoc} */
@Override public void ensure(int requested) throws IOException {
- if (buf.remaining() < requested)
+ if (buffer().remaining() < requested)
Review Comment:
Why this change? We still have `buf` reference.
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordV2Serializer.java:
##########
@@ -266,7 +265,7 @@ private static WALPointer readPositionAndCheckPoint(
int fileOff = in.readInt();
int len = in.readInt();
- if (!F.eq(idx, expPtr.index()) || (!skipPositionCheck &&
!F.eq(fileOff, expPtr.fileOffset())))
+ if (!skipPositionCheck && (!F.eq(idx, expPtr.index()) ||
!F.eq(fileOff, expPtr.fileOffset())))
Review Comment:
Do you still need this change?
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/ByteBufferWalIterator.java:
##########
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.wal;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Optional;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordSerializer;
+import
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordSerializerFactory;
+import
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordSerializerFactoryImpl;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.NotNull;
+
+/** Byte Buffer WAL Iterator */
+public class ByteBufferWalIterator extends AbstractWalRecordsIteratorAdapter {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ private final ByteBuffer buf;
+
+ /** */
+ private final int idx;
+
+ /** */
+ private final RecordSerializer serializer;
+
+ /** */
+ private final ByteBufferBackedDataInputImpl dataInput;
+
+ /** */
+ public ByteBufferWalIterator(
+ @NotNull IgniteLogger log,
+ @NotNull GridCacheSharedContext<?, ?> cctx,
+ @NotNull ByteBuffer byteBuf,
+ int segmentIdx, int ver) throws IgniteCheckedException {
+ this(log, cctx, byteBuf, segmentIdx, ver, null);
+ }
+
+ /** */
+ public ByteBufferWalIterator(
+ @NotNull IgniteLogger log,
+ @NotNull GridCacheSharedContext<?, ?> cctx,
+ @NotNull ByteBuffer byteBuf,
+ int segmentIdx,
+ int ver,
+ IgniteBiPredicate<WALRecord.RecordType, WALPointer> readTypeFilter)
+ throws IgniteCheckedException {
+ super(log);
+
+ buf = byteBuf;
+
+ idx = segmentIdx;
+
+ RecordSerializerFactory rsf = new RecordSerializerFactoryImpl(cctx,
readTypeFilter);
+
+ serializer = rsf.createSerializer(ver);
+
+ dataInput = new ByteBufferBackedDataInputImpl();
+
+ dataInput.buffer(buf);
+
+ advance();
+ }
+
+ /** */
+ private IgniteBiTuple<WALPointer, WALRecord> advanceRecord() throws
IgniteCheckedException {
+ if (!buf.hasRemaining())
+ return null;
+
+ IgniteBiTuple<WALPointer, WALRecord> result;
+
+ WALPointer actualFilePtr = new WALPointer(idx, buf.position(), 0);
Review Comment:
Actually, `buf.position() != fileOff` . Do you need this argument for
anything?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
