Skip to content

Commit

Permalink
feat: add PG OID support (#2736)
Browse files Browse the repository at this point in the history
* feat: add PG OID support

* chore: fix lint errors

* Update PG.OID implementation according to recent changes.

* Update PG.OID implementation according to recent changes.

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: keep session pool ordering when pinging (#2695)

* chore: keep session pool ordering when pinging

Pinging sessions would move the sessions that were pinged to either the
front or the back of the pool (dependingin the session pool
configuration), instead of keeping the sessions in the place where they
were when being pinged. Bringing a session that is pinged to the front
of the pool means that we will prefer using a session that has not
really been used for a while, other than for the ping. Keeping the
sessions in place is therefore preferable.

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* deps: update dependency com.google.cloud:google-cloud-monitoring to v3.38.0 (#2942)

* feat: allow attempt direct path xds via env var (#2950)

To enable Direct Access, [both `setAttemptDirectPath` and `setAttemptDirectPathXds` should be called](https://togithub.com/googleapis/sdk-platform-java/blob/4b44a7851dc1d4fd2ac21a54df6c24db5625223c/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java#L373-L386) for gax to append the correct google-c2p scheme.

This PR adds a env var `GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS` to control the enable/disable of Direct Access. When it is true, it calls `setAttemptDirectPathXds` which effectively turns on Direct Access (as `options.isAttemptDirectPath` is by default true and we don't need to call `setAttemptDirectPath` again).

* build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 (#2956)

* build(deps): update dependency org.apache.maven.plugins:maven-assembly-plugin to v3.7.1 (#2955)

* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.28.1 (#2952)

* refactor: move skip methods to abstract parser (#2948)

Move the PostgreSQL skip methods from the PostgreSQL parser to the
abstract parser. This is step 1 in refactoring the GoogleSQL and
PostgreSQL parser so they can share more code. The eventual goal is to
allow the GoogleSQL parser to be able to handle SQL string without
having to remove the comments from the string first.

* fix: return type of max commit delay option. (#2953)

* Use `TransactionOption` as return type instead of `TransactionOption`

* refactor: generalize skip methods (#2949)

Generalize the various skip methods so these can be used for both dialects. Each dialect implements a number of abstract methods to indicate what type of statements and constructs they support. These methods are used by the generalized skip methods to determine the start and end of literals, identifiers, and comments.

This is step 2 of the refactor that is needed to share more of the code between the SpannerStatementParser and PostgreSQLStatementParser.

* perf: keep comments when searching for params (#2951)

Keep all comments in the SQL string in place when converting positional parameters to named parameters. This reduces the amount of string operations that are needed for each query that is executed, and also enables actually sending comments from the client to Spanner when using positional parameters (e.g. in JDBC).

This is step 3 in the refactoring to share more code between the SpannerStatementParser and PostgreSQLStatementParser.

* chore: randomize session pool order based on TPS (#2792)

* chore: randomize session pool order based on TPS

* chore: remove unnecessary changes

* chore(main): release 6.62.0 (#2940)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(main): release 6.62.1-SNAPSHOT (#2957)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.62.0 (#2958)

* chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.62.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* chore: add session pool options for multiplexed session. (#2960)

* fix: prevent illegal negative timeout values into thread sleep() method while retrying exceptions in unit tests.

* For details on issue see - #2206

* Fixing lint issues.

* chore: add session pool options for multiplexed session.

* Update google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java

Co-authored-by: Knut Olav Løite <[email protected]>

* Update google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java

Co-authored-by: Knut Olav Løite <[email protected]>

* fix: comments.

* chore: lint fix.

---------

Co-authored-by: Knut Olav Løite <[email protected]>

* deps: update dependency com.google.cloud:google-cloud-trace to v2.38.0 (#2967)

* chore: add new members in SessionImpl for multiplexed session. Add a … (#2961)

* chore: add new members in SessionImpl for multiplexed session. Add a new method to create multiplexed session.

* chore: add unit tests.

* Update google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionClient.java

Co-authored-by: Knut Olav Løite <[email protected]>

* fix: comments.

* chore: prefer junit assertions.

* chore: change to default method in SpannerRpc interface.

---------

Co-authored-by: Knut Olav Løite <[email protected]>

* Update .gitignore to remove IDE specific files and remove unnecessary entries from CLIRR ignores

* Remove PG.OID external getters.

User should use Long/LongArray/LongList getters instead to get PgOid/PgOidArray/PgOidList columns.

* chore: generalise session pool class for multiplexed session. (#2964)

* chore: generalise session pool class for multiplexed session.

* chore: add back previous code.

* chore: address comments.

* chore: emove unnecessary debug.

* chore: add multiplexed session implementations for CachedSession/SessionFuture  interfaces. (#2973)

* chore: add multiplexed session implementations for CachedSession/SessionFuture  interfaces.

* chore: add comments.

* chore: add session replacement handler for multiplexed session.

* chore: address comments.

* chore: fix comments.

* chore: fix comments.

* Remove internal PG.OID getters.

* deps: update dependency com.google.cloud:google-cloud-monitoring to v3.39.0 (#2966)

* chore(main): release 6.62.1 (#2968)

:robot: I have created a release *beep* *boop*
---


## [6.62.1](https://togithub.com/googleapis/java-spanner/compare/v6.62.0...v6.62.1) (2024-03-28)


### Dependencies

* Update dependency com.google.cloud:google-cloud-monitoring to v3.39.0 ([#2966](https://togithub.com/googleapis/java-spanner/issues/2966)) ([a5cb1dd](https://togithub.com/googleapis/java-spanner/commit/a5cb1ddd065100497d9215eff30d57361d7e84de))
* Update dependency com.google.cloud:google-cloud-trace to v2.38.0 ([#2967](https://togithub.com/googleapis/java-spanner/issues/2967)) ([b2dc788](https://togithub.com/googleapis/java-spanner/commit/b2dc788d5a54244d83a192ecac894ff931f884c4))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore(main): release 6.62.2-SNAPSHOT (#2983)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* feat: add support for transaction-level exclusion from change streams (#2959)

* Add support for transaction-level exclusion from change streams

* cleanup

* refactor: introduce PartitionedUpdateOption

* Revert "refactor: introduce PartitionedUpdateOption"

This reverts commit 96b508b.

* Add error handling in DML update APIs where excludeTxnFromChangeStreams option is not applicable

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* deps: update dependency com.google.cloud:google-cloud-trace to v2.39.0 (#2988)

* deps: update dependency commons-io:commons-io to v2.16.0 (#2986)

* deps: update dependency com.google.cloud:google-cloud-monitoring to v3.40.0 (#2987)

* deps: update dependency com.google.cloud:google-cloud-monitoring to v3.40.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.35.0 (#2989)

* chore(deps): update dependency com.google.cloud:libraries-bom to v26.35.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* chore(main): release 6.63.0 (#2985)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* chore(main): release 6.63.1-SNAPSHOT (#2991)

:robot: I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

* chore: clean up some warnings and malformed comments (#2977)

* chore: clean up some warnings and malformed comments

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.63.0 (#2992)

* chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.63.0

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* feat: add endpoint connection URL property (#2969)

Adds an 'endpoint' connection URL property for the Connection API.
This property can be used instead of adding the endpoint to the host
group part of the Connection URL, which again removes the need to
actually change the connection URL when connecting to for example
the emulator from the JDBC driver. The latter can instead just add
the endpoint to the Properties set that is given to the JDBC driver.

* feat: support max_commit_delay in Connection API (#2954)

* feat: support max_commit_delay in Connection API

Adds support for max_commit_delay to the Connection API:
1. Adds a setMaxCommitDelay(Duration) method to Connection
2. Adds a maxCommitDelay connection URL property
3. Adds a SET MAX_COMMIT_DELAY=<duration> SQL statement

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* chore: minor improvements to default benchmarks. (#2993)

* chore: minor improvements to default benchmarks.

* chore: lint issues fix.

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 (#2996)

* chore: add regex to match unmanaged dependency check (#1941) (#2971)

Source-Link: googleapis/synthtool@ca7a716
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:cecae6152a85d55c932a64515643cf2e32a1f1b6e17503080eb07744b2177f28

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* feat: Add SessionPoolOptions, SpannerOptions protos in executor protos (#2932)

* feat: Add instance partition support to spanner instance proto

PiperOrigin-RevId: 611127452

Source-Link: googleapis/googleapis@618d47c

Source-Link: googleapis/googleapis-gen@92d8555
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTJkODU1NTg4ODI4NDMwZThiNDI4ZWQ3ODIxOWUyM2VlNjY2ZGE3OCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix(deps): Update the Java code generator (gapic-generator-java) to 2.37.0

PiperOrigin-RevId: 611816371

Source-Link: googleapis/googleapis@2a40f63

Source-Link: googleapis/googleapis-gen@d30ff07
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDMwZmYwNzY3Nzc3YjM4MWZiMTYxN2Y2N2E5MGUzYWJkM2JkYzZkYyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* feat: Add SessionPoolOptions, SpannerOptions protos in executor protos

PiperOrigin-RevId: 621265883

Source-Link: googleapis/googleapis@fed9845

Source-Link: googleapis/googleapis-gen@c66a769
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzY2YTc2OTU3ZTJlMTYzNDdiYzFkZDNmNGM2MzgyMjNmMDY1ZWU4MCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

* chore: Remove unused CLIRR entries

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Knut Olav Løite <[email protected]>
Co-authored-by: Mend Renovate <[email protected]>
Co-authored-by: Hailong Wen <[email protected]>
Co-authored-by: Arpan Mishra <[email protected]>
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: dengwe1 <[email protected]>
Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
9 people authored Apr 5, 2024
1 parent 9b77c4f commit ba2a4af
Show file tree
Hide file tree
Showing 19 changed files with 990 additions and 433 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ docs/
*.pyc

.flattened-pom.xml
.java-version
.vscode/
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,15 @@ public boolean getBoolean(String columnName) {

@Override
public long getLong(int columnIndex) {
checkNonNullOfCodes(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnIndex);
checkNonNullOfCodes(
columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnIndex);
return getLongInternal(columnIndex);
}

@Override
public long getLong(String columnName) {
int columnIndex = getColumnIndex(columnName);
checkNonNullOfCodes(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnName);
checkNonNullOfCodes(columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnName);
return getLongInternal(columnIndex);
}

Expand Down Expand Up @@ -366,30 +367,34 @@ public List<Boolean> getBooleanList(String columnName) {
@Override
public long[] getLongArray(int columnIndex) {
checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnIndex);
checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnIndex);
checkArrayElementType(
columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnIndex);
return getLongArrayInternal(columnIndex);
}

@Override
public long[] getLongArray(String columnName) {
int columnIndex = getColumnIndex(columnName);
checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnName);
checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnName);
checkArrayElementType(
columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnName);
return getLongArrayInternal(columnIndex);
}

@Override
public List<Long> getLongList(int columnIndex) {
checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnIndex);
checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnIndex);
checkArrayElementType(
columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnIndex);
return getLongListInternal(columnIndex);
}

@Override
public List<Long> getLongList(String columnName) {
int columnIndex = getColumnIndex(columnName);
checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnName);
checkArrayElementType(columnIndex, Arrays.asList(Code.ENUM, Code.INT64), columnName);
checkArrayElementType(
columnIndex, Arrays.asList(Code.ENUM, Code.PG_OID, Code.INT64), columnName);
return getLongListInternal(columnIndex);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ private Object writeReplace() {
case PG_JSONB:
builder.set(fieldName).to(Value.pgJsonb((String) value));
break;
case PG_OID:
builder.set(fieldName).to(Value.pgOid((Long) value));
break;
case BYTES:
builder
.set(fieldName)
Expand Down Expand Up @@ -158,6 +161,9 @@ private Object writeReplace() {
case PG_JSONB:
builder.set(fieldName).toPgJsonbArray((Iterable<String>) value);
break;
case PG_OID:
builder.set(fieldName).toPgOidArray((Iterable<Long>) value);
break;
case BYTES:
case PROTO:
builder
Expand Down Expand Up @@ -262,6 +268,7 @@ private static Object decodeValue(Type fieldType, com.google.protobuf.Value prot
checkType(fieldType, proto, KindCase.BOOL_VALUE);
return proto.getBoolValue();
case INT64:
case PG_OID:
case ENUM:
checkType(fieldType, proto, KindCase.STRING_VALUE);
return Long.parseLong(proto.getStringValue());
Expand Down Expand Up @@ -319,6 +326,7 @@ private static Struct decodeStructValue(Type structType, ListValue structValue)
static Object decodeArrayValue(Type elementType, ListValue listValue) {
switch (elementType.getCode()) {
case INT64:
case PG_OID:
case ENUM:
// For int64/float64/float32/enum types, use custom containers.
// These avoid wrapper object creation for non-null arrays.
Expand Down Expand Up @@ -563,6 +571,8 @@ protected Value getValueInternal(int columnIndex) {
return Value.json(isNull ? null : getJsonInternal(columnIndex));
case PG_JSONB:
return Value.pgJsonb(isNull ? null : getPgJsonbInternal(columnIndex));
case PG_OID:
return Value.pgOid(isNull ? null : getLongInternal(columnIndex));
case BYTES:
return Value.internalBytes(isNull ? null : getLazyBytesInternal(columnIndex));
case PROTO:
Expand Down Expand Up @@ -598,6 +608,8 @@ protected Value getValueInternal(int columnIndex) {
return Value.jsonArray(isNull ? null : getJsonListInternal(columnIndex));
case PG_JSONB:
return Value.pgJsonbArray(isNull ? null : getPgJsonbListInternal(columnIndex));
case PG_OID:
return Value.pgOidArray(isNull ? null : getLongListInternal(columnIndex));
case BYTES:
return Value.bytesArray(isNull ? null : getBytesListInternal(columnIndex));
case PROTO:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ private Object getAsObject(int columnIndex) {
case BOOL:
return getBooleanInternal(columnIndex);
case INT64:
case PG_OID:
case ENUM:
return getLongInternal(columnIndex);
case FLOAT32:
Expand Down Expand Up @@ -426,6 +427,7 @@ private Object getAsObject(int columnIndex) {
case BOOL:
return getBooleanListInternal(columnIndex);
case INT64:
case PG_OID:
case ENUM:
return getLongListInternal(columnIndex);
case FLOAT32:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public final class Type implements Serializable {
private static final Type TYPE_STRING = new Type(Code.STRING, null, null);
private static final Type TYPE_JSON = new Type(Code.JSON, null, null);
private static final Type TYPE_PG_JSONB = new Type(Code.PG_JSONB, null, null);
private static final Type TYPE_PG_OID = new Type(Code.PG_OID, null, null);
private static final Type TYPE_BYTES = new Type(Code.BYTES, null, null);
private static final Type TYPE_TIMESTAMP = new Type(Code.TIMESTAMP, null, null);
private static final Type TYPE_DATE = new Type(Code.DATE, null, null);
Expand All @@ -67,6 +68,7 @@ public final class Type implements Serializable {
private static final Type TYPE_ARRAY_STRING = new Type(Code.ARRAY, TYPE_STRING, null);
private static final Type TYPE_ARRAY_JSON = new Type(Code.ARRAY, TYPE_JSON, null);
private static final Type TYPE_ARRAY_PG_JSONB = new Type(Code.ARRAY, TYPE_PG_JSONB, null);
private static final Type TYPE_ARRAY_PG_OID = new Type(Code.ARRAY, TYPE_PG_OID, null);
private static final Type TYPE_ARRAY_BYTES = new Type(Code.ARRAY, TYPE_BYTES, null);
private static final Type TYPE_ARRAY_TIMESTAMP = new Type(Code.ARRAY, TYPE_TIMESTAMP, null);
private static final Type TYPE_ARRAY_DATE = new Type(Code.ARRAY, TYPE_DATE, null);
Expand Down Expand Up @@ -137,6 +139,11 @@ public static Type pgJsonb() {
return TYPE_PG_JSONB;
}

/** Returns the descriptor for the {@code PG_OID} type. */
public static Type pgOid() {
return TYPE_PG_OID;
}

/**
* To get the descriptor for the {@code PROTO} type.
*
Expand Down Expand Up @@ -198,6 +205,8 @@ public static Type array(Type elementType) {
return TYPE_ARRAY_JSON;
case PG_JSONB:
return TYPE_ARRAY_PG_JSONB;
case PG_OID:
return TYPE_ARRAY_PG_OID;
case BYTES:
return TYPE_ARRAY_BYTES;
case TIMESTAMP:
Expand Down Expand Up @@ -280,6 +289,7 @@ public enum Code {
STRING(TypeCode.STRING, "character varying"),
JSON(TypeCode.JSON, "unknown"),
PG_JSONB(TypeCode.JSON, "jsonb", TypeAnnotationCode.PG_JSONB),
PG_OID(TypeCode.INT64, "oid", TypeAnnotationCode.PG_OID),
PROTO(TypeCode.PROTO, "proto"),
ENUM(TypeCode.ENUM, "enum"),
BYTES(TypeCode.BYTES, "bytea"),
Expand Down Expand Up @@ -592,6 +602,8 @@ static Type fromProto(com.google.spanner.v1.Type proto) {
return json();
case PG_JSONB:
return pgJsonb();
case PG_OID:
return pgOid();
case BYTES:
return bytes();
case TIMESTAMP:
Expand Down
148 changes: 148 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,20 @@ public static Value pgJsonb(@Nullable String v) {
return new PgJsonbImpl(v == null, v);
}

/**
* Returns an {@code PG_OID} value.
*
* @param v the value, which may be null
*/
public static Value pgOid(@Nullable Long v) {
return new PgOidImpl(v == null, v == null ? 0 : v);
}

/** Returns an {@code PG_OID} value. */
public static Value pgOid(long v) {
return new PgOidImpl(false, v);
}

/**
* Return a {@code PROTO} value for not null proto messages.
*
Expand Down Expand Up @@ -587,6 +601,40 @@ public static Value pgJsonbArray(@Nullable Iterable<String> v) {
return new PgJsonbArrayImpl(v == null, v == null ? null : immutableCopyOf(v));
}

/**
* Returns an {@code ARRAY<PG_OID>} value.
*
* @param v the source of element values, which may be null to produce a value for which {@code
* isNull()} is {@code true}
*/
public static Value pgOidArray(@Nullable long[] v) {
return pgOidArray(v, 0, v == null ? 0 : v.length);
}

/**
* Returns an {@code ARRAY<PG_OID>} value that takes its elements from a region of an array.
*
* @param v the source of element values, which may be null to produce a value for which {@code
* isNull()} is {@code true}
* @param pos the start position of {@code v} to copy values from. Ignored if {@code v} is {@code
* null}.
* @param length the number of values to copy from {@code v}. Ignored if {@code v} is {@code
* null}.
*/
public static Value pgOidArray(@Nullable long[] v, int pos, int length) {
return pgOidArrayFactory.create(v, pos, length);
}

/**
* Returns an {@code ARRAY<PG_OID>} value.
*
* @param v the source of element values. This may be {@code null} to produce a value for which
* {@code isNull()} is {@code true}. Individual elements may also be {@code null}.
*/
public static Value pgOidArray(@Nullable Iterable<Long> v) {
return pgOidArrayFactory.create(v);
}

/**
* Returns an {@code ARRAY<PROTO>} value.
*
Expand Down Expand Up @@ -1115,6 +1163,25 @@ Value newValue(boolean isNull, BitSet nulls, long[] values) {
return new Int64ArrayImpl(isNull, nulls, values);
}
};

private static final PrimitiveArrayValueFactory<long[], Long> pgOidArrayFactory =
new PrimitiveArrayValueFactory<long[], Long>() {
@Override
long[] newArray(int size) {
return new long[size];
}

@Override
void set(long[] arr, int i, Long value) {
arr[i] = value;
}

@Override
Value newValue(boolean isNull, BitSet nulls, long[] values) {
return new PgOidArrayImpl(isNull, nulls, values);
}
};

private static final PrimitiveArrayValueFactory<float[], Float> float32ArrayFactory =
new PrimitiveArrayValueFactory<float[], Float>() {
@Override
Expand Down Expand Up @@ -1822,6 +1889,41 @@ void valueToString(StringBuilder b) {
}
}

private static class PgOidImpl extends AbstractValue {
private final long value;

private PgOidImpl(boolean isNull, long value) {
super(isNull, Type.pgOid());
this.value = value;
}

@Override
public long getInt64() {
checkNotNull();
return value;
}

@Override
com.google.protobuf.Value valueToProto() {
return com.google.protobuf.Value.newBuilder().setStringValue(Long.toString(value)).build();
}

@Override
void valueToString(StringBuilder b) {
b.append(value);
}

@Override
boolean valueEquals(Value v) {
return ((PgOidImpl) v).value == value;
}

@Override
int valueHash() {
return Long.valueOf(value).hashCode();
}
}

private static class LazyBytesImpl extends AbstractObjectValue<LazyByteArray> {

private LazyBytesImpl(boolean isNull, LazyByteArray value) {
Expand Down Expand Up @@ -2457,6 +2559,48 @@ void appendElement(StringBuilder b, String element) {
}
}

private static class PgOidArrayImpl extends PrimitiveArrayImpl<Long> {
private final long[] values;

private PgOidArrayImpl(boolean isNull, BitSet nulls, long[] values) {
super(isNull, Type.pgOid(), nulls);
this.values = values;
}

@Override
public List<Long> getInt64Array() {
return getArray();
}

@Override
boolean valueEquals(Value v) {
PgOidArrayImpl that = (PgOidArrayImpl) v;
return Arrays.equals(values, that.values);
}

@Override
int size() {
return values.length;
}

@Override
Long getValue(int i) {
return values[i];
}

@Override
com.google.protobuf.Value getValueAsProto(int i) {
return com.google.protobuf.Value.newBuilder()
.setStringValue(Long.toString(values[i]))
.build();
}

@Override
int arrayHash() {
return Arrays.hashCode(values);
}
}

private static class LazyBytesArrayImpl extends AbstractArrayValue<LazyByteArray> {
private transient AbstractLazyInitializer<List<ByteArray>> bytesArray = defaultInitializer();

Expand Down Expand Up @@ -2790,6 +2934,8 @@ private Value getValue(int fieldIndex) {
return Value.numeric(value.getBigDecimal(fieldIndex));
case PG_NUMERIC:
return Value.pgNumeric(value.getString(fieldIndex));
case PG_OID:
return Value.pgOid(value.getLong(fieldIndex));
case DATE:
return Value.date(value.getDate(fieldIndex));
case TIMESTAMP:
Expand All @@ -2815,6 +2961,8 @@ private Value getValue(int fieldIndex) {
return Value.jsonArray(value.getJsonList(fieldIndex));
case PG_JSONB:
return Value.pgJsonbArray(value.getPgJsonbList(fieldIndex));
case PG_OID:
return Value.pgOidArray(value.getLongList(fieldIndex));
case BYTES:
case PROTO:
return Value.bytesArray(value.getBytesList(fieldIndex));
Expand Down
Loading

0 comments on commit ba2a4af

Please sign in to comment.