From 81a0910a52b6f0c48fba2c4029a665f8328d1e10 Mon Sep 17 00:00:00 2001 From: Shivam Malhotra Date: Wed, 3 Jan 2024 22:50:50 +0530 Subject: [PATCH] Replaced comments related to deephaven-core#4836 with TODOs --- .../java/io/deephaven/engine/page/PagingChunkSource.java | 1 - .../parquet/table/pagestore/ColumnChunkPageStore.java | 8 +++++--- .../pagestore/OffsetIndexBasedColumnChunkPageStore.java | 5 ++--- .../pagestore/VariablePageSizeColumnChunkPageStore.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/engine/table/src/main/java/io/deephaven/engine/page/PagingChunkSource.java b/engine/table/src/main/java/io/deephaven/engine/page/PagingChunkSource.java index 98a82040c03..d1d51ea7f41 100644 --- a/engine/table/src/main/java/io/deephaven/engine/page/PagingChunkSource.java +++ b/engine/table/src/main/java/io/deephaven/engine/page/PagingChunkSource.java @@ -9,7 +9,6 @@ import io.deephaven.engine.rowset.RowSequence; import io.deephaven.engine.table.SharedContext; import io.deephaven.engine.table.impl.DefaultChunkSource; -import io.deephaven.util.annotations.FinalDefault; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java index 3e7d2566bec..c91911de204 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java @@ -172,13 +172,15 @@ public boolean usesDictionaryOnEveryPage() { public void close() {} FillContext innerFillContext(@NotNull final FillContext context) { - // Call this method from the appropriate place in the implementation of getPageContaining + // TODO(deephaven-core#4836): Call this method from the appropriate place in the implementation of + // getPageContaining to populate the context object return ((PagingContextHolder) context) .updateInnerContext(this::fillContextUpdater); } private boolean isFillContextCompatible(@Nullable final Context currentInnerContext) { - // Replace this with a test to see if the fill context comes from this.ColumnChunkReader + // TODO(deephaven-core#4836): Replace this with a test to see if the fill context comes from + // this.ColumnChunkReader return currentInnerContext == DEFAULT_FILL_INSTANCE; } @@ -189,7 +191,7 @@ private T fillContextUpdater( // noinspection unchecked return (T) (isFillContextCompatible(currentInnerContext) ? currentInnerContext - // Replace this with getting a context from this.ColumnChunkReader + // TODO(deephaven-core#4836): Replace this with getting a context from this.ColumnChunkReader : makeFillContext(chunkCapacity, sharedContext)); } } diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java index eb230a8e648..7518470d8fe 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java @@ -115,8 +115,8 @@ private ChunkPage getPage(final int pageNum) { synchronized (pageState) { // Make sure no one materialized this page as we waited for the lock if ((localRef = pageState.pageRef) == null || (page = localRef.get()) == null) { - // getPage() should accept the outer fill context, and get an inner fill context from - // this.ColumnChunkReader to pass into getPageReader. + // TODO(deephaven-core#4836): getPage() should accept the outer fill context, and get an inner fill + // context from this.ColumnChunkReader to pass into getPageReader. final ColumnPageReader reader = columnPageDirectAccessor.getPageReader(pageNum); try { page = new PageCache.IntrusivePage<>(toPage(offsetIndex.getFirstRowIndex(pageNum), reader)); @@ -150,7 +150,6 @@ public ChunkPage getPageContaining(@Nullable final FillContext fillContext pageNum = (numPages - 1); } } - // Turn return getPage(pageNum); } } diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java index 654fb8dafbc..df27c76ba38 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java @@ -43,8 +43,8 @@ final class VariablePageSizeColumnChunkPageStore extends Colum pageRowOffsets = new long[INIT_ARRAY_SIZE + 1]; pageRowOffsets[0] = 0; columnPageReaders = new ColumnPageReader[INIT_ARRAY_SIZE]; - // We probably need a super-interface of Iterator to allow ourselves to set or clear the inner fill context - // to be used by next. + // TODO(deephaven-core#4836): We probably need a super-interface of Iterator to allow ourselves to set or clear + // the inner fill context to be used by next. columnPageReaderIterator = columnChunkReader.getPageIterator(); // noinspection unchecked