Skip to content
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

Jump to bottom

test: add an exported constructor for QueryTableResult #304

Merged
merged 1 commit into from
Feb 3, 2022
Merged

test: add an exported constructor for QueryTableResult #304

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ type QueryTableResult struct {
err error
}

func NewQueryTableResult(rawResponse io.ReadCloser) *QueryTableResult {
csvReader := csv.NewReader(rawResponse)
csvReader.FieldsPerRecord = -1
return &QueryTableResult{Closer: rawResponse, csvReader: csvReader}
}

// TablePosition returns actual flux table position in the result, or -1 if no table was found yet
// Each new table is introduced by an annotation in csv
func (q *QueryTableResult) TablePosition() int {
Expand Down
69 changes: 17 additions & 52 deletions api/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package api

import (
"context"
"encoding/csv"
"fmt"
"io/ioutil"
"net/http"
Expand Down Expand Up @@ -84,9 +83,7 @@ func TestQueryCVSResultSingleTable(t *testing.T) {
)

reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())

Expand Down Expand Up @@ -310,9 +307,7 @@ func TestQueryCVSResultMultiTables(t *testing.T) {
)

reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
assert.Equal(t, -1, queryResult.TablePosition())
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
Expand Down Expand Up @@ -444,9 +439,7 @@ func TestQueryCVSResultSingleTableMultiColumnsNoValue(t *testing.T) {
)

reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())

Expand Down Expand Up @@ -529,9 +522,7 @@ func TestErrorInRow(t *testing.T) {
`,failed to create physical plan: invalid time bounds from procedure from: bounds contain zero time,897`}
csvTable := makeCSVstring(csvRowsError)
reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))

require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
Expand All @@ -545,9 +536,7 @@ func TestErrorInRow(t *testing.T) {
`,failed to create physical plan: invalid time bounds from procedure from: bounds contain zero time,`}
csvTable = makeCSVstring(csvRowsErrorNoReference)
reader = strings.NewReader(csvTable)
csvReader = csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult = &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult = NewQueryTableResult(ioutil.NopCloser(reader))

require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
Expand All @@ -561,9 +550,7 @@ func TestErrorInRow(t *testing.T) {
`,,`}
csvTable = makeCSVstring(csvRowsErrorNoMessage)
reader = strings.NewReader(csvTable)
csvReader = csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult = &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult = NewQueryTableResult(ioutil.NopCloser(reader))

require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
Expand All @@ -580,9 +567,7 @@ func TestInvalidDataType(t *testing.T) {
`

reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "deviceId has unknown data type int", queryResult.Err().Error())
Expand Down Expand Up @@ -642,9 +627,7 @@ func TestReorderedAnnotations(t *testing.T) {

`
reader := strings.NewReader(csvTable1)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())

Expand All @@ -671,9 +654,7 @@ func TestReorderedAnnotations(t *testing.T) {

`
reader = strings.NewReader(csvTable2)
csvReader = csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult = &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult = NewQueryTableResult(ioutil.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())

Expand Down Expand Up @@ -744,9 +725,7 @@ func TestDatatypeOnlyAnnotation(t *testing.T) {

`
reader := strings.NewReader(csvTable1)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())

Expand Down Expand Up @@ -775,9 +754,7 @@ func TestMissingDatatypeAnnotation(t *testing.T) {
`

reader := strings.NewReader(csvTable1)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "parsing error, datatype annotation not found", queryResult.Err().Error())
Expand All @@ -791,9 +768,7 @@ func TestMissingDatatypeAnnotation(t *testing.T) {
`

reader = strings.NewReader(csvTable2)
csvReader = csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult = &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult = NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "parsing error, datatype annotation not found", queryResult.Err().Error())
Expand All @@ -807,9 +782,7 @@ func TestMissingAnnotations(t *testing.T) {

`
reader := strings.NewReader(csvTable3)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "parsing error, annotations not found", queryResult.Err().Error())
Expand All @@ -824,9 +797,7 @@ func TestDifferentNumberOfColumns(t *testing.T) {
`

reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "parsing error, row has different number of columns than the table: 11 vs 10", queryResult.Err().Error())
Expand All @@ -839,9 +810,7 @@ func TestDifferentNumberOfColumns(t *testing.T) {
`

reader = strings.NewReader(csvTable2)
csvReader = csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult = &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult = NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "parsing error, row has different number of columns than the table: 8 vs 10", queryResult.Err().Error())
Expand All @@ -854,9 +823,7 @@ func TestDifferentNumberOfColumns(t *testing.T) {
`

reader = strings.NewReader(csvTable3)
csvReader = csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult = &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult = NewQueryTableResult(ioutil.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
assert.Equal(t, "parsing error, row has different number of columns than the table: 10 vs 8", queryResult.Err().Error())
Expand All @@ -873,9 +840,7 @@ func TestEmptyValue(t *testing.T) {
`

reader := strings.NewReader(csvTable)
csvReader := csv.NewReader(reader)
csvReader.FieldsPerRecord = -1
queryResult := &QueryTableResult{Closer: ioutil.NopCloser(reader), csvReader: csvReader}
queryResult := NewQueryTableResult(ioutil.NopCloser(reader))

require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
Expand Down