diff --git a/fluss-client/src/test/java/com/alibaba/fluss/client/write/IndexedLogWriteBatchTest.java b/fluss-client/src/test/java/com/alibaba/fluss/client/write/IndexedLogWriteBatchTest.java index 3d7222a0..8eed5fe4 100644 --- a/fluss-client/src/test/java/com/alibaba/fluss/client/write/IndexedLogWriteBatchTest.java +++ b/fluss-client/src/test/java/com/alibaba/fluss/client/write/IndexedLogWriteBatchTest.java @@ -20,9 +20,9 @@ import com.alibaba.fluss.memory.MemorySegmentOutputView; import com.alibaba.fluss.metadata.TableBucket; import com.alibaba.fluss.record.DefaultLogRecord; -import com.alibaba.fluss.record.MemoryLogRecordBatch; import com.alibaba.fluss.record.LogRecord; import com.alibaba.fluss.record.LogRecordReadContext; +import com.alibaba.fluss.record.MemoryLogRecordBatch; import com.alibaba.fluss.record.MemoryLogRecordsIndexedBuilder; import com.alibaba.fluss.record.RowKind; import com.alibaba.fluss.record.bytesview.BytesView; diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilder.java b/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilder.java index 72059e2f..2e1521e2 100644 --- a/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilder.java +++ b/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilder.java @@ -32,15 +32,15 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import static com.alibaba.fluss.record.LogRecordBatch.CURRENT_LOG_MAGIC_VALUE; +import static com.alibaba.fluss.record.LogRecordBatch.NO_BATCH_SEQUENCE; +import static com.alibaba.fluss.record.LogRecordBatch.NO_WRITER_ID; import static com.alibaba.fluss.record.MemoryLogRecordBatch.ARROW_ROWKIND_OFFSET; import static com.alibaba.fluss.record.MemoryLogRecordBatch.BASE_OFFSET_LENGTH; import static com.alibaba.fluss.record.MemoryLogRecordBatch.CRC_OFFSET; import static com.alibaba.fluss.record.MemoryLogRecordBatch.LENGTH_LENGTH; import static com.alibaba.fluss.record.MemoryLogRecordBatch.SCHEMA_ID_OFFSET; import static com.alibaba.fluss.record.MemoryLogRecordBatch.WRITE_CLIENT_ID_OFFSET; -import static com.alibaba.fluss.record.LogRecordBatch.CURRENT_LOG_MAGIC_VALUE; -import static com.alibaba.fluss.record.LogRecordBatch.NO_BATCH_SEQUENCE; -import static com.alibaba.fluss.record.LogRecordBatch.NO_WRITER_ID; import static com.alibaba.fluss.utils.Preconditions.checkArgument; import static com.alibaba.fluss.utils.Preconditions.checkNotNull; diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsIndexedBuilder.java b/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsIndexedBuilder.java index 2195a9ea..c6e50e7f 100644 --- a/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsIndexedBuilder.java +++ b/fluss-common/src/main/java/com/alibaba/fluss/record/MemoryLogRecordsIndexedBuilder.java @@ -25,15 +25,15 @@ import java.io.IOException; +import static com.alibaba.fluss.record.LogRecordBatch.CURRENT_LOG_MAGIC_VALUE; +import static com.alibaba.fluss.record.LogRecordBatch.NO_BATCH_SEQUENCE; +import static com.alibaba.fluss.record.LogRecordBatch.NO_WRITER_ID; import static com.alibaba.fluss.record.MemoryLogRecordBatch.BASE_OFFSET_LENGTH; import static com.alibaba.fluss.record.MemoryLogRecordBatch.CRC_OFFSET; import static com.alibaba.fluss.record.MemoryLogRecordBatch.LENGTH_LENGTH; import static com.alibaba.fluss.record.MemoryLogRecordBatch.RECORD_BATCH_HEADER_SIZE; import static com.alibaba.fluss.record.MemoryLogRecordBatch.SCHEMA_ID_OFFSET; import static com.alibaba.fluss.record.MemoryLogRecordBatch.WRITE_CLIENT_ID_OFFSET; -import static com.alibaba.fluss.record.LogRecordBatch.CURRENT_LOG_MAGIC_VALUE; -import static com.alibaba.fluss.record.LogRecordBatch.NO_BATCH_SEQUENCE; -import static com.alibaba.fluss.record.LogRecordBatch.NO_WRITER_ID; /** * Default builder for {@link MemoryLogRecords} of log records in {@link LogFormat#INDEXED} format. diff --git a/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java b/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java index a349b7f2..fe451ee4 100644 --- a/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java +++ b/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java @@ -25,7 +25,6 @@ import com.alibaba.fluss.metadata.PhysicalTablePath; import com.alibaba.fluss.metadata.Schema; import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.record.MemoryLogRecordBatch; import com.alibaba.fluss.record.FileLogRecords; import com.alibaba.fluss.record.KvRecord; import com.alibaba.fluss.record.KvRecordBatch; @@ -34,6 +33,7 @@ import com.alibaba.fluss.record.LogRecordBatch; import com.alibaba.fluss.record.LogRecordReadContext; import com.alibaba.fluss.record.LogRecords; +import com.alibaba.fluss.record.MemoryLogRecordBatch; import com.alibaba.fluss.record.MemoryLogRecords; import com.alibaba.fluss.record.MemoryLogRecordsArrowBuilder; import com.alibaba.fluss.record.MemoryLogRecordsIndexedBuilder; diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogTablet.java b/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogTablet.java index 856a02c5..8160959f 100644 --- a/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogTablet.java +++ b/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogTablet.java @@ -31,11 +31,11 @@ import com.alibaba.fluss.metrics.MeterView; import com.alibaba.fluss.metrics.MetricNames; import com.alibaba.fluss.metrics.groups.MetricGroup; -import com.alibaba.fluss.record.MemoryLogRecordBatch; import com.alibaba.fluss.record.FileLogProjection; import com.alibaba.fluss.record.FileLogRecords; import com.alibaba.fluss.record.LogRecordBatch; import com.alibaba.fluss.record.LogRecords; +import com.alibaba.fluss.record.MemoryLogRecordBatch; import com.alibaba.fluss.record.MemoryLogRecords; import com.alibaba.fluss.server.log.LocalLog.SegmentDeletionReason; import com.alibaba.fluss.server.metrics.group.BucketMetricGroup;