feat: add EmptyVirtualTable to Builder interface (#167)

Author: vbarua

plan/builders.go

@@ -124,6 +124,7 @@ type Builder interface {
 	// Deprecated: Use VirtualTableFromExpr(...).Remap() instead.
 	VirtualTableFromExprRemap(fieldNames []string, remap []int32, values ...expr.VirtualTableExpressionValue) (*VirtualTableReadRel, error)
 	VirtualTableFromExpr(fieldNames []string, values ...expr.VirtualTableExpressionValue) (*VirtualTableReadRel, error)
+	EmptyVirtualTable(fieldNames []string, types []types.Type) (*VirtualTableReadRel, error)
 	IcebergTableFromMetadataFile(metadataURI string, snapshot IcebergSnapshot, schema types.NamedStruct) (*IcebergTableReadRel, error)
 	// Deprecated: Use Sort(...).Remap() instead.
 	SortRemap(input Rel, remap []int32, sorts ...expr.SortField) (*SortRel, error)
@@ -568,7 +569,7 @@ func (b *builder) VirtualTableFromExpr(fieldNames []string, values ...expr.Virtu
 
 func (b *builder) VirtualTableFromExprRemap(fieldNames []string, remap []int32, values ...expr.VirtualTableExpressionValue) (*VirtualTableReadRel, error) {
 	if len(values) == 0 {
-		return nil, fmt.Errorf("%w: must provide at least one set of values for virtual table", substraitgo.ErrInvalidRel)
+		return nil, fmt.Errorf("%w: must provide at least one set of values. Consider EmptyVirtualTable to construct rowless Virtual Table", substraitgo.ErrInvalidArg)
 	}
 
 	nfields := len(fieldNames)
@@ -619,6 +620,21 @@ func (b *builder) VirtualTable(fields []string, values ...expr.StructLiteralValu
 	return b.VirtualTableRemap(fields, nil, values...)
 }
 
+func (b *builder) EmptyVirtualTable(fieldNames []string, typeList []types.Type) (*VirtualTableReadRel, error) {
+	baseSchema := types.NamedStruct{
+		Names: fieldNames,
+		Struct: types.StructType{
+			Nullability: types.NullabilityRequired,
+			Types:       typeList,
+		},
+	}
+	return &VirtualTableReadRel{
+		baseReadRel: baseReadRel{
+			baseSchema: baseSchema,
+		},
+	}, nil
+}
+
 func (b *builder) IcebergTableFromMetadataFile(metadataURI string, snapshot IcebergSnapshot, schema types.NamedStruct) (*IcebergTableReadRel, error) {
 	tableType := &Direct{}
 	tableType.MetadataUri = metadataURI

plan/plan.go

@@ -368,7 +368,7 @@ func RelFromProto(rel *proto.Rel, reg expr.ExtensionRegistry) (Rel, error) {
 			}
 		case *proto.ReadRel_VirtualTable_:
 			if len(readType.VirtualTable.Values) > 0 && len(readType.VirtualTable.Expressions) > 0 {
-				return nil, fmt.Errorf("VirtualTable Value can't have both liternal and expression")
+				return nil, fmt.Errorf("VirtualTable cannot declare both Values and Expressions")
 			}
 			var values []expr.VirtualTableExpressionValue
 			for _, v := range readType.VirtualTable.Values {

plan/plan_builder_test.go

@@ -1651,7 +1651,7 @@ func TestSetRelations(t *testing.T) {
 	checkRoundTrip(t, expectedJSON, p)
 }
 
-func TestEmptyVirtualTable(t *testing.T) {
+func TestColumnlessVirtualTable(t *testing.T) {
 	const expectedJSON = `{
 		` + versionStruct + `,
 		"relations": [
@@ -1669,24 +1669,7 @@ func TestEmptyVirtualTable(t *testing.T) {
 								"expressions": [
 									{},
 									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{},
-									{}									
+									{}
 								]
 							}
 						}
@@ -1698,7 +1681,7 @@ func TestEmptyVirtualTable(t *testing.T) {
 
 	b := plan.NewBuilderDefault()
 
-	virtual, err := b.VirtualTable(nil, make([]expr.StructLiteralValue, 20)...)
+	virtual, err := b.VirtualTable(nil, make([]expr.StructLiteralValue, 3)...)
 	require.NoError(t, err)
 
 	p, err := b.Plan(virtual, []string{})
@@ -1707,6 +1690,45 @@ func TestEmptyVirtualTable(t *testing.T) {
 	checkRoundTrip(t, expectedJSON, p)
 }
 
+func TestEmptyVirtualTable(t *testing.T) {
+	const expectedJSON = `{
+		` + versionStruct + `,
+		"relations": [
+			{
+				"root": {
+					"input": {
+						"read": {
+							"common": {"direct":{}},
+							"baseSchema": {
+								"names": ["i"],
+								"struct": {
+									"types": [
+										{"i32": {"nullability": "NULLABILITY_REQUIRED"}}
+									],
+									"nullability": "NULLABILITY_REQUIRED"
+								}
+							},
+							"virtualTable": {}
+						}
+					},
+					"names": ["i"]
+				}
+			}
+		]
+	}`
+
+	b := plan.NewBuilderDefault()
+
+	i32Type := types.Int32Type{Nullability: types.NullabilityRequired}
+	virtual, err := b.EmptyVirtualTable([]string{"i"}, []types.Type{&i32Type})
+	require.NoError(t, err)
+
+	p, err := b.Plan(virtual, []string{"i"})
+	require.NoError(t, err)
+
+	checkRoundTrip(t, expectedJSON, p)
+}
+
 func TestSetRelErrors(t *testing.T) {
 	b := plan.NewBuilderDefault()