Update buntdb

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/prometheus/client_golang v1.10.0
 	github.com/streadway/amqp v1.0.0
 	github.com/tidwall/btree v0.6.0
-	github.com/tidwall/buntdb v1.2.5
+	github.com/tidwall/buntdb v1.2.6
 	github.com/tidwall/geoindex v1.4.4
 	github.com/tidwall/geojson v1.3.0
 	github.com/tidwall/gjson v1.8.1

go.sum

@@ -412,8 +412,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/tidwall/btree v0.4.2/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
 github.com/tidwall/btree v0.6.0 h1:JLYAFGV+1gjyFi3iQbO/fupBin+Ooh7dxqVV0twJ1Bo=
 github.com/tidwall/btree v0.6.0/go.mod h1:TzIRzen6yHbibdSfK6t8QimqbUnoxUSrZfeW7Uob0q4=
-github.com/tidwall/buntdb v1.2.5 h1:eRLLh0pJkoSu/6bALIzGH7VPxhFcrWNId6FSHgi8yfc=
-github.com/tidwall/buntdb v1.2.5/go.mod h1:zpXqlA5D2772I4cTqV3ifr2AZihDgi8FV7xAQu6edfc=
+github.com/tidwall/buntdb v1.2.6 h1:eS0QSmzHfCKjxxYGh8eH6wnK5VLsJ7UjyyIr29JmnEg=
+github.com/tidwall/buntdb v1.2.6/go.mod h1:zpXqlA5D2772I4cTqV3ifr2AZihDgi8FV7xAQu6edfc=
 github.com/tidwall/cities v0.1.0 h1:CVNkmMf7NEC9Bvokf5GoSsArHCKRMTgLuubRTHnH0mE=
 github.com/tidwall/cities v0.1.0/go.mod h1:lV/HDp2gCcRcHJWqgt6Di54GiDrTZwh1aG2ZUPNbqa4=
 github.com/tidwall/geoindex v1.4.3/go.mod h1:NQJQszWCH4+KlD0wY+mgQ2hK/GdSH+9+ZRknDY8bOHc=

vendor/github.com/tidwall/buntdb/buntdb.go

@@ -201,10 +201,11 @@ func (db *DB) Save(wr io.Writer) error {
 	defer db.mu.RUnlock()
 	// use a buffered writer and flush every 4MB
 	var buf []byte
+	now := time.Now()
 	// iterated through every item in the database and write to the buffer
 	btreeAscend(db.keys, func(item interface{}) bool {
 		dbi := item.(*dbItem)
-		buf = dbi.writeSetTo(buf)
+		buf = dbi.writeSetTo(buf, now)
 		if len(buf) > 1024*1024*4 {
 			// flush when buffer is over 4MB
 			_, err = wr.Write(buf)
@@ -684,6 +685,7 @@ func (db *DB) Shrink() error {
 			}
 			done = true
 			var n int
+			now := time.Now()
 			btreeAscendGreaterOrEqual(db.keys, &dbItem{key: pivot},
 				func(item interface{}) bool {
 					dbi := item.(*dbItem)
@@ -693,7 +695,7 @@ func (db *DB) Shrink() error {
 						done = false
 						return false
 					}
-					buf = dbi.writeSetTo(buf)
+					buf = dbi.writeSetTo(buf, now)
 					n++
 					return true
 				},
@@ -953,11 +955,16 @@ func (db *DB) load() error {
 			return err
 		}
 	}
-	pos, err := db.file.Seek(n, 0)
-	if err != nil {
+	if _, err := db.file.Seek(n, 0); err != nil {
 		return err
 	}
-	db.lastaofsz = int(pos)
+	var estaofsz int
+	db.keys.Walk(func(items []interface{}) {
+		for _, v := range items {
+			estaofsz += v.(*dbItem).estAOFSetSize()
+		}
+	})
+	db.lastaofsz += estaofsz
 	return nil
 }
 
@@ -1177,12 +1184,13 @@ func (tx *Tx) Commit() error {
 		if tx.wc.rbkeys != nil {
 			tx.db.buf = append(tx.db.buf, "*1\r\n$7\r\nflushdb\r\n"...)
 		}
+		now := time.Now()
 		// Each committed record is written to disk
 		for key, item := range tx.wc.commitItems {
 			if item == nil {
 				tx.db.buf = (&dbItem{key: key}).writeDeleteTo(tx.db.buf)
 			} else {
-				tx.db.buf = item.writeSetTo(tx.db.buf)
+				tx.db.buf = item.writeSetTo(tx.db.buf, now)
 			}
 		}
 		// Flushing the buffer only once per transaction.
@@ -1255,16 +1263,53 @@ type dbItem struct {
 	keyless  bool        // keyless item for scanning
 }
 
+func estIntSize(x int) int {
+	if x == 0 {
+		return 1
+	}
+	var n int
+	for x > 0 {
+		n++
+		x /= 10
+	}
+	return n
+}
+
+func estArraySize(count int) int {
+	return 1 + estIntSize(count) + 2
+}
+
+func estBulkStringSize(s string) int {
+	return 1 + estIntSize(len(s)) + 2 + len(s) + 2
+}
+
+func (dbi *dbItem) estAOFSetSize() (n int) {
+	if dbi.opts != nil && dbi.opts.ex {
+		n += estArraySize(5)
+		n += estBulkStringSize("set")
+		n += estBulkStringSize(dbi.key)
+		n += estBulkStringSize(dbi.val)
+		n += estBulkStringSize("ex")
+		n += estBulkStringSize("99") // estimate two byte bulk string
+	} else {
+		n += estArraySize(3)
+		n += estBulkStringSize("set")
+		n += estBulkStringSize(dbi.key)
+		n += estBulkStringSize(dbi.val)
+	}
+	return n
+}
+
 func appendArray(buf []byte, count int) []byte {
 	buf = append(buf, '*')
-	buf = append(buf, strconv.FormatInt(int64(count), 10)...)
+	buf = strconv.AppendInt(buf, int64(count), 10)
 	buf = append(buf, '\r', '\n')
 	return buf
 }
 
 func appendBulkString(buf []byte, s string) []byte {
 	buf = append(buf, '$')
-	buf = append(buf, strconv.FormatInt(int64(len(s)), 10)...)
+	buf = strconv.AppendInt(buf, int64(len(s)), 10)
 	buf = append(buf, '\r', '\n')
 	buf = append(buf, s...)
 	buf = append(buf, '\r', '\n')
@@ -1272,9 +1317,9 @@ func appendBulkString(buf []byte, s string) []byte {
 }
 
 // writeSetTo writes an item as a single SET record to the a bufio Writer.
-func (dbi *dbItem) writeSetTo(buf []byte) []byte {
+func (dbi *dbItem) writeSetTo(buf []byte, now time.Time) []byte {
 	if dbi.opts != nil && dbi.opts.ex {
-		ex := time.Until(dbi.opts.exat) / time.Second
+		ex := dbi.opts.exat.Sub(now) / time.Second
 		buf = appendArray(buf, 5)
 		buf = appendBulkString(buf, "set")
 		buf = appendBulkString(buf, dbi.key)

vendor/modules.txt

@@ -165,7 +165,7 @@ github.com/streadway/amqp
 # github.com/tidwall/btree v0.6.0
 ## explicit
 github.com/tidwall/btree
-# github.com/tidwall/buntdb v1.2.5
+# github.com/tidwall/buntdb v1.2.6
 ## explicit
 github.com/tidwall/buntdb
 # github.com/tidwall/cities v0.1.0