/
diff_cmd.go
859 lines (813 loc) · 24.2 KB
/
diff_cmd.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
// SPDX-License-Identifier: Apache-2.0
// Copyright © 2022 Wrangle Ltd
package wrgl
import (
"bytes"
"encoding/csv"
"encoding/hex"
"fmt"
"os"
"path"
"path/filepath"
"regexp"
"sort"
"strings"
"time"
"github.com/gdamore/tcell/v2"
"github.com/google/uuid"
"github.com/mitchellh/colorstring"
"github.com/rivo/tview"
"github.com/spf13/cobra"
"github.com/wrgl/wrgl/cmd/wrgl/utils"
"github.com/wrgl/wrgl/pkg/conf"
conffs "github.com/wrgl/wrgl/pkg/conf/fs"
"github.com/wrgl/wrgl/pkg/diff"
diffprof "github.com/wrgl/wrgl/pkg/diff/prof"
"github.com/wrgl/wrgl/pkg/ingest"
"github.com/wrgl/wrgl/pkg/objects"
objmock "github.com/wrgl/wrgl/pkg/objects/mock"
"github.com/wrgl/wrgl/pkg/pbar"
"github.com/wrgl/wrgl/pkg/progress"
"github.com/wrgl/wrgl/pkg/ref"
"github.com/wrgl/wrgl/pkg/slice"
"github.com/wrgl/wrgl/pkg/sorter"
"github.com/wrgl/wrgl/pkg/transaction"
"github.com/wrgl/wrgl/pkg/widgets"
widgetsprof "github.com/wrgl/wrgl/pkg/widgets/prof"
)
func newDiffCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "diff { COMMIT | COMMIT_OR_FILE COMMIT_OR_FILE | BRANCH --branch-file | --all | --txid TRANSACTION_ID }",
Short: "Show changes between two commits",
Long: "Show changes between two commits with an interactive diff table. A commit can be specified using shorten sum, full sum, or a reference name. If only one commit is specified, it will be compared with a parent commit. It is also possible to specify a local CSV file instead of a commit, in which case both arguments must be given and the flag --primary-key should also be set.",
Example: strings.Join([]string{
` # show changes compared to the previous commit`,
` wrgl diff 1a2ed62`,
``,
` # don't show the interactive table, output to a CSV file instead`,
` wrgl diff 1a2ed62 --no-gui`,
``,
` # show changes between branches`,
` wrgl diff branch-1 branch-2`,
``,
` # show changes between commits`,
` wrgl diff 1a2ed6248c7243cdaaecb98ac12213a7 f1cf51efa2c1e22843b0e083efd89792`,
``,
` # show changes between files`,
` wrgl diff file-1.csv file-2.csv --primary-key id,name`,
``,
` # show changes between a file and the head commit from a branch`,
` wrgl diff my-file.csv my-branch`,
``,
` # show diff between branch.file config (set with wrgl commit --set-file) and the latest commit of a branch`,
` wrgl diff my-branch --branch-file`,
``,
` # show diff summary for branches that have branch.file configured`,
` wrgl diff --all`,
``,
` # show diff summary for all changes made with a transaction (run 'wrgl transaction -h' to learn more about transaction)`,
` wrgl diff --txid a1dbfcc4-f6da-454c-a783-f1b70d347baf`,
}, "\n"),
Args: cobra.RangeArgs(0, 2),
RunE: func(cmd *cobra.Command, args []string) error {
rd := utils.GetRepoDir(cmd)
defer rd.Close()
var db objects.Store
var rs ref.Store
if rd.Exist() {
var err error
db, err = rd.OpenObjectsStore()
if err != nil {
return err
}
defer db.Close()
rs = rd.OpenRefStore()
}
noGUI, err := cmd.Flags().GetBool("no-gui")
if err != nil {
return err
}
pk, err := cmd.Flags().GetStringSlice("primary-key")
if err != nil {
return err
}
branchFile, err := cmd.Flags().GetBool("branch-file")
if err != nil {
return err
}
all, err := cmd.Flags().GetBool("all")
if err != nil {
return err
}
tid, err := parseTxidFlag(cmd)
if err != nil {
return err
}
if len(args) == 0 && !all && tid == nil {
all = true
}
memStore := objmock.NewStore()
s := conffs.NewStore(rd.FullPath, conffs.AggregateSource, "")
c, err := s.Open()
if err != nil {
return err
}
if tid != nil {
return diffTransaction(cmd, c, db, rs, *tid)
}
if all {
return diffAllBranches(cmd, c, db, rs, pk, args)
}
if noGUI {
return runDiff(cmd, c, db, memStore, rs, pk, args, branchFile, false, outputDiffToCSV)
}
return runDiff(cmd, c, db, memStore, rs, pk, args, branchFile, false, outputDiffToTerminal)
},
}
cmd.Flags().Bool("no-gui", false, "don't show the diff table, instead output changes to file DIFF_SUM1_SUM2.csv")
cmd.Flags().StringSliceP("primary-key", "p", []string{}, "field names to be used as primary key (only applicable if diff target is a file)")
cmd.Flags().Bool("branch-file", false, "if only one argument is given and it is a branch name, compare against branch.file (if it is configured with wrgl commit --set-file)")
cmd.Flags().Bool("all", false, "show diff summary for all branches that have branch.file configured. This flag is automatically set when no argument is given and --txid is not set")
cmd.Flags().String("txid", "", "show diff summary for all changes with specified transaction id")
cmd.Flags().String("delimiter-1", "", "CSV delimiter of the first argument if the first argument is an external file. Defaults to comma.")
cmd.Flags().String("delimiter-2", "", "CSV delimiter of the second argument if the second argument is an external file. Defaults to comma.")
cmd.Flags().Bool("no-cache", false, "skip commit cache which by default keeps the command from ingesting the same file again if there has been no changes")
registerCommitFlags(cmd.Flags())
return cmd
}
func getSecondCommit(
cmd *cobra.Command, c *conf.Config, db objects.Store, memDB *objmock.Store, rs ref.Store,
pk []string, args []string, commit1 *objects.Commit, branchFile, quiet bool, delim rune,
) (inUsedDB objects.Store, name, hash string, commit *objects.Commit, err error) {
if branchFile {
return getCommit(cmd, c, db, memDB, rs, pk, args[0], false, quiet, delim)
}
if len(args) > 1 {
return getCommit(cmd, c, db, memDB, rs, pk, args[1], false, quiet, delim)
}
if len(commit1.Parents) > 0 {
return getCommit(cmd, c, db, memDB, rs, pk, hex.EncodeToString(commit1.Parents[0]), false, quiet, delim)
}
err = fmt.Errorf("specify the second object to diff against")
return
}
func createInMemCommit(cmd *cobra.Command, db *objmock.Store, pk []string, file *os.File, quiet bool, delim rune) (hash []byte, commit *objects.Commit, err error) {
logger := utils.GetLogger(cmd)
sum, err := ingestTable(
cmd, db, file, pk, quiet, *logger,
[]sorter.SorterOption{
sorter.WithDelimiter(delim),
},
[]ingest.InserterOption{},
)
if err != nil {
return
}
commit = &objects.Commit{
Table: sum,
Time: time.Now(),
}
buf := bytes.NewBuffer(nil)
_, err = commit.WriteTo(buf)
if err != nil {
return
}
sum, err = objects.SaveCommit(db, buf.Bytes())
if err != nil {
return
}
commit.Sum = sum
return sum, commit, nil
}
var filePattern = regexp.MustCompile(`^.*\..+$`)
func displayableCommitName(name string, sum []byte) string {
if name == hex.EncodeToString(sum) {
return ""
}
name = strings.TrimPrefix(name, "refs/")
return strings.TrimPrefix(name, "heads/")
}
func getCommit(
cmd *cobra.Command, c *conf.Config, db objects.Store, memStore *objmock.Store,
rs ref.Store, pk []string, cStr string, branchFile, quiet bool, delim rune,
) (inUsedDB objects.Store, name, hash string, commit *objects.Commit, err error) {
inUsedDB = db
var file *os.File
name, hashb, commit, err := ref.InterpretCommitName(db, rs, cStr, false)
if err != nil {
file, err = os.Open(cStr)
if err != nil {
if filePattern.MatchString(cStr) {
err = fmt.Errorf("can't find file %s", cStr)
return
}
return
}
inUsedDB = memStore
defer file.Close()
hashb, commit, err = createInMemCommit(cmd, memStore, pk, file, quiet, delim)
hash = hex.EncodeToString(hashb)
return inUsedDB, path.Base(file.Name()), hash, commit, err
}
if branchFile && strings.HasPrefix(name, "heads/") {
branchName := strings.TrimPrefix(name, "heads/")
errFileNotSet := fmt.Errorf("illegal flag --branch-file: branch.file is not set for branch %q", branchName)
if c.Branch == nil {
err = errFileNotSet
return
}
if branch, ok := c.Branch[branchName]; !ok {
err = errFileNotSet
return
} else if branch.File == "" {
err = errFileNotSet
return
} else {
var tmpSum []byte
tmpSum, err = ensureTempCommit(cmd, db, rs, c, branchName, branch.File, branch.PrimaryKey, quiet, delim)
if err != nil {
return
}
commit, err = objects.GetCommit(db, tmpSum)
if err != nil {
return
}
name = filepath.Base(branch.File)
hash = hex.EncodeToString(tmpSum)
return
}
}
name = displayableCommitName(cStr, hashb)
hash = hex.EncodeToString(hashb)
return
}
func uintSliceEqual(a, b []uint32) bool {
if len(a) != len(b) {
return false
}
for i, u := range a {
if u != b[i] {
return false
}
}
return true
}
func collectDiffObjects(
cmd *cobra.Command,
db1, db2 objects.Store,
tbl1, tbl2 *objects.Table,
diffChan <-chan *objects.Diff,
pt progress.Tracker,
colDiff *diff.ColDiff,
quiet bool,
) (addedRowReader, removedRowReader *diff.RowListReader, rowChangeReader *diff.RowChangeReader, err error) {
var progChan <-chan progress.Event
if pt != nil {
progChan = pt.Start()
defer pt.Stop()
}
if err = utils.WithProgressBar(cmd, quiet, func(cmd *cobra.Command, barContainer *pbar.Container) (err error) {
bar := barContainer.NewBar(-1, "Collecting changes", 0)
defer bar.Done()
mainLoop:
for {
select {
case e := <-progChan:
bar.SetTotal(e.Total)
bar.SetCurrent(e.Progress)
case d, ok := <-diffChan:
if !ok {
break mainLoop
}
if d.OldSum == nil {
if addedRowReader == nil {
addedRowReader, err = diff.NewRowListReader(db1, tbl1)
if err != nil {
return
}
}
addedRowReader.Add(d.Offset)
} else if d.Sum == nil {
if removedRowReader == nil {
removedRowReader, err = diff.NewRowListReader(db2, tbl2)
if err != nil {
return
}
}
removedRowReader.Add(d.OldOffset)
} else {
if rowChangeReader == nil {
rowChangeReader, err = diff.NewRowChangeReader(db1, db2, tbl1, tbl2, colDiff)
if err != nil {
return
}
}
rowChangeReader.AddRowDiff(d)
}
}
}
return nil
}); err != nil {
return
}
return
}
func rowLabel(label, commitName, commitSum string) string {
if commitName == "" {
return fmt.Sprintf("%s (%s)", label, commitSum[:7])
}
return fmt.Sprintf("%s %s (%s)", label, commitName, commitSum[:7])
}
func writeRowChanges(
cmd *cobra.Command,
w *csv.Writer,
db1, db2 objects.Store,
name1, name2 string,
commitHash1, commitHash2 string,
tbl1, tbl2 *objects.Table,
diffChan <-chan *objects.Diff,
pt progress.Tracker,
colDiff *diff.ColDiff,
) (err error) {
buf, err := diff.NewBlockBuffer([]objects.Store{db1, db2}, []*objects.Table{tbl1, tbl2})
if err != nil {
return
}
progChan := pt.Start()
defer pt.Stop()
if err = utils.WithProgressBar(cmd, false, func(cmd *cobra.Command, barContainer *pbar.Container) (err error) {
bar := barContainer.NewBar(-1, "Collecting changes", 0)
defer bar.Done()
mainLoop:
for {
select {
case e := <-progChan:
bar.SetTotal(e.Total)
bar.SetCurrent(e.Progress)
case d, ok := <-diffChan:
if !ok {
break mainLoop
}
var row, oldRow []string
if d.Sum != nil {
blk, off := diff.RowToBlockAndOffset(d.Offset)
row, err = buf.GetRow(0, blk, off)
if err != nil {
return err
}
row = colDiff.RearrangeRow(0, row)
}
if d.OldSum != nil {
blk, off := diff.RowToBlockAndOffset(d.OldOffset)
oldRow, err = buf.GetRow(1, blk, off)
if err != nil {
return err
}
oldRow = colDiff.RearrangeBaseRow(oldRow)
}
if d.OldSum == nil {
err = w.Write(append(
[]string{rowLabel("ADDED IN", name1, commitHash1)},
row...,
))
if err != nil {
return err
}
} else if d.Sum == nil {
err = w.Write(append(
[]string{rowLabel("REMOVED IN", name1, commitHash1)},
oldRow...,
))
if err != nil {
return err
}
} else {
err = w.Write(append(
[]string{rowLabel("BASE ROW FROM", name2, commitHash2)},
oldRow...,
))
if err != nil {
return err
}
err = w.Write(append(
[]string{rowLabel("MODIFIED IN", name1, commitHash1)},
row...,
))
if err != nil {
return err
}
}
}
}
return nil
}); err != nil {
return err
}
return nil
}
func outputDiffToCSV(
cmd *cobra.Command,
db1, db2 objects.Store,
name1, name2 string,
commitHash1, commitHash2 string,
tbl1, tbl2 *objects.Table,
diffChan <-chan *objects.Diff,
pt progress.Tracker,
colDiff *diff.ColDiff,
tpd *diffprof.TableProfileDiff,
) (err error) {
wd, err := os.Getwd()
if err != nil {
return
}
filename := fmt.Sprintf("DIFF_%s_%s.csv", commitHash1[:7], commitHash2[:7])
f, err := os.Create(path.Join(wd, filename))
if err != nil {
return
}
defer f.Close()
w := csv.NewWriter(f)
// write column names for old table
err = w.Write(append(
[]string{rowLabel("COLUMNS IN", name2, commitHash2)},
colDiff.RearrangeBaseRow(colDiff.Names)...,
))
if err != nil {
return
}
// write column names for new table
err = w.Write(append(
[]string{rowLabel("COLUMNS IN", name1, commitHash1)},
colDiff.RearrangeRow(0, colDiff.Names)...,
))
if err != nil {
return
}
// write primary key for old table
pkRow := make([]string, colDiff.Len()+1)
pkRow[0] = rowLabel("PRIMARY KEY IN", name2, commitHash2)
for _, u := range colDiff.BasePK {
pkRow[u+1] = "true"
}
err = w.Write(pkRow)
if err != nil {
return
}
// write primary key for new table
pkRow = make([]string, colDiff.Len()+1)
pkRow[0] = rowLabel("PRIMARY KEY IN", name1, commitHash1)
for _, u := range colDiff.OtherPK[0] {
pkRow[u+1] = "true"
}
err = w.Write(pkRow)
if err != nil {
return
}
if uintSliceEqual(colDiff.BasePK, colDiff.OtherPK[0]) {
// primary key stays the same, we can compare individual rows now
err = writeRowChanges(cmd, w, db1, db2, name1, name2, commitHash1, commitHash2, tbl1, tbl2, diffChan, pt, colDiff)
if err != nil {
return
}
}
w.Flush()
cmd.Printf("saved changes to file %s\n", filename)
return nil
}
func commitTitle(commitName, commitSum string) string {
if commitName == "" {
return fmt.Sprintf("[yellow]%s[white]", commitSum[:7])
}
return fmt.Sprintf("%s ([yellow]%s[white])", commitName, commitSum[:7])
}
func getDiffChan(
cmd *cobra.Command, db1, db2 objects.Store, rs ref.Store, commit1, commit2 *objects.Commit,
) (tbl1, tbl2 *objects.Table, diffChan <-chan *objects.Diff, pt progress.Tracker, cd *diff.ColDiff, errChan chan error, err error) {
tbl1, err = utils.GetTable(db1, rs, commit1)
if err != nil {
return
}
tblIdx1, err := objects.GetTableIndex(db1, commit1.Table)
if err != nil {
return
}
tbl2, err = utils.GetTable(db2, rs, commit2)
if err != nil {
return
}
tblIdx2, err := objects.GetTableIndex(db2, commit2.Table)
if err != nil {
return
}
if err != nil {
return
}
cd = diff.CompareColumns(
[2][]string{tbl2.Columns, tbl2.PrimaryKey()},
[2][]string{tbl1.Columns, tbl1.PrimaryKey()},
)
errChan = make(chan error, 10)
opts := []diff.DiffOption{}
opts = append(opts, diff.WithProgressInterval(65*time.Millisecond))
logger := utils.GetLogger(cmd)
diffChan, pt = diff.DiffTables(db1, db2, tbl1, tbl2, tblIdx1, tblIdx2, errChan, *logger, opts...)
return tbl1, tbl2, diffChan, pt, cd, errChan, nil
}
func outputDiffToTerminal(
cmd *cobra.Command,
db1, db2 objects.Store,
name1, name2 string,
commitHash1, commitHash2 string,
tbl1, tbl2 *objects.Table,
diffChan <-chan *objects.Diff,
pt progress.Tracker,
colDiff *diff.ColDiff,
tpd *diffprof.TableProfileDiff,
) (err error) {
app := tview.NewApplication()
titleBar := tview.NewTextView().SetDynamicColors(true)
fmt.Fprintf(titleBar, "%s vs %s", commitTitle(name1, commitHash1), commitTitle(name2, commitHash2))
tabPages := widgets.NewTabPages(app)
flex := tview.NewFlex().SetDirection(tview.FlexRow).
AddItem(titleBar, 1, 1, false).
AddItem(tabPages, 0, 1, true)
app.SetRoot(flex, true).
SetFocus(flex).
EnableMouse(true).
SetInputCapture(tabPages.ProcessInput)
if !uintSliceEqual(colDiff.BasePK, colDiff.OtherPK[0]) {
// primary key has changed, we can only show column changes at this point
_, addedCols, removedCols := slice.CompareStringSlices(tbl1.Columns, tbl2.Columns)
if len(addedCols) > 0 {
tabPages.AddTab(
fmt.Sprintf("+%d columns", len(addedCols)),
widgets.CreateColumnsList(nil, addedCols, nil),
)
}
if len(removedCols) > 0 {
tabPages.AddTab(
fmt.Sprintf("-%d columns", len(removedCols)),
widgets.CreateColumnsList(nil, nil, removedCols),
)
}
unchanged, added, removed := slice.CompareStringSlices(tbl1.PrimaryKey(), tbl2.PrimaryKey())
if len(added) > 0 || len(removed) > 0 {
tabPages.AddTab(
"Primary key",
widgets.CreateColumnsList(unchanged, added, removed),
)
}
return app.Run()
}
addedRowReader, removedRowReader, rowChangeReader, err := collectDiffObjects(cmd, db1, db2, tbl1, tbl2, diffChan, pt, colDiff, false)
if err != nil {
return
}
if addedRowReader != nil {
pkIndices, err := slice.KeyIndices(tbl1.Columns, tbl1.PrimaryKey())
if err != nil {
return err
}
addedTable := widgets.NewPreviewTable(addedRowReader, addedRowReader.Len(), tbl1.Columns, pkIndices)
tabPages.AddTab(fmt.Sprintf("+%d rows", addedRowReader.Len()), addedTable)
}
if removedRowReader != nil {
pkIndices, err := slice.KeyIndices(tbl2.Columns, tbl1.PrimaryKey())
if err != nil {
return err
}
removedTable := widgets.NewPreviewTable(removedRowReader, removedRowReader.Len(), tbl2.Columns, pkIndices)
tabPages.AddTab(fmt.Sprintf("-%d rows", removedRowReader.Len()), removedTable)
}
if rowChangeReader != nil {
rowChangeTable := widgets.NewDiffTable(rowChangeReader)
tabPages.AddTab(fmt.Sprintf("%d modified", rowChangeReader.Len()), rowChangeTable)
}
if tpd != nil {
profileTable, err := widgetsprof.NewStatDiffTable(tpd)
if err != nil {
return err
}
tabPages.AddTab("profile", profileTable)
}
if addedRowReader == nil && removedRowReader == nil && rowChangeReader == nil {
cmd.Println("There are no changes!")
return nil
}
usageBar := widgets.DataTableUsage()
flex.AddItem(usageBar, 1, 1, false)
app.SetBeforeDrawFunc(func(screen tcell.Screen) bool {
usageBar.BeforeDraw(screen, flex)
return false
}).SetFocus(tabPages.LastTab())
cancel := redrawEvery(app, 65*time.Millisecond)
defer cancel()
return app.Run()
}
func outputDiffSummaryToTerminal(
cmd *cobra.Command,
db1, db2 objects.Store,
name1, name2 string,
commitHash1, commitHash2 string,
tbl1, tbl2 *objects.Table,
diffChan <-chan *objects.Diff,
cd *diff.ColDiff,
) (string, error) {
sb := &strings.Builder{}
if !uintSliceEqual(cd.BasePK, cd.OtherPK[0]) {
_, addedCols, removedCols := slice.CompareStringSlices(tbl1.Columns, tbl2.Columns)
pkEqual := slice.StringSliceEqual(tbl1.PrimaryKey(), tbl2.PrimaryKey())
if len(addedCols) > 0 || len(removedCols) > 0 {
sb.WriteString("columns: ")
if len(addedCols) > 0 {
colorstring.Fprintf(sb, "[green]+%d[reset]", len(addedCols))
if len(removedCols) > 0 {
sb.WriteString("/")
}
}
if len(removedCols) > 0 {
colorstring.Fprintf(sb, "[red]-%d[reset]", len(removedCols))
}
if !pkEqual {
sb.WriteString("; ")
}
}
if !pkEqual {
colorstring.Fprintf(sb,
"primary key: [red]%s[reset]->[green]%s",
strings.Join(tbl2.PrimaryKey(), ","),
strings.Join(tbl1.PrimaryKey(), ","),
)
}
} else {
addedRowReader, removedRowReader, rowChangeReader, err := collectDiffObjects(cmd, db1, db2, tbl1, tbl2, diffChan, nil, cd, true)
if err != nil {
return "", err
}
nAdd, nRem, nMod := addedRowReader.Len(), removedRowReader.Len(), rowChangeReader.Len()
if nAdd > 0 || nRem > 0 || nMod > 0 {
sb.WriteString("rows: ")
outputs := []string{}
if nAdd > 0 {
outputs = append(outputs, fmt.Sprintf("[green]+%d[reset]", nAdd))
}
if nRem > 0 {
outputs = append(outputs, fmt.Sprintf("[red]-%d[reset]", nRem))
}
if nMod > 0 {
outputs = append(outputs, fmt.Sprintf("[yellow]m%d[reset]", nMod))
}
colorstring.Fprintf(sb, strings.Join(outputs, "/"))
}
}
return sb.String(), nil
}
func diffTableProfiles(db1, db2 objects.Store, commit1, commit2 *objects.Commit) *diffprof.TableProfileDiff {
prof1, err := objects.GetTableProfile(db1, commit1.Table)
if err != nil {
return nil
}
prof2, err := objects.GetTableProfile(db2, commit2.Table)
if err != nil {
return nil
}
return diffprof.DiffTableProfiles(prof1, prof2)
}
func runDiff(
cmd *cobra.Command, c *conf.Config, db objects.Store, memStore *objmock.Store, rs ref.Store,
pk []string, args []string, branchFile bool, quiet bool,
outputDiff func(
cmd *cobra.Command,
db1, db2 objects.Store,
name1, name2 string,
commitHash1, commitHash2 string,
tbl1, tbl2 *objects.Table,
diffChan <-chan *objects.Diff,
pt progress.Tracker,
colDiff *diff.ColDiff,
tpd *diffprof.TableProfileDiff,
) error,
) error {
delim1, err := utils.GetRuneFromFlag(cmd, "delimiter-1")
if err != nil {
return err
}
db1, name1, commitHash1, commit1, err := getCommit(cmd, c, db, memStore, rs, pk, args[0], branchFile, quiet, delim1)
if err != nil {
return err
}
delim2, err := utils.GetRuneFromFlag(cmd, "delimiter-2")
if err != nil {
return err
}
db2, name2, commitHash2, commit2, err := getSecondCommit(cmd, c, db, memStore, rs, pk, args, commit1, branchFile, quiet, delim2)
if err != nil {
return err
}
tbl1, tbl2, diffChan, pt, cd, errChan, err := getDiffChan(cmd, db1, db2, rs, commit1, commit2)
if err != nil {
return err
}
tpd := diffTableProfiles(db1, db2, commit1, commit2)
if err = outputDiff(
cmd, db1, db2, name1, name2, commitHash1, commitHash2,
tbl1, tbl2, diffChan, pt, cd, tpd,
); err != nil {
return err
}
close(errChan)
err, ok := <-errChan
if ok {
return err
}
return nil
}
type diffArgs struct {
Branch string
PK []string
Commits []string
}
func diffMultiple(cmd *cobra.Command, c *conf.Config, db objects.Store, rs ref.Store, dargs []diffArgs, branchFile, quiet bool) (err error) {
var maxLen int
for _, darg := range dargs {
if len(darg.Branch) > maxLen {
maxLen = len(darg.Branch)
}
}
sort.Slice(dargs, func(i, j int) bool {
return dargs[i].Branch < dargs[j].Branch
})
for _, darg := range dargs {
var diffSum string
if err := runDiff(cmd, c, db, nil, rs, darg.PK, darg.Commits, branchFile, quiet,
func(
cmd *cobra.Command, db1, db2 objects.Store, name1, name2, commitHash1, commitHash2 string,
tbl1, tbl2 *objects.Table, diffChan <-chan *objects.Diff, pt progress.Tracker,
cd *diff.ColDiff, tpd *diffprof.TableProfileDiff,
) (err error) {
diffSum, err = outputDiffSummaryToTerminal(
cmd, db1, db2, name1, name2, commitHash1, commitHash2,
tbl1, tbl2, diffChan, cd,
)
return
},
); err != nil {
return err
}
if diffSum != "" {
n := len(darg.Branch)
padding := strings.Repeat(" ", maxLen-n)
colorstring.Fprintf(cmd.OutOrStdout(), "[bold]%s[reset]%s %s\n", darg.Branch, padding, diffSum)
}
}
return nil
}
func diffTransaction(cmd *cobra.Command, c *conf.Config, db objects.Store, rs ref.Store, tid uuid.UUID) (err error) {
m, _, err := transaction.Diff(rs, tid)
if err != nil {
return
}
dargs := []diffArgs{}
cmd.Printf("Changes from transaction %s\n", tid.String())
for name, sums := range m {
if sums[1] == nil {
cmd.Printf("Branch %q didn't previously exist, skipping.\n", name)
continue
}
dargs = append(dargs, diffArgs{
Branch: name,
Commits: []string{hex.EncodeToString(sums[0]), hex.EncodeToString(sums[1])},
})
}
return diffMultiple(cmd, c, db, rs, dargs, false, true)
}
func diffAllBranches(
cmd *cobra.Command, c *conf.Config, db objects.Store, rs ref.Store,
pk []string, args []string,
) error {
dargs := []diffArgs{}
for name, branch := range c.Branch {
if branch.File == "" {
continue
}
if _, err := os.Stat(branch.File); os.IsNotExist(err) {
cmd.Printf("File %q does not exist, skipping branch %q.\n", branch.File, name)
continue
}
if _, err := ref.GetHead(rs, name); err == ref.ErrKeyNotFound {
cmd.Printf("Branch %q not found, skipping.\n", name)
continue
} else if err != nil {
return err
}
dargs = append(dargs, diffArgs{
Branch: name,
PK: branch.PrimaryKey,
Commits: []string{"heads/" + name},
})
}
if len(dargs) == 0 {
return fmt.Errorf("no branch with file configured. To track a file with a branch, set --set-file and --set-primary-key during commit")
}
return diffMultiple(cmd, c, db, rs, dargs, true, true)
}