Skip to content

chore: Clean up diff functions #2231

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

Merged
kodiakhq merged 1 commit into from
Jul 16, 2025
Merged

chore: Clean up diff functions #2231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 1 addition & 31 deletions plugin/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package plugin

import (
"encoding/base64"
"fmt"
"strings"

Expand All @@ -14,35 +13,6 @@ func RecordsDiff(sc *arrow.Schema, have, want []arrow.Record) string {
return TableDiff(array.NewTableFromRecords(sc, have), array.NewTableFromRecords(sc, want))
}

func getUnifiedDiff(edits array.Edits, wantCol, haveCol arrow.Array) string {
defer func() {
if r := recover(); r != nil {
wantDataType := wantCol.DataType()
wantData := make([]byte, wantCol.Len())
for _, buffer := range wantCol.Data().Buffers() {
buf := buffer.Buf()
if len(buf) > 0 {
wantData = append(wantData, buf...)
}
}
haveDataType := haveCol.DataType()
haveData := make([]byte, haveCol.Len())
for _, buffer := range haveCol.Data().Buffers() {
buf := buffer.Buf()
if len(buf) > 0 {
haveData = append(haveData, buf...)
}
}

wantBase64 := base64.StdEncoding.EncodeToString(wantData)
haveBase64 := base64.StdEncoding.EncodeToString(haveData)

panic(fmt.Errorf("panic in getUnifiedDiff: %s, want: (%s), have: (%s), want type: %s, have type: %s", r, wantBase64, haveBase64, wantDataType, haveDataType))
}
}()
return edits.UnifiedDiff(wantCol, haveCol)
}

func TableDiff(have, want arrow.Table) string {
if array.TableApproxEqual(have, want, array.WithUnorderedMapKeys(true)) {
return ""
Expand All @@ -69,7 +39,7 @@ func TableDiff(have, want arrow.Table) string {
if err != nil {
panic(fmt.Errorf("want: %v, have: %v, error: %w", wantCol.DataType(), haveCol.DataType(), err))
}
diff := getUnifiedDiff(edits, wantCol, haveCol)
diff := edits.UnifiedDiff(wantCol, haveCol)
if diff != "" {
sb.WriteString(have.Schema().Field(i).Name)
sb.WriteString(": ")
Expand Down
Loading