Cloud Spanner: Make Spanner value classes serializable #2040

mairbek · 2017-05-08T22:37:27Z

Is needed to get PCollection<Struct> in Apache Beam working.

shinfan

Just some small nits

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java

+    private static final long serialVersionUID = 695127243179520960L;
+    private final List<com.google.protobuf.Value> underlying;
+
+    private StringArray(List<com.google.protobuf.Value> underlying) {


google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java

+    private static final long serialVersionUID = -2850504708084921083L;
+    private final List<com.google.protobuf.Value> underlying;
+
+    private BoolArray(List<com.google.protobuf.Value> underlying) {


shinfan

LGTM

coveralls · 2017-05-10T05:06:00Z

Changes Unknown when pulling 3375959 on mairbek:struct-mutations into ** on GoogleCloudPlatform:master**.

coveralls · 2017-05-10T05:35:19Z

Changes Unknown when pulling afbd59a on mairbek:struct-mutations into ** on GoogleCloudPlatform:master**.

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java

@@ -2474,6 +2466,8 @@ A toPrimitiveArray(int columnIndex) {
  }

  private static class Int64Array extends PrimitiveArray<Long, long[]> {


google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java

@@ -41,7 +43,9 @@
 * <p>{@code Struct} instances are immutable.
 */
 @Immutable
-public abstract class Struct extends AbstractStructReader {
+public abstract class Struct extends AbstractStructReader implements Serializable {


…e-cloud-java into struct-mutations

coveralls · 2017-05-25T23:24:26Z

Coverage increased (+0.003%) to 80.905% when pulling 73fdfa3 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

mairbek · 2017-05-25T23:30:28Z

Reverted Struct serialization

coveralls · 2017-05-25T23:41:50Z

Coverage remained the same at 80.902% when pulling a6005ed on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

coveralls · 2017-05-26T00:01:40Z

Coverage increased (+0.003%) to 80.905% when pulling 73fdfa3 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

coveralls · 2017-05-26T00:05:44Z

Coverage increased (+0.003%) to 80.905% when pulling 73fdfa3 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

coveralls · 2017-05-26T00:10:10Z

Coverage remained the same at 80.902% when pulling a6005ed on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

coveralls · 2017-05-26T00:26:50Z

Coverage remained the same at 80.902% when pulling a6005ed on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java

-public final class Statement {
+public final class Statement implements Serializable {
+  private static final long serialVersionUID = -1967958247625065259L;
+
  private final ImmutableMap<String, Value> parameters;


coveralls · 2017-05-31T02:09:49Z

Coverage increased (+0.3%) to 81.164% when pulling b37df27 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java

+          case ARRAY:
+            switch(fieldType.getArrayElementType().getCode()) {
+              case BOOL:
+                builder.set(fieldName).toBoolArray((Iterable<Boolean>) value);


google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java

+                builder.set(fieldName).toDateArray((Iterable<Date>) value);
+                break;
+              case STRUCT:
+                builder.add(fieldName, fieldType.getStructFields(), (Iterable<Struct>) value);


google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java

+        Value.timestampArray(null),
+        Value.dateArray(ImmutableList.of(
+            Date.fromYearMonthDay(2017, 4, 17), Date.fromYearMonthDay(2017, 5, 18))),
+        Value.dateArray(null)


google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java

    reserializeAndAssert(Value.bytesArray(null));
  }
+
+  @Test(expected = IllegalStateException.class)


google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java

    reserializeAndAssert(Value.stringArray(null));

    reserializeAndAssert(
-        Value.bytesArray(Arrays.asList(newByteArray("a"), newByteArray("b"))));
+        Value.bytesArray(BrokenSerializationList.of(newByteArray("a"), newByteArray("b"))));


coveralls · 2017-06-02T21:21:58Z

Coverage increased (+0.3%) to 81.173% when pulling 893d9f1 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

coveralls · 2017-06-02T21:27:49Z

Coverage increased (+0.3%) to 81.173% when pulling 893d9f1 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

coveralls · 2017-06-02T21:58:09Z

Coverage increased (+0.3%) to 81.173% when pulling 893d9f1 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java

@@ -38,6 +39,7 @@ public void basic() {
    assertThat(stmt.getSql()).isEqualTo(sql);
    assertThat(stmt.getParameters()).isEmpty();
    assertThat(stmt.toString()).isEqualTo(sql);
+    reserializeAndAssert(stmt);


coveralls · 2017-06-03T00:26:22Z

Coverage increased (+0.3%) to 81.187% when pulling 8210ee3 on mairbek:struct-mutations into a08d3fd on GoogleCloudPlatform:master.

mairbek · 2017-06-06T01:18:57Z

Ping?

Mairbek Khadikov added 3 commits May 8, 2017 15:33

Make struct serializable

d6da693

Cleanup

ac5e65c

Undo intellij import reorg.

3375959

googlebot added the cla: yes This human has signed the Contributor License Agreement. label May 8, 2017

Make Statement and TimestampBound serializable

afbd59a

shinfan reviewed May 9, 2017

View reviewed changes

Use ListValue directly in StringArray and BoolArray

f91cc87

shinfan approved these changes May 9, 2017

View reviewed changes

vkedia reviewed May 10, 2017

View reviewed changes

Mairbek Khadikov added 2 commits May 12, 2017 15:25

Make SessionPoolOptions serializable

35ea0e1

Revert struct and session pool options serializatio

042ce76

mairbek force-pushed the struct-mutations branch from beee08c to 042ce76 Compare May 25, 2017 23:15

Mairbek Khadikov added 2 commits May 25, 2017 16:19

Revert struct serialization

73fdfa3

Merge branch 'master' of https://github.com/GoogleCloudPlatform/googl…

4e359c0

…e-cloud-java into struct-mutations

Mairbek Khadikov added 2 commits May 25, 2017 16:25

Revert struct serialization

f3441c9

Revert

a6005ed

mairbek changed the title ~~Cloud Spanner: Make Struct serializable~~ Cloud Spanner: Make Spanner value classes serializable May 25, 2017

vkedia reviewed May 26, 2017

View reviewed changes

Mairbek Khadikov added 2 commits May 30, 2017 18:12

Make Struct serializable using serialization proxy.

96a41c8

Make sure serialization fails

b37df27

vkedia reviewed May 31, 2017

View reviewed changes

Mairbek Khadikov added 3 commits June 2, 2017 14:05

Added nested struct test that passes

9f9498c

Typo fix

6dfd73b

Formatting

893d9f1

vkedia reviewed Jun 2, 2017

View reviewed changes

Statement reserialization test

8210ee3

vkedia approved these changes Jun 6, 2017

View reviewed changes

vkedia merged commit 9432d8b into googleapis:master Jun 6, 2017

		@@ -2474,6 +2466,8 @@ A toPrimitiveArray(int columnIndex) {
		}

		private static class Int64Array extends PrimitiveArray<Long, long[]> {

Cloud Spanner: Make Spanner value classes serializable #2040

Cloud Spanner: Make Spanner value classes serializable #2040

Conversation

mairbek commented May 8, 2017 • edited Loading

shinfan left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

shinfan left a comment

Choose a reason for hiding this comment

coveralls commented May 10, 2017

coveralls commented May 10, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

coveralls commented May 25, 2017

mairbek commented May 25, 2017

coveralls commented May 25, 2017

coveralls commented May 26, 2017

coveralls commented May 26, 2017

coveralls commented May 26, 2017

coveralls commented May 26, 2017

This comment was marked as spam.

This comment was marked as spam.

coveralls commented May 31, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Jun 2, 2017

coveralls commented Jun 2, 2017

coveralls commented Jun 2, 2017

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Jun 3, 2017

mairbek commented Jun 6, 2017

mairbek commented May 8, 2017 •

edited

Loading