MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-04 20:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Honor header only when requested for use (#6815)

Browse Source
This commit is contained in:
Harshavardhana 2018-11-16 10:27:48 -08:00 committed by kannappanr
parent 1c24c93f73
commit 272b8003d6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/api-errors.go
View File

@ -297,6 +297,8 @@ const (
ErrEvaluatorInvalidTimestampFormatPatternSymbol ErrEvaluatorInvalidTimestampFormatPatternSymbol
ErrEvaluatorBindingDoesNotExist ErrEvaluatorBindingDoesNotExist
ErrMissingHeaders ErrMissingHeaders
ErrInvalidColumnIndex
ErrAdminConfigNotificationTargetsFailed ErrAdminConfigNotificationTargetsFailed
ErrAdminProfilerNotEnabled ErrAdminProfilerNotEnabled
ErrInvalidDecompressedSize ErrInvalidDecompressedSize
@ -1431,6 +1433,11 @@ var errorCodeResponse = map[APIErrorCode]APIError{
Description: "Some headers in the query are missing from the file. Check the file and try again.", Description: "Some headers in the query are missing from the file. Check the file and try again.",
HTTPStatusCode: http.StatusBadRequest, HTTPStatusCode: http.StatusBadRequest,
}, },
ErrInvalidColumnIndex: {
Code: "InvalidColumnIndex",
Description: "The column index is invalid. Please check the service documentation and try again.",
HTTPStatusCode: http.StatusBadRequest,
},
ErrInvalidDecompressedSize: { ErrInvalidDecompressedSize: {
Code: "XMinioInvalidDecompressedSize", Code: "XMinioInvalidDecompressedSize",
Description: "The data provided is unfit for decompression", Description: "The data provided is unfit for decompression",
@ -1658,6 +1665,8 @@ func toAPIErrorCode(ctx context.Context, err error) (apiErr APIErrorCode) {
apiErr = ErrMissingHeaders apiErr = ErrMissingHeaders
case format.ErrParseInvalidPathComponent: case format.ErrParseInvalidPathComponent:
apiErr = ErrMissingHeaders apiErr = ErrMissingHeaders
case format.ErrInvalidColumnIndex:
apiErr = ErrInvalidColumnIndex
} }
// Compression errors // Compression errors

2
pkg/s3select/input.go
View File

@ -75,7 +75,7 @@ func New(reader io.Reader, size int64, req ObjectSelectRequest) (s3s format.Sele
req.InputSerialization.CSV.RecordDelimiter = "\n" req.InputSerialization.CSV.RecordDelimiter = "\n"
} }
s3s, err = csv.New(&csv.Options{ s3s, err = csv.New(&csv.Options{
HasHeader: req.InputSerialization.CSV.FileHeaderInfo != CSVFileHeaderInfoNone, HasHeader: req.InputSerialization.CSV.FileHeaderInfo == CSVFileHeaderInfoUse,
RecordDelimiter: req.InputSerialization.CSV.RecordDelimiter, RecordDelimiter: req.InputSerialization.CSV.RecordDelimiter,
FieldDelimiter: req.InputSerialization.CSV.FieldDelimiter, FieldDelimiter: req.InputSerialization.CSV.FieldDelimiter,
Comments: req.InputSerialization.CSV.Comments, Comments: req.InputSerialization.CSV.Comments,