Skip to content

Commit 3b8eac0

Browse files
igorbernstein2igorbernstein2
authored
---
yaml --- r: 13783 b: refs/heads/autosynth-logging c: 5adffe8 h: refs/heads/master i: 13781: d55f384 13779: 2e2895f 13775: 019462d
1 parent 89a8b3d commit 3b8eac0

4 files changed

Lines changed: 100 additions & 27 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
105105
refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
106106
refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
107107
refs/heads/autosynth-dlp: 90e4efe3be392e89dc36bce22afab981a905b1bc
108-
refs/heads/autosynth-logging: f50968d69446a3ae7b59eda608d28f21fcefea0d
108+
refs/heads/autosynth-logging: 5adffe8b96186c78663fa231fb1bff8692adf6ff
109109
refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
110110
refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6
111111
refs/tags/v0.64.0: 456e8fbd129deced3ca025f239a2d8a82bde1d0a

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
*/
1616
package com.google.cloud.bigtable.data.v2.models;
1717

18+
import com.google.api.core.InternalApi;
19+
import com.google.bigtable.v2.Cell;
20+
import com.google.bigtable.v2.Column;
21+
import com.google.bigtable.v2.Family;
1822
import com.google.common.collect.ImmutableList;
1923
import com.google.protobuf.ByteString;
2024
import java.util.List;
@@ -43,6 +47,34 @@ public ByteString getKey(Row row) {
4347
return row.getKey();
4448
}
4549

50+
/**
51+
* Helper to convert a proto Row to a model Row.
52+
*
53+
* <p>For internal use only.
54+
*/
55+
@InternalApi
56+
public Row createRowFromProto(com.google.bigtable.v2.Row row) {
57+
RowBuilder<Row> builder = createRowBuilder();
58+
builder.startRow(row.getKey());
59+
60+
for (Family family : row.getFamiliesList()) {
61+
for (Column column : family.getColumnsList()) {
62+
for (Cell cell : column.getCellsList()) {
63+
builder.startCell(
64+
family.getName(),
65+
column.getQualifier(),
66+
cell.getTimestampMicros(),
67+
cell.getLabelsList(),
68+
cell.getValue().size());
69+
builder.cellValue(cell.getValue());
70+
builder.finishCell();
71+
}
72+
}
73+
}
74+
75+
return builder.finishRow();
76+
}
77+
4678
/** {@inheritDoc} */
4779
public class DefaultRowBuilder implements RowBuilder<Row> {
4880
private ByteString currentKey;

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,19 @@
2020
import com.google.api.core.ApiFutures;
2121
import com.google.api.gax.rpc.ApiCallContext;
2222
import com.google.api.gax.rpc.UnaryCallable;
23-
import com.google.bigtable.v2.Cell;
24-
import com.google.bigtable.v2.Column;
25-
import com.google.bigtable.v2.Family;
2623
import com.google.bigtable.v2.ReadModifyWriteRowRequest;
2724
import com.google.bigtable.v2.ReadModifyWriteRowResponse;
2825
import com.google.cloud.bigtable.data.v2.internal.RequestContext;
2926
import com.google.cloud.bigtable.data.v2.models.DefaultRowAdapter;
3027
import com.google.cloud.bigtable.data.v2.models.ReadModifyWriteRow;
3128
import com.google.cloud.bigtable.data.v2.models.Row;
32-
import com.google.cloud.bigtable.data.v2.models.RowAdapter;
33-
import com.google.cloud.bigtable.data.v2.models.RowAdapter.RowBuilder;
3429
import com.google.common.util.concurrent.MoreExecutors;
3530

3631
/** Simple wrapper for ReadModifyWriteRow to wrap the request and response protobufs. */
3732
class ReadModifyWriteRowCallable extends UnaryCallable<ReadModifyWriteRow, Row> {
3833
private final UnaryCallable<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse> inner;
3934
private final RequestContext requestContext;
40-
private final RowAdapter<Row> rowAdapter;
35+
private final DefaultRowAdapter rowAdapter;
4136

4237
ReadModifyWriteRowCallable(
4338
UnaryCallable<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse> inner,
@@ -64,25 +59,6 @@ public Row apply(ReadModifyWriteRowResponse readModifyWriteRowResponse) {
6459
}
6560

6661
private Row convertResponse(ReadModifyWriteRowResponse response) {
67-
RowBuilder<Row> rowBuilder = rowAdapter.createRowBuilder();
68-
rowBuilder.startRow(response.getRow().getKey());
69-
70-
for (Family family : response.getRow().getFamiliesList()) {
71-
for (Column column : family.getColumnsList()) {
72-
for (Cell cell : column.getCellsList()) {
73-
rowBuilder.startCell(
74-
family.getName(),
75-
column.getQualifier(),
76-
cell.getTimestampMicros(),
77-
cell.getLabelsList(),
78-
cell.getValue().size());
79-
80-
rowBuilder.cellValue(cell.getValue());
81-
82-
rowBuilder.finishCell();
83-
}
84-
}
85-
}
86-
return rowBuilder.finishRow();
62+
return rowAdapter.createRowFromProto(response.getRow());
8763
}
8864
}

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,69 @@ public void sortFamiliesAreSorted() {
171171
RowCell.create("family2", col2, 1000, labels, value2)))
172172
.inOrder();
173173
}
174+
175+
@Test
176+
public void protoTest() {
177+
ByteString key = ByteString.copyFromUtf8("key");
178+
179+
String family1 = "family1";
180+
ByteString col1 = ByteString.copyFromUtf8("col1");
181+
ByteString value1 = ByteString.copyFromUtf8("value1");
182+
183+
String family2 = "family2";
184+
ByteString col2 = ByteString.copyFromUtf8("col2");
185+
ByteString value2 = ByteString.copyFromUtf8("value2");
186+
187+
List<String> labels = ImmutableList.of();
188+
189+
com.google.bigtable.v2.Row proto =
190+
com.google.bigtable.v2.Row.newBuilder()
191+
.setKey(key)
192+
.addFamilies(
193+
com.google.bigtable.v2.Family.newBuilder()
194+
.setName(family2)
195+
.addColumns(
196+
com.google.bigtable.v2.Column.newBuilder()
197+
.setQualifier(col1)
198+
.addCells(
199+
com.google.bigtable.v2.Cell.newBuilder()
200+
.setTimestampMicros(2_000)
201+
.setValue(value2)))
202+
.addColumns(
203+
com.google.bigtable.v2.Column.newBuilder()
204+
.setQualifier(col2)
205+
.addCells(
206+
com.google.bigtable.v2.Cell.newBuilder()
207+
.setTimestampMicros(2_000)
208+
.setValue(value2))))
209+
.addFamilies(
210+
com.google.bigtable.v2.Family.newBuilder()
211+
.setName(family1)
212+
.addColumns(
213+
com.google.bigtable.v2.Column.newBuilder()
214+
.setQualifier(col1)
215+
.addCells(
216+
com.google.bigtable.v2.Cell.newBuilder()
217+
.setTimestampMicros(1_000)
218+
.setValue(value1)))
219+
.addColumns(
220+
com.google.bigtable.v2.Column.newBuilder()
221+
.setQualifier(col2)
222+
.addCells(
223+
com.google.bigtable.v2.Cell.newBuilder()
224+
.setTimestampMicros(1_000)
225+
.setValue(value1))))
226+
.build();
227+
228+
Row row = adapter.createRowFromProto(proto);
229+
assertThat(row)
230+
.isEqualTo(
231+
Row.create(
232+
key,
233+
ImmutableList.of(
234+
RowCell.create(family1, col1, 1_000, labels, value1),
235+
RowCell.create(family1, col2, 1_000, labels, value1),
236+
RowCell.create(family2, col1, 2_000, labels, value2),
237+
RowCell.create(family2, col2, 2_000, labels, value2))));
238+
}
174239
}

0 commit comments

Comments
 (0)