Support for Parameterized type

extensions/simple_extension.go

@@ -3,11 +3,13 @@
 package extensions
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 	"strings"
 
 	substraitgo "github.com/substrait-io/substrait-go"
+	"github.com/substrait-io/substrait-go/types"
 	"github.com/substrait-io/substrait-go/types/parser"
 )
 
@@ -57,6 +59,7 @@
 
 type Argument interface {
 	toTypeString() string
+	ArgType() (types.Type, error)
 }
 
 type EnumArg struct {
@@ -69,6 +72,10 @@
 	return "req"
 }
 
+func (EnumArg) ArgType() (types.Type, error) {
+	return nil, errors.New("unimplemented")
+}
+
 type ValueArg struct {
 	Name        string `yaml:",omitempty"`
 	Description string `yaml:",omitempty"`
@@ -80,6 +87,10 @@
 	return v.Value.Expr.(*parser.Type).ShortType()
 }
 
+func (v ValueArg) ArgType() (types.Type, error) {
+	return v.Value.Expr.(*parser.Type).Type()
+}
+
 type TypeArg struct {
 	Name        string `yaml:",omitempty"`
 	Description string `yaml:",omitempty"`
@@ -88,6 +99,10 @@
 
 func (TypeArg) toTypeString() string { return "type" }
 
+func (TypeArg) ArgType() (types.Type, error) {
+	return nil, errors.New("unimplemented")
+}
+
 type ArgumentList []Argument
 
 func (a *ArgumentList) UnmarshalYAML(fn func(interface{}) error) error {

types/any_type.go

@@ -0,0 +1,35 @@
+package types
+
+import (
+	"fmt"
+)
+
+// AnyType to represent AnyType, this type is to indicate "any" type of argument
+// This type is not used in function invocation. It is only used in function definition
+type AnyType struct {
+	Name             string
+	TypeVariationRef uint32
+	Nullability      Nullability
+}
+
+func (AnyType) isRootRef() {}
+func (m AnyType) WithNullability(nullability Nullability) Type {
+	m.Nullability = nullability
+	return m
+}
+func (m AnyType) GetType() Type { return m }
+func (m AnyType) GetNullability() Nullability {
+	return m.Nullability
+}
+func (m AnyType) GetTypeVariationReference() uint32 {
+	return m.TypeVariationRef
+}
+func (AnyType) Equals(rhs Type) bool {
+	// equal to every other type
+	return true
+}
+
+func (t AnyType) ShortString() string { return t.Name }
+func (t AnyType) String() string {
+	return fmt.Sprintf("%s%s", t.Name, strNullable(t))
+}

types/any_type_test.go

@@ -0,0 +1,32 @@
+package types_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/substrait-io/substrait-go/types"
+)
+
+func TestAnyType(t *testing.T) {
+	for _, td := range []struct {
+		testName       string
+		argName        string
+		nullability    types.Nullability
+		expectedString string
+	}{
+		{"any", "any", types.NullabilityNullable, "any?"},
+		{"anyrequired", "any", types.NullabilityRequired, "any"},
+		{"anyOtherName", "any1", types.NullabilityNullable, "any1?"},
+		{"T name", "T", types.NullabilityNullable, "T?"},
+	} {
+		t.Run(td.testName, func(t *testing.T) {
+			arg := &types.AnyType{
+				Name:        td.argName,
+				Nullability: td.nullability,
+			}
+			require.Equal(t, td.expectedString, arg.String())
+			require.Equal(t, td.nullability, arg.GetNullability())
+			require.Equal(t, td.argName, arg.ShortString())
+		})
+	}
+}

types/parameterized_decimal_type.go

@@ -0,0 +1,44 @@
+package types
+
+import (
+	"fmt"
+)
+
+// ParameterizedDecimalType is a decimal type with precision and scale parameters of string type
+// example: Decimal(P,S). Kindly note concrete types Decimal(10, 2) are not represented by this type
+// Concrete type is represented by DecimalType
+type ParameterizedDecimalType struct {
+	Nullability      Nullability
+	TypeVariationRef uint32
+	Precision        IntegerParam
+	Scale            IntegerParam
+}
+
+func (ParameterizedDecimalType) isRootRef() {}
+func (m ParameterizedDecimalType) WithNullability(n Nullability) Type {
+	m.Nullability = n
+	return m
+}
+
+func (m ParameterizedDecimalType) GetType() Type               { return m }
+func (m ParameterizedDecimalType) GetNullability() Nullability { return m.Nullability }
+func (m ParameterizedDecimalType) GetTypeVariationReference() uint32 {
+	return m.TypeVariationRef
+}
+func (m ParameterizedDecimalType) Equals(rhs Type) bool {
+	if o, ok := rhs.(ParameterizedDecimalType); ok {
+		return o == m
+	}
+	return false
+}
+
+func (m ParameterizedDecimalType) ShortString() string {
+	t := DecimalType{}
+	return t.ShortString()
+}
+
+func (m ParameterizedDecimalType) String() string {
+	t := DecimalType{}
+	parameterString := fmt.Sprintf("<%s,%s>", m.Precision.String(), m.Scale.String())
+	return fmt.Sprintf("%s%s%s", t.BaseString(), strNullable(m), parameterString)
+}

types/parameterized_types.go

@@ -0,0 +1,101 @@
+package types
+
+import (
+	"fmt"
+)
+
+// IntegerParam represents a single integer parameter for a parameterized type
+// Example: VARCHAR(L1) -> L1 is the integer parameter
+type IntegerParam struct {
+	Name string
+}
+
+func (m IntegerParam) Equals(o IntegerParam) bool {
+	return m == o
+}
+
+func (m IntegerParam) String() string {
+	return m.Name
+}
+
+// ParameterizedTypeSingleIntegerParam This is a generic type to represent parameterized type with a single integer parameter
+type ParameterizedTypeSingleIntegerParam[T VarCharType | FixedCharType | FixedBinaryType | PrecisionTimestampType | PrecisionTimestampTzType] struct {
+	Nullability      Nullability
+	TypeVariationRef uint32
+	IntegerOption    IntegerParam
+}
+
+func (m ParameterizedTypeSingleIntegerParam[T]) WithIntegerOption(integerOption IntegerParam) Type {
+	m.IntegerOption = integerOption
+	return m
+}
+
+func (ParameterizedTypeSingleIntegerParam[T]) isRootRef() {}
+func (m ParameterizedTypeSingleIntegerParam[T]) WithNullability(n Nullability) Type {
+	m.Nullability = n
+	return m
+}
+
+func (m ParameterizedTypeSingleIntegerParam[T]) GetType() Type               { return m }
+func (m ParameterizedTypeSingleIntegerParam[T]) GetNullability() Nullability { return m.Nullability }
+func (m ParameterizedTypeSingleIntegerParam[T]) GetTypeVariationReference() uint32 {
+	return m.TypeVariationRef
+}
+func (m ParameterizedTypeSingleIntegerParam[T]) Equals(rhs Type) bool {
+	if o, ok := rhs.(ParameterizedTypeSingleIntegerParam[T]); ok {
+		return o == m
+	}
+	return false
+}
+
+func (m ParameterizedTypeSingleIntegerParam[T]) ShortString() string {
+	switch any(m).(type) {
+	case ParameterizedVarCharType:
+		t := VarCharType{}
+		return t.ShortString()
+	case ParameterizedFixedCharType:
+		t := FixedCharType{}
+		return t.ShortString()
+	case ParameterizedFixedBinaryType:
+		t := FixedBinaryType{}
+		return t.ShortString()
+	case ParameterizedPrecisionTimestampType:
+		t := PrecisionTimestampType{}
+		return t.ShortString()
+	case ParameterizedPrecisionTimestampTzType:
+		t := PrecisionTimestampTzType{}
+		return t.ShortString()
+	default:
+		panic("unknown type")
+	}
+}
+
+func (m ParameterizedTypeSingleIntegerParam[T]) String() string {
+	return fmt.Sprintf("%s%s%s", m.baseString(), strNullable(m), m.parameterString())
+}
+
+func (m ParameterizedTypeSingleIntegerParam[T]) parameterString() string {
+	return fmt.Sprintf("<%s>", m.IntegerOption.String())
+}
+
+func (m ParameterizedTypeSingleIntegerParam[T]) baseString() string {
+	switch any(m).(type) {
+	case ParameterizedVarCharType:
+		t := VarCharType{}
+		return t.BaseString()
+	case ParameterizedFixedCharType:
+		t := FixedCharType{}
+		return t.BaseString()
+	case ParameterizedFixedBinaryType:
+		t := FixedBinaryType{}
+		return t.BaseString()
+	case ParameterizedPrecisionTimestampType:
+		t := PrecisionTimestampType{}
+		return t.BaseString()
+	case ParameterizedPrecisionTimestampTzType:
+		t := PrecisionTimestampTzType{}
+		return t.BaseString()
+	default:
+		panic("unknown type")
+	}
+}

types/parameterized_types_test.go

@@ -0,0 +1,63 @@
+package types_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/substrait-io/substrait-go/types"
+)
+
+func TestParameterizedVarCharType(t *testing.T) {
+	for _, td := range []struct {
+		name                string
+		typ                 types.ParameterizedSingleIntegerType
+		nullability         types.Nullability
+		integerOption       types.IntegerParam
+		expectedString      string
+		expectedBaseString  string
+		expectedShortString string
+	}{
+		{"nullable varchar", &types.ParameterizedVarCharType{}, types.NullabilityNullable, types.IntegerParam{Name: "L1"}, "varchar?<L1>", "varchar", "vchar"},
+		{"non nullable varchar", &types.ParameterizedVarCharType{}, types.NullabilityRequired, types.IntegerParam{Name: "L1"}, "varchar<L1>", "varchar", "vchar"},
+		{"nullable fixChar", &types.ParameterizedFixedCharType{}, types.NullabilityNullable, types.IntegerParam{Name: "L1"}, "char?<L1>", "char", "fchar"},
+		{"non nullable fixChar", &types.ParameterizedFixedCharType{}, types.NullabilityRequired, types.IntegerParam{Name: "L1"}, "char<L1>", "char", "fchar"},
+		{"nullable fixBinary", &types.ParameterizedFixedBinaryType{}, types.NullabilityNullable, types.IntegerParam{Name: "L1"}, "fixedbinary?<L1>", "fixedbinary", "fbin"},
+		{"non nullable fixBinary", &types.ParameterizedFixedBinaryType{}, types.NullabilityRequired, types.IntegerParam{Name: "L1"}, "fixedbinary<L1>", "fixedbinary", "fbin"},
+		{"nullable precisionTimeStamp", &types.ParameterizedPrecisionTimestampType{}, types.NullabilityNullable, types.IntegerParam{Name: "L1"}, "precision_timestamp?<L1>", "precision_timestamp", "prets"},
+		{"non nullable precisionTimeStamp", &types.ParameterizedPrecisionTimestampType{}, types.NullabilityRequired, types.IntegerParam{Name: "L1"}, "precision_timestamp<L1>", "precision_timestamp", "prets"},
+		{"nullable precisionTimeStampTz", &types.ParameterizedPrecisionTimestampTzType{}, types.NullabilityNullable, types.IntegerParam{Name: "L1"}, "precision_timestamp_tz?<L1>", "precision_timestamp_tz", "pretstz"},
+		{"non nullable precisionTimeStampTz", &types.ParameterizedPrecisionTimestampTzType{}, types.NullabilityRequired, types.IntegerParam{Name: "L1"}, "precision_timestamp_tz<L1>", "precision_timestamp_tz", "pretstz"},
+	} {
+		t.Run(td.name, func(t *testing.T) {
+			pt := td.typ.WithIntegerOption(td.integerOption).WithNullability(td.nullability)
+			require.Equal(t, td.expectedString, pt.String())
+			require.Equal(t, td.expectedShortString, pt.ShortString())
+			require.True(t, pt.Equals(pt))
+		})
+	}
+}
+
+func TestParameterizedDecimalType(t *testing.T) {
+	for _, td := range []struct {
+		name                string
+		precision           string
+		scale               string
+		nullability         types.Nullability
+		expectedString      string
+		expectedBaseString  string
+		expectedShortString string
+	}{
+		{"nullable decimal", "P", "S", types.NullabilityNullable, "decimal?<P,S>", "decimal", "dec"},
+		{"non nullable decimal", "P", "S", types.NullabilityRequired, "decimal<P,S>", "decimal", "dec"},
+	} {
+		t.Run(td.name, func(t *testing.T) {
+			precision := types.IntegerParam{Name: td.precision}
+			scale := types.IntegerParam{Name: td.scale}
+			pt := types.ParameterizedDecimalType{Precision: precision, Scale: scale, Nullability: td.nullability}
+			require.Equal(t, td.expectedString, pt.String())
+			//require.Equal(t, td.expectedBaseString, pt.BaseString())
+			require.Equal(t, td.expectedShortString, pt.ShortString())
+			require.True(t, pt.Equals(pt))
+		})
+	}
+}