Rocksdb update

.gitignore

@@ -1 +1,2 @@
+/.rocksdb-repo
 .idea

.travis.yml

@@ -1,8 +1,7 @@
-dist: xenial
 language: go
 go:
-  - 1.12.x
-  - 1.13.x
+  - '1.10'
+  - 1.11
   - tip
 
 before_install:
@@ -17,8 +16,9 @@ before_install:
   - sudo dpkg -i libgflags-dev_2.0-1.1ubuntu1_amd64.deb
 
 install:
-  - git clone https://github.com/facebook/rocksdb.git /tmp/rocksdb
+  - git clone https://github.com/GetStream/rocksdb.git /tmp/rocksdb
   - pushd /tmp/rocksdb
+  - git checkout add-lower-priority-c-bindings
   - make clean
   - make shared_lib -j`nproc`
   - sudo cp --preserve=links ./librocksdb.* /usr/lib/
@@ -27,7 +27,7 @@ install:
   - go get -t ./...
 
 script:
-  - go test -v ./
+  - GODEBUG=cgocheck=2 go test -v ./
 
 notifications:
   email:

Makefile

@@ -0,0 +1,7 @@
+.PHONY: docker-clean
+docker-clean:
+	@docker compose down -v --remove-orphans
+
+.PHONY: docker-test
+docker-test:
+	@docker compose build test && docker compose run --rm -e GODEBUG=cgocheck=2 test go test -race=1 -v ./...

backup.go

@@ -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.rocksdb_free(unsafe.Pointer(cErr))
+		defer C.free(unsafe.Pointer(cErr))
 		return nil, errors.New(C.GoString(cErr))
 	}
 	return &BackupEngine{
@@ -104,25 +104,19 @@ func (b *BackupEngine) UnsafeGetBackupEngine() unsafe.Pointer {
 	return unsafe.Pointer(b.c)
 }
 
-// CreateNewBackupFlush takes a new backup from db. If flush is set to true,
-// it flushes the WAL before taking the backup.
-func (b *BackupEngine) CreateNewBackupFlush(db *DB, flush bool) error {
+// CreateNewBackup takes a new backup from db.
+func (b *BackupEngine) CreateNewBackup(db *DB) error {
 	var cErr *C.char
 
-	C.rocksdb_backup_engine_create_new_backup_flush(b.c, db.c, boolToChar(flush), &cErr)
+	C.rocksdb_backup_engine_create_new_backup(b.c, db.c, &cErr)
 	if cErr != nil {
-		defer C.rocksdb_free(unsafe.Pointer(cErr))
+		defer C.free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 
 	return nil
 }
 
-// CreateNewBackup takes a new backup from db.
-func (b *BackupEngine) CreateNewBackup(db *DB) error {
-	return b.CreateNewBackupFlush(db, false)
-}
-
 // GetInfo gets an object that gives information about
 // the backups that have already been taken
 func (b *BackupEngine) GetInfo() *BackupEngineInfo {
@@ -144,18 +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.rocksdb_free(unsafe.Pointer(cErr))
-		return errors.New(C.GoString(cErr))
-	}
-	return nil
-}
-
-// PurgeOldBackups deletes all backups older than the latest 'n' backups
-func (b *BackupEngine) PurgeOldBackups(n uint32) error {
-	var cErr *C.char
-	C.rocksdb_backup_engine_purge_old_backups(b.c, C.uint32_t(n), &cErr)
-	if cErr != nil {
-		defer C.rocksdb_free(unsafe.Pointer(cErr))
+		defer C.free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil

cache.go

@@ -9,7 +9,7 @@ type Cache struct {
 }
 
 // NewLRUCache creates a new LRU Cache object with the capacity given.
-func NewLRUCache(capacity uint64) *Cache {
+func NewLRUCache(capacity int) *Cache {
 	return NewNativeCache(C.rocksdb_cache_create_lru(C.size_t(capacity)))
 }
 
@@ -19,13 +19,13 @@ func NewNativeCache(c *C.rocksdb_cache_t) *Cache {
 }
 
 // GetUsage returns the Cache memory usage.
-func (c *Cache) GetUsage() uint64 {
-	return uint64(C.rocksdb_cache_get_usage(c.c))
+func (c *Cache) GetUsage() int {
+	return int(C.rocksdb_cache_get_usage(c.c))
 }
 
 // GetPinnedUsage returns the Cache pinned memory usage.
-func (c *Cache) GetPinnedUsage() uint64 {
-	return uint64(C.rocksdb_cache_get_pinned_usage(c.c))
+func (c *Cache) GetPinnedUsage() int {
+	return int(C.rocksdb_cache_get_pinned_usage(c.c))
 }
 
 // Destroy deallocates the Cache object.

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.rocksdb_free(unsafe.Pointer(cErr))
+		defer C.free(unsafe.Pointer(cErr))
 		return errors.New(C.GoString(cErr))
 	}
 	return nil

checkpoint_test.go

@@ -1,11 +1,10 @@
 package gorocksdb
 
 import (
+	"github.com/facebookgo/ensure"
 	"io/ioutil"
 	"os"
 	"testing"
-
-	"github.com/facebookgo/ensure"
 )
 
 func TestCheckpoint(t *testing.T) {

compaction_filter_test.go

@@ -11,9 +11,12 @@ func TestCompactionFilter(t *testing.T) {
 	var (
 		changeKey    = []byte("change")
 		changeValOld = []byte("old")
-		changeValNew = []byte("new")
+		changeValNew = cBackedBytes([]byte("new"))
 		deleteKey    = []byte("delete")
 	)
+
+	defer freeCBackedBytes(changeValNew)
+
 	db := newTestDB(t, "TestCompactionFilter", func(opts *Options) {
 		opts.SetCompactionFilter(&mockCompactionFilter{
 			filter: func(level int, key, val []byte) (remove bool, newVal []byte) {