Merge branch 'cypher-5' into 5-graphtypes

JPryce-Aklundh · web-flow · commit cfe51d2d9bee · 2025-09-30T14:00:48.000+02:00
diff --git a/antora.yml b/antora.yml
@@ -6,4 +6,4 @@ nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '2025.08'
+    neo4j-version: '2025.09'
diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc
@@ -84,15 +84,17 @@
 ** xref:functions/graph.adoc[]
 ** xref:functions/list.adoc[]
 ** xref:functions/load-csv.adoc[]
-** xref:functions/mathematical-logarithmic.adoc[]
-** xref:functions/mathematical-numeric.adoc[]
-** xref:functions/mathematical-trigonometric.adoc[]
+** Mathematical functions
+*** xref:functions/mathematical-logarithmic.adoc[]
+*** xref:functions/mathematical-numeric.adoc[]
+*** xref:functions/mathematical-trigonometric.adoc[]
 ** xref:functions/predicate.adoc[]
 ** xref:functions/scalar.adoc[]
 ** xref:functions/spatial.adoc[]
 ** xref:functions/string.adoc[]
-** xref:functions/temporal/duration.adoc[]
-** xref:functions/temporal/index.adoc[]
+** Temporal functions
+*** xref:functions/temporal/duration.adoc[]
+*** xref:functions/temporal/index.adoc[]
 ** xref:functions/user-defined.adoc[]
 ** xref:functions/vector.adoc[]
 
diff --git a/modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc b/modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc
@@ -31,7 +31,7 @@ For more information, see:
 [[cypher-deprecations-additions-removals-2025.xx]]
 == Neo4j 2025.xx
 
-=== Updated in Cypher 55
+=== Updated in Cypher 5
 
 [cols="2", options="header"]
 |===
@@ -63,6 +63,27 @@ For more information, see the link:{neo4j-docs-base-uri}/operations-manual/25/sc
 
 |===
 
+
+[[cypher-deprecations-additions-removals-2025.09]]
+== Neo4j 2025.09
+
+=== New in Cypher 5
+
+[cols="2", options="header"]
+|===
+| Feature
+| Details
+
+a| 
+label:functionality[]
+label:new[]
+
+New operator: `LockNodes`
+
+
+a| Introduced xref::planning-and-tuning/operators/operators-detail.adoc#query-plan-lock-nodes[`LockNodes`] operator, sometimes used in conjunction with the `LockingMerge` operator to lock nodes.
+|===
+
 [[cypher-deprecations-additions-removals-2025.08]]
 == Neo4j 2025.08
 
diff --git a/modules/ROOT/pages/functions/index.adoc b/modules/ROOT/pages/functions/index.adoc
@@ -207,8 +207,12 @@ LOAD CSV functions can be used to get information about the file that is process
 |===
 
 
+[[header-query-functions-mathematical]]
+== Mathematical functions
+
+
 [[header-query-functions-logarithmic]]
-== Logarithmic functions
+=== Logarithmic functions
 
 These functions all operate on numerical expressions only, and will return an error if used on any other values.
 
@@ -240,7 +244,7 @@ These functions all operate on numerical expressions only, and will return an er
 
 
 [[header-query-functions-numeric]]
-== Numeric functions
+=== Numeric functions
 
 These functions all operate on numerical expressions only, and will return an error if used on any other values.
 
@@ -280,7 +284,7 @@ These functions all operate on numerical expressions only, and will return an er
 
 
 [[header-query-functions-trigonometric]]
-== Trigonometric functions
+=== Trigonometric functions
 
 These functions all operate on numerical expressions only, and will return an error if used on any other values.
 
@@ -588,8 +592,12 @@ If the points are in a Cartesian CRS, the function returns the Euclidean distanc
 |===
 
 
+[[header-query-functions-temporal]]
+== Temporal functions
+
+
 [[header-query-functions-temporal-duration]]
-== Temporal duration functions
+=== Duration functions
 
 `DURATION` values of the xref::values-and-types/temporal.adoc[temporal types] can be created manipulated using the following functions:
 
@@ -620,7 +628,7 @@ If the points are in a Cartesian CRS, the function returns the Euclidean distanc
 |===
 
 [[header-query-functions-temporal-instant-types]]
-== Temporal instant types functions
+=== Instant types functions
 
 Values of the xref::values-and-types/temporal.adoc[temporal types] -- `DATE`, `ZONED TIME`, `LOCAL TIME`, `ZONED DATETIME`, and `LOCAL DATETIME` -- can be created manipulated using the following functions:
 
diff --git a/modules/ROOT/pages/functions/mathematical-logarithmic.adoc b/modules/ROOT/pages/functions/mathematical-logarithmic.adoc
@@ -2,7 +2,7 @@
 :table-caption!:
 
 [[query-functions-logarithmic]]
-= Mathematical functions - logarithmic
+= Logarithmic functions
 
 Logarithmic mathematical functions operate on numeric expressions only, and will return an error if used on any other values. See also xref:expressions/mathematical-operators.adoc[Mathematical operators].
 
diff --git a/modules/ROOT/pages/functions/mathematical-numeric.adoc b/modules/ROOT/pages/functions/mathematical-numeric.adoc
@@ -2,7 +2,7 @@
 :table-caption!:
 
 [[query-functions-numeric]]
-= Mathematical functions - numeric
+= Numeric functions
 
 Numeric mathematical functions operate on numeric expressions only, and will return an error if used on any other values.
 See also xref:expressions/mathematical-operators.adoc[Mathematical operators].
diff --git a/modules/ROOT/pages/functions/mathematical-trigonometric.adoc b/modules/ROOT/pages/functions/mathematical-trigonometric.adoc
@@ -2,7 +2,7 @@
 :table-caption!:
 
 [[query-functions-trigonometric]]
-= Mathematical functions - trigonometric
+= Trigonometric functions
 
 Trigonometric mathematical functions operate on numeric expressions only, and will return an error if used on any other values. See also xref:expressions/mathematical-operators.adoc[Mathematical operators].
 
diff --git a/modules/ROOT/pages/functions/temporal/duration.adoc b/modules/ROOT/pages/functions/temporal/duration.adoc
@@ -1,7 +1,7 @@
 :description: Cypher provides functions allowing for the creation and manipulation of temporal `DURATION` values.
 
 [[query-functions-temporal-duration]]
-= Temporal functions - duration
+= Duration functions
 :table-caption!:
 
 Duration functions allow for the creation and manipulation of temporal `DURATION` values.
diff --git a/modules/ROOT/pages/functions/temporal/index.adoc b/modules/ROOT/pages/functions/temporal/index.adoc
@@ -2,7 +2,7 @@
 :table-caption!:
 
 [[query-functions-temporal-instant-types]]
-= Temporal functions - instant types
+= Instant type functions
 
 Temporal functions allow for the creation and manipulation of values for each temporal type -- `DATE`, `ZONED TIME`, `LOCAL TIME`, `ZONED DATETIME`, and `LOCAL DATETIME`.
 
diff --git a/modules/ROOT/pages/planning-and-tuning/operators/index.adoc b/modules/ROOT/pages/planning-and-tuning/operators/index.adoc
@@ -345,6 +345,13 @@ Tests for the presence of a pattern predicate in queries containing multiple pat
 |
 |
 
+| xref::planning-and-tuning/operators/operators-detail.adoc#query-plan-lock-nodes[LockNodes]
+| Sometimes used in conjunction with the xref:planning-and-tuning/operators/operators-detail.adoc#query-plan-locking-merge[`LockingMerge`] operator to lock nodes.
+|
+|
+| label:new[Introduced in Neo4j 2025.09]
+
+
 | xref::planning-and-tuning/operators/operators-detail.adoc#query-plan-merge[Merge]
 | The `Merge` operator will either read or create nodes and/or relationships.
 |
diff --git a/modules/ROOT/pages/planning-and-tuning/operators/operators-detail.adoc b/modules/ROOT/pages/planning-and-tuning/operators/operators-detail.adoc
@@ -6087,6 +6087,83 @@ Total database accesses: 15, total allocated memory: 2232
 
 ======
 
+[role=label--new-2025.09]
+[[query-plan-lock-nodes]]
+=== Lock Nodes
+
+The `LockNodes` operator is sometimes used in conjunction with the xref:planning-and-tuning/operators/operators-detail.adoc#query-plan-locking-merge[`LockingMerge`] operator to lock nodes.
+
+
+.LockNodes
+======
+
+.Query
+[source, cypher]
+----
+PROFILE
+MATCH (s:Person {name: 'me'})
+MERGE (s)-[:FRIENDS_WITH]->(t:Person {size: size([()-->()|1])})
+----
+
+.Query Plan
+[role="queryplan", subs="attributes+"]
+----
+Planner COST
+
+Runtime PIPELINED
+
+Runtime version DEV
+
+Batch size 4
+
++----------------------------------------+----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| Operator                               | Id | Details                                                                                              | Estimated Rows | Rows | DB Hits | Memory (Bytes) | Page Cache Hits/Misses | Time (ms) | Pipeline            |
++----------------------------------------+----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| +ProduceResults                        |  0 |                                                                                                      |              1 |    0 |       0 |              0 |                    0/0 |     0.018 |                     |
+| |                                      +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+                     |
+| +EmptyResult                           |  1 |                                                                                                      |              1 |    0 |       0 |                |                    0/0 |     0.016 | In Pipeline 7       |
+| |                                      +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| +Apply                                 |  2 |                                                                                                      |              1 |    0 |       0 |                |                    0/0 |           |                     |
+| |\                                     +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | +ArgumentTracker                     | 19 |                                                                                                      |              1 |    0 |       0 |            240 |                    0/0 |     0.000 |                     |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+                     |
+| | +LockingMerge                        |  3 | CREATE (t:Person {size: COUNT {   MATCH (`anon_2`)-[`anon_3`]->(`anon_4`)   RETURN $`autoint_1` AS ` |              1 |    1 |       3 |            400 |                    0/0 |    15.340 | In Pipeline 7       |
+| | |                                    |    | anon_0` }}), (s)-[anon_1:FRIENDS_WITH]->(t), LOCK(s)                                                 |                |      |         |                |                        |           |                     |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | +AntiConditionalApply                | 18 |                                                                                                      |                |    0 |       0 |            384 |                        |     0.010 | In Pipeline 6       |
+| | |\                                   +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | | +Filter                            | 17 | t.size = anon_5 AND t:Person                                                                         |              0 |    0 |       4 |                |                        |           |                     |
+| | | |                                  +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | | +Apply                             | 16 |                                                                                                      |              1 |    2 |       0 |                |                        |           |                     |
+| | | |\                                 +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | | | +RelationshipCountFromCountStore | 15 | count( ()-[]->() ) AS anon_5                                                                         |              1 |    2 |       2 |            608 |                    0/0 |     0.113 | Fused in Pipeline 5 |
+| | | |                                  +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | | +Expand(All)                       | 14 | (s)-[anon_1:FRIENDS_WITH]->(t)                                                                       |              1 |    2 |       3 |                |                        |           |                     |
+| | | |                                  +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | | +LockNodes                         | 13 | s                                                                                                    |              1 |    1 |       0 |                |                        |           |                     |
+| | | |                                  +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | | +Argument                          | 12 | s                                                                                                    |              1 |    1 |       0 |            584 |                    0/0 |     1.494 | Fused in Pipeline 4 |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | +Optional                            | 11 | s                                                                                                    |              0 |    1 |       0 |            528 |                    0/0 |     2.057 | In Pipeline 3       |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | +Filter                              |  5 | t.size = anon_5 AND t:Person                                                                         |              0 |    0 |       4 |                |                        |           |                     |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | +Apply                               |  6 |                                                                                                      |              1 |    2 |       0 |                |                        |           |                     |
+| | |\                                   +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | | +RelationshipCountFromCountStore   |  7 | count( ()-[]->() ) AS anon_5                                                                         |              1 |    2 |       2 |            528 |                    0/0 |     4.220 | Fused in Pipeline 2 |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| | +Expand(All)                         |  8 | (s)-[anon_1:FRIENDS_WITH]->(t)                                                                       |              1 |    2 |       3 |                |                        |           |                     |
+| | |                                    +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+                        |           |                     |
+| | +Argument                            |  9 | s                                                                                                    |              1 |    1 |       0 |            432 |                    1/0 |     0.184 | Fused in Pipeline 1 |
+| |                                      +----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+| +NodeIndexSeek                         | 10 | RANGE INDEX s:Person(name) WHERE name = $autostring_0                                                |              1 |    1 |       2 |            376 |                    0/1 |     9.263 | In Pipeline 0       |
++----------------------------------------+----+------------------------------------------------------------------------------------------------------+----------------+------+---------+----------------+------------------------+-----------+---------------------+
+
+Total database accesses: 23, total allocated memory: 3248
+----
+
+======
+
 
 
 [[query-plan-foreach]]

Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,13 @@ Tests for the presence of a pattern predicate in queries containing multiple pat`
`345`	`345`	`\|`
`346`	`346`	`\|`
`347`	`347`
	`348`	`+\| xref::planning-and-tuning/operators/operators-detail.adoc#query-plan-lock-nodes[LockNodes]`
	`349`	+\| Sometimes used in conjunction with the xref:planning-and-tuning/operators/operators-detail.adoc#query-plan-locking-merge[`LockingMerge`] operator to lock nodes.
	`350`	`+\|`
	`351`	`+\|`
	`352`	`+\| label:new[Introduced in Neo4j 2025.09]`
	`353`	`+`
	`354`	`+`
`348`	`355`	`\| xref::planning-and-tuning/operators/operators-detail.adoc#query-plan-merge[Merge]`
`349`	`356`	\| The `Merge` operator will either read or create nodes and/or relationships.
`350`	`357`	`\|`