Skip to content

library update 8.0.60 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OutOfBedlam merged 2 commits into from
Jan 18, 2026
Merged

library update 8.0.60 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d193a9b
library update 8.0.60
jaden-lee7 Jan 18, 2026
f2f4835
clear pointer locality
OutOfBedlam Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 36 additions & 11 deletions mach_native.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ func LinkInfo() string {
func EngInitialize(homeDir string, machPort int, flag int, envHandle *unsafe.Pointer) error {
cstr := C.CString(homeDir)
defer C.free(unsafe.Pointer(cstr))
if rt := C.MachInitialize(cstr, C.int(machPort), C.int(flag), envHandle); rt == 0 {
var tmpHandle unsafe.Pointer
if rt := C.MachInitialize(cstr, C.int(machPort), C.int(flag), &tmpHandle); rt == 0 {
*envHandle = tmpHandle
return nil
} else {
return ErrDatabaseReturns("MachInitialize", int(rt))
Expand Down Expand Up @@ -142,7 +144,9 @@ func EngConnect(envHandle unsafe.Pointer, username string, password string, conn
C.free(unsafe.Pointer(cusername))
C.free(unsafe.Pointer(cpassword))
}()
if rt := C.MachConnect(envHandle, cusername, cpassword, conn); rt == 0 {
var tmpConn unsafe.Pointer
if rt := C.MachConnect(envHandle, cusername, cpassword, &tmpConn); rt == 0 {
*conn = tmpConn
return nil
} else {
dbErr := EngError(envHandle)
Expand All @@ -160,7 +164,9 @@ func EngConnectTrust(envHandle unsafe.Pointer, username string, conn *unsafe.Poi
defer func() {
C.free(unsafe.Pointer(cusername))
}()
if rt := C.MachConnectNoAuth(envHandle, cusername, conn); rt == 0 {
var tmpConn unsafe.Pointer
if rt := C.MachConnectNoAuth(envHandle, cusername, &tmpConn); rt == 0 {
*conn = tmpConn
return nil
} else {
dbErr := EngError(envHandle)
Expand Down Expand Up @@ -426,6 +432,10 @@ func EngBindString(stmt unsafe.Pointer, idx int, val string) error {
}

func EngBindBinary(stmt unsafe.Pointer, idx int, data []byte) error {
if len(data) == 0 {
// For empty slice, bind as empty binary
data = []byte{0}
}
ptr := unsafe.Pointer(&data[0])
if rt := C.MachBindBinary(stmt, C.int(idx), ptr, C.int(len(data))); rt != 0 {
stmtErr := EngError(stmt)
Expand Down Expand Up @@ -1095,9 +1105,11 @@ func (ab *AppendBuffer) Append(vals ...any) error {
}

func CliInitialize(env *unsafe.Pointer) error {
if rt := C.MachCLIInitialize(env); rt != 0 {
var tmpEnv unsafe.Pointer
if rt := C.MachCLIInitialize(&tmpEnv); rt != 0 {
return ErrDatabaseReturns("MachCLIInitialize", int(rt))
}
*env = tmpEnv
native.InitSignalHandler()
return nil
}
Expand All @@ -1113,9 +1125,11 @@ func CliFinalize(env unsafe.Pointer) error {
func CliConnect(env unsafe.Pointer, connStr string, conn *unsafe.Pointer) error {
cstr := C.CString(connStr)
defer C.free(unsafe.Pointer(cstr))
if rt := C.MachCLIConnect(env, cstr, conn); rt != 0 {
var tmpConn unsafe.Pointer
if rt := C.MachCLIConnect(env, cstr, &tmpConn); rt != 0 {
return CliErrorCaller(env, MACHCLI_HANDLE_ENV, "MachCLIConnect")
}
*conn = tmpConn
return nil
}

Expand Down Expand Up @@ -1156,9 +1170,11 @@ func CliErrorCaller(handle unsafe.Pointer, handleType HandleType, fn string) err
}

func CliAllocStmt(conn unsafe.Pointer, stmt *unsafe.Pointer) error {
if rt := C.MachCLIAllocStmt(conn, stmt); rt != 0 {
var tmpStmt unsafe.Pointer
if rt := C.MachCLIAllocStmt(conn, &tmpStmt); rt != 0 {
return CliErrorCaller(conn, MACHCLI_HANDLE_DBC, "MachCLIAllocStmt()")
}
*stmt = tmpStmt
return nil
}

Expand Down Expand Up @@ -1357,6 +1373,15 @@ func CliAppendData(stmt unsafe.Pointer, types []SqlType, names []string, args []
if len(types) == 0 || len(types) != len(args) || len(types) != len(names) {
return ErrDatabaseAppendWrongValueCount(len(types), len(args))
}

// Track allocated C strings to free them after MachCLIAppendData call
var allocatedCStrings []unsafe.Pointer
defer func() {
for _, ptr := range allocatedCStrings {
C.free(ptr)
}
}()

withArrivalTime := (strings.EqualFold(names[0], "_arrival_time") && types[0] == MACHCLI_SQL_TYPE_DATETIME)
var arrivalTime int64
if withArrivalTime {
Expand Down Expand Up @@ -1505,7 +1530,7 @@ func CliAppendData(stmt unsafe.Pointer, types []SqlType, names []string, args []
(*C.MachCLIAppendIPStruct)(unsafe.Pointer(&data[i])).mLength = C.uchar(4)
case string:
cstr := C.CString(value)
defer C.free(unsafe.Pointer(cstr))
allocatedCStrings = append(allocatedCStrings, unsafe.Pointer(cstr))
(*C.MachCLIAppendIPStruct)(unsafe.Pointer(&data[i])).mAddrString = cstr
(*C.MachCLIAppendIPStruct)(unsafe.Pointer(&data[i])).mLength = C.uchar(255)
}
Expand All @@ -1522,7 +1547,7 @@ func CliAppendData(stmt unsafe.Pointer, types []SqlType, names []string, args []
(*C.MachCLIAppendIPStruct)(unsafe.Pointer(&data[i])).mLength = C.uchar(6)
case string:
cstr := C.CString(value)
defer C.free(unsafe.Pointer(cstr))
allocatedCStrings = append(allocatedCStrings, unsafe.Pointer(cstr))
(*C.MachCLIAppendIPStruct)(unsafe.Pointer(&data[i])).mAddrString = cstr
(*C.MachCLIAppendIPStruct)(unsafe.Pointer(&data[i])).mLength = C.uchar(255)
}
Expand All @@ -1534,7 +1559,7 @@ func CliAppendData(stmt unsafe.Pointer, types []SqlType, names []string, args []
switch value := args[i].(type) {
case string:
cstr := C.CString(value)
defer C.free(unsafe.Pointer(cstr))
allocatedCStrings = append(allocatedCStrings, unsafe.Pointer(cstr))
(*C.MachCLIAppendVarStruct)(unsafe.Pointer(&data[i])).mLength = C.uint(C.strlen(cstr))
(*C.MachCLIAppendVarStruct)(unsafe.Pointer(&data[i])).mData = unsafe.Pointer(cstr)
default:
Expand All @@ -1548,7 +1573,7 @@ func CliAppendData(stmt unsafe.Pointer, types []SqlType, names []string, args []
switch value := args[i].(type) {
case string:
cstr := C.CString(value)
defer C.free(unsafe.Pointer(cstr))
allocatedCStrings = append(allocatedCStrings, unsafe.Pointer(cstr))
(*C.MachCLIAppendVarStruct)(unsafe.Pointer(&data[i])).mLength = C.uint(C.strlen(cstr))
(*C.MachCLIAppendVarStruct)(unsafe.Pointer(&data[i])).mData = unsafe.Pointer(cstr)
case []byte:
Expand Down Expand Up @@ -1599,7 +1624,7 @@ func CliAppendFlush(stmt unsafe.Pointer) error {

type CLIAppendErrorCallback func(stmt unsafe.Pointer, errCode int, errMsg string, buf []byte)

var cliAppendErrorCallbacks map[string]CLIAppendErrorCallback
var cliAppendErrorCallbacks = make(map[string]CLIAppendErrorCallback)

//export CliDefaultAppendErrorCallback
func CliDefaultAppendErrorCallback(stmt unsafe.Pointer, errCode C.int, errMsg *C.char, errMsgLen C.long, rowBuf *C.char, rowBufLen C.long) {
Expand Down
Binary file modified native/libmachengine_standard_darwin_amd64.a
View file
Open in desktop
Binary file not shown.
Binary file modified native/libmachengine_standard_darwin_arm64.a
View file
Open in desktop
Binary file not shown.
Binary file modified native/libmachengine_standard_linux_amd64.a
View file
Open in desktop
Binary file not shown.
Binary file modified native/libmachengine_standard_linux_arm32.a
View file
Open in desktop
Binary file not shown.
Binary file modified native/libmachengine_standard_linux_arm64.a
View file
Open in desktop
Binary file not shown.
Binary file modified native/libmachengine_standard_windows_amd64.a
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions native/native.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package native

var GitHash = "ecec245"
var Version = "8.0.59"
var GitHash = "31e600b"
var Version = "8.0.60"