feat: introduce DefaultExtensionCatalog.DEFAULT_COLLECTION (#529)

Provide convenient static instance of default ExtensionCollection

BREAKING CHANGE: removed SimpleExtension.loadDefaults

Author: vbarua

core/src/main/java/io/substrait/extendedexpression/ProtoExtendedExpressionConverter.java

@@ -2,6 +2,7 @@
 
 import io.substrait.expression.Expression;
 import io.substrait.expression.proto.ProtoExpressionConverter;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.ExtensionCollector;
 import io.substrait.extension.ExtensionLookup;
 import io.substrait.extension.ImmutableExtensionLookup;
@@ -23,7 +24,7 @@ public class ProtoExtendedExpressionConverter {
           new ExtensionCollector(), SimpleExtension.ExtensionCollection.builder().build());
 
   public ProtoExtendedExpressionConverter() {
-    this(SimpleExtension.loadDefaults());
+    this(DefaultExtensionCatalog.DEFAULT_COLLECTION);
   }
 
   public ProtoExtendedExpressionConverter(SimpleExtension.ExtensionCollection extensionCollection) {

core/src/main/java/io/substrait/extension/DefaultExtensionCatalog.java

@@ -1,5 +1,9 @@
 package io.substrait.extension;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class DefaultExtensionCatalog {
   public static final String FUNCTIONS_AGGREGATE_APPROX = "/functions_aggregate_approx.yaml";
   public static final String FUNCTIONS_AGGREGATE_GENERIC = "/functions_aggregate_generic.yaml";
@@ -14,4 +18,28 @@ public class DefaultExtensionCatalog {
   public static final String FUNCTIONS_ROUNDING_DECIMAL = "/functions_rounding_decimal.yaml";
   public static final String FUNCTIONS_SET = "/functions_set.yaml";
   public static final String FUNCTIONS_STRING = "/functions_string.yaml";
+
+  public static final SimpleExtension.ExtensionCollection DEFAULT_COLLECTION =
+      loadDefaultCollection();
+
+  private static SimpleExtension.ExtensionCollection loadDefaultCollection() {
+    List<String> defaultFiles =
+        Arrays.asList(
+                "boolean",
+                "aggregate_generic",
+                "aggregate_approx",
+                "arithmetic_decimal",
+                "arithmetic",
+                "comparison",
+                "datetime",
+                "logarithmic",
+                "rounding",
+                "rounding_decimal",
+                "string")
+            .stream()
+            .map(c -> String.format("/functions_%s.yaml", c))
+            .collect(Collectors.toList());
+
+    return SimpleExtension.load(defaultFiles);
+  }
 }

core/src/main/java/io/substrait/extension/SimpleExtension.java

@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -701,27 +700,6 @@ public ExtensionCollection merge(ExtensionCollection extensionCollection) {
     }
   }
 
-  public static ExtensionCollection loadDefaults() {
-    List<String> defaultFiles =
-        Arrays.asList(
-                "boolean",
-                "aggregate_generic",
-                "aggregate_approx",
-                "arithmetic_decimal",
-                "arithmetic",
-                "comparison",
-                "datetime",
-                "logarithmic",
-                "rounding",
-                "rounding_decimal",
-                "string")
-            .stream()
-            .map(c -> String.format("/functions_%s.yaml", c))
-            .collect(Collectors.toList());
-
-    return load(defaultFiles);
-  }
-
   public static ExtensionCollection load(List<String> resourcePaths) {
     if (resourcePaths.isEmpty()) {
       throw new IllegalArgumentException("Require at least one resource path.");

core/src/main/java/io/substrait/plan/ProtoPlanConverter.java

@@ -1,5 +1,6 @@
 package io.substrait.plan;
 
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.ExtensionLookup;
 import io.substrait.extension.ImmutableExtensionLookup;
 import io.substrait.extension.SimpleExtension;
@@ -16,7 +17,7 @@ public class ProtoPlanConverter {
   protected final SimpleExtension.ExtensionCollection extensionCollection;
 
   public ProtoPlanConverter() {
-    this(SimpleExtension.loadDefaults());
+    this(DefaultExtensionCatalog.DEFAULT_COLLECTION);
   }
 
   public ProtoPlanConverter(SimpleExtension.ExtensionCollection extensionCollection) {

core/src/main/java/io/substrait/relation/ProtoAggregateFunctionConverter.java

@@ -5,6 +5,7 @@
 import io.substrait.expression.FunctionArg;
 import io.substrait.expression.FunctionOption;
 import io.substrait.expression.proto.ProtoExpressionConverter;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.ExtensionLookup;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.type.proto.ProtoTypeConverter;
@@ -24,7 +25,7 @@ public class ProtoAggregateFunctionConverter {
 
   public ProtoAggregateFunctionConverter(
       ExtensionLookup lookup, ProtoExpressionConverter protoExpressionConverter) {
-    this(lookup, SimpleExtension.loadDefaults(), protoExpressionConverter);
+    this(lookup, DefaultExtensionCatalog.DEFAULT_COLLECTION, protoExpressionConverter);
   }
 
   public ProtoAggregateFunctionConverter(

core/src/main/java/io/substrait/relation/ProtoRelConverter.java

@@ -3,6 +3,7 @@
 import io.substrait.expression.Expression;
 import io.substrait.expression.proto.ProtoExpressionConverter;
 import io.substrait.extension.AdvancedExtension;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.ExtensionLookup;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.hint.Hint;
@@ -55,7 +56,7 @@ public class ProtoRelConverter {
   private final ProtoTypeConverter protoTypeConverter;
 
   public ProtoRelConverter(ExtensionLookup lookup) {
-    this(lookup, SimpleExtension.loadDefaults());
+    this(lookup, DefaultExtensionCatalog.DEFAULT_COLLECTION);
   }
 
   public ProtoRelConverter(ExtensionLookup lookup, SimpleExtension.ExtensionCollection extensions) {

core/src/test/java/io/substrait/TestBase.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.substrait.dsl.SubstraitBuilder;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.ExtensionCollector;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.relation.ProtoRelConverter;
@@ -13,7 +14,7 @@
 public abstract class TestBase {
 
   protected static final SimpleExtension.ExtensionCollection defaultExtensionCollection =
-      SimpleExtension.loadDefaults();
+      DefaultExtensionCatalog.DEFAULT_COLLECTION;
 
   protected TypeCreator R = TypeCreator.REQUIRED;
 

isthmus-cli/src/main/java/io/substrait/isthmus/cli/IsthmusEntryPoint.java

@@ -4,7 +4,7 @@
 import com.google.protobuf.Message;
 import com.google.protobuf.TextFormat;
 import com.google.protobuf.util.JsonFormat;
-import io.substrait.extension.SimpleExtension;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.isthmus.FeatureBoard;
 import io.substrait.isthmus.ImmutableFeatureBoard;
 import io.substrait.isthmus.SqlExpressionToSubstrait;
@@ -87,7 +87,7 @@ public Integer call() throws Exception {
     // Isthmus image is parsing SQL Expression if that argument is defined
     if (sqlExpressions != null) {
       SqlExpressionToSubstrait converter =
-          new SqlExpressionToSubstrait(featureBoard, SimpleExtension.loadDefaults());
+          new SqlExpressionToSubstrait(featureBoard, DefaultExtensionCatalog.DEFAULT_COLLECTION);
       ExtendedExpression extendedExpression = converter.convert(sqlExpressions, createStatements);
       printMessage(extendedExpression);
     } else { // by default Isthmus image are parsing SQL Query

isthmus/src/main/java/io/substrait/isthmus/SqlConverterBase.java

@@ -1,5 +1,6 @@
 package io.substrait.isthmus;
 
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import org.apache.calcite.config.CalciteConnectionConfig;
 import org.apache.calcite.config.CalciteConnectionProperty;
@@ -20,7 +21,7 @@
 
 class SqlConverterBase {
   protected static final SimpleExtension.ExtensionCollection EXTENSION_COLLECTION =
-      SimpleExtension.loadDefaults();
+      DefaultExtensionCatalog.DEFAULT_COLLECTION;
 
   final RelDataTypeFactory factory;
   final RelOptCluster relOptCluster;

isthmus/src/test/java/io/substrait/isthmus/CalciteCallTest.java

@@ -6,6 +6,7 @@
 import com.google.common.collect.ImmutableList;
 import io.substrait.expression.Expression;
 import io.substrait.expression.ExpressionCreator;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.SubstraitRelNodeConverter.Context;
 import io.substrait.isthmus.expression.ExpressionRexConverter;
@@ -22,7 +23,7 @@
 public class CalciteCallTest extends CalciteObjs {
 
   private static final SimpleExtension.ExtensionCollection EXTENSION_COLLECTION =
-      SimpleExtension.loadDefaults();
+      DefaultExtensionCatalog.DEFAULT_COLLECTION;
   private final ScalarFunctionConverter functionConverter =
       new ScalarFunctionConverter(EXTENSION_COLLECTION.scalarFunctions(), type);
   private final RexExpressionConverter rexExpressionConverter =