diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db.go b/vendor/github.com/syndtr/goleveldb/leveldb/db.go
index b27c38d37e678b07d76d3526804e8605230778b6..0de5ffe8d7a18840d90970fbef65cc399a3bd0c5 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/db.go
@@ -468,7 +468,7 @@ func recoverTable(s *session, o *opt.Options) error {
}
// Commit.
- return s.commit(rec)
+ return s.commit(rec, false)
}
func (db *DB) recoverJournal() error {
@@ -538,7 +538,7 @@ func (db *DB) recoverJournal() error {
rec.setJournalNum(fd.Num)
rec.setSeqNum(db.seq)
- if err := db.s.commit(rec); err != nil {
+ if err := db.s.commit(rec, false); err != nil {
fr.Close()
return err
}
@@ -617,7 +617,7 @@ func (db *DB) recoverJournal() error {
// Commit.
rec.setJournalNum(db.journalFd.Num)
rec.setSeqNum(db.seq)
- if err := db.s.commit(rec); err != nil {
+ if err := db.s.commit(rec, false); err != nil {
// Close journal on error.
if db.journal != nil {
db.journal.Close()
@@ -872,6 +872,10 @@ func (db *DB) Has(key []byte, ro *opt.ReadOptions) (ret bool, err error) {
// DB. And a nil Range.Limit is treated as a key after all keys in
// the DB.
//
+// WARNING: Any slice returned by interator (e.g. slice returned by calling
+// Iterator.Key() or Iterator.Key() methods), its content should not be modified
+// unless noted otherwise.
+//
// The iterator must be released after use, by calling Release method.
//
// Also read Iterator documentation of the leveldb/iterator package.
@@ -953,15 +957,27 @@ func (db *DB) GetProperty(name string) (value string, err error) {
value = "Compactions\n" +
" Level | Tables | Size(MB) | Time(sec) | Read(MB) | Write(MB)\n" +
"-------+------------+---------------+---------------+---------------+---------------\n"
+ var totalTables int
+ var totalSize, totalRead, totalWrite int64
+ var totalDuration time.Duration
for level, tables := range v.levels {
duration, read, write := db.compStats.getStat(level)
if len(tables) == 0 && duration == 0 {
continue
}
+ totalTables += len(tables)
+ totalSize += tables.size()
+ totalRead += read
+ totalWrite += write
+ totalDuration += duration
value += fmt.Sprintf(" %3d | %10d | %13.5f | %13.5f | %13.5f | %13.5f\n",
level, len(tables), float64(tables.size())/1048576.0, duration.Seconds(),
float64(read)/1048576.0, float64(write)/1048576.0)
}
+ value += "-------+------------+---------------+---------------+---------------+---------------\n"
+ value += fmt.Sprintf(" Total | %10d | %13.5f | %13.5f | %13.5f | %13.5f\n",
+ totalTables, float64(totalSize)/1048576.0, totalDuration.Seconds(),
+ float64(totalRead)/1048576.0, float64(totalWrite)/1048576.0)
case p == "iostats":
value = fmt.Sprintf("Read(MB):%.5f Write(MB):%.5f",
float64(db.s.stor.reads())/1048576.0,
@@ -1013,10 +1029,10 @@ type DBStats struct {
BlockCacheSize int
OpenedTablesCount int
- LevelSizes []int64
+ LevelSizes Sizes
LevelTablesCounts []int
- LevelRead []int64
- LevelWrite []int64
+ LevelRead Sizes
+ LevelWrite Sizes
LevelDurations []time.Duration
}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go
index 0c1b9a53b8e7a8accea012a467c1e721049ffe91..56f3632a7d299a69e923801b9f027062587b3181 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go
@@ -260,7 +260,7 @@ func (db *DB) compactionCommit(name string, rec *sessionRecord) {
db.compCommitLk.Lock()
defer db.compCommitLk.Unlock() // Defer is necessary.
db.compactionTransactFunc(name+"@commit", func(cnt *compactionTransactCounter) error {
- return db.s.commit(rec)
+ return db.s.commit(rec, true)
}, nil)
}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
index 2c69d2e531d534783a05545ef2be8fa6b3c458a5..c2ad70c8476c17efa2e2749a191e0b0ab5b615f1 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
@@ -142,6 +142,10 @@ func (snap *Snapshot) Has(key []byte, ro *opt.ReadOptions) (ret bool, err error)
// DB. And a nil Range.Limit is treated as a key after all keys in
// the DB.
//
+// WARNING: Any slice returned by interator (e.g. slice returned by calling
+// Iterator.Key() or Iterator.Value() methods), its content should not be
+// modified unless noted otherwise.
+//
// The iterator must be released after use, by calling Release method.
// Releasing the snapshot doesn't mean releasing the iterator too, the
// iterator would be still valid until released.
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_transaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_transaction.go
index b8f7e7d21dfa6012e8323d66877932bdccc1c0c1..f145b64fbbceb227eb2f21dc3cff347447e382f5 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_transaction.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/db_transaction.go
@@ -69,6 +69,10 @@ func (tr *Transaction) Has(key []byte, ro *opt.ReadOptions) (bool, error) {
// DB. And a nil Range.Limit is treated as a key after all keys in
// the DB.
//
+// WARNING: Any slice returned by interator (e.g. slice returned by calling
+// Iterator.Key() or Iterator.Key() methods), its content should not be modified
+// unless noted otherwise.
+//
// The iterator must be released after use, by calling Release method.
//
// Also read Iterator documentation of the leveldb/iterator package.
@@ -205,7 +209,7 @@ func (tr *Transaction) Commit() error {
tr.stats.startTimer()
var cerr error
for retry := 0; retry < 3; retry++ {
- cerr = tr.db.s.commit(&tr.rec)
+ cerr = tr.db.s.commit(&tr.rec, false)
if cerr != nil {
tr.db.logf("transaction@commit error R·%d %q", retry, cerr)
select {
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/session.go b/vendor/github.com/syndtr/goleveldb/leveldb/session.go
index 3f391f934622e50d269c37aa8bde0e7d6128f77d..1bec34c4c3e691c123567eb8e0f53c6f0c754e60 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/session.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/session.go
@@ -180,19 +180,19 @@ func (s *session) recover() (err error) {
}
s.manifestFd = fd
- s.setVersion(staging.finish())
+ s.setVersion(staging.finish(false))
s.setNextFileNum(rec.nextFileNum)
s.recordCommited(rec)
return nil
}
// Commit session; need external synchronization.
-func (s *session) commit(r *sessionRecord) (err error) {
+func (s *session) commit(r *sessionRecord, trivial bool) (err error) {
v := s.version()
defer v.release()
// spawn new version based on current version
- nv := v.spawn(r)
+ nv := v.spawn(r, trivial)
if s.manifest == nil {
// manifest journal writer not yet created, create one
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table.go b/vendor/github.com/syndtr/goleveldb/leveldb/table.go
index 1fac60d050b38ff20664b7bd2154b3bce90928d2..518e1db1cd4ab132de541b016d46dbf753ae6555 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/table.go
@@ -150,6 +150,14 @@ func (tf tFiles) searchMax(icmp *iComparer, ikey internalKey) int {
})
}
+// Searches smallest index of tables whose its file number
+// is smaller than the given number.
+func (tf tFiles) searchNumLess(num int64) int {
+ return sort.Search(len(tf), func(i int) bool {
+ return tf[i].fd.Num < num
+ })
+}
+
// Returns true if given key range overlaps with one or more
// tables key range. If unsorted is true then binary search will not be used.
func (tf tFiles) overlaps(icmp *iComparer, umin, umax []byte, unsorted bool) bool {
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/version.go b/vendor/github.com/syndtr/goleveldb/leveldb/version.go
index 73f272af5ff4f09ef4ac0c5adc7b11c41d1f8161..63b86fe545b3c01493870ff3be371a83dc0e4901 100644
--- a/vendor/github.com/syndtr/goleveldb/leveldb/version.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/version.go
@@ -273,10 +273,10 @@ func (v *version) newStaging() *versionStaging {
}
// Spawn a new version based on this version.
-func (v *version) spawn(r *sessionRecord) *version {
+func (v *version) spawn(r *sessionRecord, trivial bool) *version {
staging := v.newStaging()
staging.commit(r)
- return staging.finish()
+ return staging.finish(trivial)
}
func (v *version) fillRecord(r *sessionRecord) {
@@ -446,7 +446,7 @@ func (p *versionStaging) commit(r *sessionRecord) {
}
}
-func (p *versionStaging) finish() *version {
+func (p *versionStaging) finish(trivial bool) *version {
// Build new version.
nv := newVersion(p.base.s)
numLevel := len(p.levels)
@@ -463,6 +463,12 @@ func (p *versionStaging) finish() *version {
if level < len(p.levels) {
scratch := p.levels[level]
+ // Short circuit if there is no change at all.
+ if len(scratch.added) == 0 && len(scratch.deleted) == 0 {
+ nv.levels[level] = baseTabels
+ continue
+ }
+
var nt tFiles
// Prealloc list if possible.
if n := len(baseTabels) + len(scratch.added) - len(scratch.deleted); n > 0 {
@@ -480,6 +486,35 @@ func (p *versionStaging) finish() *version {
nt = append(nt, t)
}
+ // For normal table compaction, one compaction will only involve two levels
+ // of files. And the new files generated after merging the source level and
+ // source+1 level related files can be inserted as a whole into source+1 level
+ // without any overlap with the other source+1 files.
+ //
+ // When the amount of data maintained by leveldb is large, the number of files
+ // per level will be very large. While qsort is very inefficient for sorting
+ // already ordered arrays. Therefore, for the normal table compaction, we use
+ // binary search here to find the insert index to insert a batch of new added
+ // files directly instead of using qsort.
+ if trivial && len(scratch.added) > 0 {
+ added := make(tFiles, 0, len(scratch.added))
+ for _, r := range scratch.added {
+ added = append(added, tableFileFromRecord(r))
+ }
+ if level == 0 {
+ added.sortByNum()
+ index := nt.searchNumLess(added[len(added)-1].fd.Num)
+ nt = append(nt[:index], append(added, nt[index:]...)...)
+ } else {
+ added.sortByKey(p.base.s.icmp)
+ _, amax := added.getRange(p.base.s.icmp)
+ index := nt.searchMin(p.base.s.icmp, amax)
+ nt = append(nt[:index], append(added, nt[index:]...)...)
+ }
+ nv.levels[level] = nt
+ continue
+ }
+
// New tables.
for _, r := range scratch.added {
nt = append(nt, tableFileFromRecord(r))
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 0487e9299b367dcd582ec8dd2f09c2e44d3054c0..7827451668adea81366833567468265ccdba9faf 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -455,10 +455,10 @@
"revisionTime": "2017-07-05T02:17:15Z"
},
{
- "checksumSHA1": "LV0VMVON7xY1ttV+s2ph83ntmDQ=",
+ "checksumSHA1": "4DuP8qJfeXFfdbcl4wr7l1VppcY=",
"path": "github.com/syndtr/goleveldb/leveldb",
- "revision": "b001fa50d6b27f3f0bb175a87d0cb55426d0a0ae",
- "revisionTime": "2018-11-28T10:09:59Z"
+ "revision": "4217c9f31f5816db02addc94e56061da77f288d8",
+ "revisionTime": "2019-02-26T15:37:22Z"
},
{
"checksumSHA1": "mPNraL2edpk/2FYq26rSXfMHbJg=",