Feedback

lidavidm · Jul 12, 2023 · 4d430a9 · 4d430a9
1 parent 025d45b
commit 4d430a9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 16 deletions.
diff --git a/go/adbc/pkg/_tmpl/driver.go.tmpl b/go/adbc/pkg/_tmpl/driver.go.tmpl
@@ -46,6 +46,7 @@ import (
 	"github.com/apache/arrow-adbc/go/adbc"
 	"github.com/apache/arrow/go/v13/arrow/array"
 	"github.com/apache/arrow/go/v13/arrow/cdata"
+	"github.com/apache/arrow/go/v13/arrow/memory"
 	"github.com/apache/arrow/go/v13/arrow/memory/mallocator"
 )
 
@@ -201,8 +202,9 @@ func getFromHandle[T any](ptr unsafe.Pointer) *T {
 func exportStringOption(val string, out *C.char, length *C.size_t) C.AdbcStatusCode {
 	lenWithTerminator := C.size_t(len(val) + 1)
 	if lenWithTerminator <= *length {
-		// TODO: doesn't this reallocate the string? can we avoid this?
-		C.strncpy(out, (*C.char)(C.CString(val)), lenWithTerminator)
+		sink := fromCArr[byte]((*byte)(unsafe.Pointer(out)), int(*length))
+		copy(sink, val)
+		sink[lenWithTerminator] = 0
 	}
 	*length = lenWithTerminator
 	return C.ADBC_STATUS_OK
@@ -1689,9 +1691,11 @@ func {{.Prefix}}DriverInit(version C.int, rawDriver *C.void, err *C.struct_AdbcE
 
 	switch version {
 	case C.ADBC_VERSION_1_0_0:
-		C.memset(unsafe.Pointer(driver), 0, C.ADBC_DRIVER_1_0_0_SIZE)
+		sink := fromCArr[byte]((*byte)(unsafe.Pointer(driver)), C.ADBC_DRIVER_1_0_0_SIZE)
+		memory.Set(sink, 0)
 	case C.ADBC_VERSION_1_1_0:
-		C.memset(unsafe.Pointer(driver), 0, C.ADBC_DRIVER_1_1_0_SIZE)
+		sink := fromCArr[byte]((*byte)(unsafe.Pointer(driver)), C.ADBC_DRIVER_1_1_0_SIZE)
+		memory.Set(sink, 0)
 	default:
 		setErr(err, "Only version 1.0.0/1.1.0 supported, got %d", int(version))
 		return C.ADBC_STATUS_NOT_IMPLEMENTED

diff --git a/go/adbc/pkg/flightsql/driver.go b/go/adbc/pkg/flightsql/driver.go
diff --git a/go/adbc/pkg/panicdummy/driver.go b/go/adbc/pkg/panicdummy/driver.go
diff --git a/go/adbc/pkg/snowflake/driver.go b/go/adbc/pkg/snowflake/driver.go