sql: Add SQL API to set CSV/JSON options (#1268)

In S3 SQL, there is a difference between a *) non-set parameter *) a parameter set to empty *) a parameter set to a non empty value For that, users need to explicity call a method to set an option, if not done, the default value in server's side will be used.
minio · Apr 18, 2020 · 22537a4 · 22537a4
1 parent 33e5528
commit 22537a4
Show file tree

Hide file tree

Showing 2 changed files with 228 additions and 15 deletions.
diff --git a/api-select.go b/api-select.go
@@ -1,6 +1,6 @@
 /*
  * MinIO Go Library for Amazon S3 Compatible Cloud Storage
- * (C) 2018 MinIO, Inc.
+ * (C) 2018-2020 MinIO, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,31 +88,244 @@ type ParquetInputOptions struct{}
 
 // CSVInputOptions csv input specific options
 type CSVInputOptions struct {
-	FileHeaderInfo       CSVFileHeaderInfo
-	RecordDelimiter      string
-	FieldDelimiter       string `xml:",omitempty"`
-	QuoteCharacter       string `xml:",omitempty"`
-	QuoteEscapeCharacter string `xml:",omitempty"`
-	Comments             string `xml:",omitempty"`
+	FileHeaderInfo    CSVFileHeaderInfo
+	fileHeaderInfoSet bool
+
+	RecordDelimiter    string
+	recordDelimiterSet bool
+
+	FieldDelimiter    string
+	fieldDelimiterSet bool
+
+	QuoteCharacter    string
+	quoteCharacterSet bool
+
+	QuoteEscapeCharacter    string
+	quoteEscapeCharacterSet bool
+
+	Comments    string
+	commentsSet bool
+}
+
+// SetFileHeaderInfo sets the file header info in the CSV input options
+func (c *CSVInputOptions) SetFileHeaderInfo(val CSVFileHeaderInfo) {
+	c.FileHeaderInfo = val
+	c.fileHeaderInfoSet = true
+}
+
+// SetRecordDelimiter sets the record delimiter in the CSV input options
+func (c *CSVInputOptions) SetRecordDelimiter(val string) {
+	c.RecordDelimiter = val
+	c.recordDelimiterSet = true
+}
+
+// SetFieldDelimiter sets the field delimiter in the CSV input options
+func (c *CSVInputOptions) SetFieldDelimiter(val string) {
+	c.FieldDelimiter = val
+	c.fieldDelimiterSet = true
+}
+
+// SetQuoteCharacter sets the quote character in the CSV input options
+func (c *CSVInputOptions) SetQuoteCharacter(val string) {
+	c.QuoteCharacter = val
+	c.quoteCharacterSet = true
+}
+
+// SetQuoteEscapeCharacter sets the quote escape character in the CSV input options
+func (c *CSVInputOptions) SetQuoteEscapeCharacter(val string) {
+	c.QuoteEscapeCharacter = val
+	c.quoteEscapeCharacterSet = true
+}
+
+// SetComments sets the comments character in the CSV input options
+func (c *CSVInputOptions) SetComments(val string) {
+	c.Comments = val
+	c.commentsSet = true
+}
+
+// MarshalXML - produces the xml representation of the CSV input options struct
+func (c CSVInputOptions) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	if err := e.EncodeToken(start); err != nil {
+		return err
+	}
+	if c.FileHeaderInfo != "" || c.fileHeaderInfoSet {
+		if err := e.EncodeElement(c.FileHeaderInfo, xml.StartElement{Name: xml.Name{Local: "FileHeaderInfo"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.RecordDelimiter != "" || c.recordDelimiterSet {
+		if err := e.EncodeElement(c.RecordDelimiter, xml.StartElement{Name: xml.Name{Local: "RecordDelimiter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.FieldDelimiter != "" || c.fieldDelimiterSet {
+		if err := e.EncodeElement(c.FieldDelimiter, xml.StartElement{Name: xml.Name{Local: "FieldDelimiter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.QuoteCharacter != "" || c.quoteCharacterSet {
+		if err := e.EncodeElement(c.QuoteCharacter, xml.StartElement{Name: xml.Name{Local: "QuoteCharacter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.QuoteEscapeCharacter != "" || c.quoteEscapeCharacterSet {
+		if err := e.EncodeElement(c.QuoteEscapeCharacter, xml.StartElement{Name: xml.Name{Local: "QuoteEscapeCharacter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.Comments != "" || c.commentsSet {
+		if err := e.EncodeElement(c.Comments, xml.StartElement{Name: xml.Name{Local: "Comments"}}); err != nil {
+			return err
+		}
+	}
+
+	return e.EncodeToken(xml.EndElement{Name: start.Name})
 }
 
 // CSVOutputOptions csv output specific options
 type CSVOutputOptions struct {
-	QuoteFields          CSVQuoteFields `xml:",omitempty"`
-	RecordDelimiter      string
-	FieldDelimiter       string `xml:",omitempty"`
-	QuoteCharacter       string `xml:",omitempty"`
-	QuoteEscapeCharacter string `xml:",omitempty"`
+	QuoteFields    CSVQuoteFields
+	quoteFieldsSet bool
+
+	RecordDelimiter    string
+	recordDelimiterSet bool
+
+	FieldDelimiter    string
+	fieldDelimiterSet bool
+
+	QuoteCharacter    string
+	quoteCharacterSet bool
+
+	QuoteEscapeCharacter    string
+	quoteEscapeCharacterSet bool
+}
+
+// SetQuoteFields sets the quote field parameter in the CSV output options
+func (c *CSVOutputOptions) SetQuoteFields(val CSVQuoteFields) {
+	c.QuoteFields = val
+	c.quoteFieldsSet = true
+}
+
+// SetRecordDelimiter sets the record delimiter character in the CSV output options
+func (c *CSVOutputOptions) SetRecordDelimiter(val string) {
+	c.RecordDelimiter = val
+	c.recordDelimiterSet = true
+}
+
+// SetFieldDelimiter sets the field delimiter character in the CSV output options
+func (c *CSVOutputOptions) SetFieldDelimiter(val string) {
+	c.FieldDelimiter = val
+	c.fieldDelimiterSet = true
+}
+
+// SetQuoteCharacter sets the quote character in the CSV output options
+func (c *CSVOutputOptions) SetQuoteCharacter(val string) {
+	c.QuoteCharacter = val
+	c.quoteCharacterSet = true
+}
+
+// SetQuoteEscapeCharacter sets the quote escape character in the CSV output options
+func (c *CSVOutputOptions) SetQuoteEscapeCharacter(val string) {
+	c.QuoteEscapeCharacter = val
+	c.quoteEscapeCharacterSet = true
+}
+
+// MarshalXML - produces the xml representation of the CSVOutputOptions struct
+func (c CSVOutputOptions) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	if err := e.EncodeToken(start); err != nil {
+		return err
+	}
+
+	if c.QuoteFields != "" || c.quoteFieldsSet {
+		if err := e.EncodeElement(c.QuoteFields, xml.StartElement{Name: xml.Name{Local: "QuoteFields"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.RecordDelimiter != "" || c.recordDelimiterSet {
+		if err := e.EncodeElement(c.RecordDelimiter, xml.StartElement{Name: xml.Name{Local: "RecordDelimiter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.FieldDelimiter != "" || c.fieldDelimiterSet {
+		if err := e.EncodeElement(c.FieldDelimiter, xml.StartElement{Name: xml.Name{Local: "FieldDelimiter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.QuoteCharacter != "" || c.quoteCharacterSet {
+		if err := e.EncodeElement(c.QuoteCharacter, xml.StartElement{Name: xml.Name{Local: "QuoteCharacter"}}); err != nil {
+			return err
+		}
+	}
+
+	if c.QuoteEscapeCharacter != "" || c.quoteEscapeCharacterSet {
+		if err := e.EncodeElement(c.QuoteEscapeCharacter, xml.StartElement{Name: xml.Name{Local: "QuoteEscapeCharacter"}}); err != nil {
+			return err
+		}
+	}
+
+	return e.EncodeToken(xml.EndElement{Name: start.Name})
 }
 
 // JSONInputOptions json input specific options
 type JSONInputOptions struct {
-	Type JSONType
+	Type    JSONType
+	typeSet bool
+}
+
+// SetType sets the JSON type in the JSON input options
+func (j *JSONInputOptions) SetType(typ JSONType) {
+	j.Type = typ
+	j.typeSet = true
+}
+
+// MarshalXML - produces the xml representation of the JSONInputOptions struct
+func (j JSONInputOptions) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	if err := e.EncodeToken(start); err != nil {
+		return err
+	}
+
+	if j.Type != "" || j.typeSet {
+		if err := e.EncodeElement(j.Type, xml.StartElement{Name: xml.Name{Local: "Type"}}); err != nil {
+			return err
+		}
+	}
+
+	return e.EncodeToken(xml.EndElement{Name: start.Name})
 }
 
 // JSONOutputOptions - json output specific options
 type JSONOutputOptions struct {
-	RecordDelimiter string
+	RecordDelimiter    string
+	recordDelimiterSet bool
+}
+
+// SetRecordDelimiter sets the record delimiter in the JSON output options
+func (j *JSONOutputOptions) SetRecordDelimiter(val string) {
+	j.RecordDelimiter = val
+	j.recordDelimiterSet = true
+}
+
+// MarshalXML - produces the xml representation of the JSONOutputOptions struct
+func (j JSONOutputOptions) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	if err := e.EncodeToken(start); err != nil {
+		return err
+	}
+
+	if j.RecordDelimiter != "" || j.recordDelimiterSet {
+		if err := e.EncodeElement(j.RecordDelimiter, xml.StartElement{Name: xml.Name{Local: "RecordDelimiter"}}); err != nil {
+			return err
+		}
+	}
+
+	return e.EncodeToken(xml.EndElement{Name: start.Name})
 }
 
 // SelectObjectInputSerialization - input serialization parameters

diff --git a/appveyor.yml b/appveyor.yml
@@ -23,7 +23,7 @@ install:
 build_script:
   - go vet ./...
   - gofmt -s -l .
-  - golint -set_exit_status github.com/minio/minio-go/...
+  - golint -set_exit_status ./...
   - staticcheck
   - go test -short -v ./...
   - go test -short -race -v ./...