Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tecbot/gorocksdb into bibby/merge…
Browse files Browse the repository at this point in the history 
…-upstream
  • Loading branch information
@jamesbibby
jamesbibby committed Sep 30, 2019
2 parents 1a753c7 + 65a88f0 commit de48daf
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 61 deletions.
6 changes: 3 additions & 3 deletions backup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func OpenBackupEngine(opts *Options, path string) (*BackupEngine, error) {

be := C.rocksdb_backup_engine_open(opts.c, cpath, &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 &BackupEngine{
Expand All @@ -110,7 +110,7 @@ func (b *BackupEngine) CreateNewBackup(db *DB) error {

C.rocksdb_backup_engine_create_new_backup(b.c, db.c, &cErr)
if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return errors.New(C.GoString(cErr))
}

Expand Down Expand Up @@ -138,7 +138,7 @@ func (b *BackupEngine) RestoreDBFromLatestBackup(dbDir, walDir string, ro *Resto

C.rocksdb_backup_engine_restore_db_from_latest_backup(b.c, cDbDir, cWalDir, ro.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
Expand Down
2 changes: 1 addition & 1 deletion checkpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
72 changes: 36 additions & 36 deletions db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func OpenDb(opts *Options, name string) (*DB, error) {
defer C.free(unsafe.Pointer(cName))
db := C.rocksdb_open(opts.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 &DB{
Expand All @@ -51,7 +51,7 @@ func OpenDbWithTTL(opts *Options, name string, ttl int) (*DB, error) {
defer C.free(unsafe.Pointer(cName))
db := C.rocksdb_open_with_ttl(opts.c, cName, C.int(ttl), &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 &DB{
Expand All @@ -70,7 +70,7 @@ func OpenDbForReadOnly(opts *Options, name string, errorIfLogFileExist bool) (*D
defer C.free(unsafe.Pointer(cName))
db := C.rocksdb_open_for_read_only(opts.c, cName, boolToChar(errorIfLogFileExist), &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 &DB{
Expand Down Expand Up @@ -123,7 +123,7 @@ func OpenDbColumnFamilies(
&cErr,
)
if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return nil, nil, errors.New(C.GoString(cErr))
}

Expand Down Expand Up @@ -185,7 +185,7 @@ func OpenDbForReadOnlyColumnFamilies(
&cErr,
)
if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return nil, nil, errors.New(C.GoString(cErr))
}

Expand All @@ -211,7 +211,7 @@ func ListColumnFamilies(opts *Options, name string) ([]string, error) {
defer C.free(unsafe.Pointer(cName))
cNames := C.rocksdb_list_column_families(opts.c, cName, &cLen, &cErr)
if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return nil, errors.New(C.GoString(cErr))
}
namesLen := int(cLen)
Expand Down Expand Up @@ -246,7 +246,7 @@ func (db *DB) Get(opts *ReadOptions, key []byte) (*Slice, error) {
)
cValue := C.rocksdb_get(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
Expand All @@ -261,13 +261,13 @@ func (db *DB) GetBytes(opts *ReadOptions, key []byte) ([]byte, error) {
)
cValue := C.rocksdb_get(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))
}
if cValue == nil {
return nil, nil
}
defer C.free(unsafe.Pointer(cValue))
defer C.rocksdb_free(unsafe.Pointer(cValue))
return C.GoBytes(unsafe.Pointer(cValue), C.int(cValLen)), nil
}

Expand All @@ -280,7 +280,7 @@ func (db *DB) GetCF(opts *ReadOptions, cf *ColumnFamilyHandle, key []byte) (*Sli
)
cValue := C.rocksdb_get_cf(db.c, opts.c, cf.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
Expand All @@ -294,7 +294,7 @@ func (db *DB) GetPinned(opts *ReadOptions, key []byte) (*PinnableSliceHandle, er
)
cHandle := C.rocksdb_get_pinned(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 nil, errors.New(C.GoString(cErr))
}
return NewNativePinnableSliceHandle(cHandle), nil
Expand Down Expand Up @@ -323,7 +323,7 @@ func (db *DB) MultiGet(opts *ReadOptions, keys ...[]byte) (Slices, error) {

for i, rocksErr := range rocksErrs {
if rocksErr != nil {
defer C.free(unsafe.Pointer(rocksErr))
defer C.rocksdb_free(unsafe.Pointer(rocksErr))
err := fmt.Errorf("getting %q failed: %v", string(keys[i]), C.GoString(rocksErr))
errs = append(errs, err)
}
Expand Down Expand Up @@ -375,7 +375,7 @@ func (db *DB) MultiGetCFMultiCF(opts *ReadOptions, cfs ColumnFamilyHandles, keys

for i, rocksErr := range rocksErrs {
if rocksErr != nil {
defer C.free(unsafe.Pointer(rocksErr))
defer C.rocksdb_free(unsafe.Pointer(rocksErr))
err := fmt.Errorf("getting %q failed: %v", string(keys[i]), C.GoString(rocksErr))
errs = append(errs, err)
}
Expand All @@ -402,7 +402,7 @@ func (db *DB) Put(opts *WriteOptions, key, value []byte) error {
)
C.rocksdb_put(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
Expand All @@ -417,7 +417,7 @@ func (db *DB) PutCF(opts *WriteOptions, cf *ColumnFamilyHandle, key, value []byt
)
C.rocksdb_put_cf(db.c, opts.c, cf.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
Expand All @@ -431,7 +431,7 @@ func (db *DB) Delete(opts *WriteOptions, key []byte) error {
)
C.rocksdb_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
Expand All @@ -445,7 +445,7 @@ func (db *DB) DeleteCF(opts *WriteOptions, cf *ColumnFamilyHandle, key []byte) e
)
C.rocksdb_delete_cf(db.c, opts.c, cf.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
Expand All @@ -460,7 +460,7 @@ func (db *DB) Merge(opts *WriteOptions, key []byte, value []byte) error {
)
C.rocksdb_merge(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
Expand All @@ -476,7 +476,7 @@ func (db *DB) MergeCF(opts *WriteOptions, cf *ColumnFamilyHandle, key []byte, va
)
C.rocksdb_merge_cf(db.c, opts.c, cf.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
Expand All @@ -487,7 +487,7 @@ func (db *DB) Write(opts *WriteOptions, batch *WriteBatch) error {
var cErr *C.char
C.rocksdb_write(db.c, opts.c, batch.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
Expand All @@ -511,7 +511,7 @@ func (db *DB) GetUpdatesSince(seqNumber uint64) (*WalIterator, error) {
var cErr *C.char
cIter := C.rocksdb_get_updates_since(db.c, C.uint64_t(seqNumber), nil, &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 NewNativeWalIterator(unsafe.Pointer(cIter)), nil
Expand All @@ -538,7 +538,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.free(unsafe.Pointer(cValue))
defer C.rocksdb_free(unsafe.Pointer(cValue))
return C.GoString(cValue)
}

Expand All @@ -547,7 +547,7 @@ func (db *DB) GetPropertyCF(propName string, cf *ColumnFamilyHandle) string {
cProp := C.CString(propName)
defer C.free(unsafe.Pointer(cProp))
cValue := C.rocksdb_property_value_cf(db.c, cf.c, cProp)
defer C.free(unsafe.Pointer(cValue))
defer C.rocksdb_free(unsafe.Pointer(cValue))
return C.GoString(cValue)
}

Expand All @@ -560,7 +560,7 @@ func (db *DB) CreateColumnFamily(opts *Options, name string) (*ColumnFamilyHandl
defer C.free(unsafe.Pointer(cName))
cHandle := C.rocksdb_create_column_family(db.c, opts.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 NewNativeColumnFamilyHandle(cHandle), nil
Expand All @@ -571,7 +571,7 @@ func (db *DB) DropColumnFamily(c *ColumnFamilyHandle) error {
var cErr *C.char
C.rocksdb_drop_column_family(db.c, c.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
Expand Down Expand Up @@ -685,7 +685,7 @@ func (db *DB) SetOptions(keys, values []string) error {
&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
Expand Down Expand Up @@ -746,7 +746,7 @@ func (db *DB) Flush(opts *FlushOptions) error {
var cErr *C.char
C.rocksdb_flush(db.c, opts.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
Expand All @@ -757,7 +757,7 @@ func (db *DB) DisableFileDeletions() error {
var cErr *C.char
C.rocksdb_disable_file_deletions(db.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
Expand All @@ -768,7 +768,7 @@ func (db *DB) EnableFileDeletions(force bool) error {
var cErr *C.char
C.rocksdb_enable_file_deletions(db.c, boolToChar(force), &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
Expand Down Expand Up @@ -798,7 +798,7 @@ func (db *DB) DeleteFileInRange(r Range) error {
)

if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return errors.New(C.GoString(cErr))
}
return nil
Expand All @@ -821,7 +821,7 @@ func (db *DB) DeleteFileInRangeCF(cf *ColumnFamilyHandle, r Range) error {
)

if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return errors.New(C.GoString(cErr))
}
return nil
Expand Down Expand Up @@ -850,7 +850,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
Expand Down Expand Up @@ -880,7 +880,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
Expand All @@ -895,7 +895,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))
}

Expand All @@ -917,7 +917,7 @@ func DestroyDb(name string, opts *Options) error {
defer C.free(unsafe.Pointer(cName))
C.rocksdb_destroy_db(opts.c, cName, &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
Expand All @@ -932,7 +932,7 @@ func RepairDb(name string, opts *Options) error {
defer C.free(unsafe.Pointer(cName))
C.rocksdb_repair_db(opts.c, cName, &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
Expand Down
2 changes: 1 addition & 1 deletion iterator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (iter *Iterator) Err() error {
var cErr *C.char
C.rocksdb_iter_get_error(iter.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
Expand Down
2 changes: 1 addition & 1 deletion memory_usage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func GetApproximateMemoryUsageByType(dbs []*DB, caches []*Cache) (*MemoryUsage,
var cErr *C.char
memoryUsage := C.rocksdb_approximate_memory_usage_create(consumers, &cErr)
if cErr != nil {
defer C.free(unsafe.Pointer(cErr))
defer C.rocksdb_free(unsafe.Pointer(cErr))
return nil, errors.New(C.GoString(cErr))
}

Expand Down
4 changes: 2 additions & 2 deletions options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func GetOptionsFromString(base *Options, optStr string) (*Options, error) {
newOpt := NewDefaultOptions()
C.rocksdb_get_options_from_string(base.c, cOptStr, newOpt.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))
}

Expand Down Expand Up @@ -991,7 +991,7 @@ func (opts *Options) SetFIFOCompactionOptions(value *FIFOCompactionOptions) {
// GetStatisticsString returns the statistics as a string.
func (opts *Options) GetStatisticsString() string {
sString := C.rocksdb_options_statistics_get_string(opts.c)
defer C.free(unsafe.Pointer(sString))
defer C.rocksdb_free(unsafe.Pointer(sString))
return C.GoString(sString)
}

Expand Down
Loading

0 comments on commit de48daf

Please sign in to comment.