Skip to content

Commit

Permalink
chore(ruby): Re-enable bigquery-storage-v1 generation, which also req…
Browse files Browse the repository at this point in the history 
…uired updating protobuf from 3.15.3 to 3.18.1 for codegen (#1499)

* changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.

* chore(ruby): Re-enable bigquery-storage-v1 generation, which also required updating protobuf from 3.15.3 to 3.18.1 for codegen

PiperOrigin-RevId: 403132955

Source-Author: Google APIs <noreply@google.com>
Source-Date: Thu Oct 14 10:50:47 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: d2977af9e9f1fc0c9dc8368352daa032471f3c63
Source-Link: googleapis/googleapis@d2977af

* chore: revert changes to dependencies.sh

Co-authored-by: Neenu1995 <neenushaji@google.com>
  • Loading branch information
@yoshi-automation @Neenu1995
yoshi-automation and Neenu1995 committed Nov 1, 2021
1 parent 2a6bba3 commit e52dfc4
Show file tree
Hide file tree
Showing 61 changed files with 203 additions and 202 deletions.
3 changes: 2 additions & 1 deletion .kokoro/dependencies.sh
View file
Expand Up @@ -38,13 +38,14 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)

if [[ $javaVersion == 17* ]]
if [[ $javaVersion == 17* ]]
then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
else
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
fi

}

export MAVEN_OPTS=$(determineMavenOpts)
Expand Down
8 changes: 4 additions & 4 deletions ...-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java
View file
Expand Up @@ -884,10 +884,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, database_);
}
if (expireTime_ != null) {
Expand Down Expand Up @@ -921,10 +921,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, database_);
}
if (expireTime_ != null) {
Expand Down
8 changes: 4 additions & 4 deletions ...nner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupInfo.java
View file
Expand Up @@ -368,13 +368,13 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getBackupBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(backup_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, backup_);
}
if (createTime_ != null) {
output.writeMessage(2, getCreateTime());
}
if (!getSourceDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceDatabase_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, sourceDatabase_);
}
if (versionTime_ != null) {
Expand All @@ -389,13 +389,13 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getBackupBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(backup_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, backup_);
}
if (createTime_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getCreateTime());
}
if (!getSourceDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceDatabase_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, sourceDatabase_);
}
if (versionTime_ != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...e-v1/src/main/java/com/google/spanner/admin/database/v1/CreateBackupEncryptionConfig.java
View file
Expand Up @@ -437,7 +437,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
.getNumber()) {
output.writeEnum(1, encryptionType_);
}
if (!getKmsKeyNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyName_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kmsKeyName_);
}
unknownFields.writeTo(output);
Expand All @@ -455,7 +455,7 @@ public int getSerializedSize() {
.getNumber()) {
size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, encryptionType_);
}
if (!getKmsKeyNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyName_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kmsKeyName_);
}
size += unknownFields.getSerializedSize();
Expand Down
8 changes: 4 additions & 4 deletions ...-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateBackupMetadata.java
View file
Expand Up @@ -394,10 +394,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, database_);
}
if (progress_ != null) {
Expand All @@ -415,10 +415,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, database_);
}
if (progress_ != null) {
Expand Down
8 changes: 4 additions & 4 deletions ...n-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateBackupRequest.java
View file
Expand Up @@ -404,10 +404,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getParentBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
}
if (!getBackupIdBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(backupId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, backupId_);
}
if (backup_ != null) {
Expand All @@ -425,10 +425,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getParentBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
}
if (!getBackupIdBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(backupId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, backupId_);
}
if (backup_ != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...atabase-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
View file
Expand Up @@ -175,7 +175,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
}
unknownFields.writeTo(output);
Expand All @@ -187,7 +187,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, database_);
}
size += unknownFields.getSerializedSize();
Expand Down
8 changes: 4 additions & 4 deletions ...database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
View file
Expand Up @@ -411,10 +411,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getParentBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
}
if (!getCreateStatementBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(createStatement_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, createStatement_);
}
for (int i = 0; i < extraStatements_.size(); i++) {
Expand All @@ -432,10 +432,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getParentBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
}
if (!getCreateStatementBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(createStatement_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, createStatement_);
}
{
Expand Down
12 changes: 6 additions & 6 deletions ...panner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
View file
Expand Up @@ -983,7 +983,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
if (state_
Expand All @@ -999,7 +999,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (encryptionConfig_ != null) {
output.writeMessage(5, getEncryptionConfig());
}
if (!getVersionRetentionPeriodBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(versionRetentionPeriod_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 6, versionRetentionPeriod_);
}
if (earliestVersionTime_ != null) {
Expand All @@ -1008,7 +1008,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
for (int i = 0; i < encryptionInfo_.size(); i++) {
output.writeMessage(8, encryptionInfo_.get(i));
}
if (!getDefaultLeaderBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(defaultLeader_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 9, defaultLeader_);
}
unknownFields.writeTo(output);
Expand All @@ -1020,7 +1020,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
if (state_
Expand All @@ -1036,7 +1036,7 @@ public int getSerializedSize() {
if (encryptionConfig_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getEncryptionConfig());
}
if (!getVersionRetentionPeriodBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(versionRetentionPeriod_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, versionRetentionPeriod_);
}
if (earliestVersionTime_ != null) {
Expand All @@ -1045,7 +1045,7 @@ public int getSerializedSize() {
for (int i = 0; i < encryptionInfo_.size(); i++) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, encryptionInfo_.get(i));
}
if (!getDefaultLeaderBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(defaultLeader_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, defaultLeader_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions ...n-database-v1/src/main/java/com/google/spanner/admin/database/v1/DeleteBackupRequest.java
View file
Expand Up @@ -182,7 +182,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
Expand All @@ -194,7 +194,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions ...n-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
View file
Expand Up @@ -178,7 +178,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
}
unknownFields.writeTo(output);
Expand All @@ -190,7 +190,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, database_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions ...dmin-database-v1/src/main/java/com/google/spanner/admin/database/v1/EncryptionConfig.java
View file
Expand Up @@ -178,7 +178,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getKmsKeyNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyName_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kmsKeyName_);
}
unknownFields.writeTo(output);
Expand All @@ -190,7 +190,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getKmsKeyNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyName_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kmsKeyName_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions ...-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/EncryptionInfo.java
View file
Expand Up @@ -469,7 +469,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getKmsKeyVersionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyVersion_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kmsKeyVersion_);
}
if (encryptionType_
Expand All @@ -488,7 +488,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getKmsKeyVersionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyVersion_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kmsKeyVersion_);
}
if (encryptionType_
Expand Down
4 changes: 2 additions & 2 deletions ...dmin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetBackupRequest.java
View file
Expand Up @@ -182,7 +182,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
Expand All @@ -194,7 +194,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions ...database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
View file
Expand Up @@ -182,7 +182,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
}
unknownFields.writeTo(output);
Expand All @@ -194,7 +194,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getDatabaseBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(database_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, database_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions ...in-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
View file
Expand Up @@ -180,7 +180,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
Expand All @@ -192,7 +192,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getNameBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
Expand Down

0 comments on commit e52dfc4

Please sign in to comment.