Permalink
Browse files

MB-6445: Remove sqlite backend

Sqlite will be deprecated and not supported anymore as of 2.0
release.

Change-Id: I1a5c8025444ca264897958b4053ff7cfe9c97010
Reviewed-on: http://review.couchbase.org/20207
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
  • Loading branch information...
mikewied authored and chiyoung committed Aug 26, 2012
1 parent a95a3bb commit d34de537c9841bd2f7bc071da4079e6b55150b82
View
@@ -50,9 +50,6 @@
/m4/lt~obsolete.m4
/m4/version.m4
/mc-kvstore-test
-/management/*bdbconvert
-/management/sqlite3
-/mbbackup-????.mbb
/sizes
/src/config.h
/src/config.h.in
@@ -61,17 +58,8 @@
/src/stats-info.[ch]
/src/testlogger_libify.cc
/tests/module_tests/*_test
-/wrapper/*badm-online-restore
-/wrapper/*badm-online-update
/wrapper/*badm-tap-registration
-/wrapper/*bbackup
-/wrapper/*bbackup-incremental
-/wrapper/*bbackup-merge-incremental
-/wrapper/*bdbconvert
-/wrapper/*bdbmaint
-/wrapper/*bdbupgrade
/wrapper/*bepctl
-/wrapper/*brestore
/wrapper/*bstats
/wrapper/*bvbucketctl
/wrapper/wrapper
View
@@ -3,8 +3,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/src -I${top_srcdir}/include
bin_SCRIPTS = management/cbanalyze-core \
wrapper/cbadm-tap-registration \
- wrapper/cbdbmaint \
- wrapper/cbdbupgrade \
wrapper/cbepctl \
wrapper/cbstats \
wrapper/cbvbucketctl
@@ -19,7 +17,6 @@ noinst_LTLIBRARIES = \
libconfiguration.la \
libkvstore.la \
libobjectregistry.la \
- libsqlite-kvstore.la \
libcouch-kvstore.la \
libdirutils.la
@@ -29,7 +26,6 @@ fixup_stats_json:
dist_doc_DATA = docs/stats.json
-bin_PROGRAMS = management/cbdbconvert
BUILT_SOURCES = src/generated_configuration.cc \
src/generated_configuration.hh \
src/stats-info.c src/stats-info.h
@@ -102,27 +98,7 @@ libkvstore_la_SOURCES = src/crc32.c src/crc32.h src/kvstore.cc src/kvstore.hh \
src/mutation_log.cc src/mutation_log.hh \
src/mutation_log_compactor.cc \
src/mutation_log_compactor.hh
-libkvstore_la_CPPFLAGS = -I$(top_srcdir)/src/sqlite-kvstore $(AM_CPPFLAGS)
-
-libsqlite_kvstore_la_SOURCES = src/kvstore.hh \
- src/sqlite-kvstore/factory.cc \
- src/sqlite-kvstore/pathexpand.hh \
- src/sqlite-kvstore/pathexpand.cc \
- src/sqlite-kvstore/sqlite-eval.cc \
- src/sqlite-kvstore/sqlite-eval.hh \
- src/sqlite-kvstore/sqlite-kvstore.cc \
- src/sqlite-kvstore/sqlite-kvstore.hh \
- src/sqlite-kvstore/sqlite-stats.hh \
- src/sqlite-kvstore/sqlite-pst.cc \
- src/sqlite-kvstore/sqlite-pst.hh \
- src/sqlite-kvstore/sqlite-strategies.cc \
- src/sqlite-kvstore/sqlite-strategies.hh \
- src/sqlite-kvstore/sqlite-vfs.c \
- src/sqlite-kvstore/sqlite-vfs.h
-libsqlite_kvstore_la_CPPFLAGS = -I$(top_srcdir)/src/sqlite-kvstore \
- $(AM_CPPFLAGS)
-libsqlite_kvstore_la_LIBADD =
-libsqlite_kvstore_la_DEPENDENCIES =
+libkvstore_la_CPPFLAGS = $(AM_CPPFLAGS)
libblackhole_kvstore_la_CPPFLAGS = -I$(top_srcdir)/src/blackhole-kvstore \
$(AM_CPPFLAGS)
@@ -171,46 +147,16 @@ libconfiguration_la_SOURCES = src/generated_configuration.hh \
src/configuration.hh \
src/configuration.cc
-ep_la_LIBADD = libkvstore.la libsqlite-kvstore.la \
+ep_la_LIBADD = libkvstore.la \
libblackhole-kvstore.la libcouch-kvstore.la \
libobjectregistry.la libconfiguration.la $(LTLIBEVENT)
-ep_la_DEPENDENCIES = libkvstore.la libsqlite-kvstore.la \
+ep_la_DEPENDENCIES = libkvstore.la \
libblackhole-kvstore.la \
libobjectregistry.la libconfiguration.la \
libcouch-kvstore.la
ep_testsuite_la_LIBADD =libobjectregistry.la $(LTLIBEVENT)
ep_testsuite_la_DEPENDENCIES = libobjectregistry.la
-management_cbdbconvert_SOURCES = src/atomic.cc src/mutex.cc \
- management/dbconvert.cc src/testlogger.cc \
- src/item.cc src/stored-value.cc src/ep_time.c \
- src/checkpoint.cc src/vbucketmap.cc
-management_cbdbconvert_LDADD = libkvstore.la libsqlite-kvstore.la \
- libblackhole-kvstore.la \
- libobjectregistry.la \
- libconfiguration.la libkvstore.la \
- libblackhole-kvstore.la \
- libcouch-kvstore.la \
- $(LTLIBEVENT)
-management_cbdbconvert_DEPENDENCIES = libkvstore.la libsqlite-kvstore.la \
- libcouch-kvstore.la libobjectregistry.la \
- libconfiguration.la
-
-if BUILD_EMBEDDED_LIBSQLITE3
-ep_la_LIBADD += libsqlite3.la
-ep_la_DEPENDENCIES += libsqlite3.la
-management_cbdbconvert_LDADD += libsqlite3.la
-management_cbdbconvert_DEPENDENCIES += libsqlite3.la
-noinst_LTLIBRARIES += libsqlite3.la
-bin_PROGRAMS += management/sqlite3
-else
-ep_la_LIBADD += $(LIBSQLITE3)
-management_cbdbconvert_LDADD += $(LIBSQLITE3)
-endif
-
-libsqlite3_la_SOURCES = src/embedded/sqlite3.h src/embedded/sqlite3.c
-libsqlite3_la_CFLAGS = $(AM_CFLAGS) ${NO_WERROR} -DSQLITE_THREADSAFE=2
-
check_PROGRAMS=\
atomic_ptr_test \
atomic_test \
@@ -223,7 +169,6 @@ check_PROGRAMS=\
misc_test \
mutation_log_test \
mutex_test \
- pathexpand_test \
priority_test \
ringbuffer_test \
vbucket_test
@@ -345,11 +290,6 @@ gen_config_LDFLAGS = -lm
gen_code_CPPFLAGS = -I$(top_srcdir)/tools $(AM_CPPFLAGS)
gen_code_SOURCES = tools/gencode.cc tools/cJSON.c tools/cJSON.h
-management_sqlite3_SOURCES = src/embedded/sqlite3-shell.c
-management_sqlite3_CFLAGS = $(AM_CFLAGS) ${NO_WERROR}
-management_sqlite3_DEPENDENCIES = libsqlite3.la
-management_sqlite3_LDADD = libsqlite3.la
-
vbucket_test_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) ${NO_WERROR}
vbucket_test_SOURCES = tests/module_tests/vbucket_test.cc \
tests/module_tests/threadtests.hh src/vbucket.hh \
@@ -405,12 +345,6 @@ chunk_creation_test_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) ${NO_WERROR}
chunk_creation_test_SOURCES = tests/module_tests/chunk_creation_test.cc \
src/common.hh
-pathexpand_test_CPPFLAGS = -I$(top_srcdir)/src/sqlite-kvstore \
- $(AM_CPPFLAGS) ${NO_WERROR}
-pathexpand_test_SOURCES = tests/module_tests/pathexpand_test.cc \
- src/sqlite-kvstore/pathexpand.hh \
- src/sqlite-kvstore/pathexpand.cc
-
ringbuffer_test_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) ${NO_WERROR}
ringbuffer_test_SOURCES = tests/module_tests/ringbuffer_test.cc src/ringbuffer.hh
ringbuffer_test_DEPENDENCIES = src/ringbuffer.hh
@@ -421,7 +355,6 @@ hrtime_test_SOURCES += src/gethrtime.c
dispatcher_test_SOURCES += src/gethrtime.c
vbucket_test_SOURCES += src/gethrtime.c
checkpoint_test_SOURCES += src/gethrtime.c
-management_cbdbconvert_SOURCES += src/gethrtime.c
ep_testsuite_la_SOURCES += src/gethrtime.c
hash_table_test_SOURCES += src/gethrtime.c
mutation_log_test_SOURCES += src/gethrtime.c
@@ -430,12 +363,10 @@ endif
if BUILD_BYTEORDER
ep_la_SOURCES += src/byteorder.c
ep_testsuite_la_SOURCES += src/byteorder.c
-management_cbdbconvert_SOURCES += src/byteorder.c
endif
pythonlibdir=$(libdir)/python
pythonlib_DATA= \
- management/capture.py \
management/clitool.py \
management/mc_bin_client.py \
management/mc_bin_server.py \
@@ -445,16 +376,12 @@ pythonlib_DATA= \
pythonlib_SCRIPTS= \
management/cbadm-tap-registration \
- management/cbdbmaint \
- management/cbdbupgrade \
management/cbepctl \
management/cbstats \
management/cbvbucketctl
PYTHON_TOOLS= \
wrapper/cbadm-tap-registration \
- wrapper/cbdbmaint \
- wrapper/cbdbupgrade \
wrapper/cbepctl \
wrapper/cbstats \
wrapper/cbvbucketctl
@@ -498,8 +425,6 @@ ep_la_LIBADD += ep_la-probes.lo
ep_la_DEPENDENCIES += ep_la-probes.lo
ep_testsuite_la_LIBADD += ep_testsuite_la-probes.lo
ep_testsuite_la_DEPENDENCIES += ep_testsuite_la-probes.lo
-management_cbdbconvert_LDADD += .libs/cddbconvert-probes.o
-management_cbdbconvert_DEPENDENCIES += .libs/cddbconvert-probes.o
atomic_ptr_test_LDADD = .libs/atomic_ptr_test-probes.o
atomic_ptr_test_DEPENDENCIES += .libs/atomic_ptr_test-probes.o
atomic_test_LDADD = .libs/atomic_test-probes.o
@@ -550,12 +475,6 @@ ep_testsuite_la-probes.lo: $(ep_testsuite_la_OBJECTS) dtrace/probes.h
sed -e s,ep_la-item,ep_testsuite_la-probes,g ep_la-item.lo \
> ep_testsuite_la-probes.lo
-.libs/cddbconvert-probes.o: $(management_cbdbconvert_OBJECTS) dtrace/probes.h
- $(DTRACE) $(DTRACEFLAGS) -G \
- -o .libs/cddbconvert-probes.o \
- -s ${srcdir}/dtrace/probes.d \
- $(management_cbdbconvert_OBJECTS)
-
.libs/atomic_ptr_test-probes.o: $(atomic_ptr_test_OBJECTS) dtrace/probes.h
$(DTRACE) $(DTRACEFLAGS) -G \
-o .libs/atomic_ptr_test-probes.o \
View
@@ -40,15 +40,13 @@
}
},
"backend": {
- "default": "sqlite",
+ "default": "couchdb",
"dynamic": false,
"type": "std::string",
"validator": {
"enum": [
"blackhole",
- "couchdb",
- "sqlite",
- "mccouch"
+ "couchdb"
]
}
},
@@ -117,14 +115,6 @@
"descr": "True if we want to enable data traffic after warmup is complete",
"type": "bool"
},
- "db_shards": {
- "default": "4",
- "type": "size_t"
- },
- "db_strategy": {
- "default": "multiMTVBDB",
- "type": "std::string"
- },
"dbname": {
"default": "/tmp/test",
"descr": "Path to on-disk storage.",
@@ -327,10 +317,6 @@
}
}
},
- "shardpattern": {
- "default": "%d/%b-%i.sqlite",
- "type": "std::string"
- },
"stored_val_type": {
"default": "",
"type": "std::string"
View
@@ -40,18 +40,6 @@ AC_ARG_ENABLE([valgrind],
AS_IF([test "$ac_enable_valgrind" = "yes"],
[ AC_DEFINE(VALGRIND, 1, [Enable extra memset to help valgrind])])
-AC_ARG_ENABLE([system-libsqlite3],
- [AS_HELP_STRING([--enable-system-libsqlite3],
- [Build with system installed libsqlite3. @<:@default=off@:>@])],
- [ac_enable_system_libsqlite3="$enableval"],
- [ac_enable_system_libsqlite3="no"])
-
-AS_IF([test "$ac_enable_system_libsqlite3" = "yes"],
- [ PANDORA_REQUIRE_LIBSQLITE3
- AC_DEFINE(USE_SYSTEM_LIBSQLITE3, 1, "Set if you want to use a system installed sqlite3")
- ])
-AM_CONDITIONAL(BUILD_EMBEDDED_LIBSQLITE3, test "$ac_enable_system_libsqlite3" = "no")
-
AC_ARG_ENABLE([generated-tests],
[AS_HELP_STRING([--enable-generated-tests],
[Run generated test suite. @<:@default=off@:>@])],
View
@@ -28,14 +28,8 @@ memcached like this:
|------------------------+--------+--------------------------------------------|
| config_file | string | Path to additional parameters. |
| dbname | string | Path to on-disk storage. |
-| shardpattern | string | File pattern for shards (see below) |
| ht_locks | int | Number of locks per hash table. |
| ht_size | int | Number of buckets per hash table. |
-| initfile | string | Optional SQL script to run after |
-| | | opening DB |
-| postInitfile | string | Optional SQL script to run after |
-| | | all DB shards and statements have |
-| | | been initialized |
| max_item_size | int | Maximum number of bytes allowed for |
| | | an item. |
| max_size | int | Max cumulative item size in bytes. |
@@ -72,9 +66,6 @@ memcached like this:
| failpartialwarmup | bool | If false, continue running after failing |
| | | to load some records. |
| max_vbuckets | int | Maximum number of vbuckets expected (1024) |
-| db_shards | int | Number of shards for db store |
-| db_strategy | string | DB store strategy ("multiDB", "singleDB" |
-| | | or "singleMTDB") |
| concurrentDB | bool | True (default) if concurrent DB reads are |
| | | permitted where possible. |
| chk_remover_stime | int | Interval for the checkpoint remover that |
@@ -123,18 +114,3 @@ memcached like this:
| } | scanner will be scheduled to run. |
| pager_active_vb_pcnt | int | Percentage of active vbucket items among |
| | | all evicted items by item pager. |
-
-** Shard Patterns
-
-When using a multi-sharded database, =shardpattern= specifies how
-shards are named relative to the main database.
-
-=shardpattern= uses a printf-style string to expand the path with the
-given variables:
-
-- =%d= : The directory name containing the main database
- (This will be =.= for relative paths).
-- =%b= : The base name of the main database.
-- =%i= : The shard number.
-
-The default value of =shardpattern= is =%d/%b-%i.sqlite=
View
@@ -128,8 +128,6 @@ For introductory information on stats within membase, start with the
| ep_tap_keepalive | Tap keepalive time. |
| ep_dbname | DB path. |
| ep_dbinit | Number of seconds to initialize DB. |
-| ep_dbshards | Number of shards for db store |
-| ep_db_strategy | SQLite db strategy |
| ep_io_num_read | Number of io read operations |
| ep_io_num_write | Number of io write operations |
| ep_io_read_bytes | Number of bytes read (key + values) |
@@ -627,15 +625,6 @@ The following stats are available for all database engine:
| writeSize | Size of data in write operations |
| delete | Time spent in delete() calls |
-The following stats are available for the Sqlite database engine:
-
-| sector_size | Disk sector size (bytes) |
-| lock | Number of database lock operations |
-| truncate | Number of truncate operations |
-| sync | Time spent in sync() calls |
-| readSeek | Seek distance in read operations |
-| writeSeek | Seek distance in write operations |
-
The following stats are available for the CouchStore database engine:
| backend_type | Type of backend database engine |
Oops, something went wrong.

0 comments on commit d34de53

Please sign in to comment.