From 2e81186f499f16aa67108886b5fd5b9510b3e855 Mon Sep 17 00:00:00 2001 From: Matt Topol Date: Fri, 26 May 2023 11:55:34 -0400 Subject: [PATCH] fix lint and integration issue --- dev/archery/archery/integration/datagen.py | 1 - go/arrow/compute/executor.go | 12 +++++++----- go/arrow/internal/arrjson/arrjson.go | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dev/archery/archery/integration/datagen.py b/dev/archery/archery/integration/datagen.py index f34d563cd0647..f2992bcee1955 100644 --- a/dev/archery/archery/integration/datagen.py +++ b/dev/archery/archery/integration/datagen.py @@ -823,7 +823,6 @@ def _get_buffers(self): ] - class StringViewColumn(BinaryViewColumn): def _encode_value(self, x): diff --git a/go/arrow/compute/executor.go b/go/arrow/compute/executor.go index c341e99cb42d9..a5dcf8ed61ddd 100644 --- a/go/arrow/compute/executor.go +++ b/go/arrow/compute/executor.go @@ -88,11 +88,11 @@ var ( // then be modified to set into a context. // // The default exec context uses the following values: -// - ChunkSize = DefaultMaxChunkSize (MaxInt64) -// - PreallocContiguous = true -// - Registry = GetFunctionRegistry() -// - ExecChannelSize = 10 -// - NumParallel = runtime.NumCPU() +// - ChunkSize = DefaultMaxChunkSize (MaxInt64) +// - PreallocContiguous = true +// - Registry = GetFunctionRegistry() +// - ExecChannelSize = 10 +// - NumParallel = runtime.NumCPU() func DefaultExecCtx() ExecCtx { return defaultExecCtx } func init() { @@ -171,6 +171,8 @@ func addComputeDataPrealloc(dt arrow.DataType, widths []bufferPrealloc) []buffer return append(widths, bufferPrealloc{bitWidth: 32, addLen: 1}) case arrow.LARGE_BINARY, arrow.LARGE_STRING, arrow.LARGE_LIST: return append(widths, bufferPrealloc{bitWidth: 64, addLen: 1}) + case arrow.STRING_VIEW, arrow.BINARY_VIEW: + return append(widths, bufferPrealloc{bitWidth: arrow.StringHeaderSizeBytes * 8}) } return widths } diff --git a/go/arrow/internal/arrjson/arrjson.go b/go/arrow/internal/arrjson/arrjson.go index 2af7cfbc6845d..00c19835122d8 100644 --- a/go/arrow/internal/arrjson/arrjson.go +++ b/go/arrow/internal/arrjson/arrjson.go @@ -159,9 +159,9 @@ func typeToJSON(arrowType arrow.DataType) (json.RawMessage, error) { case *arrow.LargeStringType: typ = nameJSON{"largeutf8"} case *arrow.BinaryViewType: - typ = nameJSON{"binary_view"} + typ = nameJSON{"binaryview"} case *arrow.StringViewType: - typ = nameJSON{"utf8_view"} + typ = nameJSON{"utf8view"} case *arrow.Date32Type: typ = unitZoneJSON{Name: "date", Unit: "DAY"} case *arrow.Date64Type: @@ -342,9 +342,9 @@ func typeFromJSON(typ json.RawMessage, children []FieldWrapper) (arrowType arrow arrowType = arrow.BinaryTypes.String case "largeutf8": arrowType = arrow.BinaryTypes.LargeString - case "binary_view": + case "binaryview": arrowType = arrow.BinaryTypes.BinaryView - case "utf8_view": + case "utf8view": arrowType = arrow.BinaryTypes.StringView case "date": t := unitZoneJSON{}