From d85922c62b758773a6a349701741806d6ebaed21 Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Thu, 31 Mar 2016 16:20:35 -0700 Subject: [PATCH 1/5] DOCS-6410: Comment on: "manual/reference/method/db.copyDatabase.txt" --- source/includes/extracts-fact-copydb-behavior-base.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/includes/extracts-fact-copydb-behavior-base.yaml b/source/includes/extracts-fact-copydb-behavior-base.yaml index 7fd6381d251..d5393d334b8 100644 --- a/source/includes/extracts-fact-copydb-behavior-base.yaml +++ b/source/includes/extracts-fact-copydb-behavior-base.yaml @@ -7,6 +7,11 @@ content: | - {{copydb}} creates the target database if it does not exist. + - If the target database exists, the source database appends + its tables if there are no collisions. If there are collisions + between the target's tables and the source's tables, {{copydb}} + fails and returns an error. + - {{copydb}} requires enough free disk space on the host instance for the copied database. Use the :method:`db.stats()` operation to check the size of the database on the source From 425be404f9f824b2244c69995c6131e7b1bdd4fe Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Mon, 11 Apr 2016 16:37:57 -0700 Subject: [PATCH 2/5] DOCS-6410: changed wording to clarify conditions which will cause copyDatabase() to fail --- source/includes/extracts-fact-copydb-behavior-base.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/includes/extracts-fact-copydb-behavior-base.yaml b/source/includes/extracts-fact-copydb-behavior-base.yaml index d5393d334b8..a7a37762b02 100644 --- a/source/includes/extracts-fact-copydb-behavior-base.yaml +++ b/source/includes/extracts-fact-copydb-behavior-base.yaml @@ -8,8 +8,8 @@ content: | - {{copydb}} creates the target database if it does not exist. - If the target database exists, the source database appends - its tables if there are no collisions. If there are collisions - between the target's tables and the source's tables, {{copydb}} + its tables if there are no collisions. If any tables from the + source database already exist in the target database, {{copydb}} fails and returns an error. - {{copydb}} requires enough free disk space on the host From 1d86e26e7636b808307409337dbee451ff776fe6 Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Thu, 21 Apr 2016 15:00:17 -0700 Subject: [PATCH 3/5] Rewording of behavior description --- source/includes/extracts-fact-copydb-behavior-base.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/includes/extracts-fact-copydb-behavior-base.yaml b/source/includes/extracts-fact-copydb-behavior-base.yaml index a7a37762b02..91330aab64c 100644 --- a/source/includes/extracts-fact-copydb-behavior-base.yaml +++ b/source/includes/extracts-fact-copydb-behavior-base.yaml @@ -7,10 +7,10 @@ content: | - {{copydb}} creates the target database if it does not exist. - - If the target database exists, the source database appends - its tables if there are no collisions. If any tables from the - source database already exist in the target database, {{copydb}} - fails and returns an error. + - If the target database exists and no collection from the source database + exists in the target database, {{copydb}} copies the collections from + the source database to the target database. If any collection from the + source database exists in the target database, {{copydb}} errors. - {{copydb}} requires enough free disk space on the host instance for the copied database. Use the :method:`db.stats()` From ae0cbe41c4ed1045de00a0d6d6bcac3549b3069e Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Thu, 21 Apr 2016 15:34:02 -0700 Subject: [PATCH 4/5] Tried a few different descriptions of error situation, decided to stick with a brief, vague, but possibly less confusing one --- source/includes/extracts-fact-copydb-behavior-base.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/includes/extracts-fact-copydb-behavior-base.yaml b/source/includes/extracts-fact-copydb-behavior-base.yaml index 91330aab64c..bcce5684e46 100644 --- a/source/includes/extracts-fact-copydb-behavior-base.yaml +++ b/source/includes/extracts-fact-copydb-behavior-base.yaml @@ -10,7 +10,8 @@ content: | - If the target database exists and no collection from the source database exists in the target database, {{copydb}} copies the collections from the source database to the target database. If any collection from the - source database exists in the target database, {{copydb}} errors. + source database exists in the target database, {{copydb}} errors out at + that point. - {{copydb}} requires enough free disk space on the host instance for the copied database. Use the :method:`db.stats()` From 44b6f893dbbf8ef81b52c4b9af0892fd1d315743 Mon Sep 17 00:00:00 2001 From: Steve Renaker Date: Tue, 26 Apr 2016 10:13:58 -0700 Subject: [PATCH 5/5] DOCS-6410: changed wording --- source/includes/extracts-fact-copydb-behavior-base.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/includes/extracts-fact-copydb-behavior-base.yaml b/source/includes/extracts-fact-copydb-behavior-base.yaml index bcce5684e46..8c2d6598c59 100644 --- a/source/includes/extracts-fact-copydb-behavior-base.yaml +++ b/source/includes/extracts-fact-copydb-behavior-base.yaml @@ -10,8 +10,8 @@ content: | - If the target database exists and no collection from the source database exists in the target database, {{copydb}} copies the collections from the source database to the target database. If any collection from the - source database exists in the target database, {{copydb}} errors out at - that point. + source database exists in the target database, {{copydb}} errors out and + does not copy any remaining collections from the source database. - {{copydb}} requires enough free disk space on the host instance for the copied database. Use the :method:`db.stats()`