Skip to content

Commit

Permalink
Replaced comments related to deephaven-core#4836 with TODOs
Browse files Browse the repository at this point in the history
  • Loading branch information
malhotrashivam committed Jan 3, 2024
1 parent e673959 commit 81a0910
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -189,7 +191,7 @@ private <T extends FillContext> 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));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ private ChunkPage<ATTR> 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));
Expand Down Expand Up @@ -150,7 +150,6 @@ public ChunkPage<ATTR> getPageContaining(@Nullable final FillContext fillContext
pageNum = (numPages - 1);
}
}
// Turn
return getPage(pageNum);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ final class VariablePageSizeColumnChunkPageStore<ATTR extends Any> 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
Expand Down

0 comments on commit 81a0910

Please sign in to comment.