diff --git a/go/Godeps/LICENSES b/go/Godeps/LICENSES index a2397c13d5..1c9c545469 100644 --- a/go/Godeps/LICENSES +++ b/go/Godeps/LICENSES @@ -4582,16 +4582,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. = LICENSE cd114db727544ba06cf58a8d6ab0a48a4c7dfe64d33ff2aaaa6b7a49 = ================================================================================ -================================================================================ -= github.com/kch42/buzhash licensed under: = - - DO WHATEVER THE FUCK YOU WANT, PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHATEVER THE FUCK YOU WANT. -= LICENSE 03d3e3813a51a67f46a07063e39f5d6451619f4ede2ae1c4c4cccb9e = -================================================================================ - ================================================================================ = github.com/klauspost/compress licensed under: = diff --git a/go/libraries/doltcore/table/typed/parquet/writer.go b/go/libraries/doltcore/table/typed/parquet/writer.go index b91e9ff5c5..ad9cb80ddd 100644 --- a/go/libraries/doltcore/table/typed/parquet/writer.go +++ b/go/libraries/doltcore/table/typed/parquet/writer.go @@ -17,8 +17,8 @@ package parquet import ( "context" "fmt" - "github.com/xitongsys/parquet-go-source/local" + "github.com/xitongsys/parquet-go-source/local" "github.com/xitongsys/parquet-go/source" "github.com/xitongsys/parquet-go/writer" @@ -31,9 +31,9 @@ import ( var WriteBufSize = 256 * 1024 type ParquetWriter struct { - filewriter source.ParquetFile - pwriter *writer.CSVWriter - sch schema.Schema + filewriter source.ParquetFile + pwriter *writer.CSVWriter + sch schema.Schema } func NewParquetWriter(outSch schema.Schema, destName string) (*ParquetWriter, error) { diff --git a/go/libraries/doltcore/table/typed/parquet/writer_test.go b/go/libraries/doltcore/table/typed/parquet/writer_test.go index 644e9b5b27..70b1f3b0a6 100644 --- a/go/libraries/doltcore/table/typed/parquet/writer_test.go +++ b/go/libraries/doltcore/table/typed/parquet/writer_test.go @@ -17,12 +17,13 @@ package parquet import ( "context" "fmt" - "github.com/xitongsys/parquet-go-source/local" - "github.com/xitongsys/parquet-go/reader" "io/ioutil" "os" "testing" + "github.com/xitongsys/parquet-go-source/local" + "github.com/xitongsys/parquet-go/reader" + "github.com/dolthub/dolt/go/libraries/doltcore/row" "github.com/dolthub/dolt/go/libraries/doltcore/schema" "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" @@ -47,9 +48,9 @@ var colColl = schema.NewColCollection(inCols...) var rowSch = schema.MustSchemaFromCols(colColl) type Person struct { - Name string `parquet:"name=name, type=BYTE_ARRAY, convertedtype=UTF8"` - Age int64 `parquet:"name=age, type=INT64, repetitiontype=OPTIONAL"` - Title string `parquet:"name=title, type=BYTE_ARRAY, convertedtype=UTF8, repetitiontype=OPTIONAL"` + Name string `parquet:"name=name, type=BYTE_ARRAY, convertedtype=UTF8"` + Age int64 `parquet:"name=age, type=INT64, repetitiontype=OPTIONAL"` + Title string `parquet:"name=title, type=BYTE_ARRAY, convertedtype=UTF8, repetitiontype=OPTIONAL"` } func mustRow(r row.Row, err error) row.Row { @@ -79,7 +80,7 @@ func getSampleRows() (rows []row.Row) { ageColTag: types.Uint(27), //titleColTag: types.String(""), - /* title = NULL */})), + /* title = NULL */})), } }