From b47b7e3c4ada20d07ad781b42d6db312ca391a8d Mon Sep 17 00:00:00 2001 From: erezrokah Date: Wed, 16 Jul 2025 17:38:29 +0100 Subject: [PATCH] chore: Clean up diff functions --- plugin/diff.go | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/plugin/diff.go b/plugin/diff.go index 205e7dd40c..deff697945 100644 --- a/plugin/diff.go +++ b/plugin/diff.go @@ -1,7 +1,6 @@ package plugin import ( - "encoding/base64" "fmt" "strings" @@ -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 "" @@ -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(": ")