[Pkg-javascript-commits] [node-leveldown] 354/492: upgraded to leveldb at 1.11.0
Andrew Kelley
andrewrk-guest at moszumanska.debian.org
Sun Jul 6 17:14:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.
commit 0b8b46ff472fd4a5634fc37757e68cce963f681c
Author: Rod Vagg <rod at vagg.org>
Date: Fri Jun 14 18:14:40 2013 +1000
upgraded to leveldb at 1.11.0
---
deps/leveldb-1.11.0.tar.gz | Bin 0 -> 205413 bytes
.../{leveldb-1.10.0 => leveldb-1.11.0}/.gitignore | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/AUTHORS | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/LICENSE | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/Makefile | 6 +-
.../{leveldb-1.10.0 => leveldb-1.11.0}/NEWS | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/README | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/TODO | 0
.../build_detect_platform | 0
.../db/builder.cc | 0
.../db/builder.h | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/db/c.cc | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/db/c_test.c | 0
.../db/corruption_test.cc | 0
.../db/db_bench.cc | 0
.../db/db_impl.cc | 21 +++--
.../db/db_impl.h | 1 +
.../db/db_iter.cc | 0
.../db/db_iter.h | 0
.../db/db_test.cc | 54 ++++++++++---
.../db/dbformat.cc | 0
.../db/dbformat.h | 0
.../db/dbformat_test.cc | 0
.../db/filename.cc | 0
.../db/filename.h | 0
.../db/filename_test.cc | 2 +-
.../db/leveldb_main.cc | 0
.../db/log_format.h | 0
.../db/log_reader.cc | 0
.../db/log_reader.h | 0
.../db/log_test.cc | 0
.../db/log_writer.cc | 0
.../db/log_writer.h | 0
.../db/memtable.cc | 0
.../db/memtable.h | 0
.../db/repair.cc | 0
.../db/skiplist.h | 0
.../db/skiplist_test.cc | 0
.../db/snapshot.h | 0
.../db/table_cache.cc | 0
.../db/table_cache.h | 0
.../db/version_edit.cc | 0
.../db/version_edit.h | 0
.../db/version_edit_test.cc | 0
.../db/version_set.cc | 21 +++--
.../db/version_set.h | 0
.../db/version_set_test.cc | 0
.../db/write_batch.cc | 0
.../db/write_batch_internal.h | 0
.../db/write_batch_test.cc | 0
.../doc/bench/db_bench_sqlite3.cc | 0
.../doc/bench/db_bench_tree_db.cc | 0
.../doc/benchmark.html | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/doc/doc.css | 0
.../doc/impl.html | 0
.../doc/index.html | 0
.../doc/log_format.txt | 0
.../doc/table_format.txt | 0
.../helpers/memenv/memenv.cc | 0
.../helpers/memenv/memenv.h | 0
.../helpers/memenv/memenv_test.cc | 0
.../include/leveldb/c.h | 0
.../include/leveldb/cache.h | 0
.../include/leveldb/comparator.h | 0
.../include/leveldb/db.h | 2 +-
.../include/leveldb/env.h | 0
.../include/leveldb/filter_policy.h | 0
.../include/leveldb/iterator.h | 0
.../include/leveldb/options.h | 0
.../include/leveldb/slice.h | 0
.../include/leveldb/status.h | 0
.../include/leveldb/table.h | 0
.../include/leveldb/table_builder.h | 0
.../include/leveldb/write_batch.h | 0
.../leveldb/leveldb-1.11.0/issues/issue178_test.cc | 88 +++++++++++++++++++++
.../{leveldb-1.10.0 => leveldb-1.11.0}/port/README | 0
.../port/atomic_pointer.h | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/port/port.h | 4 +-
.../port/port_example.h | 0
.../port/port_posix.cc | 0
.../port/port_posix.h | 0
.../port/thread_annotations.h | 0
.../port/win/stdint.h | 0
.../table/block.cc | 0
.../table/block.h | 0
.../table/block_builder.cc | 0
.../table/block_builder.h | 0
.../table/filter_block.cc | 0
.../table/filter_block.h | 0
.../table/filter_block_test.cc | 0
.../table/format.cc | 0
.../table/format.h | 0
.../table/iterator.cc | 0
.../table/iterator_wrapper.h | 0
.../table/merger.cc | 0
.../table/merger.h | 0
.../table/table.cc | 0
.../table/table_builder.cc | 0
.../table/table_test.cc | 0
.../table/two_level_iterator.cc | 0
.../table/two_level_iterator.h | 0
.../util/arena.cc | 0
.../util/arena.h | 0
.../util/arena_test.cc | 0
.../util/bloom.cc | 0
.../util/bloom_test.cc | 0
.../util/cache.cc | 0
.../util/cache_test.cc | 0
.../util/coding.cc | 0
.../util/coding.h | 0
.../util/coding_test.cc | 2 +-
.../util/comparator.cc | 0
.../util/crc32c.cc | 0
.../util/crc32c.h | 0
.../util/crc32c_test.cc | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/util/env.cc | 0
.../util/env_posix.cc | 6 +-
.../util/env_test.cc | 0
.../util/filter_policy.cc | 0
.../util/hash.cc | 0
.../{leveldb-1.10.0 => leveldb-1.11.0}/util/hash.h | 0
.../util/histogram.cc | 0
.../util/histogram.h | 0
.../util/logging.cc | 0
.../util/logging.h | 0
.../util/mutexlock.h | 0
.../util/options.cc | 0
.../util/posix_logger.h | 0
.../util/random.h | 0
.../util/status.cc | 0
.../util/testharness.cc | 0
.../util/testharness.h | 0
.../util/testutil.cc | 0
.../util/testutil.h | 0
deps/leveldb/leveldb.gyp | 2 +-
135 files changed, 174 insertions(+), 35 deletions(-)
diff --git a/deps/leveldb-1.11.0.tar.gz b/deps/leveldb-1.11.0.tar.gz
new file mode 100644
index 0000000..a9a2ec9
Binary files /dev/null and b/deps/leveldb-1.11.0.tar.gz differ
diff --git a/deps/leveldb/leveldb-1.10.0/.gitignore b/deps/leveldb/leveldb-1.11.0/.gitignore
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/.gitignore
rename to deps/leveldb/leveldb-1.11.0/.gitignore
diff --git a/deps/leveldb/leveldb-1.10.0/AUTHORS b/deps/leveldb/leveldb-1.11.0/AUTHORS
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/AUTHORS
rename to deps/leveldb/leveldb-1.11.0/AUTHORS
diff --git a/deps/leveldb/leveldb-1.10.0/LICENSE b/deps/leveldb/leveldb-1.11.0/LICENSE
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/LICENSE
rename to deps/leveldb/leveldb-1.11.0/LICENSE
diff --git a/deps/leveldb/leveldb-1.10.0/Makefile b/deps/leveldb/leveldb-1.11.0/Makefile
similarity index 97%
rename from deps/leveldb/leveldb-1.10.0/Makefile
rename to deps/leveldb/leveldb-1.11.0/Makefile
index ab5ed83..748d122 100644
--- a/deps/leveldb/leveldb-1.10.0/Makefile
+++ b/deps/leveldb/leveldb-1.11.0/Makefile
@@ -42,6 +42,7 @@ TESTS = \
env_test \
filename_test \
filter_block_test \
+ issue178_test \
log_test \
memenv_test \
skiplist_test \
@@ -69,7 +70,7 @@ SHARED = $(SHARED1)
else
# Update db.h if you change these.
SHARED_MAJOR = 1
-SHARED_MINOR = 10
+SHARED_MINOR = 11
SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
SHARED2 = $(SHARED1).$(SHARED_MAJOR)
SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)
@@ -146,6 +147,9 @@ filename_test: db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS)
filter_block_test: table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(CXX) $(LDFLAGS) table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+issue178_test: issues/issue178_test.o $(LIBOBJECTS) $(TESTHARNESS)
+ $(CXX) $(LDFLAGS) issues/issue178_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
log_test: db/log_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(CXX) $(LDFLAGS) db/log_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
diff --git a/deps/leveldb/leveldb-1.10.0/NEWS b/deps/leveldb/leveldb-1.11.0/NEWS
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/NEWS
rename to deps/leveldb/leveldb-1.11.0/NEWS
diff --git a/deps/leveldb/leveldb-1.10.0/README b/deps/leveldb/leveldb-1.11.0/README
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/README
rename to deps/leveldb/leveldb-1.11.0/README
diff --git a/deps/leveldb/leveldb-1.10.0/TODO b/deps/leveldb/leveldb-1.11.0/TODO
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/TODO
rename to deps/leveldb/leveldb-1.11.0/TODO
diff --git a/deps/leveldb/leveldb-1.10.0/build_detect_platform b/deps/leveldb/leveldb-1.11.0/build_detect_platform
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/build_detect_platform
rename to deps/leveldb/leveldb-1.11.0/build_detect_platform
diff --git a/deps/leveldb/leveldb-1.10.0/db/builder.cc b/deps/leveldb/leveldb-1.11.0/db/builder.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/builder.cc
rename to deps/leveldb/leveldb-1.11.0/db/builder.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/builder.h b/deps/leveldb/leveldb-1.11.0/db/builder.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/builder.h
rename to deps/leveldb/leveldb-1.11.0/db/builder.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/c.cc b/deps/leveldb/leveldb-1.11.0/db/c.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/c.cc
rename to deps/leveldb/leveldb-1.11.0/db/c.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/c_test.c b/deps/leveldb/leveldb-1.11.0/db/c_test.c
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/c_test.c
rename to deps/leveldb/leveldb-1.11.0/db/c_test.c
diff --git a/deps/leveldb/leveldb-1.10.0/db/corruption_test.cc b/deps/leveldb/leveldb-1.11.0/db/corruption_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/corruption_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/corruption_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/db_bench.cc b/deps/leveldb/leveldb-1.11.0/db/db_bench.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/db_bench.cc
rename to deps/leveldb/leveldb-1.11.0/db/db_bench.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/db_impl.cc b/deps/leveldb/leveldb-1.11.0/db/db_impl.cc
similarity index 98%
rename from deps/leveldb/leveldb-1.10.0/db/db_impl.cc
rename to deps/leveldb/leveldb-1.11.0/db/db_impl.cc
index 5c30d6f..395d317 100644
--- a/deps/leveldb/leveldb-1.10.0/db/db_impl.cc
+++ b/deps/leveldb/leveldb-1.11.0/db/db_impl.cc
@@ -35,6 +35,8 @@
namespace leveldb {
+const int kNumNonTableCacheFiles = 10;
+
// Information kept for every waiting writer
struct DBImpl::Writer {
Status status;
@@ -92,9 +94,9 @@ Options SanitizeOptions(const std::string& dbname,
Options result = src;
result.comparator = icmp;
result.filter_policy = (src.filter_policy != NULL) ? ipolicy : NULL;
- ClipToRange(&result.max_open_files, 20, 50000);
- ClipToRange(&result.write_buffer_size, 64<<10, 1<<30);
- ClipToRange(&result.block_size, 1<<10, 4<<20);
+ ClipToRange(&result.max_open_files, 64 + kNumNonTableCacheFiles, 50000);
+ ClipToRange(&result.write_buffer_size, 64<<10, 1<<30);
+ ClipToRange(&result.block_size, 1<<10, 4<<20);
if (result.info_log == NULL) {
// Open a log file in the same directory as the db
src.env->CreateDir(dbname); // In case it does not exist
@@ -130,12 +132,13 @@ DBImpl::DBImpl(const Options& options, const std::string& dbname)
log_(NULL),
tmp_batch_(new WriteBatch),
bg_compaction_scheduled_(false),
- manual_compaction_(NULL) {
+ manual_compaction_(NULL),
+ consecutive_compaction_errors_(0) {
mem_->Ref();
has_imm_.Release_Store(NULL);
// Reserve ten files or so for other uses and give the rest to TableCache.
- const int table_cache_size = options.max_open_files - 10;
+ const int table_cache_size = options.max_open_files - kNumNonTableCacheFiles;
table_cache_ = new TableCache(dbname_, &options_, table_cache_size);
versions_ = new VersionSet(dbname_, &options_, table_cache_,
@@ -619,6 +622,7 @@ void DBImpl::BackgroundCall() {
Status s = BackgroundCompaction();
if (s.ok()) {
// Success
+ consecutive_compaction_errors_ = 0;
} else if (shutting_down_.Acquire_Load()) {
// Error most likely due to shutdown; do not wait
} else {
@@ -630,7 +634,12 @@ void DBImpl::BackgroundCall() {
Log(options_.info_log, "Waiting after background compaction error: %s",
s.ToString().c_str());
mutex_.Unlock();
- env_->SleepForMicroseconds(1000000);
+ ++consecutive_compaction_errors_;
+ int seconds_to_sleep = 1;
+ for (int i = 0; i < 3 && i < consecutive_compaction_errors_ - 1; ++i) {
+ seconds_to_sleep *= 2;
+ }
+ env_->SleepForMicroseconds(seconds_to_sleep * 1000000);
mutex_.Lock();
}
}
diff --git a/deps/leveldb/leveldb-1.10.0/db/db_impl.h b/deps/leveldb/leveldb-1.11.0/db/db_impl.h
similarity index 99%
rename from deps/leveldb/leveldb-1.10.0/db/db_impl.h
rename to deps/leveldb/leveldb-1.11.0/db/db_impl.h
index bd29dd8..3c8d711 100644
--- a/deps/leveldb/leveldb-1.10.0/db/db_impl.h
+++ b/deps/leveldb/leveldb-1.11.0/db/db_impl.h
@@ -163,6 +163,7 @@ class DBImpl : public DB {
// Have we encountered a background error in paranoid mode?
Status bg_error_;
+ int consecutive_compaction_errors_;
// Per level compaction stats. stats_[level] stores the stats for
// compactions that produced data for the specified "level".
diff --git a/deps/leveldb/leveldb-1.10.0/db/db_iter.cc b/deps/leveldb/leveldb-1.11.0/db/db_iter.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/db_iter.cc
rename to deps/leveldb/leveldb-1.11.0/db/db_iter.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/db_iter.h b/deps/leveldb/leveldb-1.11.0/db/db_iter.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/db_iter.h
rename to deps/leveldb/leveldb-1.11.0/db/db_iter.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/db_test.cc b/deps/leveldb/leveldb-1.11.0/db/db_test.cc
similarity index 97%
rename from deps/leveldb/leveldb-1.10.0/db/db_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/db_test.cc
index 2f51296..49aae04 100644
--- a/deps/leveldb/leveldb-1.10.0/db/db_test.cc
+++ b/deps/leveldb/leveldb-1.11.0/db/db_test.cc
@@ -33,8 +33,11 @@ class AtomicCounter {
public:
AtomicCounter() : count_(0) { }
void Increment() {
+ IncrementBy(1);
+ }
+ void IncrementBy(int count) {
MutexLock l(&mu_);
- count_++;
+ count_ += count;
}
int Read() {
MutexLock l(&mu_);
@@ -45,6 +48,10 @@ class AtomicCounter {
count_ = 0;
}
};
+
+void DelayMilliseconds(int millis) {
+ Env::Default()->SleepForMicroseconds(millis * 1000);
+}
}
// Special Env used to delay background operations
@@ -69,6 +76,7 @@ class SpecialEnv : public EnvWrapper {
AtomicCounter random_read_counter_;
AtomicCounter sleep_counter_;
+ AtomicCounter sleep_time_counter_;
explicit SpecialEnv(Env* base) : EnvWrapper(base) {
delay_sstable_sync_.Release_Store(NULL);
@@ -103,7 +111,7 @@ class SpecialEnv : public EnvWrapper {
Status Flush() { return base_->Flush(); }
Status Sync() {
while (env_->delay_sstable_sync_.Acquire_Load() != NULL) {
- env_->SleepForMicroseconds(100000);
+ DelayMilliseconds(100);
}
return base_->Sync();
}
@@ -174,8 +182,9 @@ class SpecialEnv : public EnvWrapper {
virtual void SleepForMicroseconds(int micros) {
sleep_counter_.Increment();
- target()->SleepForMicroseconds(micros);
+ sleep_time_counter_.IncrementBy(micros);
}
+
};
class DBTest {
@@ -625,7 +634,7 @@ TEST(DBTest, GetEncountersEmptyLevel) {
}
// Step 4: Wait for compaction to finish
- env_->SleepForMicroseconds(1000000);
+ DelayMilliseconds(1000);
ASSERT_EQ(NumTableFilesAtLevel(0), 0);
} while (ChangeOptions());
@@ -1309,7 +1318,7 @@ TEST(DBTest, L0_CompactionBug_Issue44_a) {
Reopen();
Reopen();
ASSERT_EQ("(a->v)", Contents());
- env_->SleepForMicroseconds(1000000); // Wait for compaction to finish
+ DelayMilliseconds(1000); // Wait for compaction to finish
ASSERT_EQ("(a->v)", Contents());
}
@@ -1325,7 +1334,7 @@ TEST(DBTest, L0_CompactionBug_Issue44_b) {
Put("","");
Reopen();
Put("","");
- env_->SleepForMicroseconds(1000000); // Wait for compaction to finish
+ DelayMilliseconds(1000); // Wait for compaction to finish
Reopen();
Put("d","dv");
Reopen();
@@ -1335,7 +1344,7 @@ TEST(DBTest, L0_CompactionBug_Issue44_b) {
Delete("b");
Reopen();
ASSERT_EQ("(->)(c->cv)", Contents());
- env_->SleepForMicroseconds(1000000); // Wait for compaction to finish
+ DelayMilliseconds(1000); // Wait for compaction to finish
ASSERT_EQ("(->)(c->cv)", Contents());
}
@@ -1520,6 +1529,30 @@ TEST(DBTest, NoSpace) {
ASSERT_GE(env_->sleep_counter_.Read(), 5);
}
+TEST(DBTest, ExponentialBackoff) {
+ Options options = CurrentOptions();
+ options.env = env_;
+ Reopen(&options);
+
+ ASSERT_OK(Put("foo", "v1"));
+ ASSERT_EQ("v1", Get("foo"));
+ Compact("a", "z");
+ env_->non_writable_.Release_Store(env_); // Force errors for new files
+ env_->sleep_counter_.Reset();
+ env_->sleep_time_counter_.Reset();
+ for (int i = 0; i < 5; i++) {
+ dbfull()->TEST_CompactRange(2, NULL, NULL);
+ }
+ env_->non_writable_.Release_Store(NULL);
+
+ // Wait for compaction to finish
+ DelayMilliseconds(1000);
+
+ ASSERT_GE(env_->sleep_counter_.Read(), 5);
+ ASSERT_LT(env_->sleep_counter_.Read(), 10);
+ ASSERT_GE(env_->sleep_time_counter_.Read(), 10e6);
+}
+
TEST(DBTest, NonWritableFileSystem) {
Options options = CurrentOptions();
options.write_buffer_size = 1000;
@@ -1533,7 +1566,7 @@ TEST(DBTest, NonWritableFileSystem) {
fprintf(stderr, "iter %d; errors %d\n", i, errors);
if (!Put("foo", big).ok()) {
errors++;
- env_->SleepForMicroseconds(100000);
+ DelayMilliseconds(100);
}
}
ASSERT_GT(errors, 0);
@@ -1589,6 +1622,7 @@ TEST(DBTest, MissingSSTFile) {
dbfull()->TEST_CompactMemTable();
ASSERT_EQ("bar", Get("foo"));
+ Close();
ASSERT_TRUE(DeleteAnSSTFile());
Options options = CurrentOptions();
options.paranoid_checks = true;
@@ -1742,13 +1776,13 @@ TEST(DBTest, MultiThreaded) {
}
// Let them run for a while
- env_->SleepForMicroseconds(kTestSeconds * 1000000);
+ DelayMilliseconds(kTestSeconds * 1000);
// Stop the threads and wait for them to finish
mt.stop.Release_Store(&mt);
for (int id = 0; id < kNumThreads; id++) {
while (mt.thread_done[id].Acquire_Load() == NULL) {
- env_->SleepForMicroseconds(100000);
+ DelayMilliseconds(100);
}
}
} while (ChangeOptions());
diff --git a/deps/leveldb/leveldb-1.10.0/db/dbformat.cc b/deps/leveldb/leveldb-1.11.0/db/dbformat.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/dbformat.cc
rename to deps/leveldb/leveldb-1.11.0/db/dbformat.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/dbformat.h b/deps/leveldb/leveldb-1.11.0/db/dbformat.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/dbformat.h
rename to deps/leveldb/leveldb-1.11.0/db/dbformat.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/dbformat_test.cc b/deps/leveldb/leveldb-1.11.0/db/dbformat_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/dbformat_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/dbformat_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/filename.cc b/deps/leveldb/leveldb-1.11.0/db/filename.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/filename.cc
rename to deps/leveldb/leveldb-1.11.0/db/filename.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/filename.h b/deps/leveldb/leveldb-1.11.0/db/filename.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/filename.h
rename to deps/leveldb/leveldb-1.11.0/db/filename.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/filename_test.cc b/deps/leveldb/leveldb-1.11.0/db/filename_test.cc
similarity index 99%
rename from deps/leveldb/leveldb-1.10.0/db/filename_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/filename_test.cc
index 47353d6..5a26da4 100644
--- a/deps/leveldb/leveldb-1.10.0/db/filename_test.cc
+++ b/deps/leveldb/leveldb-1.11.0/db/filename_test.cc
@@ -70,7 +70,7 @@ TEST(FileNameTest, Parse) {
for (int i = 0; i < sizeof(errors) / sizeof(errors[0]); i++) {
std::string f = errors[i];
ASSERT_TRUE(!ParseFileName(f, &number, &type)) << f;
- };
+ }
}
TEST(FileNameTest, Construction) {
diff --git a/deps/leveldb/leveldb-1.10.0/db/leveldb_main.cc b/deps/leveldb/leveldb-1.11.0/db/leveldb_main.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/leveldb_main.cc
rename to deps/leveldb/leveldb-1.11.0/db/leveldb_main.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/log_format.h b/deps/leveldb/leveldb-1.11.0/db/log_format.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/log_format.h
rename to deps/leveldb/leveldb-1.11.0/db/log_format.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/log_reader.cc b/deps/leveldb/leveldb-1.11.0/db/log_reader.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/log_reader.cc
rename to deps/leveldb/leveldb-1.11.0/db/log_reader.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/log_reader.h b/deps/leveldb/leveldb-1.11.0/db/log_reader.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/log_reader.h
rename to deps/leveldb/leveldb-1.11.0/db/log_reader.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/log_test.cc b/deps/leveldb/leveldb-1.11.0/db/log_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/log_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/log_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/log_writer.cc b/deps/leveldb/leveldb-1.11.0/db/log_writer.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/log_writer.cc
rename to deps/leveldb/leveldb-1.11.0/db/log_writer.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/log_writer.h b/deps/leveldb/leveldb-1.11.0/db/log_writer.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/log_writer.h
rename to deps/leveldb/leveldb-1.11.0/db/log_writer.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/memtable.cc b/deps/leveldb/leveldb-1.11.0/db/memtable.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/memtable.cc
rename to deps/leveldb/leveldb-1.11.0/db/memtable.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/memtable.h b/deps/leveldb/leveldb-1.11.0/db/memtable.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/memtable.h
rename to deps/leveldb/leveldb-1.11.0/db/memtable.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/repair.cc b/deps/leveldb/leveldb-1.11.0/db/repair.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/repair.cc
rename to deps/leveldb/leveldb-1.11.0/db/repair.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/skiplist.h b/deps/leveldb/leveldb-1.11.0/db/skiplist.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/skiplist.h
rename to deps/leveldb/leveldb-1.11.0/db/skiplist.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/skiplist_test.cc b/deps/leveldb/leveldb-1.11.0/db/skiplist_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/skiplist_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/skiplist_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/snapshot.h b/deps/leveldb/leveldb-1.11.0/db/snapshot.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/snapshot.h
rename to deps/leveldb/leveldb-1.11.0/db/snapshot.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/table_cache.cc b/deps/leveldb/leveldb-1.11.0/db/table_cache.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/table_cache.cc
rename to deps/leveldb/leveldb-1.11.0/db/table_cache.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/table_cache.h b/deps/leveldb/leveldb-1.11.0/db/table_cache.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/table_cache.h
rename to deps/leveldb/leveldb-1.11.0/db/table_cache.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/version_edit.cc b/deps/leveldb/leveldb-1.11.0/db/version_edit.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/version_edit.cc
rename to deps/leveldb/leveldb-1.11.0/db/version_edit.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/version_edit.h b/deps/leveldb/leveldb-1.11.0/db/version_edit.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/version_edit.h
rename to deps/leveldb/leveldb-1.11.0/db/version_edit.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/version_edit_test.cc b/deps/leveldb/leveldb-1.11.0/db/version_edit_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/version_edit_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/version_edit_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/version_set.cc b/deps/leveldb/leveldb-1.11.0/db/version_set.cc
similarity index 99%
rename from deps/leveldb/leveldb-1.10.0/db/version_set.cc
rename to deps/leveldb/leveldb-1.11.0/db/version_set.cc
index 7d0a5de..4fd1dde 100644
--- a/deps/leveldb/leveldb-1.10.0/db/version_set.cc
+++ b/deps/leveldb/leveldb-1.11.0/db/version_set.cc
@@ -1331,14 +1331,19 @@ Compaction* VersionSet::CompactRange(
}
// Avoid compacting too much in one shot in case the range is large.
- const uint64_t limit = MaxFileSizeForLevel(level);
- uint64_t total = 0;
- for (size_t i = 0; i < inputs.size(); i++) {
- uint64_t s = inputs[i]->file_size;
- total += s;
- if (total >= limit) {
- inputs.resize(i + 1);
- break;
+ // But we cannot do this for level-0 since level-0 files can overlap
+ // and we must not pick one file and drop another older file if the
+ // two files overlap.
+ if (level > 0) {
+ const uint64_t limit = MaxFileSizeForLevel(level);
+ uint64_t total = 0;
+ for (size_t i = 0; i < inputs.size(); i++) {
+ uint64_t s = inputs[i]->file_size;
+ total += s;
+ if (total >= limit) {
+ inputs.resize(i + 1);
+ break;
+ }
}
}
diff --git a/deps/leveldb/leveldb-1.10.0/db/version_set.h b/deps/leveldb/leveldb-1.11.0/db/version_set.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/version_set.h
rename to deps/leveldb/leveldb-1.11.0/db/version_set.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/version_set_test.cc b/deps/leveldb/leveldb-1.11.0/db/version_set_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/version_set_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/version_set_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/write_batch.cc b/deps/leveldb/leveldb-1.11.0/db/write_batch.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/write_batch.cc
rename to deps/leveldb/leveldb-1.11.0/db/write_batch.cc
diff --git a/deps/leveldb/leveldb-1.10.0/db/write_batch_internal.h b/deps/leveldb/leveldb-1.11.0/db/write_batch_internal.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/write_batch_internal.h
rename to deps/leveldb/leveldb-1.11.0/db/write_batch_internal.h
diff --git a/deps/leveldb/leveldb-1.10.0/db/write_batch_test.cc b/deps/leveldb/leveldb-1.11.0/db/write_batch_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/db/write_batch_test.cc
rename to deps/leveldb/leveldb-1.11.0/db/write_batch_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/doc/bench/db_bench_sqlite3.cc b/deps/leveldb/leveldb-1.11.0/doc/bench/db_bench_sqlite3.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/bench/db_bench_sqlite3.cc
rename to deps/leveldb/leveldb-1.11.0/doc/bench/db_bench_sqlite3.cc
diff --git a/deps/leveldb/leveldb-1.10.0/doc/bench/db_bench_tree_db.cc b/deps/leveldb/leveldb-1.11.0/doc/bench/db_bench_tree_db.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/bench/db_bench_tree_db.cc
rename to deps/leveldb/leveldb-1.11.0/doc/bench/db_bench_tree_db.cc
diff --git a/deps/leveldb/leveldb-1.10.0/doc/benchmark.html b/deps/leveldb/leveldb-1.11.0/doc/benchmark.html
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/benchmark.html
rename to deps/leveldb/leveldb-1.11.0/doc/benchmark.html
diff --git a/deps/leveldb/leveldb-1.10.0/doc/doc.css b/deps/leveldb/leveldb-1.11.0/doc/doc.css
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/doc.css
rename to deps/leveldb/leveldb-1.11.0/doc/doc.css
diff --git a/deps/leveldb/leveldb-1.10.0/doc/impl.html b/deps/leveldb/leveldb-1.11.0/doc/impl.html
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/impl.html
rename to deps/leveldb/leveldb-1.11.0/doc/impl.html
diff --git a/deps/leveldb/leveldb-1.10.0/doc/index.html b/deps/leveldb/leveldb-1.11.0/doc/index.html
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/index.html
rename to deps/leveldb/leveldb-1.11.0/doc/index.html
diff --git a/deps/leveldb/leveldb-1.10.0/doc/log_format.txt b/deps/leveldb/leveldb-1.11.0/doc/log_format.txt
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/log_format.txt
rename to deps/leveldb/leveldb-1.11.0/doc/log_format.txt
diff --git a/deps/leveldb/leveldb-1.10.0/doc/table_format.txt b/deps/leveldb/leveldb-1.11.0/doc/table_format.txt
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/doc/table_format.txt
rename to deps/leveldb/leveldb-1.11.0/doc/table_format.txt
diff --git a/deps/leveldb/leveldb-1.10.0/helpers/memenv/memenv.cc b/deps/leveldb/leveldb-1.11.0/helpers/memenv/memenv.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/helpers/memenv/memenv.cc
rename to deps/leveldb/leveldb-1.11.0/helpers/memenv/memenv.cc
diff --git a/deps/leveldb/leveldb-1.10.0/helpers/memenv/memenv.h b/deps/leveldb/leveldb-1.11.0/helpers/memenv/memenv.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/helpers/memenv/memenv.h
rename to deps/leveldb/leveldb-1.11.0/helpers/memenv/memenv.h
diff --git a/deps/leveldb/leveldb-1.10.0/helpers/memenv/memenv_test.cc b/deps/leveldb/leveldb-1.11.0/helpers/memenv/memenv_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/helpers/memenv/memenv_test.cc
rename to deps/leveldb/leveldb-1.11.0/helpers/memenv/memenv_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/c.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/c.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/c.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/c.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/cache.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/cache.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/cache.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/cache.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/comparator.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/comparator.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/comparator.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/comparator.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/db.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/db.h
similarity index 99%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/db.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/db.h
index a37c097..27ea76e 100644
--- a/deps/leveldb/leveldb-1.10.0/include/leveldb/db.h
+++ b/deps/leveldb/leveldb-1.11.0/include/leveldb/db.h
@@ -14,7 +14,7 @@ namespace leveldb {
// Update Makefile if you change these
static const int kMajorVersion = 1;
-static const int kMinorVersion = 10;
+static const int kMinorVersion = 11;
struct Options;
struct ReadOptions;
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/env.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/env.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/env.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/env.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/filter_policy.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/filter_policy.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/filter_policy.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/filter_policy.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/iterator.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/iterator.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/iterator.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/iterator.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/options.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/options.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/options.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/options.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/slice.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/slice.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/slice.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/slice.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/status.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/status.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/status.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/status.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/table.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/table.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/table.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/table.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/table_builder.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/table_builder.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/table_builder.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/table_builder.h
diff --git a/deps/leveldb/leveldb-1.10.0/include/leveldb/write_batch.h b/deps/leveldb/leveldb-1.11.0/include/leveldb/write_batch.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/include/leveldb/write_batch.h
rename to deps/leveldb/leveldb-1.11.0/include/leveldb/write_batch.h
diff --git a/deps/leveldb/leveldb-1.11.0/issues/issue178_test.cc b/deps/leveldb/leveldb-1.11.0/issues/issue178_test.cc
new file mode 100644
index 0000000..c0a21f0
--- /dev/null
+++ b/deps/leveldb/leveldb-1.11.0/issues/issue178_test.cc
@@ -0,0 +1,88 @@
+// Test for issue 178: a manual compaction causes deleted data to reappear.
+#include <iostream>
+#include <sstream>
+#include <cstdlib>
+
+#include "leveldb/db.h"
+#include "leveldb/write_batch.h"
+#include "util/testharness.h"
+
+namespace {
+
+const int kNumKeys = 1100000;
+
+std::string Key1(int i) {
+ char buf[100];
+ snprintf(buf, sizeof(buf), "my_key_%d", i);
+ return buf;
+}
+
+std::string Key2(int i) {
+ return Key1(i) + "_xxx";
+}
+
+class Issue178 { };
+
+TEST(Issue178, Test) {
+ // Get rid of any state from an old run.
+ std::string dbpath = leveldb::test::TmpDir() + "/leveldb_cbug_test";
+ DestroyDB(dbpath, leveldb::Options());
+
+ // Open database. Disable compression since it affects the creation
+ // of layers and the code below is trying to test against a very
+ // specific scenario.
+ leveldb::DB* db;
+ leveldb::Options db_options;
+ db_options.create_if_missing = true;
+ db_options.compression = leveldb::kNoCompression;
+ ASSERT_OK(leveldb::DB::Open(db_options, dbpath, &db));
+
+ // create first key range
+ leveldb::WriteBatch batch;
+ for (size_t i = 0; i < kNumKeys; i++) {
+ batch.Put(Key1(i), "value for range 1 key");
+ }
+ ASSERT_OK(db->Write(leveldb::WriteOptions(), &batch));
+
+ // create second key range
+ batch.Clear();
+ for (size_t i = 0; i < kNumKeys; i++) {
+ batch.Put(Key2(i), "value for range 2 key");
+ }
+ ASSERT_OK(db->Write(leveldb::WriteOptions(), &batch));
+
+ // delete second key range
+ batch.Clear();
+ for (size_t i = 0; i < kNumKeys; i++) {
+ batch.Delete(Key2(i));
+ }
+ ASSERT_OK(db->Write(leveldb::WriteOptions(), &batch));
+
+ // compact database
+ std::string start_key = Key1(0);
+ std::string end_key = Key1(kNumKeys - 1);
+ leveldb::Slice least(start_key.data(), start_key.size());
+ leveldb::Slice greatest(end_key.data(), end_key.size());
+
+ // commenting out the line below causes the example to work correctly
+ db->CompactRange(&least, &greatest);
+
+ // count the keys
+ leveldb::Iterator* iter = db->NewIterator(leveldb::ReadOptions());
+ size_t num_keys = 0;
+ for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
+ num_keys++;
+ }
+ delete iter;
+ ASSERT_EQ(kNumKeys, num_keys) << "Bad number of keys";
+
+ // close database
+ delete db;
+ DestroyDB(dbpath, leveldb::Options());
+}
+
+} // anonymous namespace
+
+int main(int argc, char** argv) {
+ return leveldb::test::RunAllTests();
+}
diff --git a/deps/leveldb/leveldb-1.10.0/port/README b/deps/leveldb/leveldb-1.11.0/port/README
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/README
rename to deps/leveldb/leveldb-1.11.0/port/README
diff --git a/deps/leveldb/leveldb-1.10.0/port/atomic_pointer.h b/deps/leveldb/leveldb-1.11.0/port/atomic_pointer.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/atomic_pointer.h
rename to deps/leveldb/leveldb-1.11.0/port/atomic_pointer.h
diff --git a/deps/leveldb/leveldb-1.10.0/port/port.h b/deps/leveldb/leveldb-1.11.0/port/port.h
similarity index 87%
rename from deps/leveldb/leveldb-1.10.0/port/port.h
rename to deps/leveldb/leveldb-1.11.0/port/port.h
index e009fb6..e667db4 100644
--- a/deps/leveldb/leveldb-1.10.0/port/port.h
+++ b/deps/leveldb/leveldb-1.11.0/port/port.h
@@ -10,9 +10,7 @@
// Include the appropriate platform specific file below. If you are
// porting to a new platform, see "port_example.h" for documentation
// of what the new port_<platform>.h file must provide.
-#if defined(LEVELDB_PLATFORM_UV)
-# include "port_uv.h"
-#elif defined(LEVELDB_PLATFORM_POSIX)
+#if defined(LEVELDB_PLATFORM_POSIX)
# include "port/port_posix.h"
#elif defined(LEVELDB_PLATFORM_CHROMIUM)
# include "port/port_chromium.h"
diff --git a/deps/leveldb/leveldb-1.10.0/port/port_example.h b/deps/leveldb/leveldb-1.11.0/port/port_example.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/port_example.h
rename to deps/leveldb/leveldb-1.11.0/port/port_example.h
diff --git a/deps/leveldb/leveldb-1.10.0/port/port_posix.cc b/deps/leveldb/leveldb-1.11.0/port/port_posix.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/port_posix.cc
rename to deps/leveldb/leveldb-1.11.0/port/port_posix.cc
diff --git a/deps/leveldb/leveldb-1.10.0/port/port_posix.h b/deps/leveldb/leveldb-1.11.0/port/port_posix.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/port_posix.h
rename to deps/leveldb/leveldb-1.11.0/port/port_posix.h
diff --git a/deps/leveldb/leveldb-1.10.0/port/thread_annotations.h b/deps/leveldb/leveldb-1.11.0/port/thread_annotations.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/thread_annotations.h
rename to deps/leveldb/leveldb-1.11.0/port/thread_annotations.h
diff --git a/deps/leveldb/leveldb-1.10.0/port/win/stdint.h b/deps/leveldb/leveldb-1.11.0/port/win/stdint.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/port/win/stdint.h
rename to deps/leveldb/leveldb-1.11.0/port/win/stdint.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/block.cc b/deps/leveldb/leveldb-1.11.0/table/block.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/block.cc
rename to deps/leveldb/leveldb-1.11.0/table/block.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/block.h b/deps/leveldb/leveldb-1.11.0/table/block.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/block.h
rename to deps/leveldb/leveldb-1.11.0/table/block.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/block_builder.cc b/deps/leveldb/leveldb-1.11.0/table/block_builder.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/block_builder.cc
rename to deps/leveldb/leveldb-1.11.0/table/block_builder.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/block_builder.h b/deps/leveldb/leveldb-1.11.0/table/block_builder.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/block_builder.h
rename to deps/leveldb/leveldb-1.11.0/table/block_builder.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/filter_block.cc b/deps/leveldb/leveldb-1.11.0/table/filter_block.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/filter_block.cc
rename to deps/leveldb/leveldb-1.11.0/table/filter_block.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/filter_block.h b/deps/leveldb/leveldb-1.11.0/table/filter_block.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/filter_block.h
rename to deps/leveldb/leveldb-1.11.0/table/filter_block.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/filter_block_test.cc b/deps/leveldb/leveldb-1.11.0/table/filter_block_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/filter_block_test.cc
rename to deps/leveldb/leveldb-1.11.0/table/filter_block_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/format.cc b/deps/leveldb/leveldb-1.11.0/table/format.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/format.cc
rename to deps/leveldb/leveldb-1.11.0/table/format.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/format.h b/deps/leveldb/leveldb-1.11.0/table/format.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/format.h
rename to deps/leveldb/leveldb-1.11.0/table/format.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/iterator.cc b/deps/leveldb/leveldb-1.11.0/table/iterator.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/iterator.cc
rename to deps/leveldb/leveldb-1.11.0/table/iterator.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/iterator_wrapper.h b/deps/leveldb/leveldb-1.11.0/table/iterator_wrapper.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/iterator_wrapper.h
rename to deps/leveldb/leveldb-1.11.0/table/iterator_wrapper.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/merger.cc b/deps/leveldb/leveldb-1.11.0/table/merger.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/merger.cc
rename to deps/leveldb/leveldb-1.11.0/table/merger.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/merger.h b/deps/leveldb/leveldb-1.11.0/table/merger.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/merger.h
rename to deps/leveldb/leveldb-1.11.0/table/merger.h
diff --git a/deps/leveldb/leveldb-1.10.0/table/table.cc b/deps/leveldb/leveldb-1.11.0/table/table.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/table.cc
rename to deps/leveldb/leveldb-1.11.0/table/table.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/table_builder.cc b/deps/leveldb/leveldb-1.11.0/table/table_builder.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/table_builder.cc
rename to deps/leveldb/leveldb-1.11.0/table/table_builder.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/table_test.cc b/deps/leveldb/leveldb-1.11.0/table/table_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/table_test.cc
rename to deps/leveldb/leveldb-1.11.0/table/table_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/two_level_iterator.cc b/deps/leveldb/leveldb-1.11.0/table/two_level_iterator.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/two_level_iterator.cc
rename to deps/leveldb/leveldb-1.11.0/table/two_level_iterator.cc
diff --git a/deps/leveldb/leveldb-1.10.0/table/two_level_iterator.h b/deps/leveldb/leveldb-1.11.0/table/two_level_iterator.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/table/two_level_iterator.h
rename to deps/leveldb/leveldb-1.11.0/table/two_level_iterator.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/arena.cc b/deps/leveldb/leveldb-1.11.0/util/arena.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/arena.cc
rename to deps/leveldb/leveldb-1.11.0/util/arena.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/arena.h b/deps/leveldb/leveldb-1.11.0/util/arena.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/arena.h
rename to deps/leveldb/leveldb-1.11.0/util/arena.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/arena_test.cc b/deps/leveldb/leveldb-1.11.0/util/arena_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/arena_test.cc
rename to deps/leveldb/leveldb-1.11.0/util/arena_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/bloom.cc b/deps/leveldb/leveldb-1.11.0/util/bloom.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/bloom.cc
rename to deps/leveldb/leveldb-1.11.0/util/bloom.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/bloom_test.cc b/deps/leveldb/leveldb-1.11.0/util/bloom_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/bloom_test.cc
rename to deps/leveldb/leveldb-1.11.0/util/bloom_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/cache.cc b/deps/leveldb/leveldb-1.11.0/util/cache.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/cache.cc
rename to deps/leveldb/leveldb-1.11.0/util/cache.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/cache_test.cc b/deps/leveldb/leveldb-1.11.0/util/cache_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/cache_test.cc
rename to deps/leveldb/leveldb-1.11.0/util/cache_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/coding.cc b/deps/leveldb/leveldb-1.11.0/util/coding.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/coding.cc
rename to deps/leveldb/leveldb-1.11.0/util/coding.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/coding.h b/deps/leveldb/leveldb-1.11.0/util/coding.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/coding.h
rename to deps/leveldb/leveldb-1.11.0/util/coding.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/coding_test.cc b/deps/leveldb/leveldb-1.11.0/util/coding_test.cc
similarity index 99%
rename from deps/leveldb/leveldb-1.10.0/util/coding_test.cc
rename to deps/leveldb/leveldb-1.11.0/util/coding_test.cc
index 2c52b17..fb5726e 100644
--- a/deps/leveldb/leveldb-1.10.0/util/coding_test.cc
+++ b/deps/leveldb/leveldb-1.11.0/util/coding_test.cc
@@ -109,7 +109,7 @@ TEST(Coding, Varint64) {
values.push_back(power);
values.push_back(power-1);
values.push_back(power+1);
- };
+ }
std::string s;
for (int i = 0; i < values.size(); i++) {
diff --git a/deps/leveldb/leveldb-1.10.0/util/comparator.cc b/deps/leveldb/leveldb-1.11.0/util/comparator.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/comparator.cc
rename to deps/leveldb/leveldb-1.11.0/util/comparator.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/crc32c.cc b/deps/leveldb/leveldb-1.11.0/util/crc32c.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/crc32c.cc
rename to deps/leveldb/leveldb-1.11.0/util/crc32c.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/crc32c.h b/deps/leveldb/leveldb-1.11.0/util/crc32c.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/crc32c.h
rename to deps/leveldb/leveldb-1.11.0/util/crc32c.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/crc32c_test.cc b/deps/leveldb/leveldb-1.11.0/util/crc32c_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/crc32c_test.cc
rename to deps/leveldb/leveldb-1.11.0/util/crc32c_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/env.cc b/deps/leveldb/leveldb-1.11.0/util/env.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/env.cc
rename to deps/leveldb/leveldb-1.11.0/util/env.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/env_posix.cc b/deps/leveldb/leveldb-1.11.0/util/env_posix.cc
similarity index 99%
rename from deps/leveldb/leveldb-1.10.0/util/env_posix.cc
rename to deps/leveldb/leveldb-1.11.0/util/env_posix.cc
index bb58c1d..a3f197d 100644
--- a/deps/leveldb/leveldb-1.10.0/util/env_posix.cc
+++ b/deps/leveldb/leveldb-1.11.0/util/env_posix.cc
@@ -466,7 +466,7 @@ class PosixEnv : public Env {
result = IOError(fname, errno);
}
return result;
- };
+ }
virtual Status CreateDir(const std::string& name) {
Status result;
@@ -474,7 +474,7 @@ class PosixEnv : public Env {
result = IOError(name, errno);
}
return result;
- };
+ }
virtual Status DeleteDir(const std::string& name) {
Status result;
@@ -482,7 +482,7 @@ class PosixEnv : public Env {
result = IOError(name, errno);
}
return result;
- };
+ }
virtual Status GetFileSize(const std::string& fname, uint64_t* size) {
Status s;
diff --git a/deps/leveldb/leveldb-1.10.0/util/env_test.cc b/deps/leveldb/leveldb-1.11.0/util/env_test.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/env_test.cc
rename to deps/leveldb/leveldb-1.11.0/util/env_test.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/filter_policy.cc b/deps/leveldb/leveldb-1.11.0/util/filter_policy.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/filter_policy.cc
rename to deps/leveldb/leveldb-1.11.0/util/filter_policy.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/hash.cc b/deps/leveldb/leveldb-1.11.0/util/hash.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/hash.cc
rename to deps/leveldb/leveldb-1.11.0/util/hash.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/hash.h b/deps/leveldb/leveldb-1.11.0/util/hash.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/hash.h
rename to deps/leveldb/leveldb-1.11.0/util/hash.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/histogram.cc b/deps/leveldb/leveldb-1.11.0/util/histogram.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/histogram.cc
rename to deps/leveldb/leveldb-1.11.0/util/histogram.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/histogram.h b/deps/leveldb/leveldb-1.11.0/util/histogram.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/histogram.h
rename to deps/leveldb/leveldb-1.11.0/util/histogram.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/logging.cc b/deps/leveldb/leveldb-1.11.0/util/logging.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/logging.cc
rename to deps/leveldb/leveldb-1.11.0/util/logging.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/logging.h b/deps/leveldb/leveldb-1.11.0/util/logging.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/logging.h
rename to deps/leveldb/leveldb-1.11.0/util/logging.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/mutexlock.h b/deps/leveldb/leveldb-1.11.0/util/mutexlock.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/mutexlock.h
rename to deps/leveldb/leveldb-1.11.0/util/mutexlock.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/options.cc b/deps/leveldb/leveldb-1.11.0/util/options.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/options.cc
rename to deps/leveldb/leveldb-1.11.0/util/options.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/posix_logger.h b/deps/leveldb/leveldb-1.11.0/util/posix_logger.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/posix_logger.h
rename to deps/leveldb/leveldb-1.11.0/util/posix_logger.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/random.h b/deps/leveldb/leveldb-1.11.0/util/random.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/random.h
rename to deps/leveldb/leveldb-1.11.0/util/random.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/status.cc b/deps/leveldb/leveldb-1.11.0/util/status.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/status.cc
rename to deps/leveldb/leveldb-1.11.0/util/status.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/testharness.cc b/deps/leveldb/leveldb-1.11.0/util/testharness.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/testharness.cc
rename to deps/leveldb/leveldb-1.11.0/util/testharness.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/testharness.h b/deps/leveldb/leveldb-1.11.0/util/testharness.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/testharness.h
rename to deps/leveldb/leveldb-1.11.0/util/testharness.h
diff --git a/deps/leveldb/leveldb-1.10.0/util/testutil.cc b/deps/leveldb/leveldb-1.11.0/util/testutil.cc
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/testutil.cc
rename to deps/leveldb/leveldb-1.11.0/util/testutil.cc
diff --git a/deps/leveldb/leveldb-1.10.0/util/testutil.h b/deps/leveldb/leveldb-1.11.0/util/testutil.h
similarity index 100%
rename from deps/leveldb/leveldb-1.10.0/util/testutil.h
rename to deps/leveldb/leveldb-1.11.0/util/testutil.h
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index c2811bc..f62d494 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -1,7 +1,7 @@
{'targets': [{
'target_name': 'leveldb'
, 'variables': {
- 'ldbversion': '1.10.0'
+ 'ldbversion': '1.11.0'
}
, 'type': 'static_library'
# Overcomes an issue with the linker and thin .a files on SmartOS
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git
More information about the Pkg-javascript-commits
mailing list