Let Result.getRowsUpdated() return Long.

This is to allow for large update counts. [resolves #255] Signed-off-by: Mark Paluch <[email protected]>
r2dbc · Jan 27, 2022 · 03977f5 · 03977f5
1 parent fbc8625
commit 03977f5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/r2dbc-spec/src/main/asciidoc/changes.adoc b/r2dbc-spec/src/main/asciidoc/changes.adoc
@@ -3,6 +3,13 @@
 
 The following section reflects the history of changes.
 
+[[changes.1.0.0]]
+== 1.0
+
+Revised `Result.getRowsUpdated()` signature::
+
+* `Result.getRowsUpdated()` now returns a `Long` value instead of `Integer` to allow for large update counts.
+
 [[changes.0.9.x]]
 == 0.9
 

diff --git a/r2dbc-spec/src/main/asciidoc/index.adoc b/r2dbc-spec/src/main/asciidoc/index.adoc
@@ -9,7 +9,7 @@ ifdef::backend-pdf[]
 :toc:
 endif::[]
 
-(C) 2017-2021 The original authors.
+(C) 2017-2022 The original authors.
 
 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 

diff --git a/r2dbc-spec/src/main/asciidoc/result.adoc b/r2dbc-spec/src/main/asciidoc/result.adoc
@@ -30,7 +30,7 @@ The following example shows how to get a count of updated rows:
 [source,java]
 ----
 // result is a Result object
-Publisher<Integer> rowsUpdated = result.getRowsUpdated();
+Publisher<Long> rowsUpdated = result.getRowsUpdated();
 ----
 ====
 

diff --git a/r2dbc-spi-test/src/main/java/io/r2dbc/spi/test/MockResult.java b/r2dbc-spi-test/src/main/java/io/r2dbc/spi/test/MockResult.java
@@ -50,8 +50,8 @@ public static MockResult empty() {
     }
 
     @Override
-    public Flux<Integer> getRowsUpdated() {
-        return this.segments.filter(UpdateCount.class::isInstance).cast(UpdateCount.class).map(UpdateCount::value).collect(Collectors.summingInt(Long::intValue)).flux();
+    public Flux<Long> getRowsUpdated() {
+        return this.segments.filter(UpdateCount.class::isInstance).cast(UpdateCount.class).map(UpdateCount::value).collect(Collectors.summingLong(Long::longValue)).flux();
     }
 
     @Override

diff --git a/r2dbc-spi-test/src/main/java/io/r2dbc/spi/test/TestKit.java b/r2dbc-spi-test/src/main/java/io/r2dbc/spi/test/TestKit.java
@@ -83,7 +83,7 @@ public interface TestKit<T> {
      * @param result the result object
      * @return mono emitting the update row count.
      */
-    default Mono<Integer> extractRowsUpdated(Result result) {
+    default Mono<Long> extractRowsUpdated(Result result) {
         return Mono.from(result.getRowsUpdated());
     }
 
@@ -795,9 +795,9 @@ default void savePoint() {
                 Connection::close)
             .as(StepVerifier::create)
             .expectNext(collectionOf(100)).as("test_value from select")
-            .expectNext(1).as("rows inserted")
+            .expectNext(1L).as("rows inserted")
             .expectNext(collectionOf(100, 200)).as("values from select")
-            .expectNext(1).as("rows inserted")
+            .expectNext(1L).as("rows inserted")
             .expectNext(collectionOf(100, 200, 300)).as("values from select")
             .expectNext(collectionOf(100, 200)).as("values from select")
             .verifyComplete();
@@ -907,7 +907,7 @@ default void transactionCommit() {
                 Connection::close)
             .as(StepVerifier::create)
             .expectNext(collectionOf(100)).as("test_value from select")
-            .expectNext(1).as("rows inserted")
+            .expectNext(1L).as("rows inserted")
             .expectNext(collectionOf(100, 200)).as("values from select")
             .expectNext(collectionOf(100, 200)).as("values from select")
             .verifyComplete();
@@ -943,7 +943,7 @@ default void transactionRollback() {
                 Connection::close)
             .as(StepVerifier::create)
             .expectNext(collectionOf(100)).as("test_value from select")
-            .expectNext(1).as("rows inserted")
+            .expectNext(1L).as("rows inserted")
             .expectNext(collectionOf(100, 200)).as("values from select")
             .expectNext(collectionOf(100)).as("test_value from select")
             .verifyComplete();

diff --git a/r2dbc-spi/src/main/java/io/r2dbc/spi/Result.java b/r2dbc-spi/src/main/java/io/r2dbc/spi/Result.java
@@ -40,7 +40,7 @@ public interface Result {
      * @return the number of rows updated by a query against a database
      * @throws IllegalStateException if the result was consumed
      */
-    Publisher<Integer> getRowsUpdated();
+    Publisher<Long> getRowsUpdated();
 
     /**
      * Returns a mapping of the rows that are the results of a query against a database.  May be empty if the query did not return any rows.  A {@link Row} can be only considered valid within a