This is an automated email from the ASF dual-hosted git repository.
zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-go.git
The following commit(s) were added to refs/heads/main by this push:
new 8d7be55c9 fix(table): pass contexts in tests broken by concurrent io
and rewrite merges (#2346)
8d7be55c9 is described below
commit 8d7be55c962455412cb7e1ce7409f70441d6fd10
Author: Matt Topol <[email protected]>
AuthorDate: Wed Oct 28 17:02:29 2026 +0000
fix(table): pass contexts in tests broken by concurrent io and rewrite
merges (#2346)
#2336 made WriteFile context-aware and #2100 added a context to
processManifests; tests merged alongside them still used the old
signatures, so main no longer compiles the table test package.
---
table/commit_retry_test.go | 6 +++---
table/rewrite_manifests_internal_test.go | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/table/commit_retry_test.go b/table/commit_retry_test.go
index b0c478be2..f4f5b5d96 100644
--- a/table/commit_retry_test.go
+++ b/table/commit_retry_test.go
@@ -1468,15 +1468,15 @@ func
TestDoCommit_PartialRebuildFailureRemovesWrittenList(t *testing.T) {
wfs := newMemIO(1<<20, nil)
const loc = "mem://default/table-location/metadata/"
for _, name := range []string{"staged-1.avro", "staged-2.avro"} {
- require.NoError(t, wfs.WriteFile(loc+name, []byte("list")))
+ require.NoError(t, wfs.WriteFile(t.Context(), loc+name,
[]byte("list")))
}
rebuildErr := errors.New("simulated rebuild failure")
first := &addSnapshotUpdate{
baseUpdate: baseUpdate{ActionName: UpdateAddSnapshot},
Snapshot: &Snapshot{SnapshotID: 101, ParentSnapshotID: &head,
SequenceNumber: 2, ManifestList: loc + "staged-1.avro"},
- rebuildManifestList: func(_ context.Context, _ Metadata, parent
*Snapshot, fio iceio.WriteFileIO, _ int) (*Snapshot, error) {
- if err := fio.WriteFile(loc+"rebuilt-1.avro",
[]byte("list")); err != nil {
+ rebuildManifestList: func(ctx context.Context, _ Metadata,
parent *Snapshot, fio iceio.WriteFileIO, _ int) (*Snapshot, error) {
+ if err := fio.WriteFile(ctx, loc+"rebuilt-1.avro",
[]byte("list")); err != nil {
return nil, err
}
parentID := parent.SnapshotID
diff --git a/table/rewrite_manifests_internal_test.go
b/table/rewrite_manifests_internal_test.go
index 64eaeb029..4c261ea25 100644
--- a/table/rewrite_manifests_internal_test.go
+++ b/table/rewrite_manifests_internal_test.go
@@ -409,7 +409,7 @@ func TestRewriteManifestsFailedPassKeepsPreviousState(t
*testing.T) {
var buf bytes.Buffer
_, err := iceberg.WriteManifest(path, &buf, 2, spec,
schema, prod.snapshotID, entries)
require.NoError(t, err)
- require.NoError(t, mem.WriteFile(path, buf.Bytes()))
+ require.NoError(t, mem.WriteFile(t.Context(), path,
buf.Bytes()))
out[i] = iceberg.NewManifestBuilder(2, path,
int64(buf.Len()), int32(spec.ID()), prod.snapshotID).
AddedFiles(addedFiles).Content(iceberg.ManifestContentData).Build()
}
@@ -417,13 +417,13 @@ func TestRewriteManifestsFailedPassKeepsPreviousState(t
*testing.T) {
return out
}
- _, err := r.processManifests(inputs("good", 1))
+ _, err := r.processManifests(t.Context(), inputs("good", 1))
require.NoError(t, err)
added, rewritten, superseded := slices.Clone(r.added),
slices.Clone(r.rewritten), slices.Clone(r.superseded)
require.NotEmpty(t, added)
// A header count that lies trips the guard after the merged file is
written.
- _, err = r.processManifests(inputs("lying", 99))
+ _, err = r.processManifests(t.Context(), inputs("lying", 99))
require.Error(t, err)
assert.Equal(t, added, r.added)