summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 10:11:41 +0000
committerdgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 10:11:41 +0000
commitef28aa5f3f4b3cab6b8881dc86bfa8a77e19f036 (patch)
tree63da6773878654f8cd4a8e8f3fe508cc443e6e2e
parentf7db39718c73a2498b016f70a0b77c9f7514e95a (diff)
downloadchromium_src-ef28aa5f3f4b3cab6b8881dc86bfa8a77e19f036.zip
chromium_src-ef28aa5f3f4b3cab6b8881dc86bfa8a77e19f036.tar.gz
chromium_src-ef28aa5f3f4b3cab6b8881dc86bfa8a77e19f036.tar.bz2
Roll leveldb to r76.
Main change that affects chrome is properly sanitizing options.max_open_files. There's also a large change in this roll that fixes a bug where a large contiguous keyspace of deleted data was not getting compacted. The fix improves performance for random seeks on such a database. BUG=268455 Review URL: https://chromiumcodereview.appspot.com/23295021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218978 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/leveldatabase/README.chromium2
-rw-r--r--third_party/leveldatabase/port/port_chromium.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index e7ec3a3..5014e7e 100644
--- a/DEPS
+++ b/DEPS
@@ -94,7 +94,7 @@ deps = {
"/trunk/src@312",
"src/third_party/leveldatabase/src":
- (Var("googlecode_url") % "leveldb") + "/trunk@75",
+ (Var("googlecode_url") % "leveldb") + "/trunk@76",
"src/third_party/snappy/src":
(Var("googlecode_url") % "snappy") + "/trunk@74",
diff --git a/third_party/leveldatabase/README.chromium b/third_party/leveldatabase/README.chromium
index d1f08d3..1462c90 100644
--- a/third_party/leveldatabase/README.chromium
+++ b/third_party/leveldatabase/README.chromium
@@ -1,7 +1,7 @@
Name: LevelDB: A Fast Persistent Key-Value Store
Short Name: leveldb
URL: http://code.google.com/p/leveldb/
-Version: r75
+Version: r76
License: New BSD
License File: src/LICENSE
Security Critical: yes
diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h
index 6de765e..661e85b 100644
--- a/third_party/leveldatabase/port/port_chromium.h
+++ b/third_party/leveldatabase/port/port_chromium.h
@@ -22,6 +22,7 @@
#if defined(OS_WIN)
#define snprintf _snprintf
+typedef SSIZE_T ssize_t;
#if !defined(__clang__)
# define va_copy(a, b) do { (a) = (b); } while (0)
#endif