[Pkg-javascript-commits] [node-leveldown] 06/07: fixes for basho leveldb

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to tag basho-0.10.0
in repository node-leveldown.

commit 459d1f7fd4a4431af480f843e3784475995fd77d
Author: Rod Vagg <rod at vagg.org>
Date:   Wed Oct 9 20:04:04 2013 +1100

    fixes for basho leveldb
---
 deps/leveldb/leveldb-basho | 2 +-
 deps/leveldb/leveldb.gyp   | 4 +++-
 test/repair-test.js        | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/deps/leveldb/leveldb-basho b/deps/leveldb/leveldb-basho
index 79547d7..1f5b2c5 160000
--- a/deps/leveldb/leveldb-basho
+++ b/deps/leveldb/leveldb-basho
@@ -1 +1 @@
-Subproject commit 79547d7115c968fc69fd744ad1e8352c42cb8dd0
+Subproject commit 1f5b2c5b3c815c6721f5a12a9d1408b624e58860
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 3cf0b0c..3fb6096 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -1,7 +1,7 @@
 {'targets': [{
     'target_name': 'leveldb'
   , 'variables': {
-        'ldbversion': '1.14.0'
+        'ldbversion': 'basho'
     }
   , 'type': 'static_library'
 		# Overcomes an issue with the linker and thin .a files on SmartOS
@@ -66,6 +66,7 @@
             'cflags': [
                 '-Wno-sign-compare'
               , '-Wno-unused-but-set-variable'
+              , '-Wno-ignored-qualifiers'
             ]
         }]
       , ['OS == "linux"', {
@@ -170,5 +171,6 @@
       , 'leveldb-<(ldbversion)/util/status.cc'
       , 'leveldb-<(ldbversion)/port/port_posix.cc'
       , 'leveldb-<(ldbversion)/helpers/memenv/memenv.cc'
+      , 'leveldb-<(ldbversion)/util/throttle.cc'
    ]
 }]}
diff --git a/test/repair-test.js b/test/repair-test.js
index 225a3ac..0de8e17 100644
--- a/test/repair-test.js
+++ b/test/repair-test.js
@@ -38,11 +38,11 @@ makeTest('test repair() compacts', function (db, t, done, location) {
     t.notOk(err, 'no error')
     var files = fs.readdirSync(location)
     t.ok(files.some(function (f) { return (/\.log$/).test(f) }), 'directory contains log file(s)')
-    t.notOk(files.some(function (f) { return (/\.ldb$/).test(f) }), 'directory does not contain ldb file(s)')
+    t.notOk(files.some(function (f) { return (/\.sst$/).test(f) }), 'directory does not contain sst file(s)')
     leveldown.repair(location, function () {
       files = fs.readdirSync(location)
       t.notOk(files.some(function (f) { return (/\.log$/).test(f) }), 'directory does not contain log file(s)')
-      t.ok(files.some(function (f) { return (/\.ldb$/).test(f) }), 'directory contains ldb file(s)')
+      t.ok(files.some(function (f) { return (/\.sst$/).test(f) }), 'directory contains sst file(s)')
       done(false)
     })
   })

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git