Skip to content

Commit d7753c3

Browse files
committed
simplify: table: rename ReadFile()
1 parent b1ceef8 commit d7753c3

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

data/histogram/histogram_read.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// have other configurations, use `table.ReadFile()` directly
1515
// and call `HistogramFromTable()`.
1616
func ParseFileCSV(file string, name string, binNameColIdx, binFrequencyColIdx uint) (*Histogram, error) {
17-
tbl, err := table.ReadFiles(nil, file)
17+
tbl, err := table.ReadFile(nil, file)
1818
if err != nil {
1919
return nil, err
2020
}

data/histogram/histogram_sets_read.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// NewHistogramSetsCSVs expects multiple files to have same columns.
1313
func NewHistogramSetsCSVs(filenames []string, key1ColIdx, key2ColIdx, uidColIdx uint) (*HistogramSets, table.Table, error) {
1414
hsets := NewHistogramSets("")
15-
tbl, err := table.ReadFiles(nil, filenames...)
15+
tbl, err := table.ReadFile(nil, filenames...)
1616
if err != nil {
1717
return hsets, tbl, err
1818
}

data/table/read.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
var debugReadCSV = false // should not need to use this.
1515

16-
// ReadFiles reads in a list of delimited files and returns a merged `Table` struct.
16+
// ReadFile reads one or more delimited files and returns a merged `Table` struct.
1717
// An error is returned if the columns count differs between files.
18-
func ReadFiles(opts *ParseOptions, filenames ...string) (Table, error) {
18+
func ReadFile(opts *ParseOptions, filenames ...string) (Table, error) {
1919
tbl := NewTable("")
2020
if len(filenames) == 0 {
2121
return tbl, errors.New("no filenames provided")

data/table/read_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var readFileTests = []struct {
1616
// TestReadFile reads a CSV file.
1717
func TestReadFile(t *testing.T) {
1818
for _, tt := range readFileTests {
19-
tbl, err := ReadFiles(nil, tt.filename)
19+
tbl, err := ReadFile(nil, tt.filename)
2020
if err != nil {
2121
t.Errorf("table.ReadFile(\"%s\",...) Error: [%v]",
2222
tt.filename, err.Error())

data/timeseries/examples/parse_csv/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func main() {
2323
log.Fatal(err)
2424
}
2525

26-
tbl, err := table.ReadFiles(nil, opts.File)
26+
tbl, err := table.ReadFile(nil, opts.File)
2727
if err != nil {
2828
log.Fatal(err)
2929
}

0 commit comments

Comments
 (0)