astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-21 05:00:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

run gofumpt cleanup across code-base (#14015)

Browse Source
This commit is contained in:
Harshavardhana
2022-01-02 09:15:06 -08:00
committed by GitHub
parent 6f474982ed
commit f527c708f2
250 changed files with 1201 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/s3select/csv/args.go
-1
View File
@@ -142,7 +142,6 @@ func (args *WriterArgs) IsEmpty() bool {
// UnmarshalXML - decodes XML data.
func (args *WriterArgs) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
args.QuoteFields = asneeded
args.RecordDelimiter = defaultRecordDelimiter
args.FieldDelimiter = defaultFieldDelimiter
internal/s3select/csv/reader.go
-1
View File
@@ -277,7 +277,6 @@ func (r *Reader) startReaders(newReader func(io.Reader) *csv.Reader) error {
}()
}
return nil
}
// NewReader - creates new CSV reader using readCloser.
internal/s3select/csv/reader_contrib_test.go
-2
View File
@@ -219,7 +219,6 @@ func TestReadExtended(t *testing.T) {
for i, c := range cases {
t.Run(c.file, func(t *testing.T) {
var err error
var record sql.Record
var result bytes.Buffer
@@ -435,7 +434,6 @@ func TestReadFailures(t *testing.T) {
for i, c := range cases {
t.Run(c.file, func(t *testing.T) {
var err error
var record sql.Record
var result bytes.Buffer
internal/s3select/message.go
+1 -3
View File
@@ -71,9 +71,7 @@ const (
maxRecordMessageLength = (128 << 10) - 256
)
var (
bufLength = payloadLenForMsgLen(maxRecordMessageLength)
)
var bufLength = payloadLenForMsgLen(maxRecordMessageLength)
// newRecordsMessage - creates new Records Message which can contain a single record, partial records,
// or multiple records. Depending on the size of the result, a response can contain one or more of these messages.
internal/s3select/select.go
+1 -3
View File
@@ -229,9 +229,7 @@ type S3Select struct {
close func() error
}
var (
legacyXMLName = "SelectObjectContentRequest"
)
var legacyXMLName = "SelectObjectContentRequest"
// UnmarshalXML - decodes XML data.
func (s3Select *S3Select) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
internal/s3select/select_benchmark_test.go
+2 -3
View File
@@ -61,8 +61,7 @@ func genSampleCSVData(count int) []byte {
return buf.Bytes()
}
type nullResponseWriter struct {
}
type nullResponseWriter struct{}
func (w *nullResponseWriter) Header() http.Header {
return nil
@@ -79,7 +78,7 @@ func (w *nullResponseWriter) Flush() {
}
func benchmarkSelect(b *testing.B, count int, query string) {
var requestXML = []byte(`
requestXML := []byte(`
<?xml version="1.0" encoding="UTF-8"?>
<SelectObjectContentRequest>
<Expression>` + query + `</Expression>
internal/s3select/select_test.go
+15 -17
View File
@@ -61,7 +61,7 @@ func TestJSONQueries(t *testing.T) {
{"id": 2,"title": "Second Record","desc": "another text","numbers": [2, 3.0, 4]}
{"id": 3,"title": "Second Record","desc": "another text","nested": [[2, 3.0, 4], [7, 8.5, 9]]}`
var testTable = []struct {
testTable := []struct {
name string
query string
requestXML []byte // override request XML
@@ -100,14 +100,16 @@ func TestJSONQueries(t *testing.T) {
wantResult: `{"id":0}
{"id":1}
{"id":2}
{"id":3}`},
{"id":3}`,
},
{
name: "bignum-2",
query: `SELECT id from s3object s WHERE s.id >= -9223372036854775808`,
wantResult: `{"id":0}
{"id":1}
{"id":2}
{"id":3}`},
{"id":3}`,
},
{
name: "donatello-3",
query: `SELECT * from s3object s WHERE 'value' IN s.synonyms[*]`,
@@ -603,7 +605,7 @@ func TestCSVQueries(t *testing.T) {
input := `index,ID,CaseNumber,Date,Day,Month,Year,Block,IUCR,PrimaryType,Description,LocationDescription,Arrest,Domestic,Beat,District,Ward,CommunityArea,FBI Code,XCoordinate,YCoordinate,UpdatedOn,Latitude,Longitude,Location
2700763,7732229,,2010-05-26 00:00:00,26,May,2010,113XX S HALSTED ST,1150,,CREDIT CARD FRAUD,,False,False,2233,22.0,34.0,,11,,,,41.688043288,-87.6422444,"(41.688043288, -87.6422444)"`
var testTable = []struct {
testTable := []struct {
name string
query string
requestXML []byte
@@ -687,7 +689,7 @@ func TestCSVQueries2(t *testing.T) {
1,2010-01-01T,7867786,4565.908123,"a text, with comma"
2,2017-01-02T03:04Z,-5, 0.765111,
`)
var testTable = []struct {
testTable := []struct {
name string
query string
input []byte
@@ -872,7 +874,7 @@ func TestCSVQueries3(t *testing.T) {
apple,1,true
mango,3,false
`
var testTable = []struct {
testTable := []struct {
name string
query string
requestXML []byte // override request XML
@@ -1014,7 +1016,7 @@ true`,
}
func TestCSVInput(t *testing.T) {
var testTable = []struct {
testTable := []struct {
requestXML []byte
expectedResult []byte
}{
@@ -1114,7 +1116,7 @@ func TestCSVInput(t *testing.T) {
},
}
var csvData = []byte(`one,two,three
csvData := []byte(`one,two,three
-1,foo,true
,bar,false
2.5,baz,true
@@ -1158,12 +1160,10 @@ func TestCSVInput(t *testing.T) {
}
})
}
}
func TestJSONInput(t *testing.T) {
var testTable = []struct {
testTable := []struct {
requestXML []byte
expectedResult []byte
}{
@@ -1239,7 +1239,7 @@ func TestJSONInput(t *testing.T) {
},
}
var jsonData = []byte(`{"three":true,"two":"foo","one":-1}
jsonData := []byte(`{"three":true,"two":"foo","one":-1}
{"three":false,"two":"bar","one":null}
{"three":true,"two":"baz","one":2.5}
`)
@@ -1288,7 +1288,7 @@ func TestParquetInput(t *testing.T) {
os.Setenv("MINIO_API_SELECT_PARQUET", "on")
defer os.Setenv("MINIO_API_SELECT_PARQUET", "off")
var testTable = []struct {
testTable := []struct {
requestXML []byte
expectedResult []byte
}{
@@ -1405,7 +1405,7 @@ func TestParquetInputSchema(t *testing.T) {
os.Setenv("MINIO_API_SELECT_PARQUET", "on")
defer os.Setenv("MINIO_API_SELECT_PARQUET", "off")
var testTable = []struct {
testTable := []struct {
requestXML []byte
wantResult string
}{
@@ -1517,7 +1517,6 @@ func TestParquetInputSchema(t *testing.T) {
if !reflect.DeepEqual(gotS, testCase.wantResult) {
t.Errorf("received response does not match with expected reply. Query: %s\ngot: %s\nwant:%s", testCase.requestXML, gotS, testCase.wantResult)
}
})
}
}
@@ -1526,7 +1525,7 @@ func TestParquetInputSchemaCSV(t *testing.T) {
os.Setenv("MINIO_API_SELECT_PARQUET", "on")
defer os.Setenv("MINIO_API_SELECT_PARQUET", "off")
var testTable = []struct {
testTable := []struct {
requestXML []byte
wantResult string
}{
@@ -1636,7 +1635,6 @@ func TestParquetInputSchemaCSV(t *testing.T) {
if !reflect.DeepEqual(gotS, testCase.wantResult) {
t.Errorf("received response does not match with expected reply. Query: %s\ngot: %s\nwant:%s", testCase.requestXML, gotS, testCase.wantResult)
}
})
}
}
internal/s3select/simdj/reader_amd64_test.go
-1
View File
@@ -67,7 +67,6 @@ func TestNDJSON(t *testing.T) {
}
for _, tt := range testCases {
t.Run(tt.name, func(t *testing.T) {
ref := loadCompressed(t, tt.name)
internal/s3select/sql/parser_test.go
-2
View File
@@ -84,7 +84,6 @@ func TestJSONPath(t *testing.T) {
}
// repr.Println(j, repr.Indent(" "), repr.OmitEmpty(true))
}
}
func TestIdentifierParsing(t *testing.T) {
@@ -342,7 +341,6 @@ func TestFromClauseJSONPath(t *testing.T) {
// repr.Println(s, repr.Indent(" "), repr.OmitEmpty(true))
}
}
func TestSelectParsing(t *testing.T) {
internal/s3select/sql/statement.go
+1 -3
View File
@@ -26,9 +26,7 @@ import (
"github.com/minio/simdjson-go"
)
var (
errBadLimitSpecified = errors.New("Limit value must be a positive integer")
)
var errBadLimitSpecified = errors.New("Limit value must be a positive integer")
const (
baseTableName = "s3object"
internal/s3select/sql/timestampfuncs.go
+8 -10
View File
@@ -30,16 +30,14 @@ const (
layoutNanosecond = "2006-01-02T15:04:05.999999999Z07:00"
)
var (
tformats = []string{
layoutYear,
layoutMonth,
layoutDay,
layoutMinute,
layoutSecond,
layoutNanosecond,
}
)
var tformats = []string{
layoutYear,
layoutMonth,
layoutDay,
layoutMinute,
layoutSecond,
layoutNanosecond,
}
func parseSQLTimestamp(s string) (t time.Time, err error) {
for _, f := range tformats {