From a4aef8806f5d1a2942068ddad76da26a5b1b5f4d Mon Sep 17 00:00:00 2001
From: Natalia Ivakina <natalia.ivakina@neotechnology.com>
Date: Tue, 21 Jan 2025 13:31:00 +0100
Subject: [PATCH 1/8] Add missing options of the copy and incremental import
 commands

---
 modules/ROOT/pages/backup-restore/copy-database.adoc  | 11 +++++++++--
 .../pages/tools/neo4j-admin/neo4j-admin-import.adoc   |  7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/ROOT/pages/backup-restore/copy-database.adoc b/modules/ROOT/pages/backup-restore/copy-database.adoc
index abc321d9f..473c04978 100644
--- a/modules/ROOT/pages/backup-restore/copy-database.adoc
+++ b/modules/ROOT/pages/backup-restore/copy-database.adoc
@@ -28,7 +28,8 @@ For more information, see <<copy-estimating-iops, Estimating the processing time
 [source,role=noheader]
 ----
 neo4j-admin database copy [-h] [--copy-schema] [--expand-commands] [--force] [--verbose] [--compact-node-store[=true|false]]
-                             [--additional-config=<file>] [--from-pagecache=<size>] [--temp-path=<path>] [--to-format=<format>]
+                             [--additional-config=<file>] [--from-pagecache] [--max-off-heap-memory=<size>]
+                             [--temp-path=<path>] [--to-format=<format>]
                              [--to-path-schema=<path>] [--copy-only-node-properties=<label.property>[,<label.property>...]]...
                              [--copy-only-nodes-with-labels=<label>[,<label>...]]... [--copy-only-relationship-properties=<relationship.
                              property>[,<relationship.property>...]]... [--copy-only-relationships-with-types=<type>[,<type>...]]...
@@ -123,7 +124,7 @@ The indexes will be built the first time the database is started.
 |Force the command to run even if the integrity of the database cannot be verified.
 |
 
-|--from-pagecache=<size>
+|--from-pagecache
 |The size of the page cache to use for reading.
 [TIP]
 You can use the `--from-pagecache` option to speed up the copy operation by specifying how much cache to allocate when reading the source.
@@ -155,6 +156,12 @@ relationship types will not be included in the copy.
 Cannot be combined with `--copy-only-relationships-with-types`.
 |
 
+|--max-off-heap-memory=<size>
+|Maximum memory that neo4j-admin can use for various data structures and caching to improve performance.
+Values can be plain numbers, such as 10000000, or 20G for 20 gigabytes.
+It can also be specified as a percentage of the available memory, for example 70%%.
+|
+
 |--skip-labels=<label>[,<label>...]
 |A comma-separated list of labels to ignore.
 |
diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index d16788a1c..c6417d06b 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -595,7 +595,8 @@ The syntax for importing a set of CSV files incrementally is:
 
 [source, syntax, role="nocopy"]
 ----
-neo4j-admin database import incremental [-h] [--expand-commands] --force [--verbose] [--auto-skip-subsequent-headers
+neo4j-admin database import incremental [-h] [--expand-commands] --force [--update-all-matching-relationships] 
+                                        [--verbose] [--auto-skip-subsequent-headers
                                         [=true|false]] [--ignore-empty-strings[=true|false]] [--ignore-extra-columns
                                         [=true|false]] [--legacy-style-quoting[=true|false]] [--normalize-types
                                         [=true|false]] [--skip-bad-entries-logging[=true|false]]
@@ -878,6 +879,10 @@ performance, this value should not be greater than the number of available proce
 |Whether or not strings should be trimmed for whitespaces.
 |false
 
+|--update-all-matching-relationships
+|If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error
+|false
+
 |--verbose
 |Enable verbose output.
 |

From 970642576c90f00c12d733efda87ed3e09a3a2d1 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:45:24 +0100
Subject: [PATCH 2/8] Apply suggestions from code review

---
 modules/ROOT/pages/backup-restore/copy-database.adoc        | 6 +++---
 .../ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ROOT/pages/backup-restore/copy-database.adoc b/modules/ROOT/pages/backup-restore/copy-database.adoc
index 473c04978..d37f54ccf 100644
--- a/modules/ROOT/pages/backup-restore/copy-database.adoc
+++ b/modules/ROOT/pages/backup-restore/copy-database.adoc
@@ -28,7 +28,7 @@ For more information, see <<copy-estimating-iops, Estimating the processing time
 [source,role=noheader]
 ----
 neo4j-admin database copy [-h] [--copy-schema] [--expand-commands] [--force] [--verbose] [--compact-node-store[=true|false]]
-                             [--additional-config=<file>] [--from-pagecache] [--max-off-heap-memory=<size>]
+                             [--additional-config=<file>] [--from-pagecache=<size>] [--from-pagecache, --max-off-heap-memory=<size>]
                              [--temp-path=<path>] [--to-format=<format>]
                              [--to-path-schema=<path>] [--copy-only-node-properties=<label.property>[,<label.property>...]]...
                              [--copy-only-nodes-with-labels=<label>[,<label>...]]... [--copy-only-relationship-properties=<relationship.
@@ -124,7 +124,7 @@ The indexes will be built the first time the database is started.
 |Force the command to run even if the integrity of the database cannot be verified.
 |
 
-|--from-pagecache
+|--from-pagecache=<size>
 |The size of the page cache to use for reading.
 [TIP]
 You can use the `--from-pagecache` option to speed up the copy operation by specifying how much cache to allocate when reading the source.
@@ -156,7 +156,7 @@ relationship types will not be included in the copy.
 Cannot be combined with `--copy-only-relationships-with-types`.
 |
 
-|--max-off-heap-memory=<size>
+|--from-pagecache, --max-off-heap-memory=<size>
 |Maximum memory that neo4j-admin can use for various data structures and caching to improve performance.
 Values can be plain numbers, such as 10000000, or 20G for 20 gigabytes.
 It can also be specified as a percentage of the available memory, for example 70%%.
diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index c6417d06b..239c67c3a 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -880,7 +880,7 @@ performance, this value should not be greater than the number of available proce
 |false
 
 |--update-all-matching-relationships
-|If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error
+|If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error --verbose Enable verbose output.
 |false
 
 |--verbose

From 4d189682d34c696b8181fcfabe54a8ef84eb5823 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:46:49 +0100
Subject: [PATCH 3/8] Update neo4j-admin-import.adoc

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 239c67c3a..455a78da8 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -609,8 +609,8 @@ neo4j-admin database import incremental [-h] [--expand-commands] --force [--upda
                                         [--read-buffer-size=<size>] [--report-file=<path>] [--schema=<path>]
                                         [--stage=all|prepare|build|merge] [--threads=<num>] --nodes=[<label>[:
                                         <label>]...=]<files>... [--nodes=[<label>[:<label>]...=]<files>...]...
-                                        [--relationships=[<type>=]<files>...]... [--multiline-fields=true|false|<path>[,
-                                        <path>] [--multiline-fields-format=v1|v2]] <database>
+                                        [--relationships=[<type>=]<files>...]... [--multiline-fields=true|false|<path>[,<path>]
+                                        [--multiline-fields-format=v1|v2]] <database>
 ----
 
 === Description

From 93840dbb7156cd47c3ee5cb35c37fabd944b6b19 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:51:58 +0100
Subject: [PATCH 4/8] Update
 modules/ROOT/pages/backup-restore/copy-database.adoc

---
 modules/ROOT/pages/backup-restore/copy-database.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/pages/backup-restore/copy-database.adoc b/modules/ROOT/pages/backup-restore/copy-database.adoc
index d37f54ccf..217ca1ebd 100644
--- a/modules/ROOT/pages/backup-restore/copy-database.adoc
+++ b/modules/ROOT/pages/backup-restore/copy-database.adoc
@@ -159,7 +159,7 @@ Cannot be combined with `--copy-only-relationships-with-types`.
 |--from-pagecache, --max-off-heap-memory=<size>
 |Maximum memory that neo4j-admin can use for various data structures and caching to improve performance.
 Values can be plain numbers, such as 10000000, or 20G for 20 gigabytes.
-It can also be specified as a percentage of the available memory, for example 70%%.
+It can also be specified as a percentage of the available memory, for example 70%.
 |
 
 |--skip-labels=<label>[,<label>...]

From f139bb6dfa7eda6af5083a20279c301161f47d0e Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Tue, 21 Jan 2025 14:09:54 +0100
Subject: [PATCH 5/8] Fix mismatches in the usage section

---
 .../tools/neo4j-admin/neo4j-admin-import.adoc | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 455a78da8..6cc94883e 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -596,20 +596,20 @@ The syntax for importing a set of CSV files incrementally is:
 [source, syntax, role="nocopy"]
 ----
 neo4j-admin database import incremental [-h] [--expand-commands] --force [--update-all-matching-relationships] 
-                                        [--verbose] [--auto-skip-subsequent-headers
-                                        [=true|false]] [--ignore-empty-strings[=true|false]] [--ignore-extra-columns
-                                        [=true|false]] [--legacy-style-quoting[=true|false]] [--normalize-types
-                                        [=true|false]] [--skip-bad-entries-logging[=true|false]]
-                                        [--skip-bad-relationships[=true|false]] [--skip-duplicate-nodes[=true|false]]
-                                        [--strict[=true|false]] [--trim-strings[=true|false]]
-                                        [--additional-config=<file>] [--array-delimiter=<char>] [--bad-tolerance=<num>]
-                                        [--delimiter=<char>] [--high-parallel-io=on|off|auto]
-                                        [--id-type=string|integer|actual] [--input-encoding=<character-set>]
-                                        [--input-type=csv|parquet] [--max-off-heap-memory=<size>] [--quote=<char>]
-                                        [--read-buffer-size=<size>] [--report-file=<path>] [--schema=<path>]
-                                        [--stage=all|prepare|build|merge] [--threads=<num>] --nodes=[<label>[:
-                                        <label>]...=]<files>... [--nodes=[<label>[:<label>]...=]<files>...]...
-                                        [--relationships=[<type>=]<files>...]... [--multiline-fields=true|false|<path>[,<path>]
+                                        [--verbose] [--auto-skip-subsequent-headers[=true|false]]
+                                        [--ignore-empty-strings[=true|false]] [--ignore-extra-columns[=true|false]]
+                                        [--legacy-style-quoting[=true|false]] [--normalize-types[=true|false]]
+                                        [--skip-bad-entries-logging[=true|false]] [--skip-bad-relationships
+                                        [=true|false]] [--skip-duplicate-nodes[=true|false]] [--strict[=true|false]]
+                                        [--trim-strings[=true|false]] [--additional-config=<file>]
+                                        [--array-delimiter=<char>] [--bad-tolerance=<num>] [--delimiter=<char>]
+                                        [--high-parallel-io=on|off|auto] [--id-type=string|integer|actual]
+                                        [--input-encoding=<character-set>] [--input-type=csv|parquet]
+                                        [--max-off-heap-memory=<size>] [--quote=<char>] [--read-buffer-size=<size>]
+                                        [--report-file=<path>] [--schema=<path>] [--stage=all|prepare|build|merge]
+                                        [--threads=<num>] --nodes=[<label>[:<label>]...=]<files>...  [--nodes=[<label>[:
+                                        <label>]...=]<files>...]... [--relationships=[<type>=]<files>...]...
+                                        [--multiline-fields=true|false|<path>[,<path>]
                                         [--multiline-fields-format=v1|v2]] <database>
 ----
 

From c8a694ab07f2f9fec15a8968017bd4b038b5c168 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Tue, 21 Jan 2025 14:16:54 +0100
Subject: [PATCH 6/8] Add labels, fix the test failures

---
 modules/ROOT/pages/backup-restore/copy-database.adoc         | 4 ++--
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ROOT/pages/backup-restore/copy-database.adoc b/modules/ROOT/pages/backup-restore/copy-database.adoc
index 217ca1ebd..884b65fb1 100644
--- a/modules/ROOT/pages/backup-restore/copy-database.adoc
+++ b/modules/ROOT/pages/backup-restore/copy-database.adoc
@@ -157,10 +157,10 @@ Cannot be combined with `--copy-only-relationships-with-types`.
 |
 
 |--from-pagecache, --max-off-heap-memory=<size>
-|Maximum memory that neo4j-admin can use for various data structures and caching to improve performance.
+|label:new[Introduced in 2025.01] Maximum memory that neo4j-admin can use for various data structures and caching to improve performance.
 Values can be plain numbers, such as 10000000, or 20G for 20 gigabytes.
 It can also be specified as a percentage of the available memory, for example 70%.
-|
+|90%
 
 |--skip-labels=<label>[,<label>...]
 |A comma-separated list of labels to ignore.
diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 6cc94883e..4aa36b3e0 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -607,7 +607,7 @@ neo4j-admin database import incremental [-h] [--expand-commands] --force [--upda
                                         [--input-encoding=<character-set>] [--input-type=csv|parquet]
                                         [--max-off-heap-memory=<size>] [--quote=<char>] [--read-buffer-size=<size>]
                                         [--report-file=<path>] [--schema=<path>] [--stage=all|prepare|build|merge]
-                                        [--threads=<num>] --nodes=[<label>[:<label>]...=]<files>...  [--nodes=[<label>[:
+                                        [--threads=<num>] --nodes=[<label>[:<label>]...=]<files>... [--nodes=[<label>[:
                                         <label>]...=]<files>...]... [--relationships=[<type>=]<files>...]...
                                         [--multiline-fields=true|false|<path>[,<path>]
                                         [--multiline-fields-format=v1|v2]] <database>
@@ -880,7 +880,7 @@ performance, this value should not be greater than the number of available proce
 |false
 
 |--update-all-matching-relationships
-|If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error --verbose Enable verbose output.
+|label:new[Introduced in 2025.01] If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error --verbose Enable verbose output.
 |false
 
 |--verbose

From 566ca5850fc7bc36a5bc03f940e3f8f032635ad6 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Tue, 21 Jan 2025 14:32:28 +0100
Subject: [PATCH 7/8] Update
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 4aa36b3e0..1cda76426 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -880,7 +880,7 @@ performance, this value should not be greater than the number of available proce
 |false
 
 |--update-all-matching-relationships
-|label:new[Introduced in 2025.01] If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error --verbose Enable verbose output.
+|label:new[Introduced in 2025.01] If one relationship data entry matches multiple existing relationships, this decides whether to update all matching, or to instead log as error.
 |false
 
 |--verbose

From a01eb2d7e85ac4980ef5fac5bc06cde1c7e5b6db Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:47:40 +0100
Subject: [PATCH 8/8] Remove --from-pagecache from the options list

---
 modules/ROOT/pages/backup-restore/copy-database.adoc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/ROOT/pages/backup-restore/copy-database.adoc b/modules/ROOT/pages/backup-restore/copy-database.adoc
index 884b65fb1..413094c4e 100644
--- a/modules/ROOT/pages/backup-restore/copy-database.adoc
+++ b/modules/ROOT/pages/backup-restore/copy-database.adoc
@@ -28,7 +28,7 @@ For more information, see <<copy-estimating-iops, Estimating the processing time
 [source,role=noheader]
 ----
 neo4j-admin database copy [-h] [--copy-schema] [--expand-commands] [--force] [--verbose] [--compact-node-store[=true|false]]
-                             [--additional-config=<file>] [--from-pagecache=<size>] [--from-pagecache, --max-off-heap-memory=<size>]
+                             [--additional-config=<file>] [--from-pagecache, --max-off-heap-memory=<size>]
                              [--temp-path=<path>] [--to-format=<format>]
                              [--to-path-schema=<path>] [--copy-only-node-properties=<label.property>[,<label.property>...]]...
                              [--copy-only-nodes-with-labels=<label>[,<label>...]]... [--copy-only-relationship-properties=<relationship.
@@ -124,13 +124,6 @@ The indexes will be built the first time the database is started.
 |Force the command to run even if the integrity of the database cannot be verified.
 |
 
-|--from-pagecache=<size>
-|The size of the page cache to use for reading.
-[TIP]
-You can use the `--from-pagecache` option to speed up the copy operation by specifying how much cache to allocate when reading the source.
-The `--from-pagecache` should be assigned whatever memory you can spare since Neo4j does random reads from the source.
-|8m
-
 |--from-path-data=<path>
 |Path to the databases directory, containing the database directory to source from.
 It can be used to target databases outside of the installation.