leveldb-ruby 0.10 → 0.11

data/leveldb/util/random.h

@@ -54,6 +54,6 @@ class Random {
   }
 };
 
-}
+}  // namespace leveldb
 
 #endif  // STORAGE_LEVELDB_UTIL_RANDOM_H_

data/leveldb/util/status.cc

@@ -72,4 +72,4 @@ std::string Status::ToString() const {
   }
 }
 
-}
+}  // namespace leveldb

data/leveldb/util/testharness.cc

@@ -73,5 +73,5 @@ int RandomSeed() {
   return result;
 }
 
-}
-}
+}  // namespace test
+}  // namespace leveldb

data/leveldb/util/testharness.h

@@ -132,7 +132,7 @@ void TCONCAT(_Test_,name)::_Run()
 extern bool RegisterTest(const char* base, const char* name, void (*func)());
 
 
-}
-}
+}  // namespace test
+}  // namespace leveldb
 
 #endif  // STORAGE_LEVELDB_UTIL_TESTHARNESS_H_

data/leveldb/util/testutil.cc

@@ -47,5 +47,5 @@ extern Slice CompressibleString(Random* rnd, double compressed_fraction,
   return Slice(*dst);
 }
 
-}
-}
+}  // namespace test
+}  // namespace leveldb

data/leveldb/util/testutil.h

@@ -47,7 +47,7 @@ class ErrorEnv : public EnvWrapper {
   }
 };
 
-}
-}
+}  // namespace test
+}  // namespace leveldb
 
 #endif  // STORAGE_LEVELDB_UTIL_TESTUTIL_H_

data/lib/leveldb.rb

@@ -4,7 +4,6 @@ module LevelDB
 class DB
   include Enumerable
   class << self
-
     ## Loads or creates a LevelDB database as necessary, stored on disk at
     ## +pathname+.
     def new pathname
@@ -29,16 +28,49 @@ class DB
     def path_string pathname
       File.respond_to?(:path) ? File.path(pathname) : pathname.to_str
     end
-
   end
 
+  attr_reader :pathname
+
   alias :includes? :exists?
   alias :contains? :exists?
   alias :member? :exists?
   alias :[] :get
   alias :[]= :put
 
+  def each(*args, &block)
+    i = iterator(*args)
+    i.each(&block) if block
+    i
+  end
+
+  def iterator(*args); Iterator.new self, *args end
   def keys; map { |k, v| k } end
   def values; map { |k, v| v } end
+
+  def inspect
+    %(<#{self.class} #{@pathname.inspect}>)
+  end
+end
+
+class Iterator
+  include Enumerable
+
+  attr_reader :db, :from, :to
+
+  def self.new(db, opts={})
+    make db, opts
+  end
+
+  def reversed?; @reversed end
+  def inspect
+    %(<#{self.class} #{@db.inspect} @from=#{@from.inspect} @to=#{@to.inspect}#{' (reversed)' if @reversed}>)
+  end
 end
+
+class WriteBatch
+  class << self
+    private :new
+  end
 end
+end # module LevelDB

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leveldb-ruby
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 14:26:21.000000000 -07:00
-default_executable: 
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies: []
 description: LevelDB-Ruby is a Ruby binding to LevelDB.
 email: wmorgan-leveldb-ruby-gemspec@masanjin.net
@@ -23,6 +22,7 @@ extra_rdoc_files:
 files:
 - README
 - ext/leveldb/extconf.rb
+- ext/leveldb/platform.rb
 - lib/leveldb.rb
 - ext/leveldb/leveldb.cc
 - leveldb/Makefile
@@ -66,6 +66,9 @@ files:
 - leveldb/db/write_batch.cc
 - leveldb/db/write_batch_internal.h
 - leveldb/db/write_batch_test.cc
+- leveldb/helpers/memenv/memenv.cc
+- leveldb/helpers/memenv/memenv.h
+- leveldb/helpers/memenv/memenv_test.cc
 - leveldb/include/leveldb/c.h
 - leveldb/include/leveldb/cache.h
 - leveldb/include/leveldb/comparator.h
@@ -82,16 +85,9 @@ files:
 - leveldb/port/port.h
 - leveldb/port/port_android.cc
 - leveldb/port/port_android.h
-- leveldb/port/port_chromium.cc
-- leveldb/port/port_chromium.h
 - leveldb/port/port_example.h
-- leveldb/port/port_osx.cc
-- leveldb/port/port_osx.h
 - leveldb/port/port_posix.cc
 - leveldb/port/port_posix.h
-- leveldb/port/sha1_portable.cc
-- leveldb/port/sha1_portable.h
-- leveldb/port/sha1_test.cc
 - leveldb/port/win/stdint.h
 - leveldb/table/block.cc
 - leveldb/table/block.h
@@ -121,7 +117,6 @@ files:
 - leveldb/util/crc32c.h
 - leveldb/util/crc32c_test.cc
 - leveldb/util/env.cc
-- leveldb/util/env_chromium.cc
 - leveldb/util/env_posix.cc
 - leveldb/util/env_test.cc
 - leveldb/util/hash.cc
@@ -139,7 +134,6 @@ files:
 - leveldb/util/testharness.h
 - leveldb/util/testutil.cc
 - leveldb/util/testutil.h
-has_rdoc: true
 homepage: http://github.com/wmorgan/leveldb-ruby
 licenses: []
 post_install_message: 
@@ -166,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: a Ruby binding to LevelDB

data/leveldb/port/port_chromium.cc

@@ -1,80 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#include "port/port_chromium.h"
-
-#include "util/logging.h"
-
-#if defined(USE_SNAPPY)
-#  include "third_party/snappy/src/snappy.h"
-#endif
-
-namespace leveldb {
-namespace port {
-
-Mutex::Mutex() {
-}
-
-Mutex::~Mutex() {
-}
-
-void Mutex::Lock() {
-  mu_.Acquire();
-}
-
-void Mutex::Unlock() {
-  mu_.Release();
-}
-
-void Mutex::AssertHeld() {
-  mu_.AssertAcquired();
-}
-
-CondVar::CondVar(Mutex* mu)
-    : cv_(&mu->mu_) {
-}
-
-CondVar::~CondVar() { }
-
-void CondVar::Wait() {
-  cv_.Wait();
-}
-
-void CondVar::Signal(){
-  cv_.Signal();
-}
-
-void CondVar::SignalAll() {
-  cv_.Broadcast();
-}
-
-bool Snappy_Compress(const char* input, size_t input_length,
-                     std::string* output) {
-#if defined(USE_SNAPPY)
-  output->resize(snappy::MaxCompressedLength(input_length));
-  size_t outlen;
-  snappy::RawCompress(input, input_length, &(*output)[0], &outlen);
-  output->resize(outlen);
-  return true;
-#else
-  return false;
-#endif
-}
-
-bool Snappy_Uncompress(const char* input_data, size_t input_length,
-                       std::string* output) {
-#if defined(USE_SNAPPY)
-  size_t ulength;
-  if (!snappy::GetUncompressedLength(input_data, input_length, &ulength)) {
-    return false;
-  }
-  output->resize(ulength);
-  return snappy::RawUncompress(input_data, input_length, &(*output)[0]);
-#else
-  return false;
-#endif
-}
-
-}
-}

data/leveldb/port/port_chromium.h

@@ -1,97 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-//
-// See port_example.h for documentation for the following types/functions.
-
-#ifndef STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_
-#define STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_
-
-#include <stdint.h>
-#include <string>
-#include <cstring>
-#include "base/atomicops.h"
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/synchronization/condition_variable.h"
-#include "base/synchronization/lock.h"
-
-// Linux's ThreadIdentifier() needs this.
-#if defined(OS_LINUX)
-#  include <linux/unistd.h>
-#endif
-
-#if defined(OS_WIN)
-#define snprintf _snprintf
-#define va_copy(a, b) do { (a) = (b); } while (0)
-#endif
-
-namespace leveldb {
-namespace port {
-
-// Chromium only supports little endian.
-static const bool kLittleEndian = true;
-
-class Mutex {
- public:
-  Mutex();
-  ~Mutex();
-  void Lock();
-  void Unlock();
-  void AssertHeld();
-
- private:
-  base::Lock mu_;
-
-  friend class CondVar;
-  DISALLOW_COPY_AND_ASSIGN(Mutex);
-};
-
-class CondVar {
- public:
-  explicit CondVar(Mutex* mu);
-  ~CondVar();
-  void Wait();
-  void Signal();
-  void SignalAll();
-
- private:
-  base::ConditionVariable cv_;
-
-  DISALLOW_COPY_AND_ASSIGN(CondVar);
-};
-
-class AtomicPointer {
- private:
-  typedef base::subtle::AtomicWord Rep;
-  Rep rep_;
- public:
-  AtomicPointer() { }
-  explicit AtomicPointer(void* p) : rep_(reinterpret_cast<Rep>(p)) {}
-  inline void* Acquire_Load() const {
-    return reinterpret_cast<void*>(::base::subtle::Acquire_Load(&rep_));
-  }
-  inline void Release_Store(void* v) {
-    ::base::subtle::Release_Store(&rep_, reinterpret_cast<Rep>(v));
-  }
-  inline void* NoBarrier_Load() const {
-    return reinterpret_cast<void*>(::base::subtle::NoBarrier_Load(&rep_));
-  }
-  inline void NoBarrier_Store(void* v) {
-    ::base::subtle::NoBarrier_Store(&rep_, reinterpret_cast<Rep>(v));
-  }
-};
-
-bool Snappy_Compress(const char* input, size_t input_length,
-                     std::string* output);
-bool Snappy_Uncompress(const char* input_data, size_t input_length,
-                       std::string* output);
-
-inline bool GetHeapProfile(void (*func)(void*, const char*, int), void* arg) {
-  return false;
-}
-
-}
-}
-
-#endif  // STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_

data/leveldb/port/port_osx.cc

@@ -1,50 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#include "port_osx.h"
-
-#include <cstdlib>
-#include <stdio.h>
-#include <string.h>
-#include "util/logging.h"
-
-namespace leveldb {
-namespace port {
-
-static void PthreadCall(const char* label, int result) {
-  if (result != 0) {
-    fprintf(stderr, "pthread %s: %s\n", label, strerror(result));
-    abort();
-  }
-}
-
-Mutex::Mutex() { PthreadCall("init mutex", pthread_mutex_init(&mu_, NULL)); }
-
-Mutex::~Mutex() { PthreadCall("destroy mutex", pthread_mutex_destroy(&mu_)); }
-
-void Mutex::Lock() { PthreadCall("lock", pthread_mutex_lock(&mu_)); }
-
-void Mutex::Unlock() { PthreadCall("unlock", pthread_mutex_unlock(&mu_)); }
-
-CondVar::CondVar(Mutex* mu)
-    : mu_(mu) {
-    PthreadCall("init cv", pthread_cond_init(&cv_, NULL));
-}
-
-CondVar::~CondVar() { PthreadCall("destroy cv", pthread_cond_destroy(&cv_)); }
-
-void CondVar::Wait() {
-  PthreadCall("wait", pthread_cond_wait(&cv_, &mu_->mu_));
-}
-
-void CondVar::Signal() {
-  PthreadCall("signal", pthread_cond_signal(&cv_));
-}
-
-void CondVar::SignalAll() {
-  PthreadCall("broadcast", pthread_cond_broadcast(&cv_));
-}
-
-}
-}

data/leveldb/port/port_osx.h

@@ -1,125 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-//
-// See port_example.h for documentation for the following types/functions.
-
-#ifndef STORAGE_LEVELDB_PORT_PORT_OSX_H_
-#define STORAGE_LEVELDB_PORT_PORT_OSX_H_
-
-#include <libkern/OSAtomic.h>
-#include <machine/endian.h>
-#include <pthread.h>
-#include <stdint.h>
-
-#include <string>
-
-namespace leveldb {
-
-// The following 4 methods implemented here for the benefit of env_posix.cc.
-inline size_t fread_unlocked(void *a, size_t b, size_t c, FILE *d) {
-  return fread(a, b, c, d);
-}
-
-inline size_t fwrite_unlocked(const void *a, size_t b, size_t c, FILE *d) {
-  return fwrite(a, b, c, d);
-}
-
-inline int fflush_unlocked(FILE *f) {
-  return fflush(f);
-}
-
-inline int fdatasync(int fd) {
-  return fsync(fd);
-}
-
-namespace port {
-
-static const bool kLittleEndian = (__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN);
-
-// ------------------ Threading -------------------
-
-// A Mutex represents an exclusive lock.
-class Mutex {
- public:
-  Mutex();
-  ~Mutex();
-
-  void Lock();
-  void Unlock();
-  void AssertHeld() { }
-
- private:
-  friend class CondVar;
-  pthread_mutex_t mu_;
-
-  // No copying
-  Mutex(const Mutex&);
-  void operator=(const Mutex&);
-};
-
-class CondVar {
- public:
-  explicit CondVar(Mutex* mu);
-  ~CondVar();
-
-  void Wait();
-  void Signal();
-  void SignalAll();
-
- private:
-  pthread_cond_t cv_;
-  Mutex* mu_;
-};
-
-inline void MemoryBarrier() {
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-  // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on
-  // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering.
-  __asm__ __volatile__("" : : : "memory");
-#else
-  OSMemoryBarrier();
-#endif
-}
-
-class AtomicPointer {
- private:
-  void* ptr_;
- public:
-  AtomicPointer() { }
-  explicit AtomicPointer(void* p) : ptr_(p) {}
-  inline void* Acquire_Load() const {
-    void* ptr = ptr_;
-    MemoryBarrier();
-    return ptr;
-  }
-  inline void Release_Store(void* v) {
-    MemoryBarrier();
-    ptr_ = v;
-  }
-  inline void* NoBarrier_Load() const {
-    return ptr_;
-  }
-  inline void NoBarrier_Store(void* v) {
-    ptr_ = v;
-  }
-};
-
-inline bool Snappy_Compress(const char* input, size_t input_length,
-                            std::string* output) {
-  return false;
-}
-
-inline bool Snappy_Uncompress(const char* input_data, size_t input_length,
-                              std::string* output) {
-  return false;
-}
-
-inline bool GetHeapProfile(void (*func)(void*, const char*, int), void* arg) {
-  return false;
-}
-
-}
-}
-
-#endif  // STORAGE_LEVELDB_PORT_PORT_OSX_H_