use rocksdb_free for release

tecbot · Nov 23, 2017 · eff08f0 · eff08f0
1 parent 533a9e9
commit eff08f0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/checkpoint.go b/checkpoint.go
@@ -43,7 +43,7 @@ func (checkpoint *Checkpoint) CreateCheckpoint(checkpoint_dir string, log_size_f
 
 	C.rocksdb_checkpoint_create(checkpoint.c, cDir, C.uint64_t(log_size_for_flush), &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil

diff --git a/db.go b/db.go
@@ -244,7 +244,7 @@ func (db *DB) GetBytes(opts *ReadOptions, key []byte) ([]byte, error) {
 	if cValue == nil {
 		return nil, nil
 	}
-	defer C.rocksdb_free(unsafe.Pointer(cValue))
+	defer C.free(unsafe.Pointer(cValue))
 	return C.GoBytes(unsafe.Pointer(cValue), C.int(cValLen)), nil
 }
 
@@ -394,7 +394,7 @@ func (db *DB) GetProperty(propName string) string {
 	cprop := C.CString(propName)
 	defer C.free(unsafe.Pointer(cprop))
 	cValue := C.rocksdb_property_value(db.c, cprop)
-	defer C.rocksdb_free(unsafe.Pointer(cValue))
+	defer C.free(unsafe.Pointer(cValue))
 	return C.GoString(cValue)
 }
 
@@ -617,7 +617,7 @@ func (db *DB) IngestExternalFile(filePaths []string, opts *IngestExternalFileOpt
 	)
 
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -647,7 +647,7 @@ func (db *DB) IngestExternalFileCF(handle *ColumnFamilyHandle, filePaths []strin
 	)
 
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -662,7 +662,7 @@ func (db *DB) NewCheckpoint() (*Checkpoint, error) {
 		db.c, &cErr,
 	)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return nil, errors.New(C.GoString(cErr))
 	}
 

diff --git a/dynflag.go b/dynflag.go
@@ -1,4 +1,4 @@
 package gorocksdb
 
-// #cgo LDFLAGS: -lrocksdb_je
+// #cgo LDFLAGS: -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy
 import "C"
diff --git a/options.go b/options.go
@@ -564,7 +564,7 @@ func (opts *Options) SetUseFsync(value bool) {
 // Default: empty
 func (opts *Options) SetDbLogDir(value string) {
 	cvalue := C.CString(value)
-	defer C.rocksdb_free(unsafe.Pointer(cvalue))
+	defer C.free(unsafe.Pointer(cvalue))
 	C.rocksdb_options_set_db_log_dir(opts.c, cvalue)
 }
 
@@ -576,7 +576,7 @@ func (opts *Options) SetDbLogDir(value string) {
 // Default: empty
 func (opts *Options) SetWalDir(value string) {
 	cvalue := C.CString(value)
-	defer C.rocksdb_free(unsafe.Pointer(cvalue))
+	defer C.free(unsafe.Pointer(cvalue))
 	C.rocksdb_options_set_wal_dir(opts.c, cvalue)
 }
 

diff --git a/slice.go b/slice.go
@@ -1,7 +1,6 @@
 package gorocksdb
 
 // #include <stdlib.h>
-// #include "rocksdb/c.h"
 import "C"
 import "unsafe"
 
@@ -37,7 +36,7 @@ func (s *Slice) Size() int {
 // Free frees the slice data.
 func (s *Slice) Free() {
 	if !s.freed {
-		C.rocksdb_free(unsafe.Pointer(s.data))
+		C.free(unsafe.Pointer(s.data))
 		s.freed = true
 	}
 }
diff --git a/sst_file_writer.go b/sst_file_writer.go
@@ -30,7 +30,7 @@ func (w *SSTFileWriter) Open(path string) error {
 	defer C.free(unsafe.Pointer(cPath))
 	C.rocksdb_sstfilewriter_open(w.c, cPath, &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -44,7 +44,7 @@ func (w *SSTFileWriter) Add(key, value []byte) error {
 	var cErr *C.char
 	C.rocksdb_sstfilewriter_add(w.c, cKey, C.size_t(len(key)), cValue, C.size_t(len(value)), &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -55,7 +55,7 @@ func (w *SSTFileWriter) Finish() error {
 	var cErr *C.char
 	C.rocksdb_sstfilewriter_finish(w.c, &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil

diff --git a/transaction.go b/transaction.go
@@ -26,7 +26,7 @@ func (transaction *Transaction) Commit() error {
 	)
 	C.rocksdb_transaction_commit(transaction.c, &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -40,7 +40,7 @@ func (transaction *Transaction) Rollback() error {
 	C.rocksdb_transaction_rollback(transaction.c, &cErr)
 
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -57,7 +57,7 @@ func (transaction *Transaction) Get(opts *ReadOptions, key []byte) (*Slice, erro
 		transaction.c, opts.c, cKey, C.size_t(len(key)), &cValLen, &cErr,
 	)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return nil, errors.New(C.GoString(cErr))
 	}
 	return NewSlice(cValue, cValLen), nil
@@ -74,7 +74,7 @@ func (transaction *Transaction) Put(key, value []byte) error {
 		transaction.c, cKey, C.size_t(len(key)), cValue, C.size_t(len(value)), &cErr,
 	)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -88,7 +88,7 @@ func (transaction *Transaction) Delete(key []byte) error {
 	)
 	C.rocksdb_transaction_delete(transaction.c, cKey, C.size_t(len(key)), &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil

diff --git a/transactiondb.go b/transactiondb.go
@@ -30,7 +30,7 @@ func OpenTransactionDb(
 	db := C.rocksdb_transactiondb_open(
 		opts.c, transactionDBOpts.c, cName, &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return nil, errors.New(C.GoString(cErr))
 	}
 	return &TransactionDB{
@@ -83,7 +83,7 @@ func (db *TransactionDB) Get(opts *ReadOptions, key []byte) (*Slice, error) {
 		db.c, opts.c, cKey, C.size_t(len(key)), &cValLen, &cErr,
 	)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return nil, errors.New(C.GoString(cErr))
 	}
 	return NewSlice(cValue, cValLen), nil
@@ -100,7 +100,7 @@ func (db *TransactionDB) Put(opts *WriteOptions, key, value []byte) error {
 		db.c, opts.c, cKey, C.size_t(len(key)), cValue, C.size_t(len(value)), &cErr,
 	)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -114,7 +114,7 @@ func (db *TransactionDB) Delete(opts *WriteOptions, key []byte) error {
 	)
 	C.rocksdb_transactiondb_delete(db.c, opts.c, cKey, C.size_t(len(key)), &cErr)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil
@@ -129,7 +129,7 @@ func (db *TransactionDB) NewCheckpoint() (*Checkpoint, error) {
 		db.c, &cErr,
 	)
 	if cErr != nil {
-		defer C.free(unsafe.Pointer(cErr))
+		defer C.rocksdb_free(unsafe.Pointer(cErr))
 		return nil, errors.New(C.GoString(cErr))
 	}