Merge pull request #65 from TileDB-Inc/an/64-cint-to-cint32

Shelnutt2 · web-flow · commit 9b360decc2f8 · 2019-04-01T16:56:32.000-04:00
converts C.int and C.uint to C.int32_t and C.uint32_t respectively. Closes #64
diff --git a/array.go b/array.go
@@ -259,8 +259,8 @@ func (a *Array) NonEmptyDomain() ([]NonEmptyDomain, bool, error) {
 		return nil, false, err
 	}
 
-	var ret C.int
-	var isEmpty C.int
+	var ret C.int32_t
+	var isEmpty C.int32_t
 	switch domainType {
 
 	case TILEDB_INT8:
@@ -492,7 +492,7 @@ func (a *Array) MaxBufferSize(attributeName string, subarray interface{}) (uint6
 	defer C.free(unsafe.Pointer(cAttributeName))
 
 	var bufferSize C.uint64_t
-	var ret C.int
+	var ret C.int32_t
 	// Switch on domain type to cast subarray to proper type
 	switch domainType {
 	case TILEDB_INT8:
@@ -559,7 +559,7 @@ func (a *Array) MaxBufferSizeVar(attributeName string, subarray interface{}) (ui
 
 	var bufferValSize C.uint64_t
 	var bufferOffSize C.uint64_t
-	var ret C.int
+	var ret C.int32_t
 	// Switch on domain type to cast subarray to proper type
 	switch domainType {
 	case TILEDB_INT8:
diff --git a/array_schema.go b/array_schema.go
@@ -66,7 +66,7 @@ func (a *ArraySchema) AddAttributes(attributes ...*Attribute) error {
 
 // AttributeNum returns the number of attributes
 func (a *ArraySchema) AttributeNum() (uint, error) {
-	var attrNum C.uint
+	var attrNum C.uint32_t
 	ret := C.tiledb_array_schema_get_attribute_num(a.context.tiledbContext, a.tiledbArraySchema, &attrNum)
 	if ret != C.TILEDB_OK {
 		return 0, fmt.Errorf("Error getting attribute number for tiledb arraySchema: %s", a.context.LastError())
@@ -77,7 +77,11 @@ func (a *ArraySchema) AttributeNum() (uint, error) {
 // AttributeFromIndex get a copy of an Attribute in the schema by name.
 func (a *ArraySchema) AttributeFromIndex(index uint) (*Attribute, error) {
 	attr := Attribute{context: a.context}
-	ret := C.tiledb_array_schema_get_attribute_from_index(a.context.tiledbContext, a.tiledbArraySchema, C.uint(index), &attr.tiledbAttribute)
+	ret := C.tiledb_array_schema_get_attribute_from_index(
+		a.context.tiledbContext,
+		a.tiledbArraySchema,
+		C.uint32_t(index),
+		&attr.tiledbAttribute)
 	if ret != C.TILEDB_OK {
 		return nil, fmt.Errorf("Error getting attribute %d for tiledb arraySchema: %s", index, a.context.LastError())
 	}
diff --git a/attribute.go b/attribute.go
@@ -79,7 +79,8 @@ func (a *Attribute) FilterList() (*FilterList, error) {
 // This is inferred from the type parameter of the NewAttribute
 // function, but can also be set manually.
 func (a *Attribute) SetCellValNum(val uint) error {
-	ret := C.tiledb_attribute_set_cell_val_num(a.context.tiledbContext, a.tiledbAttribute, C.uint(val))
+	ret := C.tiledb_attribute_set_cell_val_num(a.context.tiledbContext,
+		a.tiledbAttribute, C.uint32_t(val))
 	if ret != C.TILEDB_OK {
 		return fmt.Errorf("Error setting tiledb attribute cell val num: %s", a.context.LastError())
 	}
@@ -89,7 +90,7 @@ func (a *Attribute) SetCellValNum(val uint) error {
 // CellValNum returns number of values of one cell on this attribute.
 // For variable-sized attributes returns TILEDB_VAR_NUM.
 func (a *Attribute) CellValNum() (uint, error) {
-	var cellValNum C.uint
+	var cellValNum C.uint32_t
 	ret := C.tiledb_attribute_get_cell_val_num(a.context.tiledbContext, a.tiledbAttribute, &cellValNum)
 	if ret != C.TILEDB_OK {
 		return 0, fmt.Errorf("Error getting tiledb attribute cell val num: %s", a.context.LastError())
diff --git a/context.go b/context.go
@@ -86,7 +86,7 @@ func (c *Context) LastError() error {
 
 // IsSupportedFS Return true if the given filesystem backend is supported.
 func (c *Context) IsSupportedFS(fs FS) (bool, error) {
-	var isSupported C.int
+	var isSupported C.int32_t
 	ret := C.tiledb_ctx_is_supported_fs(c.tiledbContext, C.tiledb_filesystem_t(fs), &isSupported)
 
 	if ret != C.TILEDB_OK {
diff --git a/dimension.go b/dimension.go
@@ -47,7 +47,7 @@ func NewDimension(context *Context, name string, domain interface{}, extent inte
 	}
 
 	var datatype Datatype
-	var ret C.int
+	var ret C.int32_t
 	// Convert domain to type then to void*
 	var cdomain unsafe.Pointer
 	// Convert extent to type then to void*
@@ -216,7 +216,7 @@ func (d *Dimension) Domain() (interface{}, error) {
 		return nil, err
 	}
 
-	var ret C.int
+	var ret C.int32_t
 	var domain interface{}
 	switch datatype {
 	case TILEDB_INT8:
@@ -336,7 +336,7 @@ func (d *Dimension) Extent() (interface{}, error) {
 		return nil, err
 	}
 
-	var ret C.int
+	var ret C.int32_t
 	var extent interface{}
 	switch datatype {
 	case TILEDB_INT8:
diff --git a/domain.go b/domain.go
@@ -59,7 +59,7 @@ func (d *Domain) Type() (Datatype, error) {
 
 // NDim returns the number of dimensions
 func (d *Domain) NDim() (uint, error) {
-	var ndim C.uint
+	var ndim C.uint32_t
 	ret := C.tiledb_domain_get_ndim(d.context.tiledbContext, d.tiledbDomain, &ndim)
 	if ret != C.TILEDB_OK {
 		return 0, fmt.Errorf("Error getting tiledb domain number of dimensions: %s", d.context.LastError())
@@ -70,7 +70,8 @@ func (d *Domain) NDim() (uint, error) {
 // DimensionFromIndex retrieves a dimension object from a domain by index.
 func (d *Domain) DimensionFromIndex(index uint) (*Dimension, error) {
 	var dim *C.tiledb_dimension_t
-	ret := C.tiledb_domain_get_dimension_from_index(d.context.tiledbContext, d.tiledbDomain, C.uint(index), &dim)
+	ret := C.tiledb_domain_get_dimension_from_index(d.context.tiledbContext,
+		d.tiledbDomain, C.uint32_t(index), &dim)
 	if ret != C.TILEDB_OK {
 		return nil, fmt.Errorf("Error getting tiledb dimension by index for domain: %s", d.context.LastError())
 	}
diff --git a/kv.go b/kv.go
@@ -101,7 +101,11 @@ setting, where machines need to operate on the same view of the k.
 func (k *KV) OpenAtWithKey(queryType QueryType, encryptionType EncryptionType, key string, timestamp uint64) error {
 	ckey := unsafe.Pointer(C.CString(key))
 	defer C.free(ckey)
-	ret := C.tiledb_kv_open_at_with_key(k.context.tiledbContext, k.tiledbKV, C.tiledb_query_type_t(queryType), C.tiledb_encryption_type_t(encryptionType), ckey, C.uint32_t(len(key)), C.uint64_t(timestamp))
+	ret := C.tiledb_kv_open_at_with_key(k.context.tiledbContext, k.tiledbKV,
+		C.tiledb_query_type_t(queryType),
+		C.tiledb_encryption_type_t(encryptionType),
+		ckey, C.uint32_t(len(key)),
+		C.uint64_t(timestamp))
 	if ret != C.TILEDB_OK {
 		return fmt.Errorf("Error opening tiledb kv with key at %d for querying: %s", timestamp, k.context.LastError())
 	}
diff --git a/kv_item.go b/kv_item.go
@@ -307,7 +307,7 @@ func (k *KVItem) Key() (interface{}, error) {
 		}
 	case TILEDB_CHAR:
 		elements := int(keySize) / C.sizeof_char
-		return C.GoStringN((*C.char)(cKey), C.int(elements)), nil
+		return C.GoStringN((*C.char)(cKey), C.int32_t(elements)), nil
 
 	default:
 		return nil, fmt.Errorf("Unsupported tiledb key type: %v", keyType)
@@ -573,7 +573,7 @@ func (k *KVItem) Value(attribute string) (interface{}, error) {
 		return float64(*(*C.double)(cValue)), nil
 	case TILEDB_CHAR:
 		elements := int(valueSize) / C.sizeof_char
-		return C.GoStringN((*C.char)(cValue), C.int(elements)), nil
+		return C.GoStringN((*C.char)(cValue), C.int32_t(elements)), nil
 	default:
 		return nil, fmt.Errorf("Unsupported tiledb value type: %v", valueType)
 	}
diff --git a/kv_schema.go b/kv_schema.go
@@ -66,7 +66,7 @@ func (k *KVSchema) AddAttributes(attributes ...*Attribute) error {
 
 // AttributeNum returns the number of attributes
 func (k *KVSchema) AttributeNum() (uint, error) {
-	var attrNum C.uint
+	var attrNum C.uint32_t
 	ret := C.tiledb_kv_schema_get_attribute_num(k.context.tiledbContext, k.tiledbKVSchema, &attrNum)
 	if ret != C.TILEDB_OK {
 		return 0, fmt.Errorf("Error getting attribute number for tiledb KVSchema: %s", k.context.LastError())
@@ -77,7 +77,10 @@ func (k *KVSchema) AttributeNum() (uint, error) {
 // AttributeFromIndex get a copy of an Attribute in the schema by name.
 func (k *KVSchema) AttributeFromIndex(index uint) (*Attribute, error) {
 	attr := Attribute{context: k.context}
-	ret := C.tiledb_kv_schema_get_attribute_from_index(k.context.tiledbContext, k.tiledbKVSchema, C.uint(index), &attr.tiledbAttribute)
+	ret := C.tiledb_kv_schema_get_attribute_from_index(k.context.tiledbContext,
+		k.tiledbKVSchema,
+		C.uint32_t(index),
+		&attr.tiledbAttribute)
 	if ret != C.TILEDB_OK {
 		return nil, fmt.Errorf("Error getting attribute %d for tiledb KVSchema: %s", index, k.context.LastError())
 	}
diff --git a/query.go b/query.go
@@ -393,7 +393,7 @@ func (q *Query) Buffer(attributeName string) (interface{}, error) {
 	cattributeName := C.CString(attributeName)
 	defer C.free(unsafe.Pointer(cattributeName))
 
-	var ret C.int
+	var ret C.int32_t
 	var cbufferSize *C.uint64_t
 	var cbuffer unsafe.Pointer
 	var buffer interface{}
@@ -794,7 +794,7 @@ func (q *Query) BufferVar(attributeName string) ([]uint64, interface{}, error) {
 	cattributeName := C.CString(attributeName)
 	defer C.free(unsafe.Pointer(cattributeName))
 
-	var ret C.int
+	var ret C.int32_t
 	var cbufferSize *C.uint64_t
 	var cbuffer unsafe.Pointer
 	var buffer interface{}
@@ -1037,7 +1037,7 @@ func (q *Query) Type() (QueryType, error) {
 // HasResults Returns true if the query has results
 // Applicable only to read queries (it returns false for write queries)
 func (q *Query) HasResults() (bool, error) {
-	var hasResults C.int
+	var hasResults C.int32_t
 	ret := C.tiledb_query_has_results(q.context.tiledbContext, q.tiledbQuery, &hasResults)
 	if ret != C.TILEDB_OK {
 		return false, fmt.Errorf("Error checking if query has results: %s", q.context.LastError())
diff --git a/version.go b/version.go
@@ -10,9 +10,9 @@ import "C"
 // Version returns the TileDB shared library version these bindings are linked
 // against at runtime
 func Version() (major int, minor int, rev int) {
-	var cmajor C.int = -1
-	var cminor C.int = -1
-	var crev C.int = -1
+	var cmajor C.int32_t = -1
+	var cminor C.int32_t = -1
+	var crev C.int32_t = -1
 	C.tiledb_version(&cmajor, &cminor, &crev)
 
 	return int(cmajor), int(cminor), int(crev)
diff --git a/vfs.go b/vfs.go
@@ -30,7 +30,7 @@ func (v *VFSfh) Free() {
 // IsClosed checks a vfs file handler to see if it is closed. Return true if
 // file handler is closed, false if its not closed and error is non-nil on error
 func (v *VFSfh) IsClosed() (bool, error) {
-	var isClosed C.int
+	var isClosed C.int32_t
 
 	ret := C.tiledb_vfs_fh_is_closed(v.context.tiledbContext, v.tiledbVFSfh, &isClosed)
 
@@ -141,7 +141,7 @@ func (v *VFS) EmptyBucket(uri string) error {
 func (v *VFS) IsEmptyBucket(uri string) (bool, error) {
 	curi := C.CString(uri)
 	defer C.free(unsafe.Pointer(curi))
-	var isEmpty C.int
+	var isEmpty C.int32_t
 	ret := C.tiledb_vfs_is_empty_bucket(v.context.tiledbContext, v.tiledbVFS, curi, &isEmpty)
 
 	if ret != C.TILEDB_OK {
@@ -159,7 +159,7 @@ func (v *VFS) IsEmptyBucket(uri string) (bool, error) {
 func (v *VFS) IsBucket(uri string) (bool, error) {
 	curi := C.CString(uri)
 	defer C.free(unsafe.Pointer(curi))
-	var isBucket C.int
+	var isBucket C.int32_t
 	ret := C.tiledb_vfs_is_bucket(v.context.tiledbContext, v.tiledbVFS, curi, &isBucket)
 
 	if ret != C.TILEDB_OK {
@@ -190,7 +190,7 @@ func (v *VFS) CreateDir(uri string) error {
 func (v *VFS) IsDir(uri string) (bool, error) {
 	curi := C.CString(uri)
 	defer C.free(unsafe.Pointer(curi))
-	var isDir C.int
+	var isDir C.int32_t
 	ret := C.tiledb_vfs_is_dir(v.context.tiledbContext, v.tiledbVFS, curi, &isDir)
 
 	if ret != C.TILEDB_OK {
@@ -221,7 +221,7 @@ func (v *VFS) RemoveDir(uri string) error {
 func (v *VFS) IsFile(uri string) (bool, error) {
 	curi := C.CString(uri)
 	defer C.free(unsafe.Pointer(curi))
-	var isFile C.int
+	var isFile C.int32_t
 	ret := C.tiledb_vfs_is_file(v.context.tiledbContext, v.tiledbVFS, curi, &isFile)
 
 	if ret != C.TILEDB_OK {
@@ -340,7 +340,7 @@ func (v *VFS) Read(fh *VFSfh, offset uint64, nbytes uint64) ([]byte, error) {
 		return []byte{}, fmt.Errorf("Unknown error in VFS.Read: %s", v.context.LastError())
 	}
 
-	bytes = C.GoBytes(cbuffer, C.int(nbytes))
+	bytes = C.GoBytes(cbuffer, C.int32_t(nbytes))
 
 	return bytes, nil
 }
