diff options
author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-05-23 14:23:07 -0500 |
---|---|---|
committer | jiangph <jiangph@cn.ibm.com> | 2018-08-21 23:31:09 +0800 |
commit | d0330635008067b642bd56a553958810425e5461 (patch) | |
tree | b9456b4ce899de6a5028346c4c692f7c5d5f8924 | |
parent | 5230ca02c4a75c637ec914f9a4d6216cad64c7e3 (diff) | |
download | couchdb-d0330635008067b642bd56a553958810425e5461.tar.gz |
Rename PSE test modules
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_attachments.erl (renamed from src/couch_pse_tests/src/test_engine_attachments.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_compaction.erl (renamed from src/couch_pse_tests/src/test_engine_compaction.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_fold_changes.erl (renamed from src/couch_pse_tests/src/test_engine_fold_changes.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_fold_docs.erl (renamed from src/couch_pse_tests/src/test_engine_fold_docs.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_get_set_props.erl (renamed from src/couch_pse_tests/src/test_engine_get_set_props.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_open_close_delete.erl (renamed from src/couch_pse_tests/src/test_engine_open_close_delete.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_purge_docs.erl (renamed from src/couch_pse_tests/src/test_engine_purge_docs.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_read_write_docs.erl (renamed from src/couch_pse_tests/src/test_engine_read_write_docs.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_ref_counting.erl (renamed from src/couch_pse_tests/src/test_engine_ref_counting.erl) | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_util.erl (renamed from src/couch_pse_tests/src/test_engine_util.erl) | 51 |
10 files changed, 22 insertions, 47 deletions
diff --git a/src/couch_pse_tests/src/test_engine_attachments.erl b/src/couch_pse_tests/src/cpse_test_attachments.erl index 9763ef545..d8fd2b84b 100644 --- a/src/couch_pse_tests/src/test_engine_attachments.erl +++ b/src/couch_pse_tests/src/cpse_test_attachments.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_attachments). +-module(cpse_test_attachments). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_compaction.erl b/src/couch_pse_tests/src/cpse_test_compaction.erl index 44c5357a6..0c81707b5 100644 --- a/src/couch_pse_tests/src/test_engine_compaction.erl +++ b/src/couch_pse_tests/src/cpse_test_compaction.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_compaction). +-module(cpse_test_compaction). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_fold_changes.erl b/src/couch_pse_tests/src/cpse_test_fold_changes.erl index 4ca09a863..5ed45c154 100644 --- a/src/couch_pse_tests/src/test_engine_fold_changes.erl +++ b/src/couch_pse_tests/src/cpse_test_fold_changes.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_fold_changes). +-module(cpse_test_fold_changes). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_fold_docs.erl b/src/couch_pse_tests/src/cpse_test_fold_docs.erl index 3ed068f0c..fbea7da5b 100644 --- a/src/couch_pse_tests/src/test_engine_fold_docs.erl +++ b/src/couch_pse_tests/src/cpse_test_fold_docs.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_fold_docs). +-module(cpse_test_fold_docs). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_get_set_props.erl b/src/couch_pse_tests/src/cpse_test_get_set_props.erl index 764fe393d..678f0cb2b 100644 --- a/src/couch_pse_tests/src/test_engine_get_set_props.erl +++ b/src/couch_pse_tests/src/cpse_test_get_set_props.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_get_set_props). +-module(cpse_test_get_set_props). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_open_close_delete.erl b/src/couch_pse_tests/src/cpse_test_open_close_delete.erl index ce0187ef9..3fb023bb1 100644 --- a/src/couch_pse_tests/src/test_engine_open_close_delete.erl +++ b/src/couch_pse_tests/src/cpse_test_open_close_delete.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_open_close_delete). +-module(cpse_test_open_close_delete). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_purge_docs.erl b/src/couch_pse_tests/src/cpse_test_purge_docs.erl index 7d83f6035..d90faeee2 100644 --- a/src/couch_pse_tests/src/test_engine_purge_docs.erl +++ b/src/couch_pse_tests/src/cpse_test_purge_docs.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_purge_docs). +-module(cpse_test_purge_docs). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_read_write_docs.erl b/src/couch_pse_tests/src/cpse_test_read_write_docs.erl index 2eeeab58e..1f20c4076 100644 --- a/src/couch_pse_tests/src/test_engine_read_write_docs.erl +++ b/src/couch_pse_tests/src/cpse_test_read_write_docs.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_read_write_docs). +-module(cpse_test_read_write_docs). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_ref_counting.erl b/src/couch_pse_tests/src/cpse_test_ref_counting.erl index f0a2489f6..c21ec88b6 100644 --- a/src/couch_pse_tests/src/test_engine_ref_counting.erl +++ b/src/couch_pse_tests/src/cpse_test_ref_counting.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_ref_counting). +-module(cpse_test_ref_counting). -compile(export_all). diff --git a/src/couch_pse_tests/src/test_engine_util.erl b/src/couch_pse_tests/src/cpse_util.erl index 52358097a..122ba425c 100644 --- a/src/couch_pse_tests/src/test_engine_util.erl +++ b/src/couch_pse_tests/src/cpse_util.erl @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. --module(test_engine_util). +-module(cpse_util). -compile(export_all). @@ -18,15 +18,15 @@ -define(TEST_MODULES, [ - test_engine_open_close_delete, - test_engine_get_set_props, - test_engine_read_write_docs, - test_engine_attachments, - test_engine_fold_docs, - test_engine_fold_changes, - test_engine_purge_docs, - test_engine_compaction, - test_engine_ref_counting + cpse_test_open_close_delete, + cpse_test_get_set_props, + cpse_test_read_write_docs, + cpse_test_attachments, + cpse_test_fold_docs, + cpse_test_fold_changes, + cpse_test_purge_docs, + cpse_test_compaction, + cpse_test_ref_counting ]). @@ -206,7 +206,8 @@ gen_write(Db, {Action, {<<"_local/", _/binary>> = DocId, Body}}) -> deleted = Deleted }}; - Rev = couch_hash:md5_hash(term_to_binary({DocId, Body, Atts})), +gen_write(Db, {Action, {DocId, Body}}) -> + gen_write(Db, {Action, {DocId, Body, []}}); gen_write(Db, {create, {DocId, Body, Atts}}) -> {not_found, _} = couch_db:open_doc(Db, DocId), @@ -252,33 +253,7 @@ gen_write(Db, {Action, {DocId, Body, Atts}}) -> deleted = Deleted, body = Body, atts = Atts - }, - - Path = gen_path(Action, RevPos, PrevRevId, Rev, Leaf), - RevsLimit = Engine:get_revs_limit(St), - NodeType = case Action of - conflict -> new_branch; - _ -> new_leaf - end, - {MergedTree, NodeType} = couch_key_tree:merge(PrevRevTree, Path), - NewTree = couch_key_tree:stem(MergedTree, RevsLimit), - - NewFDI = PrevFDI#full_doc_info{ - deleted = couch_doc:is_deleted(NewTree), - update_seq = UpdateSeq, - rev_tree = NewTree, - sizes = Sizes - }, - - {PrevFDI, NewFDI}. - - -gen_revision(conflict, DocId, _PrevRev, Body, Atts) -> - couch_hash:md5_hash(term_to_binary({DocId, Body, Atts})); -gen_revision(delete, DocId, PrevRev, Body, Atts) -> - gen_revision(update, DocId, PrevRev, Body, Atts); -gen_revision(update, DocId, PrevRev, Body, Atts) -> - couch_hash:md5_hash(term_to_binary({DocId, PrevRev, Body, Atts})). + }}. gen_rev(A, DocId, {Pos, Rev}, Body, Atts) when A == update; A == delete -> |