fix breaking substrait-go change

apache · Feb 18, 2025 · dbc0bf1 · dbc0bf1
1 parent 0c0a682
commit dbc0bf1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/arrow/compute/exprs/builders.go b/arrow/compute/exprs/builders.go
@@ -36,7 +36,8 @@ import (
 // Arrow Extension registry and the default collection of substrait extensions
 // from the Substrait-go repo.
 func NewDefaultExtensionSet() ExtensionIDSet {
-	return NewExtensionSetDefault(expr.NewEmptyExtensionRegistry(&extensions.DefaultCollection))
+	return NewExtensionSetDefault(
+		expr.NewEmptyExtensionRegistry(extensions.GetDefaultCollectionWithNoError()))
 }
 
 // NewScalarCall constructs a substrait ScalarFunction expression with the provided

diff --git a/arrow/compute/exprs/exec.go b/arrow/compute/exprs/exec.go
@@ -173,7 +173,7 @@ func GetExtensionIDSet(ctx context.Context) ExtensionIDSet {
 	v, ok := ctx.Value(extCtxKey{}).(ExtensionIDSet)
 	if !ok {
 		return NewExtensionSet(
-			expr.NewEmptyExtensionRegistry(&extensions.DefaultCollection),
+			expr.NewEmptyExtensionRegistry(extensions.GetDefaultCollectionWithNoError()),
 			GetExtensionRegistry(ctx))
 	}
 	return v
@@ -434,7 +434,8 @@ func ExecuteScalarSubstrait(ctx context.Context, expression *expr.Extended, part
 	}
 
 	reg := GetExtensionRegistry(ctx)
-	set := NewExtensionSet(expr.NewExtensionRegistry(expression.Extensions, &extensions.DefaultCollection), reg)
+	set := NewExtensionSet(expr.NewExtensionRegistry(expression.Extensions,
+		extensions.GetDefaultCollectionWithNoError()), reg)
 	sc, err := ToArrowSchema(expression.BaseSchema, set)
 	if err != nil {
 		return nil, err