diff --git a/go/store/prolly/artifact_map.go b/go/store/prolly/artifact_map.go index d526c5562bc..c77dfad8c2d 100644 --- a/go/store/prolly/artifact_map.go +++ b/go/store/prolly/artifact_map.go @@ -587,7 +587,6 @@ type Artifact struct { } func mergeArtifactsDescriptorsFromSource(srcKd val.TupleDesc) (kd, vd val.TupleDesc) { - // artifact key consists of keys of source schema, followed by target branch // commit hash, and artifact type. keyTypes := srcKd.Types @@ -601,7 +600,11 @@ func mergeArtifactsDescriptorsFromSource(srcKd val.TupleDesc) (kd, vd val.TupleD // json blob data valTypes := []val.Type{{Enc: val.JSONEnc, Nullable: false}} - return val.NewTupleDescriptor(keyTypes...), val.NewTupleDescriptor(valTypes...) + // Add empty handlers for the new types + handlers := make([]val.TupleTypeHandler, len(keyTypes)) + copy(handlers, srcKd.Handlers) + + return val.NewTupleDescriptorWithArgs(val.TupleDescriptorArgs{Handlers: handlers}, keyTypes...), val.NewTupleDescriptor(valTypes...) } func ArtifactDebugFormat(ctx context.Context, m ArtifactMap) (string, error) { diff --git a/go/store/val/extended_comparator.go b/go/store/val/extended_comparator.go index 297f151bc84..3a5451c2677 100644 --- a/go/store/val/extended_comparator.go +++ b/go/store/val/extended_comparator.go @@ -82,7 +82,7 @@ func (c ExtendedTupleComparator) Validated(types []Type) TupleComparator { switch types[i].Enc { case ExtendedEnc, ExtendedAddrEnc: if handler == nil { - panic("extende encoding requires a handler") + panic("extended encoding requires a handler") } else { hasHandler = true }