Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add String type with Utf8Raw encoding to Bigtable API #2191

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

feat: Add String type with Utf8Raw encoding to Bigtable API #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
469a092
fix(deps): Update the Java code generator (gapic-generator-java) to 2…
gcf-owl-bot[bot] Apr 30, 2024
91068b0
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Apr 30, 2024
cf37a6b
chore: Fix endpoint resolution
lqiu96 Apr 30, 2024
a611fdf
chore: update copyright year for auto-generated protos
gcf-owl-bot[bot] May 7, 2024
4e7f38c
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 8, 2024
b23b515
feat: Add String type with Utf8Raw encoding to Bigtable API
gcf-owl-bot[bot] May 23, 2024
b4e7d48
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 23, 2024
a64302d
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 23, 2024
a6db4b8
chore: Remove settings the endpoint
lqiu96 May 28, 2024
912d14e
Merge branch 'main' into owl-bot-copy
lqiu96 May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 0 additions & 18 deletions .../main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,15 +455,6 @@ public BigtableInstanceAdminStub createStub() throws IOException {
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

/** Returns the default service name. */
@Override
public String getServiceName() {
Expand Down Expand Up @@ -1229,15 +1220,6 @@ public UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettin
return listHotTabletsSettings;
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

@Override
public BigtableInstanceAdminStubSettings build() throws IOException {
return new BigtableInstanceAdminStubSettings(this);
Expand Down
18 changes: 0 additions & 18 deletions ...src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,15 +671,6 @@ public BigtableTableAdminStub createStub() throws IOException {
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

/** Returns the default service name. */
@Override
public String getServiceName() {
Expand Down Expand Up @@ -1722,15 +1713,6 @@ public UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettin
return testIamPermissionsSettings;
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

@Override
public BigtableTableAdminStubSettings build() throws IOException {
return new BigtableTableAdminStubSettings(this);
Expand Down
18 changes: 0 additions & 18 deletions ...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,6 @@ public BigtableStub createStub() throws IOException {
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

/** Returns the default service name. */
@Override
public String getServiceName() {
Expand Down Expand Up @@ -547,15 +538,6 @@ public UnaryCallSettings.Builder<MutateRowRequest, MutateRowResponse> mutateRowS
return readChangeStreamSettings;
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

@Override
public BigtableStubSettings build() throws IOException {
return new BigtableStubSettings(this);
Expand Down
5 changes: 5 additions & 0 deletions ...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,11 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
.setJwtEnabledScopes(JWT_ENABLED_SCOPES);
}

@Override
public String getServiceName() {
return "bigtable";
}
Comment on lines +376 to +379
Copy link
Contributor

@lqiu96 lqiu96 Apr 30, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that EnhancedBigtableStubSettings inherits directly from StubSettings and not BigtableStubSettings:

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java

Line 95 in 26d5437

public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableStubSettings> {

EnhancedBigtableStubSettings will not be able to determine the serviceName because that is generated inside BigtableStubSettings. I have duplicated this here so the EnhancedStubSettings can determine the serviceName.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes sense, though Im curious why getServiceName() is not abstract in the base StubSettings class?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, StubSettings is a public abstract class that is not marked with @InternalApi. We were afraid that there may be some use external use cases where users have extended or implemented StubSettings and now would need to implement getServiceName(). We provided a default implementation so that it would not break anyone.


/**
* Returns the object with the settings used for calls to ReadRows.
*
Expand Down
72 changes: 72 additions & 0 deletions ...in/resources/META-INF/native-image/com.google.cloud.bigtable.admin.v2/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,24 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Table$AutomatedBackupPolicy",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Table$AutomatedBackupPolicy$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Table$Builder",
"queryAllDeclaredConstructors": true,
Expand Down Expand Up @@ -2330,6 +2348,60 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Type$String",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Type$String$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Type$String$Encoding",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Type$String$Encoding$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Type$String$Encoding$Utf8Raw",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Type$String$Encoding$Utf8Raw$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.UndeleteTableMetadata",
"queryAllDeclaredConstructors": true,
Expand Down
2 changes: 1 addition & 1 deletion ...google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...oud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface AppProfileOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...le-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AuthorizedView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AuthorizedViewOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface AuthorizedViewOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...table-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimitsOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface AutoscalingLimitsOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...loud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingTargets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...able-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingTargetsOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface AutoscalingTargetsOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Backup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...oud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupInfoOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface BackupInfoOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...e-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface BackupOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...table-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_instance_admin.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public final class BigtableInstanceAdminProto {
Expand Down
2 changes: 1 addition & 1 deletion ...bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public final class BigtableTableAdminProto {
Expand Down
2 changes: 1 addition & 1 deletion ...loud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ChangeStreamConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...able-admin-v2/src/main/java/com/google/bigtable/admin/v2/ChangeStreamConfigOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface ChangeStreamConfigOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequestOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface CheckConsistencyRequestOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...igtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...dmin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponseOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface CheckConsistencyResponseOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.bigtable.admin.v2;

public interface ClusterOrBuilder
Expand Down