rambleraptor commented on code in PR #1283: URL: https://github.com/apache/iceberg-go/pull/1283#discussion_r3502186654
########## table/rewrite_manifests.go: ########## @@ -0,0 +1,297 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package table + +import ( + "context" + "fmt" + "slices" + "strconv" + + "github.com/apache/iceberg-go" + iceio "github.com/apache/iceberg-go/io" +) + +// Snapshot summary keys for a manifest rewrite. +const ( + manifestsCreatedKey = "manifests-created" + manifestsReplacedKey = "manifests-replaced" + manifestsKeptKey = "manifests-kept" + entriesProcessedKey = "entries-processed" +) + +// RewriteManifestsResult reports the manifests changed by a rewrite. +type RewriteManifestsResult struct { + // RewrittenManifests are the old manifests that were replaced. + RewrittenManifests []iceberg.ManifestFile + // AddedManifests are the new manifests written in their place. + AddedManifests []iceberg.ManifestFile +} + +type rewriteManifestsCfg struct { + targetSizeBytes int64 + specID *int + predicate func(iceberg.ManifestFile) bool +} + +// RewriteManifestsOpt configures [Transaction.RewriteManifests]. +type RewriteManifestsOpt func(*rewriteManifestsCfg) + +// WithManifestTargetSize overrides the target manifest size in bytes. +// The default comes from the commit.manifest.target-size-bytes property. +func WithManifestTargetSize(size int64) RewriteManifestsOpt { + return func(c *rewriteManifestsCfg) { + if size > 0 { + c.targetSizeBytes = size + } + } +} + +// WithRewriteSpecID restricts the rewrite to manifests of one partition spec. +func WithRewriteSpecID(id int) RewriteManifestsOpt { + return func(c *rewriteManifestsCfg) { c.specID = &id } +} + +// WithRewriteManifestPredicate only rewrites manifests for which pred is true. +// Manifests that don't match are left untouched. +func WithRewriteManifestPredicate(pred func(iceberg.ManifestFile) bool) RewriteManifestsOpt { + return func(c *rewriteManifestsCfg) { c.predicate = pred } +} + +// rewriteManifests is a producer that merges small data manifests into +// fewer, target-sized ones, committed as a metadata-only REPLACE snapshot. +type rewriteManifests struct { + base *snapshotProducer + cfg rewriteManifestsCfg + + rewritten []iceberg.ManifestFile + added []iceberg.ManifestFile + + // result is the value returned to the caller. record() rewrites its + // fields on every pass, including OCC retries, so the pointer the caller + // holds reflects the manifests actually committed, not attempt 0's. + result *RewriteManifestsResult +} + +func newRewriteManifestsProducer(txn *Transaction, fs iceio.WriteFileIO, props iceberg.Properties, cfg rewriteManifestsCfg) *snapshotProducer { + prod := createSnapshotProducer(OpReplace, txn, fs, nil, props) + prod.producerImpl = &rewriteManifests{base: prod, cfg: cfg, result: &RewriteManifestsResult{}} + // A rewrite re-expresses inherited manifests, so OCC retries must + // re-derive from the fresh parent rather than carry these forward. + prod.rebuildMode = true + + return prod +} + +func (r *rewriteManifests) existingManifests() ([]iceberg.ManifestFile, error) { + snap := r.base.txn.meta.currentSnapshot() + if snap == nil { + return nil, nil + } + + return snap.Manifests(r.base.io) +} + +func (r *rewriteManifests) deletedEntries(context.Context) ([]iceberg.ManifestEntry, error) { + return nil, nil +} + +func (r *rewriteManifests) processManifests(manifests []iceberg.ManifestFile) ([]iceberg.ManifestFile, error) { + var toRewrite, kept []iceberg.ManifestFile + for _, m := range manifests { + if r.eligible(m) { + toRewrite = append(toRewrite, m) + } else { + kept = append(kept, m) + } + } + + mgr := manifestMergeManager{ + targetSizeBytes: r.cfg.targetSizeBytes, + minCountToMerge: 1, // force a merge regardless of count + mergeEnabled: true, // explicit op ignores commit.manifest-merge.enabled + snap: r.base, + } + merged, err := mgr.mergeManifests(toRewrite) + if err != nil { + return nil, err + } + + if err := validateRewriteFileCounts(toRewrite, merged); err != nil { + return nil, err + } + + // Record on every pass, not just the first. An OCC retry re-runs this + // against the fresh parent and writes a different merged set; the last + // pass is the one that commits, so its counts are the ones that must win. + r.record(toRewrite, merged, kept) + + return slices.Concat(merged, kept), nil +} + +// eligible reports whether m is a data manifest selected for rewrite. +func (r *rewriteManifests) eligible(m iceberg.ManifestFile) bool { + if m.ManifestContent() != iceberg.ManifestContentData { + return false + } + if r.cfg.specID != nil && int(m.PartitionSpecID()) != *r.cfg.specID { + return false + } + if r.cfg.predicate != nil && !r.cfg.predicate(m) { + return false + } + + return true +} + +func (r *rewriteManifests) record(toRewrite, merged, kept []iceberg.ManifestFile) { + // A prior pass (a superseded OCC attempt) wrote its own merged manifests + // that the catalog never referenced. Carry their paths into the + // producer's superseded set so commit() can delete them on success; + // otherwise every retry leaks a full set of merged .avro files. + for _, m := range r.added { + r.base.supersededManifests = append(r.base.supersededManifests, m.FilePath()) + } + r.added, r.rewritten = nil, nil + + inPaths := make(map[string]struct{}, len(toRewrite)) + for _, m := range toRewrite { + inPaths[m.FilePath()] = struct{}{} + } + outPaths := make(map[string]struct{}, len(merged)) + for _, m := range merged { + outPaths[m.FilePath()] = struct{}{} + } + + // Bins of a single manifest pass through unchanged; only the manifests + // that actually appear on one side and not the other are added/replaced. + // This drives the returned RewriteManifestsResult. + for _, m := range merged { + if _, ok := inPaths[m.FilePath()]; !ok { + r.added = append(r.added, m) + } + } + for _, m := range toRewrite { + if _, ok := outPaths[m.FilePath()]; !ok { + r.rewritten = append(r.rewritten, m) + } + } + + // Publish into the shared result the caller holds so a retry's counts win. + r.result.RewrittenManifests = r.rewritten + r.result.AddedManifests = r.added + + // The summary follows Java's Appendix-F accounting over the full eligible + // set, pass-throughs included, so it reads the same as a Java-written + // snapshot — distinct from the added/rewritten diff above. + r.base.snapshotProps[manifestsCreatedKey] = strconv.Itoa(len(merged)) + r.base.snapshotProps[manifestsReplacedKey] = strconv.Itoa(len(toRewrite)) + r.base.snapshotProps[manifestsKeptKey] = strconv.Itoa(len(kept)) + if entries := manifestActiveFiles(toRewrite); entries >= 0 { + r.base.snapshotProps[entriesProcessedKey] = strconv.FormatInt(entries, 10) + } else { + delete(r.base.snapshotProps, entriesProcessedKey) + } +} + +func (r *rewriteManifests) validate(*conflictContext) error { return nil } +func (r *rewriteManifests) needsValidation() bool { return false } + +// manifestActiveFiles sums added + existing data files, or -1 if any manifest +// reports an unknown count. +func manifestActiveFiles(manifests []iceberg.ManifestFile) int64 { + var total int64 + for _, m := range manifests { + added, existing := m.AddedDataFiles(), m.ExistingDataFiles() + if added < 0 || existing < 0 { + return -1 + } + total += int64(added) + int64(existing) + } + + return total +} + +// validateRewriteFileCounts guards against dropping or duplicating data files: +// the rewritten manifests must hold the same active files as their inputs. +func validateRewriteFileCounts(before, after []iceberg.ManifestFile) error { + in, out := manifestActiveFiles(before), manifestActiveFiles(after) + if in < 0 || out < 0 { Review Comment: I ended up doing the full approach. Hope that works. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
