@@ -18,37 +18,14 @@ package compute
1818
1919import (
2020 "fmt"
21- "strings"
2221
2322 "github.com/apache/arrow/go/v10/arrow"
2423 "github.com/apache/arrow/go/v10/arrow/array"
2524 "github.com/apache/arrow/go/v10/arrow/scalar"
2625)
2726
28- //go:generate go run golang.org/x/tools/cmd/stringer -type=ValueShape -linecomment
2927//go:generate go run golang.org/x/tools/cmd/stringer -type=DatumKind -linecomment
3028
31- // ValueShape is a brief description of the shape of a value (array, scalar or otherwise)
32- type ValueShape int8
33-
34- const (
35- // either Array or Scalar
36- ShapeAny ValueShape = iota // any
37- ShapeArray // array
38- ShapeScalar // scalar
39- )
40-
41- // ValueDescr is a descriptor type giving both the shape and the datatype of a value
42- // but without the data.
43- type ValueDescr struct {
44- Shape ValueShape
45- Type arrow.DataType
46- }
47-
48- func (v * ValueDescr ) String () string {
49- return fmt .Sprintf ("%s [%s]" , v .Shape , v .Type )
50- }
51-
5229// DatumKind is an enum used for denoting which kind of type a datum is encapsulating
5330type DatumKind int
5431
@@ -82,8 +59,6 @@ type Datum interface {
8259// a slice with 1 element for Array, and the slice of chunks for a chunked array.
8360type ArrayLikeDatum interface {
8461 Datum
85- Shape () ValueShape
86- Descr () ValueDescr
8762 NullN () int64
8863 Type () arrow.DataType
8964 Chunks () []arrow.Array
@@ -114,12 +89,10 @@ type ScalarDatum struct {
11489}
11590
11691func (ScalarDatum ) Kind () DatumKind { return KindScalar }
117- func (ScalarDatum ) Shape () ValueShape { return ShapeScalar }
11892func (ScalarDatum ) Len () int64 { return 1 }
11993func (ScalarDatum ) Chunks () []arrow.Array { return nil }
12094func (d * ScalarDatum ) Type () arrow.DataType { return d .Value .DataType () }
12195func (d * ScalarDatum ) String () string { return d .Value .String () }
122- func (d * ScalarDatum ) Descr () ValueDescr { return ValueDescr {ShapeScalar , d .Value .DataType ()} }
12396func (d * ScalarDatum ) ToScalar () (scalar.Scalar , error ) {
12497 return d .Value , nil
12598}
@@ -155,11 +128,9 @@ type ArrayDatum struct {
155128}
156129
157130func (ArrayDatum ) Kind () DatumKind { return KindArray }
158- func (ArrayDatum ) Shape () ValueShape { return ShapeArray }
159131func (d * ArrayDatum ) Type () arrow.DataType { return d .Value .DataType () }
160132func (d * ArrayDatum ) Len () int64 { return int64 (d .Value .Len ()) }
161133func (d * ArrayDatum ) NullN () int64 { return int64 (d .Value .NullN ()) }
162- func (d * ArrayDatum ) Descr () ValueDescr { return ValueDescr {ShapeArray , d .Value .DataType ()} }
163134func (d * ArrayDatum ) String () string { return fmt .Sprintf ("Array:{%s}" , d .Value .DataType ()) }
164135func (d * ArrayDatum ) MakeArray () arrow.Array { return array .MakeFromData (d .Value ) }
165136func (d * ArrayDatum ) Chunks () []arrow.Array { return []arrow.Array {d .MakeArray ()} }
@@ -191,11 +162,9 @@ type ChunkedDatum struct {
191162}
192163
193164func (ChunkedDatum ) Kind () DatumKind { return KindChunked }
194- func (ChunkedDatum ) Shape () ValueShape { return ShapeArray }
195165func (d * ChunkedDatum ) Type () arrow.DataType { return d .Value .DataType () }
196166func (d * ChunkedDatum ) Len () int64 { return int64 (d .Value .Len ()) }
197167func (d * ChunkedDatum ) NullN () int64 { return int64 (d .Value .NullN ()) }
198- func (d * ChunkedDatum ) Descr () ValueDescr { return ValueDescr {ShapeArray , d .Value .DataType ()} }
199168func (d * ChunkedDatum ) String () string { return fmt .Sprintf ("Array:{%s}" , d .Value .DataType ()) }
200169func (d * ChunkedDatum ) Chunks () []arrow.Array { return d .Value .Chunks () }
201170
@@ -258,46 +227,6 @@ func (d *TableDatum) Equals(other Datum) bool {
258227}
259228
260229// CollectionDatum is a slice of Datums
261- type CollectionDatum []Datum
262-
263- func (CollectionDatum ) Kind () DatumKind { return KindCollection }
264- func (c CollectionDatum ) Len () int64 { return int64 (len (c )) }
265- func (c CollectionDatum ) String () string {
266- var b strings.Builder
267- b .WriteString ("Collection(" )
268- for i , d := range c {
269- if i > 0 {
270- b .WriteString (", " )
271- }
272- b .WriteString (d .String ())
273- }
274- b .WriteByte (')' )
275- return b .String ()
276- }
277-
278- func (c CollectionDatum ) Release () {
279- for _ , v := range c {
280- v .Release ()
281- }
282- }
283-
284- func (c CollectionDatum ) Equals (other Datum ) bool {
285- rhs , ok := other .(CollectionDatum )
286- if ! ok {
287- return false
288- }
289-
290- if len (c ) != len (rhs ) {
291- return false
292- }
293-
294- for i := range c {
295- if ! c [i ].Equals (rhs [i ]) {
296- return false
297- }
298- }
299- return true
300- }
301230
302231// NewDatum will construct the appropriate Datum type based on what is passed in
303232// as the argument.
@@ -327,8 +256,6 @@ func NewDatum(value interface{}) Datum {
327256 case arrow.Table :
328257 v .Retain ()
329258 return & TableDatum {v }
330- case []Datum :
331- return CollectionDatum (v )
332259 case scalar.Scalar :
333260 return & ScalarDatum {v }
334261 default :
@@ -342,5 +269,4 @@ var (
342269 _ ArrayLikeDatum = (* ChunkedDatum )(nil )
343270 _ TableLikeDatum = (* RecordDatum )(nil )
344271 _ TableLikeDatum = (* TableDatum )(nil )
345- _ Datum = (CollectionDatum )(nil )
346272)
0 commit comments