@@ -199,18 +199,18 @@ func createCsvDiff(diffFile *DiffFile, baseReader *csv.Reader, headReader *csv.R
199
199
cells [i ] = & TableDiffCell {LeftCell : acell , RightCell : bcell , Type : celltype }
200
200
}
201
201
}
202
- cells_index := 0
202
+ cellsIndex := 0
203
203
for i := 0 ; i < len (b2a ); i ++ {
204
204
if b2a [i ] == unmappedColumn {
205
205
bcell , _ := getCell (brow , i )
206
- if cells [cells_index ] != nil && len (cells ) >= cells_index + 1 {
207
- copy (cells [cells_index + 1 :], cells [cells_index :])
206
+ if cells [cellsIndex ] != nil && len (cells ) >= cellsIndex + 1 {
207
+ copy (cells [cellsIndex + 1 :], cells [cellsIndex :])
208
208
}
209
- cells [cells_index ] = & TableDiffCell {RightCell : bcell , Type : TableDiffCellAdd }
210
- } else if cells_index < b2a [i ] {
211
- cells_index = b2a [i ]
209
+ cells [cellsIndex ] = & TableDiffCell {RightCell : bcell , Type : TableDiffCellAdd }
210
+ } else if cellsIndex < b2a [i ] {
211
+ cellsIndex = b2a [i ]
212
212
}
213
- cells_index += 1
213
+ cellsIndex += 1
214
214
}
215
215
216
216
return & TableDiffRow {RowIdx : bline , Cells : cells }, nil
@@ -294,24 +294,24 @@ func getColumnMapping(a *csvReader, b *csvReader) ([]int, []int) {
294
294
// tryMapColumnsByContent tries to map missing columns by the content of the first lines.
295
295
func tryMapColumnsByContent (a * csvReader , a2b []int , b * csvReader , b2a []int ) {
296
296
for i := 0 ; i < len (a2b ); i ++ {
297
- b_start := 0
298
- for a2b [i ] == unmappedColumn && b_start < len (b2a ) {
299
- if b2a [b_start ] == unmappedColumn {
297
+ bStart := 0
298
+ for a2b [i ] == unmappedColumn && bStart < len (b2a ) {
299
+ if b2a [bStart ] == unmappedColumn {
300
300
rows := util .Min (maxRowsToInspect , util .Max (0 , util .Min (len (a .buffer ), len (b .buffer ))- 1 ))
301
301
same := 0
302
302
for j := 1 ; j <= rows ; j ++ {
303
303
acell , ea := getCell (a .buffer [j ], i )
304
- bcell , eb := getCell (b .buffer [j ], b_start )
304
+ bcell , eb := getCell (b .buffer [j ], bStart )
305
305
if ea == nil && eb == nil && acell == bcell {
306
306
same ++
307
307
}
308
308
}
309
309
if (float32 (same ) / float32 (rows )) > minRatioToMatch {
310
- a2b [i ] = b_start
311
- b2a [b_start ] = i
310
+ a2b [i ] = bStart
311
+ b2a [bStart ] = i
312
312
}
313
313
}
314
- b_start += 1
314
+ bStart += 1
315
315
}
316
316
}
317
317
}
0 commit comments