Skip to content

Commit f9bd86b

Browse files
alex268alex268
committed
Fixed readed -> read
1 parent 44e709c commit f9bd86b

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎core/src/main/java/tech/ydb/core/grpc/GrpcFlowControl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public interface GrpcFlowControl {
1111
interface Call {
1212
void onStart();
13-
void onMessageReaded();
13+
void onMessageRead();
1414
}
1515

1616
Call newCall(IntConsumer req);

‎core/src/main/java/tech/ydb/core/impl/call/GrpcFlows.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void onStart() {
2626
}
2727

2828
@Override
29-
public void onMessageReaded() {
29+
public void onMessageRead() {
3030
req.accept(1);
3131
}
3232
}

‎core/src/main/java/tech/ydb/core/impl/call/ReadStreamCall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void onMessage(RespT message) {
114114
logger.trace("ReadStreamCall[{}] <-- {}", traceId, TextFormat.shortDebugString((Message) message));
115115
}
116116
consumer.onNext(message);
117-
flow.onMessageReaded();
117+
flow.onMessageRead();
118118
} catch (Exception ex) {
119119
statusFuture.completeExceptionally(ex);
120120

‎core/src/main/java/tech/ydb/core/impl/call/ReadWriteStreamCall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void onMessage(R message) {
153153
}
154154

155155
consumer.onNext(message);
156-
flow.onMessageReaded();
156+
flow.onMessageRead();
157157
} catch (Exception ex) {
158158
statusFuture.completeExceptionally(ex);
159159
try {

‎query/src/test/java/tech/ydb/query/impl/QueryExecuteTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,23 @@ public static void dropTable() {
104104

105105
@Test
106106
public void streamReadTest() {
107-
AtomicLong rowReaded = new AtomicLong(0);
107+
AtomicLong rowsRead = new AtomicLong(0);
108108

109109
try (QueryClient client = QueryClient.newClient(YDB).build()) {
110110
try (QuerySession session = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
111111
session.createQuery("SELECT * FROM " + TEST_TABLE, TxMode.NONE).execute(part -> {
112-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
112+
rowsRead.addAndGet(part.getResultSetReader().getRowCount());
113113
}).join().getStatus().expectSuccess("Cannot execute query");
114114
}
115115
}
116116

117-
Assert.assertEquals(TEST_TABLE_SIZE, rowReaded.get());
117+
Assert.assertEquals(TEST_TABLE_SIZE, rowsRead.get());
118118
}
119119

120120

121121
@Test
122122
public void flowControlTest() {
123-
AtomicLong rowReaded = new AtomicLong(0);
123+
AtomicLong rowsRead = new AtomicLong(0);
124124
TestFlowCall flow = new TestFlowCall();
125125

126126
ExecuteQuerySettings settings = ExecuteQuerySettings.newBuilder()
@@ -136,21 +136,21 @@ public void flowControlTest() {
136136
Assert.assertFalse(flow.isStarted());
137137

138138
CompletableFuture<Result<QueryInfo>> res = stream.execute(part -> {
139-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
139+
rowsRead.addAndGet(part.getResultSetReader().getRowCount());
140140
});
141141

142142
Assert.assertTrue(flow.isStarted());
143143

144144
int requested = 0;
145-
long readed = rowReaded.get();
146-
Assert.assertEquals(0l, readed);
145+
long read = rowsRead.get();
146+
Assert.assertEquals(0l, read);
147147

148-
while (readed < TEST_TABLE_SIZE) {
148+
while (read < TEST_TABLE_SIZE) {
149149
flow.requestNext(1);
150150
requested++;
151151
flow.waitUntil(requested);
152-
Assert.assertTrue(rowReaded.get() > readed);
153-
readed = rowReaded.get();
152+
Assert.assertTrue(rowsRead.get() > read);
153+
read = rowsRead.get();
154154
}
155155

156156
Assert.assertTrue(res.join().isSuccess());
@@ -174,7 +174,7 @@ public void onStart() {
174174
}
175175

176176
@Override
177-
public void onMessageReaded() {
177+
public void onMessageRead() {
178178
semaphore.release();
179179
}
180180
}

‎table/src/test/java/tech/ydb/table/integration/ReadTableTest.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -108,73 +108,73 @@ public static void dropTable() {
108108
@Test
109109
public void readTableTest() {
110110
String tablePath = tablePath(TEST_TABLE);
111-
AtomicLong rowReaded = new AtomicLong(0);
111+
AtomicLong rowsRead = new AtomicLong(0);
112112

113113
ReadTableSettings rts = ReadTableSettings.newBuilder().column("id").build();
114114
retryCtx.supplyStatus(session -> {
115-
rowReaded.set(0);
115+
rowsRead.set(0);
116116
return session.executeReadTable(tablePath, rts).start(part -> {
117-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
117+
rowsRead.addAndGet(part.getResultSetReader().getRowCount());
118118
});
119119
}).join().expectSuccess("Cannot read table " + tablePath);
120120

121-
Assert.assertEquals(TEST_TABLE_SIZE, rowReaded.get());
121+
Assert.assertEquals(TEST_TABLE_SIZE, rowsRead.get());
122122
}
123123

124124
@Test
125125
public void limitedReadTableTest() {
126126
String tablePath = tablePath(TEST_TABLE);
127-
AtomicLong rowReaded = new AtomicLong(0);
127+
AtomicLong rewsRead = new AtomicLong(0);
128128

129129
ReadTableSettings rts = ReadTableSettings.newBuilder().column("id").batchLimitRows(100).build();
130130
retryCtx.supplyStatus(session -> {
131-
rowReaded.set(0);
131+
rewsRead.set(0);
132132
return session.executeReadTable(tablePath, rts).start(part -> {
133133
Assert.assertTrue(part.getResultSetReader().getRowCount() <= 100);
134-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
134+
rewsRead.addAndGet(part.getResultSetReader().getRowCount());
135135
});
136136
}).join().expectSuccess("Cannot read table " + tablePath);
137137

138-
Assert.assertEquals(TEST_TABLE_SIZE, rowReaded.get());
138+
Assert.assertEquals(TEST_TABLE_SIZE, rewsRead.get());
139139
}
140140

141141
@Test
142142
public void partialReadTableTest() {
143143
String tablePath = tablePath(TEST_TABLE);
144-
AtomicLong rowReaded = new AtomicLong(0);
144+
AtomicLong rowsRead = new AtomicLong(0);
145145

146146
ReadTableSettings rts = ReadTableSettings.newBuilder().column("id")
147147
.fromKeyExclusive(PrimitiveValue.newInt64(1))
148148
.toKeyExclusive(PrimitiveValue.newInt64(TEST_TABLE_SIZE))
149149
.build();
150150
retryCtx.supplyStatus(session -> {
151-
rowReaded.set(0);
151+
rowsRead.set(0);
152152
return session.executeReadTable(tablePath, rts).start(part -> {
153-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
153+
rowsRead.addAndGet(part.getResultSetReader().getRowCount());
154154
});
155155
}).join().expectSuccess("Cannot read table " + tablePath);
156156

157-
Assert.assertEquals(TEST_TABLE_SIZE - 2, rowReaded.get());
157+
Assert.assertEquals(TEST_TABLE_SIZE - 2, rowsRead.get());
158158

159159
ReadTableSettings rts2 = ReadTableSettings.newBuilder().column("id")
160160
.fromKeyInclusive(PrimitiveValue.newInt64(2))
161161
.toKeyInclusive(PrimitiveValue.newInt64(TEST_TABLE_SIZE - 1))
162162
.build();
163163
retryCtx.supplyStatus(session -> {
164-
rowReaded.set(0);
164+
rowsRead.set(0);
165165
return session.executeReadTable(tablePath, rts2).start(part -> {
166-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
166+
rowsRead.addAndGet(part.getResultSetReader().getRowCount());
167167
});
168168
}).join().expectSuccess("Cannot read table " + tablePath);
169169

170-
Assert.assertEquals(TEST_TABLE_SIZE - 2, rowReaded.get());
170+
Assert.assertEquals(TEST_TABLE_SIZE - 2, rowsRead.get());
171171
}
172172

173173
@Test
174174
public void flowControlReadTableTest() {
175175
String tablePath = tablePath(TEST_TABLE);
176176

177-
AtomicLong rowReaded = new AtomicLong(0);
177+
AtomicLong rowsRead = new AtomicLong(0);
178178
TestFlowCall flow = new TestFlowCall();
179179

180180
ReadTableSettings rts = ReadTableSettings.newBuilder().column("id")
@@ -188,21 +188,21 @@ public void flowControlReadTableTest() {
188188
Assert.assertFalse(flow.isStarted());
189189

190190
CompletableFuture<Status> res = stream.start(part -> {
191-
rowReaded.addAndGet(part.getResultSetReader().getRowCount());
191+
rowsRead.addAndGet(part.getResultSetReader().getRowCount());
192192
});
193193

194194
Assert.assertTrue(flow.isStarted());
195195

196196
int requested = 0;
197-
long readed = rowReaded.get();
198-
Assert.assertEquals(0l, readed);
197+
long read = rowsRead.get();
198+
Assert.assertEquals(0l, read);
199199

200-
while (readed < TEST_TABLE_SIZE) {
200+
while (read < TEST_TABLE_SIZE) {
201201
flow.requestNext(1);
202202
requested++;
203203
flow.waitUntil(requested);
204-
Assert.assertTrue(rowReaded.get() > readed);
205-
readed = rowReaded.get();
204+
Assert.assertTrue(rowsRead.get() > read);
205+
read = rowsRead.get();
206206
}
207207

208208
Assert.assertTrue(res.join().isSuccess());
@@ -225,7 +225,7 @@ public void onStart() {
225225
}
226226

227227
@Override
228-
public void onMessageReaded() {
228+
public void onMessageRead() {
229229
semaphore.release();
230230
}
231231
}

0 commit comments

Comments
 (0)