Skip to content

GH-37538: [Go] Cheaper initial dictionary implementation #37634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brancz wants to merge 2 commits into from
Closed

GH-37538: [Go] Cheaper initial dictionary implementation #37634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ae9035
go: Sketch out cheaper initial dictionary implementation
brancz Sep 8, 2023
c10f7db
go/arrow/array: Add init dictionary use case unit test
brancz Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 20 additions & 127 deletions go/arrow/array/dictionary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,9 @@ type dictionaryBuilder struct {
deltaOffset int
memoTable hashing.MemoTable
idxBuilder IndexBuilder

initialDictOffset int
initialDict arrow.Array
}

// NewDictionaryBuilderWithDict initializes a dictionary builder and inserts the values from `init` as the first
Expand All @@ -447,196 +450,86 @@ func NewDictionaryBuilderWithDict(mem memory.Allocator, dt *arrow.DictionaryType
dt: dt,
}

if init != nil {
bldr.initialDictOffset = init.Len()
bldr.initialDict = init
}

switch dt.ValueType.ID() {
case arrow.NULL:
ret := &NullDictionaryBuilder{bldr}
debug.Assert(init == nil, "arrow/array: doesn't make sense to init a null dictionary")
return ret
case arrow.UINT8:
ret := &Uint8DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Uint8)); err != nil {
panic(err)
}
}
return ret
case arrow.INT8:
ret := &Int8DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Int8)); err != nil {
panic(err)
}
}
return ret
case arrow.UINT16:
ret := &Uint16DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Uint16)); err != nil {
panic(err)
}
}
return ret
case arrow.INT16:
ret := &Int16DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Int16)); err != nil {
panic(err)
}
}
return ret
case arrow.UINT32:
ret := &Uint32DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Uint32)); err != nil {
panic(err)
}
}
return ret
case arrow.INT32:
ret := &Int32DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Int32)); err != nil {
panic(err)
}
}
return ret
case arrow.UINT64:
ret := &Uint64DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Uint64)); err != nil {
panic(err)
}
}
return ret
case arrow.INT64:
ret := &Int64DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Int64)); err != nil {
panic(err)
}
}
return ret
case arrow.FLOAT16:
ret := &Float16DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Float16)); err != nil {
panic(err)
}
}
return ret
case arrow.FLOAT32:
ret := &Float32DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Float32)); err != nil {
panic(err)
}
}
return ret
case arrow.FLOAT64:
ret := &Float64DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Float64)); err != nil {
panic(err)
}
}
return ret
case arrow.STRING:
ret := &BinaryDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertStringDictValues(init.(*String)); err != nil {
panic(err)
}
}
return ret
case arrow.BINARY:
ret := &BinaryDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Binary)); err != nil {
panic(err)
}
}
return ret
case arrow.FIXED_SIZE_BINARY:
ret := &FixedSizeBinaryDictionaryBuilder{
bldr, dt.ValueType.(*arrow.FixedSizeBinaryType).ByteWidth,
}
if init != nil {
if err = ret.InsertDictValues(init.(*FixedSizeBinary)); err != nil {
panic(err)
}
}
return ret
case arrow.DATE32:
ret := &Date32DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Date32)); err != nil {
panic(err)
}
}
return ret
case arrow.DATE64:
ret := &Date64DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Date64)); err != nil {
panic(err)
}
}
return ret
case arrow.TIMESTAMP:
ret := &TimestampDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Timestamp)); err != nil {
panic(err)
}
}
return ret
case arrow.TIME32:
ret := &Time32DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Time32)); err != nil {
panic(err)
}
}
return ret
case arrow.TIME64:
ret := &Time64DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Time64)); err != nil {
panic(err)
}
}
return ret
case arrow.INTERVAL_MONTHS:
ret := &MonthIntervalDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*MonthInterval)); err != nil {
panic(err)
}
}
return ret
case arrow.INTERVAL_DAY_TIME:
ret := &DayTimeDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*DayTimeInterval)); err != nil {
panic(err)
}
}
return ret
case arrow.DECIMAL128:
ret := &Decimal128DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Decimal128)); err != nil {
panic(err)
}
}
return ret
case arrow.DECIMAL256:
ret := &Decimal256DictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Decimal256)); err != nil {
panic(err)
}
}
return ret
case arrow.LIST:
case arrow.STRUCT:
Expand All @@ -648,22 +541,12 @@ func NewDictionaryBuilderWithDict(mem memory.Allocator, dt *arrow.DictionaryType
case arrow.FIXED_SIZE_LIST:
case arrow.DURATION:
ret := &DurationDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*Duration)); err != nil {
panic(err)
}
}
return ret
case arrow.LARGE_STRING:
case arrow.LARGE_BINARY:
case arrow.LARGE_LIST:
case arrow.INTERVAL_MONTH_DAY_NANO:
ret := &MonthDayNanoDictionaryBuilder{bldr}
if init != nil {
if err = ret.InsertDictValues(init.(*MonthDayNanoInterval)); err != nil {
panic(err)
}
}
return ret
}

Expand Down Expand Up @@ -804,6 +687,16 @@ func (b *dictionaryBuilder) NewDictionaryArray() *Dictionary {
a.refCount = 1

indices := b.newData()

if b.initialDict != nil {
dict := MakeFromData(indices.dictionary)
finalDict, err := Concatenate([]arrow.Array{b.initialDict, dict}, b.mem)
if err != nil {
panic(err)
}
indices.dictionary = finalDict.Data().(*Data)
}

a.setData(indices)
indices.Release()
return a
Expand Down Expand Up @@ -849,14 +742,14 @@ func (b *dictionaryBuilder) insertDictBytes(val []byte) error {

func (b *dictionaryBuilder) appendValue(val interface{}) error {
idx, _, err := b.memoTable.GetOrInsert(val)
b.idxBuilder.Append(idx)
b.idxBuilder.Append(idx + b.initialDictOffset)
b.length += 1
return err
}

func (b *dictionaryBuilder) appendBytes(val []byte) error {
idx, _, err := b.memoTable.GetOrInsertBytes(val)
b.idxBuilder.Append(idx)
b.idxBuilder.Append(idx + b.initialDictOffset)
b.length += 1
return err
}
Expand Down
44 changes: 44 additions & 0 deletions go/arrow/array/dictionary_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1914,3 +1914,47 @@ func BenchmarkBinaryDictionaryBuilder(b *testing.B) {
assert.NoError(b, builder.AppendString(randString()))
}
}

func TestBinaryDictionaryBuilderWithInitDict(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(t, 0)

dictType := &arrow.DictionaryType{IndexType: &arrow.Int32Type{}, ValueType: arrow.BinaryTypes.String}
bldr := array.NewDictionaryBuilder(mem, dictType).(*array.BinaryDictionaryBuilder)
defer bldr.Release()

bldr.AppendString("drop-1")
bldr.AppendString("keep-2")
bldr.AppendString("keep-3")

arr := bldr.NewArray().(*array.Dictionary)
defer arr.Release()
indices := arr.Indices().(*array.Int32)
dict := arr.Dictionary().(*array.String)

keepIndices := map[int]struct{}{}
for i := 0; i < dict.Len(); i++ {
if strings.HasPrefix(dict.Value(i), "keep-") {
keepIndices[i] = struct{}{}
}
}

bldr2 := array.NewDictionaryBuilderWithDict(mem, dictType, dict).(*array.BinaryDictionaryBuilder)
indices2 := bldr2.IndexBuilder().Builder.(*array.Int32Builder)
defer bldr2.Release()

for i := 0; i < arr.Len(); i++ {
if _, ok := keepIndices[i]; ok {
indices2.Append(indices.Value(i))
}
}

arr2 := bldr2.NewArray().(*array.Dictionary)
defer arr2.Release()
dict2 := arr2.Dictionary().(*array.String)

assert.Equal(t, 2, arr2.Len())
assert.Equal(t, 3, dict2.Len())
assert.Equal(t, "keep-2", dict2.Value(arr2.GetValueIndex(0)))
assert.Equal(t, "keep-3", dict2.Value(arr2.GetValueIndex(1)))
}