Some checks failed
go: build dev binaries / cleanup (push) Successful in 4s
Codespell / Check for spelling errors (push) Failing after 3s
docker: build dev containers / build-rust-binaries (amd64, x86_64-unknown-linux-musl) (push) Failing after 3s
docker: build dev containers / build-dev-containers (push) Has been skipped
docker: build dev containers / build-rust-binaries (arm64, true, aarch64-unknown-linux-musl) (push) Failing after 3s
End to End / FUSE Mount (push) Failing after 2s
EC Integration Tests / EC Integration Tests (push) Failing after 30s
FUSE DLM Integration Tests / FUSE DLM Integration Tests (push) Failing after 3s
FUSE Volume Server Failover Tests / FUSE Volume Server Failover (push) Failing after 3s
FUSE Integration Tests / FUSE Integration Testing (push) Failing after 2s
FUSE P2P Peer Chunk Sharing Integration Tests / FUSE P2P Peer Chunk Sharing (push) Failing after 3s
go: build binary / Go Vet (push) Failing after 2s
go: build binary / Go Vet 32-bit (push) Failing after 3s
go: build binary / Build (push) Failing after 4s
go: build binary / Build cross-platform (freebsd/amd64) (push) Failing after 3s
go: build binary / Build cross-platform (windows/amd64) (push) Failing after 3s
go: build binary / Build cross-platform (darwin/arm64) (push) Failing after 3s
go: build binary / Build cross-platform (windows/arm64) (push) Failing after 3s
go: build binary / Test (push) Failing after 2s
go: build binary / Test 32-bit (push) Failing after 3s
helm: lint and test charts / lint-test (push) Failing after 3s
Java Client Integration Tests / Java Integration Tests (11) (push) Failing after 3s
Java Client Integration Tests / Java Integration Tests (17) (push) Failing after 3s
go: build dev binaries / build_dev_linux_windows (amd64, linux) (push) Failing after 2s
go: build dev binaries / build_dev_linux_windows (amd64, windows) (push) Failing after 3s
go: build dev binaries / build_dev_darwin (amd64, darwin) (push) Has been skipped
go: build dev binaries / build_dev_darwin (arm64, darwin) (push) Has been skipped
Java Client Unit Tests / Java Unit Tests (11) (push) Failing after 3s
Java Client Unit Tests / Java Unit Tests (17) (push) Failing after 2s
Java Client Unit Tests / Java Unit Tests (21) (push) Failing after 3s
Java Client Unit Tests / Java Unit Tests (8) (push) Failing after 3s
Kafka Quick Test (Load Test with Schema Registry) / Kafka Client Load Test (Quick) (push) Failing after 3s
Kafka Gateway Tests / Kafka Unit Tests (unit-tests-1) (push) Failing after 11s
Kafka Gateway Tests / Kafka Integration Tests (Critical) (integration-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka End-to-End Tests (with SMQ) (e2e-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka Consumer Group Tests (Highly Isolated) (consumer-group-1) (push) Failing after 2s
Kafka Gateway Tests / Kafka Client Compatibility (with SMQ) (client-compat-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka SMQ Integration Tests (Full Stack) (smq-integration-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka Protocol Tests (Isolated) (protocol-1) (push) Failing after 3s
KMS Tests / KMS Provider Integration Tests (push) Failing after 2s
KMS Tests / S3 KMS End-to-End Tests (push) Failing after 3s
Master Cold Start Tests / Master Cold Start Tests (push) Failing after 4s
Metadata Subscribe Integration Tests / Metadata Subscribe Integration Tests (push) Failing after 3s
Multi-Master Tests / Multi-Master Failover Tests (push) Failing after 3s
Performance / CPU and Heap Profile (push) Failing after 2s
Performance / S3 Read/Write Benchmark (rust volume) (push) Failing after 3s
pjdfstest POSIX Compliance / pjdfstest (push) Failing after 2s
Plugin Worker Integration Tests / Plugin Worker: erasure_coding (push) Failing after 3s
Plugin Worker Integration Tests / Plugin Worker: vacuum (push) Failing after 3s
Rust Volume Server Tests / Rust Integration Tests (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (grpc - Shard 1) (push) Failing after 2s
Rust Volume Server Tests / Go Tests with Rust Volume (http - Shard 1) (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (grpc - Shard 2) (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (http - Shard 2) (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (grpc - Shard 3) (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Distributed Tests (push) Failing after 2s
S3 IAM Integration Tests / S3 IAM Performance Tests (push) Failing after 3s
Performance / Throughput Benchmark (go volume) (push) Failing after 3s
Performance / Throughput Benchmark (rust volume) (push) Failing after 2s
Performance / S3 Read/Write Benchmark (go volume) (push) Failing after 3s
Plugin Worker Integration Tests / Plugin Worker: volume_balance (push) Failing after 3s
PostgreSQL Gateway Tests / PostgreSQL Basic Tests (push) Failing after 3s
Rust Volume Server Tests / Rust Unit Tests (push) Failing after 2s
Rust Volume Server Tests / Go Tests with Rust Volume (http - Shard 3) (push) Failing after 3s
Rust Plugin Worker Tests / Rust Plugin Worker Build and Unit Tests (push) Failing after 3s
rust: build dev volume server binaries / cleanup (push) Successful in 3s
S3 ETag and ACL Tests / S3 ETag + ACL Integration Tests (push) Failing after 3s
S3 IAM Integration Tests / IAM Unit Tests (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Integration Tests (advanced) (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Integration Tests (basic) (push) Failing after 2s
S3 IAM Integration Tests / S3 IAM Integration Tests (group) (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Integration Tests (policy-enforcement) (push) Failing after 2s
S3 IAM Integration Tests / S3 IAM Integration Tests (sts) (push) Failing after 4s
S3 Keycloak Integration Tests / S3 Keycloak Integration Tests (push) Failing after 3s
S3 PyArrow Parquet Tests / PyArrow Parquet Tests (Python 3.11) (push) Failing after 3s
S3 PyArrow Parquet Tests / Go Unit Tests (Implicit Directory) (push) Has been cancelled
S3 PyArrow Parquet Tests / PyArrow Parquet Tests (Python 3.12) (push) Has been cancelled
rust: build dev volume server binaries / build-rust-volume-dev-darwin (darwin-amd64, x86_64-apple-darwin) (push) Has been cancelled
rust: build dev volume server binaries / build-rust-volume-dev-darwin (darwin-arm64, aarch64-apple-darwin) (push) Has been cancelled
rust: build dev volume server binaries / build-rust-volume-dev-linux (linux-amd64, x86_64-unknown-linux-gnu) (push) Has been cancelled
S3 PyArrow Parquet Tests / PyArrow Parquet Tests (Python 3.9) (push) Has been cancelled
S3 Proxy Signature Tests / S3 Proxy Signature Verification Tests (push) Has been cancelled
S3 SDK V2 Route Disambiguation Tests / S3 SDK V2 Routing Tests (push) Has been cancelled
S3 SSE Tests / S3 SSE Integration Tests (quick) (push) Has been cancelled
S3 SSE Tests / S3 SSE Compatibility Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Metadata Persistence Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Copy Operations Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Multipart Upload Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Performance Test (push) Has been cancelled
S3 SSE Tests / S3 Volume Encryption Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Integration Tests (comprehensive) (push) Has been cancelled
Spark Integration Tests / Spark Integration Tests (push) Failing after 2s
Telemetry Integration Tests / telemetry-integration-test (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (grpc - Shard 1) (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (http - Shard 1) (push) Failing after 3s
Ceph S3 tests / Basic S3 tests (KV store) (push) Has been cancelled
Ceph S3 tests / S3 Versioning & Object Lock tests (push) Has been cancelled
S3 Policy Integration Tests / S3 Policy Unit Tests (push) Failing after 3s
Ceph S3 tests / S3 CORS tests (push) Has been cancelled
Ceph S3 tests / SeaweedFS Custom S3 Copy tests (push) Has been cancelled
Ceph S3 tests / Basic S3 tests (SQL store) (push) Has been cancelled
test s3 over https using aws-cli / awscli-tests (push) Has been cancelled
TLS Rotation Integration Tests / TLS Rotation Integration Tests (push) Has been cancelled
Vacuum Integration Tests / Vacuum Integration Tests (push) Has been cancelled
S3 Policy Integration Tests / S3 Policy Variables Integration Tests (push) Failing after 3s
S3 Policy Integration Tests / S3 Policy Enforcement Integration Tests (advanced-policy) (push) Failing after 3s
S3 Policy Integration Tests / S3 Policy Enforcement Integration Tests (basic-policy) (push) Failing after 2s
S3 Policy Integration Tests / S3 Policy Enforcement Integration Tests (contextual-policy) (push) Failing after 4s
S3 Policy Integration Tests / Trusted Proxy Detection Tests (push) Failing after 2s
S3 Policy Integration Tests / S3 Policy Shell Integration Tests (push) Failing after 3s
Samba on FUSE Integration / samba-integration (push) Failing after 2s
SFTP Integration Tests / SFTP Integration Testing (push) Failing after 3s
terraform: validate and test modules / fmt, validate, plan-level tests (push) Failing after 3s
terraform: validate and test modules / local cluster smoke test (real weed) (push) Failing after 2s
Volume Server Integration Tests / Volume Server Integration Tests (grpc - Shard 3) (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (grpc - Shard 2) (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (http - Shard 2) (push) Failing after 2s
Volume Server Integration Tests / Volume Server Integration Tests (http - Shard 3) (push) Failing after 5s
mount: windows conformance / WinFsp conformance (push) Has been cancelled
mount: windows / Mount on Windows (push) Has been cancelled
143 lines
4.4 KiB
Go
143 lines
4.4 KiB
Go
package iceberg
|
|
|
|
import (
|
|
"encoding/json"
|
|
"slices"
|
|
|
|
"github.com/apache/iceberg-go"
|
|
"github.com/apache/iceberg-go/table"
|
|
)
|
|
|
|
// nameMappingFromSchema derives the spec's field-id-to-names mapping from a
|
|
// table schema, mirroring Java's MappingUtil.create. List elements and map
|
|
// keys/values use the canonical "element"/"key"/"value" names.
|
|
func nameMappingFromSchema(schema *iceberg.Schema) iceberg.NameMapping {
|
|
return mappedFieldsOf(schema.Fields())
|
|
}
|
|
|
|
func mappedFieldsOf(fields []iceberg.NestedField) []iceberg.MappedField {
|
|
mapped := make([]iceberg.MappedField, 0, len(fields))
|
|
for _, field := range fields {
|
|
id := field.ID
|
|
mapped = append(mapped, iceberg.MappedField{
|
|
Names: []string{field.Name},
|
|
FieldID: &id,
|
|
Fields: mappedFieldsOfType(field.Type),
|
|
})
|
|
}
|
|
return mapped
|
|
}
|
|
|
|
func mappedFieldsOfType(typ iceberg.Type) []iceberg.MappedField {
|
|
switch t := typ.(type) {
|
|
case *iceberg.StructType:
|
|
return mappedFieldsOf(t.FieldList)
|
|
case *iceberg.ListType:
|
|
return mappedFieldsOf([]iceberg.NestedField{t.ElementField()})
|
|
case *iceberg.MapType:
|
|
return mappedFieldsOf([]iceberg.NestedField{t.KeyField(), t.ValueField()})
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// refreshDefaultNameMapping keeps schema.name-mapping.default in sync with
|
|
// the current schema across commits, so schema evolution does not strand
|
|
// readers of field-id-less data files on the creation-time mapping. The
|
|
// stored mapping is merged rather than replaced: per field-id, names already
|
|
// present are kept alongside the current schema name, so files written under
|
|
// a renamed column's old name (and user-added aliases) stay resolvable.
|
|
// Returns the (possibly patched) serialized metadata.
|
|
func refreshDefaultNameMapping(raw []byte, updated table.Metadata) []byte {
|
|
if updated == nil {
|
|
return raw
|
|
}
|
|
updatedSchema := updated.CurrentSchema()
|
|
if updatedSchema == nil || len(updatedSchema.Fields()) == 0 {
|
|
return raw
|
|
}
|
|
mapping := nameMappingFromSchema(updatedSchema)
|
|
|
|
existing := updated.Properties()[table.DefaultNameMappingKey]
|
|
if existing != "" {
|
|
var existingMapping iceberg.NameMapping
|
|
if err := json.Unmarshal([]byte(existing), &existingMapping); err != nil {
|
|
// Not a mapping we can merge; leave whatever the user stored.
|
|
return raw
|
|
}
|
|
mapping = mergeMappedFields(existingMapping, mapping)
|
|
}
|
|
wantJSON, err := json.Marshal(mapping)
|
|
if err != nil {
|
|
return raw
|
|
}
|
|
want := string(wantJSON)
|
|
if existing == want {
|
|
return raw
|
|
}
|
|
|
|
var metadata map[string]json.RawMessage
|
|
if err := json.Unmarshal(raw, &metadata); err != nil {
|
|
return raw
|
|
}
|
|
properties := map[string]json.RawMessage{}
|
|
if rawProperties, ok := metadata["properties"]; ok {
|
|
if err := json.Unmarshal(rawProperties, &properties); err != nil {
|
|
return raw
|
|
}
|
|
}
|
|
valueJSON, err := json.Marshal(want)
|
|
if err != nil {
|
|
return raw
|
|
}
|
|
properties[table.DefaultNameMappingKey] = valueJSON
|
|
propertiesJSON, err := json.Marshal(properties)
|
|
if err != nil {
|
|
return raw
|
|
}
|
|
metadata["properties"] = propertiesJSON
|
|
patched, err := json.Marshal(metadata)
|
|
if err != nil {
|
|
return raw
|
|
}
|
|
return patched
|
|
}
|
|
|
|
// mergeMappedFields folds the names of an existing mapping into the mapping
|
|
// derived from the current schema. Fields are matched by field-id per nesting
|
|
// level; entries whose ids left the schema are dropped, since current readers
|
|
// cannot project those fields anyway. A name can belong to only one field per
|
|
// level (Java readers reject ambiguous mappings), so a historical name that
|
|
// the current schema assigns to a different field-id stays with its new owner
|
|
// instead of being duplicated onto the old one — which also keeps mappings
|
|
// clean when a commit replaces the schema with reassigned field ids.
|
|
func mergeMappedFields(existing, derived []iceberg.MappedField) []iceberg.MappedField {
|
|
byID := make(map[int]*iceberg.MappedField, len(existing))
|
|
for i := range existing {
|
|
byID[existing[i].ID()] = &existing[i]
|
|
}
|
|
nameOwner := make(map[string]int)
|
|
for _, d := range derived {
|
|
for _, name := range d.Names {
|
|
nameOwner[name] = d.ID()
|
|
}
|
|
}
|
|
for i := range derived {
|
|
prior, ok := byID[derived[i].ID()]
|
|
if !ok {
|
|
continue
|
|
}
|
|
for _, name := range prior.Names {
|
|
if ownerID, taken := nameOwner[name]; taken && ownerID != derived[i].ID() {
|
|
continue
|
|
}
|
|
if !slices.Contains(derived[i].Names, name) {
|
|
derived[i].Names = append(derived[i].Names, name)
|
|
nameOwner[name] = derived[i].ID()
|
|
}
|
|
}
|
|
derived[i].Fields = mergeMappedFields(prior.Fields, derived[i].Fields)
|
|
}
|
|
return derived
|
|
}
|