baabeetaa#2 (#3)

pebble.go

@@ -69,48 +69,15 @@ type PebbleDB struct {
 
 var _ DB = (*PebbleDB)(nil)
 
-func NewPebbleDB(name string, dir string) (DB, error) {
-	dbPath := filepath.Join(dir, name+".db")
-	//	cache := pebble.NewCache(1024 * 1024 * 32)
-	//	defer cache.Unref()
-	opts := &pebble.Options{
-		//		Cache:                       cache,
-		//		FormatMajorVersion:          pebble.FormatNewest,
-		//		L0CompactionThreshold:       2,
-		//		L0StopWritesThreshold:       1000,
-		//		LBaseMaxBytes:               64 << 20, // 64 MB
-		//		Levels:                      make([]pebble.LevelOptions, 7),
-		//		MaxConcurrentCompactions:    3,
-		//		MaxOpenFiles:                1024,
-		//		MemTableSize:                64 << 20,
-		//		MemTableStopWritesThreshold: 4,
-	}
-	/*
-		for i := 0; i < len(opts.Levels); i++ {
-			l := &opts.Levels[i]
-			l.BlockSize = 32 << 10       // 32 KB
-			l.IndexBlockSize = 256 << 10 // 256 KB
-			l.FilterPolicy = bloom.FilterPolicy(10)
-			l.FilterType = pebble.TableFilter
-			if i > 0 {
-				l.TargetFileSize = opts.Levels[i-1].TargetFileSize * 2
-			}
-			l.EnsureDefaults()
-		}
-	*/
-	//	opts.Levels[6].FilterPolicy = nil
-	//	opts.FlushSplitBytes = opts.Levels[0].TargetFileSize
-
-	//for i := 0; i < len(opts.Levels); i++ {
-	//	l := &opts.Levels[i]
-	//	l.Compression = pebble.NoCompression
-	//	l.EnsureDefaults()
-	//}
-	//
-	//opts.DisableAutomaticCompactions = true
-
+func NewPebbleDB(name string, dir string) (*PebbleDB, error) {
+	opts := &pebble.Options{}
 	opts.EnsureDefaults()
+	return NewPebbleDBWithOpts(name, dir, opts)
+}
 
+func NewPebbleDBWithOpts(name string, dir string, opts *pebble.Options) (*PebbleDB, error) {
+	dbPath := filepath.Join(dir, name+".db")
+	opts.EnsureDefaults()
 	p, err := pebble.Open(dbPath, opts)
 	if err != nil {
 		return nil, err