Conversation
Merged 7 upstream commits: - f991e31 Parquet Source: snapshot sync fixes (apache#806) - 4307565 Parquet source: column stats support (apache#805) - 5c25674 Remove wildcard imports and enforce with spotless (apache#809) - fe7215e add .sdkmanrc to .gitignore (apache#793) - abbf4b7 fix(iceberg): nested comments (apache#797) - 8e58367 Remove redundant getSnapshotAt calls (apache#791) - 8cab6a2 fix(delta): avoid NPE for binary in map/array (apache#795) Resolved conflicts: - TestDeltaKernelSchemaExtractor.java: kept StructField import needed for new tests
Fixed wildcard imports in Delta Kernel test files to comply with spotless rules enforced in upstream commit 5c25674.
The spotless:apply command removed wildcard imports but didn't add back all necessary specific imports. Added missing imports: TestDeltaKernelReadWriteIntegration.java: - Static assertions (assertEquals, assertTrue, assertFalse, assertNotNull) - java.util.* (Random, UUID, List, Map, Set, Arrays, Collections, etc.) TestDeltaKernelSync.java: - Static assertions (including fail) - java.util.* (Random, UUID, List, Map, Set, Arrays, Collections, etc.) TestDeltaKernelDataFileUpdatesExtractor.java: - Static assertions (assertEquals, assertTrue, assertFalse, assertNotNull) - java.util.* (List, Arrays, Collections) All tests now compile successfully.
|
I have tried to address all the comments @vinishjail97 @the-other-tim-brown |
| } | ||
| } catch (Exception e) { | ||
| // Log and continue to next commit | ||
| log.warn( |
There was a problem hiding this comment.
log.warn("...", version, e.getMessage()) swallows the stack trace. Pass the exception as the last argument instead: log.warn("Failed to parse commit metadata for version {}", version, e). On-call engineers debugging a production issue won't know where the parse failure originated.
| try { | ||
| Table table = Table.forPath(engine, basePath); | ||
| this.latestSchema = table.getLatestSnapshot(engine).getSchema(); | ||
| } catch (Exception e) { |
There was a problem hiding this comment.
catch (Exception e) silently sets this.latestSchema = null. If the error is a network issue, permissions error, or anything other than "table doesn't exist", this will silently proceed with a null schema and cause an NPE in addColumn() at line 366 (latestSchema.add(field)). Should catch only the specific "table not found" exception from Delta Kernel, not the broad Exception.
…Kernel integration
|
@vinishjail97 I have implemented all the above suggestions. |
| for (RowBackedAction action : actions) { | ||
|
|
||
| if (action instanceof io.delta.kernel.internal.actions.AddFile) { | ||
| io.delta.kernel.internal.actions.AddFile addFile = |
There was a problem hiding this comment.
Can these classes from the delta kernel be imported?
| DeltaKernelDataFileUpdatesExtractor.builder() | ||
| .engine(engine) | ||
| .basePath(targetTable.getBasePath()) | ||
| // Column statistics are not needed for conversion operations |
There was a problem hiding this comment.
When we convert from one format to another, we actually do want the statistics. This allows query engines to leverage them for their planning operations for improved efficiency.
| if (action instanceof AddFile) { | ||
| AddFile addFile = (AddFile) action; | ||
| Row wrappedRow = | ||
| io.delta.kernel.internal.actions.SingleAction.createAddFileSingleAction( |
There was a problem hiding this comment.
Let's start using imports throughout the PR please. Do a sanity check of the files and make sure you are using them throughout. Highlighting every line leads to a lot of noise on the reviews.
| public static boolean tableExists(Engine engine, String basePath) { | ||
| try { | ||
| Table table = Table.forPath(engine, basePath); | ||
| table.getLatestSnapshot(engine); |
There was a problem hiding this comment.
This looks like it will load the snapshot, is there a more lightweight way to do this?
| DeltaKernelSchemaExtractor.getInstance().toInternalSchema(structRepresentation)); | ||
| } | ||
|
|
||
| // ========== Tests for fromInternalSchema() - New Tests ========== |
There was a problem hiding this comment.
Remove this comment for New Tests?
|
|
||
| // ========== Tests for fromInternalSchema() - New Tests ========== | ||
|
|
||
| @Test |
There was a problem hiding this comment.
Let's have tests with nested fields, lists and maps as well
|
|
||
| // Verify we have AddFile actions | ||
| boolean hasAddFile = actionList.stream().anyMatch(action -> action instanceof AddFile); | ||
| assertTrue(hasAddFile, "Should contain AddFile actions"); |
There was a problem hiding this comment.
Can we assert on the content of the AddFile to make sure it is aligned with our expectations?
| actionList.stream().filter(action -> action instanceof RemoveFile).count(); | ||
|
|
||
| // Verify: Should have AddFile for file3 (new file) | ||
| assertTrue(addFileCount >= 1, "Should have at least 1 AddFile action for new file (file3)"); |
There was a problem hiding this comment.
These counts should be strict. Only 1 file is expected to be added and 1 removed
… type tests - Enhanced TestDeltaKernelDataFileUpdatesExtractor with detailed AddFile content assertions - Added strict count verification (== instead of >=) for differential sync tests - Fixed path format inconsistency (Hadoop URI vs plain string) in test files - Added 3 comprehensive tests for fromInternalSchema: nested records, lists, and maps - Simplified test code by inlining nested schema builds with clear structural comments - Fixed applyDiff signature and improved DeltaKernelDataFileUpdatesExtractor - Added DeltaKernelUtils.tableExists helper method - All 19 tests passing (16 schema + 3 data file updater tests) Test coverage now includes: - Multi-level nested structures (3 levels deep) - Lists of primitives and complex types - Maps of primitives and complex types - Round-trip conversions with complex types - Strict assertions on AddFile/RemoveFile actions Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
| return DeltaKernelUtils.tableExists(engine, basePath); | ||
| } | ||
|
|
||
| private Map<String, String> getConfigurationsForDeltaSync() { |
There was a problem hiding this comment.
getConfigurationsForDeltaSync() does not set minReaderVersion/minWriterVersion, unlike the existing DeltaConversionTarget. Protocol versions default to Delta Kernel defaults, which may not match features used (e.g., generated columns require writer version 4). Is this intentional?
| @@ -265,22 +265,27 @@ private void collectUnsupportedStats(Map<String, Object> additionalStats) { | |||
| */ | |||
There was a problem hiding this comment.
This class is ~300 lines of near-identical duplication from DeltaStatsExtractor in the Standalone package. The only material difference is the AddFile import. Consider extracting shared stats serialization logic (convertStatsToDeltaFormat, insertValueAtPath, flattenStatMap, DeltaStats) into a common utility to avoid maintaining two copies.
This commit adds column statistics support to DeltaKernelDataFileUpdatesExtractor and eliminates code duplication by extracting shared stats logic into a common utility. ## Statistics Implementation - Add statistics support to DeltaKernelDataFileUpdatesExtractor - Implement convertToDataFileStatistics() using Delta Kernel 4.0.0 native API - Convert XTable ColumnStat to Delta Kernel DataFileStatistics (Column/Literal objects) - Support all stat types: BOOLEAN, DATE, DECIMAL, DOUBLE, INT, LONG, FLOAT, STRING, TIMESTAMP, TIMESTAMP_NTZ - Thread InternalSchema through call chain for stats conversion - Extract decimal precision/scale from schema metadata - Honor includeColumnStats flag to conditionally generate stats ## Code Deduplication - Create DeltaStatsUtils with shared stats conversion logic (~300 lines) - Refactor DeltaStatsExtractor to delegate to DeltaStatsUtils (300 -> 80 lines) - Refactor DeltaKernelStatsExtractor to delegate to DeltaStatsUtils (330 -> 80 lines) - Eliminate ~600 lines of duplicate code between Delta Standalone and Delta Kernel - Single source of truth for Delta stats serialization/parsing ## Test Improvements - Strengthen TestDeltaKernelDataFileUpdatesExtractor assertions - Change weak assertTrue(size > 0) to assertEquals(expectedSize, size) - Verify exact value propagation for size and modification time - Fix resource leak in TestDeltaKernelSync.validateDeltaTable() - Add try-with-resources for CloseableIterator instances ## Verification - All 110 Delta unit tests pass - No breaking changes to public APIs - Code style checks pass - Build succeeds Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
@vinishjail97 I have addressed all the comments. |
What is the purpose of the pull request
This PR migrates
XTable's Delta Lake integration from Delta Standalone to
Delta Kernel for writers
Brief change log
Verify this pull request
(Please pick either of the following options)
This pull request is a trivial rework / code cleanup without any test coverage.
(or)
This pull request is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(example:)