Skip to content

Commit 808589d

Browse files
Chris Hallmp911de
Chris Hall
authored and
mp911de
committed
Accept Long in CommandComplete.
[resolves #597][#598]
1 parent 7021b67 commit 808589d

File tree

10 files changed

+87
-31
lines changed

10 files changed

+87
-31
lines changed

‎src/main/java/io/r2dbc/postgresql/PostgresqlResult.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ final class PostgresqlResult extends AbstractReferenceCounted implements io.r2db
6464
public Mono<Long> getRowsUpdated() {
6565

6666
return this.messages
67-
.<Integer>handle((message, sink) -> {
67+
.<Long>handle((message, sink) -> {
6868

6969
if (message instanceof ErrorResponse) {
7070
this.factory.handleErrorResponse(message, (SynchronousSink) sink);
@@ -77,7 +77,7 @@ public Mono<Long> getRowsUpdated() {
7777

7878
if (message instanceof CommandComplete) {
7979

80-
Integer rowCount = ((CommandComplete) message).getRows();
80+
Long rowCount = ((CommandComplete) message).getRows();
8181
if (rowCount != null) {
8282
sink.next(rowCount);
8383
}
@@ -91,8 +91,8 @@ public Mono<Long> getRowsUpdated() {
9191

9292
long sum = 0;
9393

94-
for (Integer integer : list) {
95-
sum += integer;
94+
for (Long value : list) {
95+
sum += value;
9696
}
9797

9898
sink.next(sum);

‎src/main/java/io/r2dbc/postgresql/PostgresqlSegmentResult.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private PostgresqlSegmentResult(Flux<Segment> segments) {
8383

8484
if (message instanceof CommandComplete) {
8585

86-
Integer rowCount = ((CommandComplete) message).getRows();
86+
Long rowCount = ((CommandComplete) message).getRows();
8787
if (rowCount != null) {
8888
sink.next(new PostgresqlUpdateCountSegment(rowCount));
8989
}

‎src/main/java/io/r2dbc/postgresql/message/backend/CommandComplete.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public final class CommandComplete implements BackendMessage {
3535

3636
private final Integer rowId;
3737

38-
private final Integer rows;
38+
private final Long rows;
3939

4040
/**
4141
* Create a new message.
@@ -45,7 +45,7 @@ public final class CommandComplete implements BackendMessage {
4545
* @param rows the number of rows affected by the command
4646
* @throws IllegalArgumentException if {@code command} is {@code null}
4747
*/
48-
public CommandComplete(String command, @Nullable Integer rowId, @Nullable Integer rows) {
48+
public CommandComplete(String command, @Nullable Integer rowId, @Nullable Long rows) {
4949
this.command = Assert.requireNonNull(command, "command must not be null");
5050
this.rowId = rowId;
5151
this.rows = rows;
@@ -90,7 +90,7 @@ public Integer getRowId() {
9090
* @return the number of rows affected by the command
9191
*/
9292
@Nullable
93-
public Integer getRows() {
93+
public Long getRows() {
9494
return this.rows;
9595
}
9696

@@ -122,15 +122,15 @@ static CommandComplete decode(ByteBuf in) {
122122
String rowId = tag.substring(index1 + 1, index2);
123123
String rows = tag.substring(index2 + 1, index3 != -1 ? index3 : tag.length());
124124

125-
return new CommandComplete(command, Integer.parseInt(rowId), Integer.parseInt(rows));
125+
return new CommandComplete(command, Integer.parseInt(rowId), Long.parseLong(rows));
126126
} else if (isNoRowId(tag)) {
127127

128128
int index1 = tag.indexOf(' ');
129129
int index2 = tag.indexOf(' ', index1 + 1);
130130
String command = tag.substring(0, index1 != -1 ? index1 : tag.length());
131131
String rows = index1 != -1 ? tag.substring(index1 + 1, index2 != -1 ? index2 : tag.length()) : null;
132132

133-
return new CommandComplete(command, null, rows != null ? Integer.parseInt(rows) : null);
133+
return new CommandComplete(command, null, rows != null ? Long.parseLong(rows) : null);
134134
} else {
135135
return new CommandComplete(tag, null, null);
136136
}

‎src/test/java/io/r2dbc/postgresql/PostgresqlConnectionUnitTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ void copyIn() {
517517
.expectRequest(new Query("some-sql"), new CopyData(Unpooled.EMPTY_BUFFER), CopyDone.INSTANCE)
518518
.thenRespond(
519519
new CopyInResponse(emptySet(), Format.FORMAT_TEXT),
520-
new CommandComplete("cmd", 1, 0),
520+
new CommandComplete("cmd", 1, 0L),
521521
new ReadyForQuery(ReadyForQuery.TransactionStatus.IDLE)
522522
)
523523
.build();

‎src/test/java/io/r2dbc/postgresql/PostgresqlCopyInUnitTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void copyIn() {
5454
.expectRequest(new Query("some-sql"), new CopyData(byteBuffer), CopyDone.INSTANCE)
5555
.thenRespond(
5656
new CopyInResponse(emptySet(), Format.FORMAT_TEXT),
57-
new CommandComplete("cmd", 1, 1),
57+
new CommandComplete("cmd", 1, 1L),
5858
new ReadyForQuery(IDLE)
5959
).build();
6060

@@ -85,7 +85,7 @@ void copyInEmpty() {
8585
.transactionStatus(TransactionStatus.IDLE)
8686
.expectRequest(new Query("some-sql"), CopyDone.INSTANCE).thenRespond(
8787
new CopyInResponse(emptySet(), Format.FORMAT_TEXT),
88-
new CommandComplete("cmd", 1, 0),
88+
new CommandComplete("cmd", 1, 0L),
8989
new ReadyForQuery(ReadyForQuery.TransactionStatus.IDLE)
9090
)
9191
.build();
@@ -128,7 +128,7 @@ void copyInCancel() {
128128
new CopyFail("Copy operation failed: Cancelled")
129129
).thenRespond(
130130
new CopyInResponse(emptySet(), Format.FORMAT_TEXT),
131-
new CommandComplete("cmd", 1, 1),
131+
new CommandComplete("cmd", 1, 1L),
132132
new ReadyForQuery(IDLE)
133133
).build();
134134

‎src/test/java/io/r2dbc/postgresql/PostgresqlResultUnitTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class PostgresqlResultUnitTests {
3535

3636
@Test
3737
void toResultCommandComplete() {
38-
PostgresqlResult result = PostgresqlResult.toResult(MockContext.empty(), Flux.just(new CommandComplete("test", null, 1)), ExceptionFactory.INSTANCE);
38+
PostgresqlResult result = PostgresqlResult.toResult(MockContext.empty(), Flux.just(new CommandComplete("test", null, 1L)), ExceptionFactory.INSTANCE);
3939

4040
result.map((row, rowMetadata) -> row)
4141
.as(StepVerifier::create)
@@ -49,7 +49,7 @@ void toResultCommandComplete() {
4949

5050
@Test
5151
void toResultCommandCompleteUsingSegments() {
52-
io.r2dbc.postgresql.api.PostgresqlResult result = PostgresqlResult.toResult(MockContext.empty(), Flux.just(new CommandComplete("test", null, 1)), ExceptionFactory.INSTANCE).filter(it -> true);
52+
io.r2dbc.postgresql.api.PostgresqlResult result = PostgresqlResult.toResult(MockContext.empty(), Flux.just(new CommandComplete("test", null, 1L)), ExceptionFactory.INSTANCE).filter(it -> true);
5353

5454
result.map((row, rowMetadata) -> row)
5555
.as(StepVerifier::create)

‎src/test/java/io/r2dbc/postgresql/PostgresqlSegmentResultUnitTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void getRowsUpdatedShouldTerminateWithError() {
8989
void shouldConsumeRowsUpdated() {
9090

9191
PostgresqlSegmentResult result = PostgresqlSegmentResult.toResult(MockContext.empty(), Flux.just(new CommandComplete
92-
("test", null, 42)), ExceptionFactory.INSTANCE);
92+
("test", null, 42L)), ExceptionFactory.INSTANCE);
9393

9494
result.getRowsUpdated()
9595
.as(StepVerifier::create)
@@ -101,7 +101,7 @@ void shouldConsumeRowsUpdated() {
101101
void filterShouldRetainUpdateCount() {
102102

103103
PostgresqlSegmentResult result = PostgresqlSegmentResult.toResult(MockContext.empty(), Flux.just(new CommandComplete
104-
("test", null, 42)), ExceptionFactory.INSTANCE);
104+
("test", null, 42L)), ExceptionFactory.INSTANCE);
105105

106106
result.filter(Result.UpdateCount.class::isInstance).getRowsUpdated()
107107
.as(StepVerifier::create)
@@ -193,7 +193,7 @@ void flatMapShouldNotTerminateWithError() {
193193

194194
PostgresqlSegmentResult result = PostgresqlSegmentResult.toResult(MockContext.empty(), Flux.just(new ErrorResponse(Collections.emptyList()), new RowDescription(Collections.emptyList()),
195195
new DataRow(), new CommandComplete
196-
("test", null, 42)), ExceptionFactory.INSTANCE);
196+
("test", null, 42L)), ExceptionFactory.INSTANCE);
197197

198198
Flux.from(result.flatMap(Mono::just))
199199
.as(StepVerifier::create)

‎src/test/java/io/r2dbc/postgresql/client/ReactorNettyClientIntegrationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ void exchange() {
200200
.as(StepVerifier::create)
201201
.assertNext(message -> assertThat(message).isInstanceOf(RowDescription.class))
202202
.assertNext(message -> assertThat(message).isInstanceOf(DataRow.class))
203-
.expectNext(new CommandComplete("SELECT", null, 1))
203+
.expectNext(new CommandComplete("SELECT", null, 1L))
204204
.verifyComplete();
205205
}
206206

@@ -286,8 +286,8 @@ void parallelExchange() {
286286
.assertNext(message -> assertThat(message).isInstanceOf(RowDescription.class))
287287
.assertNext(message -> assertThat(message).isInstanceOf(DataRow.class))
288288
.assertNext(message -> assertThat(message).isInstanceOf(DataRow.class))
289-
.expectNext(new CommandComplete("SELECT", null, 1))
290-
.expectNext(new CommandComplete("SELECT", null, 1))
289+
.expectNext(new CommandComplete("SELECT", null, 1L))
290+
.expectNext(new CommandComplete("SELECT", null, 1L))
291291
.verifyComplete();
292292
}
293293

‎src/test/java/io/r2dbc/postgresql/message/backend/BackendMessageDecoderUnitTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void commandComplete() {
138138

139139
return buffer;
140140
});
141-
assertThat(message).isEqualTo(new CommandComplete("COPY", null, 100));
141+
assertThat(message).isEqualTo(new CommandComplete("COPY", null, 100L));
142142
}
143143

144144
@Test

‎src/test/java/io/r2dbc/postgresql/message/backend/CommandCompleteUnitTests.java‎

Lines changed: 64 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class CommandCompleteUnitTests {
2929

3030
@Test
3131
void constructorNoCommand() {
32-
assertThatIllegalArgumentException().isThrownBy(() -> new CommandComplete(null, 100, 200))
32+
assertThatIllegalArgumentException().isThrownBy(() -> new CommandComplete(null, 100, 200L))
3333
.withMessage("command must not be null");
3434
}
3535

@@ -42,7 +42,15 @@ void decodeCopy() {
4242

4343
return buffer;
4444
})
45-
.isEqualTo(new CommandComplete("COPY", null, 100));
45+
.isEqualTo(new CommandComplete("COPY", null, 100L));
46+
assertThat(CommandComplete.class)
47+
.decoded(buffer -> {
48+
buffer.writeCharSequence("COPY 4294967294", UTF_8);
49+
buffer.writeByte(0);
50+
51+
return buffer;
52+
})
53+
.isEqualTo(new CommandComplete("COPY", null, 4294967294L));
4654
}
4755

4856
@Test
@@ -54,7 +62,15 @@ void decodeDelete() {
5462

5563
return buffer;
5664
})
57-
.isEqualTo(new CommandComplete("DELETE", null, 100));
65+
.isEqualTo(new CommandComplete("DELETE", null, 100L));
66+
assertThat(CommandComplete.class)
67+
.decoded(buffer -> {
68+
buffer.writeCharSequence("DELETE 4294967294", UTF_8);
69+
buffer.writeByte(0);
70+
71+
return buffer;
72+
})
73+
.isEqualTo(new CommandComplete("DELETE", null, 4294967294L));
5874
}
5975

6076
@Test
@@ -66,7 +82,15 @@ void decodeFetch() {
6682

6783
return buffer;
6884
})
69-
.isEqualTo(new CommandComplete("FETCH", null, 100));
85+
.isEqualTo(new CommandComplete("FETCH", null, 100L));
86+
assertThat(CommandComplete.class)
87+
.decoded(buffer -> {
88+
buffer.writeCharSequence("FETCH 4294967294", UTF_8);
89+
buffer.writeByte(0);
90+
91+
return buffer;
92+
})
93+
.isEqualTo(new CommandComplete("FETCH", null, 4294967294L));
7094
}
7195

7296
@Test
@@ -78,7 +102,15 @@ void decodeInsert() {
78102

79103
return buffer;
80104
})
81-
.isEqualTo(new CommandComplete("INSERT", 100, 200));
105+
.isEqualTo(new CommandComplete("INSERT", 100, 200L));
106+
assertThat(CommandComplete.class)
107+
.decoded(buffer -> {
108+
buffer.writeCharSequence("INSERT 100 4294967294", UTF_8);
109+
buffer.writeByte(0);
110+
111+
return buffer;
112+
})
113+
.isEqualTo(new CommandComplete("INSERT", 100, 4294967294L));
82114
}
83115

84116
@Test
@@ -90,7 +122,15 @@ void decodeMove() {
90122

91123
return buffer;
92124
})
93-
.isEqualTo(new CommandComplete("MOVE", null, 100));
125+
.isEqualTo(new CommandComplete("MOVE", null, 100L));
126+
assertThat(CommandComplete.class)
127+
.decoded(buffer -> {
128+
buffer.writeCharSequence("MOVE 4294967294", UTF_8);
129+
buffer.writeByte(0);
130+
131+
return buffer;
132+
})
133+
.isEqualTo(new CommandComplete("MOVE", null, 4294967294L));
94134
}
95135

96136
@Test
@@ -114,7 +154,15 @@ void decodeSelect() {
114154

115155
return buffer;
116156
})
117-
.isEqualTo(new CommandComplete("SELECT", null, 100));
157+
.isEqualTo(new CommandComplete("SELECT", null, 100L));
158+
assertThat(CommandComplete.class)
159+
.decoded(buffer -> {
160+
buffer.writeCharSequence("SELECT 4294967294", UTF_8);
161+
buffer.writeByte(0);
162+
163+
return buffer;
164+
})
165+
.isEqualTo(new CommandComplete("SELECT", null, 4294967294L));
118166
assertThat(CommandComplete.class)
119167
.decoded(buffer -> {
120168
buffer.writeCharSequence("SELECT", UTF_8);
@@ -134,7 +182,15 @@ void decodeUpdate() {
134182

135183
return buffer;
136184
})
137-
.isEqualTo(new CommandComplete("UPDATE", null, 100));
185+
.isEqualTo(new CommandComplete("UPDATE", null, 100L));
186+
assertThat(CommandComplete.class)
187+
.decoded(buffer -> {
188+
buffer.writeCharSequence("UPDATE 4294967294", UTF_8);
189+
buffer.writeByte(0);
190+
191+
return buffer;
192+
})
193+
.isEqualTo(new CommandComplete("UPDATE", null, 4294967294L));
138194
}
139195

140196
}

0 commit comments

Comments
 (0)