Take Keith's suggestion: rearrange `api/leveldb` by copyright to simplify maintenance of the license information. Rename the "eleveldb" flavor to "basho" in the process, so the directory name matches the option. List the choices in the configure help, and check for invalid flavors.

--HG--
rename : api/leveldb/util/perf_count.cc => api/leveldb/basho/perf_count.cc
rename : api/leveldb/include/leveldb/perf_count.h => api/leveldb/basho/perf_count.h
rename : api/leveldb/include/leveldb/replay_iterator.h => api/leveldb/hyperleveldb/replay_iterator.h
rename : api/leveldb/AUTHORS => api/leveldb/leveldb/AUTHORS
rename : api/leveldb/LICENSE => api/leveldb/leveldb/LICENSE
rename : api/leveldb/db/dbformat.h => api/leveldb/leveldb/db/dbformat.h
rename : api/leveldb/db/skiplist.h => api/leveldb/leveldb/db/skiplist.h
rename : api/leveldb/db/write_batch.cc => api/leveldb/leveldb/db/write_batch.cc
rename : api/leveldb/db/write_batch_internal.h => api/leveldb/leveldb/db/write_batch_internal.h
rename : api/leveldb/include/leveldb/cache.h => api/leveldb/leveldb/include/leveldb/cache.h
rename : api/leveldb/include/leveldb/comparator.h => api/leveldb/leveldb/include/leveldb/comparator.h
rename : api/leveldb/include/leveldb/db.h => api/leveldb/leveldb/include/leveldb/db.h
rename : api/leveldb/include/leveldb/env.h => api/leveldb/leveldb/include/leveldb/env.h
rename : api/leveldb/include/leveldb/filter_policy.h => api/leveldb/leveldb/include/leveldb/filter_policy.h
rename : api/leveldb/include/leveldb/iterator.h => api/leveldb/leveldb/include/leveldb/iterator.h
rename : api/leveldb/include/leveldb/options.h => api/leveldb/leveldb/include/leveldb/options.h
rename : api/leveldb/include/leveldb/slice.h => api/leveldb/leveldb/include/leveldb/slice.h
rename : api/leveldb/include/leveldb/status.h => api/leveldb/leveldb/include/leveldb/status.h
rename : api/leveldb/include/leveldb/write_batch.h => api/leveldb/leveldb/include/leveldb/write_batch.h
rename : api/leveldb/port/port.h => api/leveldb/leveldb/port/port.h
rename : api/leveldb/util/arena.h => api/leveldb/leveldb/util/arena.h
rename : api/leveldb/util/coding.cc => api/leveldb/leveldb/util/coding.cc
rename : api/leveldb/util/coding.h => api/leveldb/leveldb/util/coding.h
rename : api/leveldb/util/comparator.cc => api/leveldb/leveldb/util/comparator.cc
rename : api/leveldb/util/env.cc => api/leveldb/leveldb/util/env.cc
rename : api/leveldb/util/env_posix.cc => api/leveldb/leveldb/util/env_posix.cc
rename : api/leveldb/util/logging.cc => api/leveldb/leveldb/util/logging.cc
rename : api/leveldb/util/logging.h => api/leveldb/leveldb/util/logging.h
rename : api/leveldb/util/options.cc => api/leveldb/leveldb/util/options.cc
rename : api/leveldb/util/posix_logger.h => api/leveldb/leveldb/util/posix_logger.h
rename : api/leveldb/util/random.h => api/leveldb/leveldb/util/random.h
rename : api/leveldb/util/status.cc => api/leveldb/leveldb/util/status.cc

35 files changed, 35 insertions, 33 deletions

diff --git a/api/leveldb/Makefile.am b/api/leveldb/Makefile.am
index 0d5b5040a95..cf0af88fd62 100644
--- a/api/leveldb/Makefile.am
+++ b/api/leveldb/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/api/leveldb/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/leveldb -I$(srcdir)/leveldb/include
 
 lib_LTLIBRARIES = libwiredtiger_leveldb.la
 
@@ -17,40 +17,42 @@ endif
 endif
 leveldbinclude_HEADERS = \
 	wiredtiger_config.h \
-	include/leveldb/cache.h \
-	include/leveldb/comparator.h\
-	include/leveldb/db.h \
-	include/leveldb/env.h \
-	include/leveldb/filter_policy.h \
-	include/leveldb/iterator.h \
-	include/leveldb/options.h \
-	include/leveldb/slice.h \
-	include/leveldb/status.h \
-	include/leveldb/write_batch.h
+	leveldb/include/leveldb/cache.h \
+	leveldb/include/leveldb/comparator.h\
+	leveldb/include/leveldb/db.h \
+	leveldb/include/leveldb/env.h \
+	leveldb/include/leveldb/filter_policy.h \
+	leveldb/include/leveldb/iterator.h \
+	leveldb/include/leveldb/options.h \
+	leveldb/include/leveldb/slice.h \
+	leveldb/include/leveldb/status.h \
+	leveldb/include/leveldb/write_batch.h
 
-if HAVE_ELEVELDB
+if HAVE_BASHOLEVELDB
+AM_CPPFLAGS += -I$(srcdir)/leveldb/include/leveldb -I$(srcdir)/basho
 leveldbinclude_HEADERS += \
-	 include/leveldb/perf_count.h
+	 basho/perf_count.h
 endif
 if HAVE_HYPERLEVELDB
+AM_CPPFLAGS += -I$(srcdir)/leveldb/include/leveldb -I$(srcdir)/hyperleveldb
 leveldbinclude_HEADERS += \
-	 include/leveldb/replay_iterator.h
+	 hyperleveldb/replay_iterator.h
 endif
 
 libwiredtiger_leveldb_la_LDFLAGS = -release @VERSION@
 libwiredtiger_leveldb_la_LIBADD = $(top_builddir)/libwiredtiger.la
 libwiredtiger_leveldb_la_SOURCES = \
 	leveldb_wt.cc \
-	util/coding.cc util/comparator.cc util/env.cc util/env_posix.cc \
-	util/logging.cc util/options.cc util/status.cc
+	leveldb/util/coding.cc leveldb/util/comparator.cc leveldb/util/env.cc leveldb/util/env_posix.cc \
+	leveldb/util/logging.cc leveldb/util/options.cc leveldb/util/status.cc
 
-if HAVE_ELEVELDB
-libwiredtiger_leveldb_la_SOURCES += util/perf_count.cc
+if HAVE_BASHOLEVELDB
+libwiredtiger_leveldb_la_SOURCES += basho/perf_count.cc
 endif
 if HAVE_ROCKSDB
 libwiredtiger_leveldb_la_SOURCES += rocks_wt.cc rocksdb/write_batch.cc
 else
-libwiredtiger_leveldb_la_SOURCES += db/write_batch.cc
+libwiredtiger_leveldb_la_SOURCES += leveldb/db/write_batch.cc
 endif
 
 if HAVE_ROCKSDB
diff --git a/api/leveldb/util/perf_count.cc b/api/leveldb/basho/perf_count.cc
index d086f29379a..0e666ac1dc0 100644
--- a/api/leveldb/util/perf_count.cc
+++ b/api/leveldb/basho/perf_count.cc
@@ -31,7 +31,7 @@
 #include <errno.h>
 
 #ifndef STORAGE_LEVELDB_INCLUDE_PERF_COUNT_H_
-#include "leveldb/perf_count.h"
+#include "perf_count.h"
 #endif
 
 #include "util/coding.h"
diff --git a/api/leveldb/include/leveldb/perf_count.h b/api/leveldb/basho/perf_count.h
index 0edf1b96549..0edf1b96549 100644
--- a/api/leveldb/include/leveldb/perf_count.h
+++ b/api/leveldb/basho/perf_count.h
diff --git a/api/leveldb/include/leveldb/replay_iterator.h b/api/leveldb/hyperleveldb/replay_iterator.h
index 6e2f562c6c4..6e2f562c6c4 100644
--- a/api/leveldb/include/leveldb/replay_iterator.h
+++ b/api/leveldb/hyperleveldb/replay_iterator.h
diff --git a/api/leveldb/AUTHORS b/api/leveldb/leveldb/AUTHORS
index 27a9407e52f..27a9407e52f 100644
--- a/api/leveldb/AUTHORS
+++ b/api/leveldb/leveldb/AUTHORS
diff --git a/api/leveldb/LICENSE b/api/leveldb/leveldb/LICENSE
index 8e80208cd72..8e80208cd72 100644
--- a/api/leveldb/LICENSE
+++ b/api/leveldb/leveldb/LICENSE
diff --git a/api/leveldb/db/dbformat.h b/api/leveldb/leveldb/db/dbformat.h
index 2c8a9d5f5a7..2c8a9d5f5a7 100644
--- a/api/leveldb/db/dbformat.h
+++ b/api/leveldb/leveldb/db/dbformat.h
diff --git a/api/leveldb/db/skiplist.h b/api/leveldb/leveldb/db/skiplist.h
index af85be6d016..af85be6d016 100644
--- a/api/leveldb/db/skiplist.h
+++ b/api/leveldb/leveldb/db/skiplist.h
diff --git a/api/leveldb/db/write_batch.cc b/api/leveldb/leveldb/db/write_batch.cc
index 0a11cb10f33..0a11cb10f33 100644
--- a/api/leveldb/db/write_batch.cc
+++ b/api/leveldb/leveldb/db/write_batch.cc
diff --git a/api/leveldb/db/write_batch_internal.h b/api/leveldb/leveldb/db/write_batch_internal.h
index c8421cce124..c8421cce124 100644
--- a/api/leveldb/db/write_batch_internal.h
+++ b/api/leveldb/leveldb/db/write_batch_internal.h
diff --git a/api/leveldb/include/leveldb/cache.h b/api/leveldb/leveldb/include/leveldb/cache.h
index 6ae25122133..6ae25122133 100644
--- a/api/leveldb/include/leveldb/cache.h
+++ b/api/leveldb/leveldb/include/leveldb/cache.h
diff --git a/api/leveldb/include/leveldb/comparator.h b/api/leveldb/leveldb/include/leveldb/comparator.h
index 23e0ba84559..23e0ba84559 100644
--- a/api/leveldb/include/leveldb/comparator.h
+++ b/api/leveldb/leveldb/include/leveldb/comparator.h
diff --git a/api/leveldb/include/leveldb/db.h b/api/leveldb/leveldb/include/leveldb/db.h
index bd9a1857a74..c1818d28a7a 100644
--- a/api/leveldb/include/leveldb/db.h
+++ b/api/leveldb/leveldb/include/leveldb/db.h
@@ -67,7 +67,7 @@ struct Range {
   Range(const Slice& s, const Slice& l) : start(s), limit(l) { }
 };
 
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 // Abstract holder for a DB value.
 // This allows callers to manage their own value buffers and have
 // DB values copied directly into those buffers.
@@ -230,7 +230,7 @@ class DB {
   // May return some other Status on an error.
   virtual Status Get(const ReadOptions& options,
                      const Slice& key, std::string* value) = 0;
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
   virtual Status Get(const ReadOptions& options,
                      const Slice& key, Value* value) = 0;
 #endif
diff --git a/api/leveldb/include/leveldb/env.h b/api/leveldb/leveldb/include/leveldb/env.h
index 35071f6992d..0d043307736 100644
--- a/api/leveldb/include/leveldb/env.h
+++ b/api/leveldb/leveldb/include/leveldb/env.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <stdarg.h>
 #include <stdint.h>
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 #include "perf_count.h"
 #endif
 #include "status.h"
@@ -153,7 +153,7 @@ class Env {
   // Sleep/delay the thread for the perscribed number of micro-seconds.
   virtual void SleepForMicroseconds(int micros) = 0;
 
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
   // Riak specific:  Where supported, give count of background jobs pending.
   virtual int GetBackgroundBacklog() const {return(0);};
   
diff --git a/api/leveldb/include/leveldb/filter_policy.h b/api/leveldb/leveldb/include/leveldb/filter_policy.h
index b9c6ddd3dde..2d970e709d6 100644
--- a/api/leveldb/include/leveldb/filter_policy.h
+++ b/api/leveldb/leveldb/include/leveldb/filter_policy.h
@@ -69,7 +69,7 @@ class FilterPolicy {
 // FilterPolicy (like NewBloomFilterPolicy) that does not ignore
 // trailing spaces in keys.
 extern const FilterPolicy* NewBloomFilterPolicy(int bits_per_key);
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 extern const FilterPolicy* NewBloomFilterPolicy2(int bits_per_key);
 #endif
 
diff --git a/api/leveldb/include/leveldb/iterator.h b/api/leveldb/leveldb/include/leveldb/iterator.h
index 3845d553a4e..3845d553a4e 100644
--- a/api/leveldb/include/leveldb/iterator.h
+++ b/api/leveldb/leveldb/include/leveldb/iterator.h
diff --git a/api/leveldb/include/leveldb/options.h b/api/leveldb/leveldb/include/leveldb/options.h
index ae4164bb318..a14503fe086 100644
--- a/api/leveldb/include/leveldb/options.h
+++ b/api/leveldb/leveldb/include/leveldb/options.h
@@ -75,7 +75,7 @@ struct Options {
   Options* OptimizeLevelStyleCompaction() { return this; }
 #endif
 
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
   // Riak specific: this variable replaces paranoid_checks at one
   // one place in the code.  This variable alone controls whether or not
   // compaction read operations check CRC values.  Riak needs
diff --git a/api/leveldb/include/leveldb/slice.h b/api/leveldb/leveldb/include/leveldb/slice.h
index d7c20cfcaac..d7c20cfcaac 100644
--- a/api/leveldb/include/leveldb/slice.h
+++ b/api/leveldb/leveldb/include/leveldb/slice.h
diff --git a/api/leveldb/include/leveldb/status.h b/api/leveldb/leveldb/include/leveldb/status.h
index 8b2cbb9b422..8b2cbb9b422 100644
--- a/api/leveldb/include/leveldb/status.h
+++ b/api/leveldb/leveldb/include/leveldb/status.h
diff --git a/api/leveldb/include/leveldb/write_batch.h b/api/leveldb/leveldb/include/leveldb/write_batch.h
index 9184d42c24c..9184d42c24c 100644
--- a/api/leveldb/include/leveldb/write_batch.h
+++ b/api/leveldb/leveldb/include/leveldb/write_batch.h
diff --git a/api/leveldb/port/port.h b/api/leveldb/leveldb/port/port.h
index 1f83635a82c..1f83635a82c 100644
--- a/api/leveldb/port/port.h
+++ b/api/leveldb/leveldb/port/port.h
diff --git a/api/leveldb/util/arena.h b/api/leveldb/leveldb/util/arena.h
index 8f7dde226c4..8f7dde226c4 100644
--- a/api/leveldb/util/arena.h
+++ b/api/leveldb/leveldb/util/arena.h
diff --git a/api/leveldb/util/coding.cc b/api/leveldb/leveldb/util/coding.cc
index ad1f457a16a..ad1f457a16a 100644
--- a/api/leveldb/util/coding.cc
+++ b/api/leveldb/leveldb/util/coding.cc
diff --git a/api/leveldb/util/coding.h b/api/leveldb/leveldb/util/coding.h
index ed56ef4ea2d..ed56ef4ea2d 100644
--- a/api/leveldb/util/coding.h
+++ b/api/leveldb/leveldb/util/coding.h
diff --git a/api/leveldb/util/comparator.cc b/api/leveldb/leveldb/util/comparator.cc
index 57c89628af9..57c89628af9 100644
--- a/api/leveldb/util/comparator.cc
+++ b/api/leveldb/leveldb/util/comparator.cc
diff --git a/api/leveldb/util/env.cc b/api/leveldb/leveldb/util/env.cc
index 00a04f0dc3e..00a04f0dc3e 100644
--- a/api/leveldb/util/env.cc
+++ b/api/leveldb/leveldb/util/env.cc
diff --git a/api/leveldb/util/env_posix.cc b/api/leveldb/leveldb/util/env_posix.cc
index 084ae160807..084ae160807 100644
--- a/api/leveldb/util/env_posix.cc
+++ b/api/leveldb/leveldb/util/env_posix.cc
diff --git a/api/leveldb/util/logging.cc b/api/leveldb/leveldb/util/logging.cc
index 96526e76123..96526e76123 100644
--- a/api/leveldb/util/logging.cc
+++ b/api/leveldb/leveldb/util/logging.cc
diff --git a/api/leveldb/util/logging.h b/api/leveldb/leveldb/util/logging.h
index b0c5da813e8..b0c5da813e8 100644
--- a/api/leveldb/util/logging.h
+++ b/api/leveldb/leveldb/util/logging.h
diff --git a/api/leveldb/util/options.cc b/api/leveldb/leveldb/util/options.cc
index a8c79233bb5..a8c79233bb5 100644
--- a/api/leveldb/util/options.cc
+++ b/api/leveldb/leveldb/util/options.cc
diff --git a/api/leveldb/util/posix_logger.h b/api/leveldb/leveldb/util/posix_logger.h
index f15de45e05e..f15de45e05e 100644
--- a/api/leveldb/util/posix_logger.h
+++ b/api/leveldb/leveldb/util/posix_logger.h
diff --git a/api/leveldb/util/random.h b/api/leveldb/leveldb/util/random.h
index 66e0c94e7cb..66e0c94e7cb 100644
--- a/api/leveldb/util/random.h
+++ b/api/leveldb/leveldb/util/random.h
diff --git a/api/leveldb/util/status.cc b/api/leveldb/leveldb/util/status.cc
index e8edd9dbb11..e8edd9dbb11 100644
--- a/api/leveldb/util/status.cc
+++ b/api/leveldb/leveldb/util/status.cc
diff --git a/api/leveldb/leveldb_wt.cc b/api/leveldb/leveldb_wt.cc
index 45fde20659a..ac868d4e0d7 100644
--- a/api/leveldb/leveldb_wt.cc
+++ b/api/leveldb/leveldb_wt.cc
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sstream>
 
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 namespace leveldb {
 Value::~Value() {}
 
@@ -185,7 +185,7 @@ FilterPolicy::~FilterPolicy() {}
 const FilterPolicy *NewBloomFilterPolicy(int bits_per_key) {
   return new FilterPolicyImpl(bits_per_key);
 }
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 const FilterPolicy *NewBloomFilterPolicy2(int bits_per_key) {
   return NewBloomFilterPolicy(bits_per_key);
 }
@@ -449,7 +449,7 @@ DbImpl::Get(const ReadOptions& options,
   return WiredTigerErrorToStatus(ret, errmsg);
 }
 
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 // If the database contains an entry for "key" store the
 // corresponding value in *value and return OK.
 //
diff --git a/api/leveldb/leveldb_wt.h b/api/leveldb/leveldb_wt.h
index 07036d51b7a..a1f8c845d12 100644
--- a/api/leveldb/leveldb_wt.h
+++ b/api/leveldb/leveldb_wt.h
@@ -38,8 +38,8 @@
 #include "leveldb/slice.h"
 #include "leveldb/status.h"
 #include "leveldb/write_batch.h"
-#if HAVE_ELEVELDB
-#include "leveldb/perf_count.h"
+#if HAVE_BASHO_LEVELDB
+#include "basho/perf_count.h"
 #endif
 
 #include "wiredtiger.h"
@@ -63,7 +63,7 @@ using leveldb::Range;
 using leveldb::Slice;
 using leveldb::Snapshot;
 using leveldb::Status;
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
 using leveldb::Value;
 #endif
 #if HAVE_ROCKSDB
@@ -279,7 +279,7 @@ public:
   virtual Status Get(const ReadOptions& options,
          const Slice& key, std::string* value);
 
-#if HAVE_ELEVELDB
+#if HAVE_BASHOLEVELDB
   virtual Status Get(const ReadOptions& options,
          const Slice& key, Value* value);
 #endif