chore(ffi): Improve error buffer writing #276
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ong with fields
The FFI interface introducing by this commit has corresponding Go wrapping:
```
func ValidateExpression(atc string, s *Schema) (bool, []string, int64) {
atcC := unsafe.Pointer(C.CString(atc))
defer C.free(atcC)
errLen := C.ulong(1024)
errBuf := [1024]C.uchar{}
expr := C.expression_validate((*C.uchar)(atcC), s.s, &errBuf[0], &errLen)
defer C.expression_validate_free_result(expr)
if expr == nil {
fmt.Println("Error: ", string(errBuf[:errLen]))
return false, nil, 0
}
validate := bool(expr.validate)
operators := int64(expr.operators)
flds := make([]string, expr.fields_total)
flds_slice := unsafe.Slice(expr.fields, expr.fields_total)
for i := range flds {
flds[i] = C.GoString((*C.char)(unsafe.Pointer(flds_slice[i])))
}
return validate, flds, operators
}
```
…Rust
An example go binding for the FFI interface introduced by this commit:
```Go
func ValidateExpression(atc string, s *Schema) (bool, []string, uint64, error) {
atcC := unsafe.Pointer(C.CString(atc))
defer C.free(atcC)
errLen := C.ulong(1024)
errBuf := [1024]C.uchar{}
fieldsLen := C.ulong(1024)
fieldsBuf := [1024]C.uchar{}
fieldsTotal := C.ulong(0)
operatorsC := C.uint64_t(0)
result := C.expression_validate((*C.uchar)(atcC), s.s, &fieldsBuf[0], &fieldsLen, &fieldsTotal, &operatorsC, &errBuf[0], &errLen)
if bool(result) == false {
return false, nil, 0, fmt.Errorf(string(errBuf[:errLen]))
}
operators := uint64(operatorsC)
flds := make([]string, uintptr(fieldsTotal))
p := 0
for i := range flds {
flds[i] = C.GoString((*C.char)(unsafe.Pointer(&fieldsBuf[p])))
p += len(flds[i]) + 1
}
return true, flds, operators, nil
}
```
Co-authored-by: Javier <javier@guerrag.com>
…stead. This commit contains two parts: 1. Moving everything guarded by feature flag `expr_validation` to `ffi.rs`. 2. Remove feature flag `expr_validation`. 3. Remove public interfaces `get_field` and `get_operator` for `Predicate`. No internal logic has been changed.
remove the redundant error message when buffer is too small. remove the ability to fetch fields count and total length without a valid `field_buf`. Must pass a valid `field_buf` if calling for getting fields.
Co-authored-by: Datong Sun <datong.sun@konghq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is meant to be merged after #263.