ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into columnfamilies

Browse Source 
Conflicts:
	db/compaction_picker.cc
	db/compaction_picker.h
	db/db_impl.cc
	db/version_set.cc
	db/version_set.h
	include/rocksdb/options.h
	util/options.cc
This commit is contained in:
Igor Canadi
2014-03-05 16:55:51 -08:00
parent e2dd148a8b abeee9f2cb
commit 80a207fc90
13 changed files with 275 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/options.cc
View File

@@ -148,6 +148,7 @@ DBOptions::DBOptions()
paranoid_checks(false),
env(Env::Default()),
info_log(nullptr),
info_log_level(INFO),
max_open_files(1000),
statistics(nullptr),
disableDataSync(false),
@@ -185,6 +186,7 @@ DBOptions::DBOptions(const Options& options)
paranoid_checks(options.paranoid_checks),
env(options.env),
info_log(options.info_log),
info_log_level(options.info_log_level),
max_open_files(options.max_open_files),
statistics(options.statistics),
disableDataSync(options.disableDataSync),