diff options
author | Robert Newson <rnewson@apache.org> | 2018-07-13 19:15:07 +0100 |
---|---|---|
committer | Robert Newson <rnewson@apache.org> | 2018-07-13 19:15:07 +0100 |
commit | b833aa32c3416a69c46d2f86465bea2b3342d6d2 (patch) | |
tree | 45d8e3e1606e64ad20f18674024e985dd1bcf4ea | |
parent | e89c39a89ae345cecbbbcc100e9209b030d3d833 (diff) | |
download | couchdb-b833aa32c3416a69c46d2f86465bea2b3342d6d2.tar.gz |
Revert "Add default props at db creation"
This reverts commit 79834c20e8f07d9cf418de9fa2b6d949e6790d67.
-rw-r--r-- | src/couch/src/couch_bt_engine.erl | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/couch/src/couch_bt_engine.erl b/src/couch/src/couch_bt_engine.erl index e4596116e..e0992cf6f 100644 --- a/src/couch/src/couch_bt_engine.erl +++ b/src/couch/src/couch_bt_engine.erl @@ -791,26 +791,17 @@ increment_update_seq(#st{header = Header} = St) -> }. -set_default_values(Fd, Header, Compression, Options, PtrName, OptName, DefaultValue) -> - case couch_bt_engine_header:get(Header, PtrName) of +set_default_security_object(Fd, Header, Compression, Options) -> + case couch_bt_engine_header:get(Header, security_ptr) of Pointer when is_integer(Pointer) -> Header; - Val when Val =:= nil; Val =:= undefined -> - Default = couch_util:get_value(OptName, Options, DefaultValue), + _ -> + Default = couch_util:get_value(default_security_object, Options), AppendOpts = [{compression, Compression}], {ok, Ptr, _} = couch_file:append_term(Fd, Default, AppendOpts), - couch_bt_engine_header:set(Header, PtrName, Ptr) + couch_bt_engine_header:set(Header, security_ptr, Ptr) end. -set_default_security_object(Fd, Header, Compression, Options) -> - set_default_values(Fd, Header, Compression, Options, - security_ptr, default_security_object, undefined). - - -set_default_props(Fd, Header, Compression, Options) -> - set_default_values(Fd, Header, Compression, Options, - props_ptr, default_props, []). - delete_compaction_files(FilePath) -> RootDir = config:get("couchdb", "database_dir", "."), |