Skip to content

fix: fix automated backup #2844

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

Merged
gcf-merge-on-green merged 3 commits into from
Mar 16, 2026
Merged

fix: fix automated backup #2844

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e96c5e0
fix: fix automated backup
mutianf Mar 13, 2026
8764474
Merge branch 'main' of github.com:googleapis/java-bigtable
mutianf Mar 16, 2026
8b6e314
mark nullable
mutianf Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Map;
import java.util.Map.Entry;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.threeten.bp.Duration;

/** Wrapper for {@link Table} protocol buffer object */
Expand Down Expand Up @@ -111,6 +112,7 @@ public static class AutomatedBackupPolicy {
@InternalApi
public static AutomatedBackupPolicy fromProto(
com.google.bigtable.admin.v2.Table.AutomatedBackupPolicy proto) {
Preconditions.checkNotNull(proto);
return new AutomatedBackupPolicy(proto);
}

Expand Down Expand Up @@ -143,7 +145,7 @@ public String viewConfig() {

private final Duration changeStreamRetention;
private final boolean deletionProtection;
private static AutomatedBackupPolicy automatedBackupPolicy;
@Nullable private final AutomatedBackupPolicy automatedBackupPolicy;

@InternalApi
public static Table fromProto(@Nonnull com.google.bigtable.admin.v2.Table proto) {
Expand All @@ -170,10 +172,9 @@ public static Table fromProto(@Nonnull com.google.bigtable.admin.v2.Table proto)
proto.getChangeStreamConfig().getRetentionPeriod().getNanos());
}

AutomatedBackupPolicy automatedBackupPolicy = null;
if (proto.hasAutomatedBackupPolicy()) {
automatedBackupPolicy = AutomatedBackupPolicy.fromProto(proto.getAutomatedBackupPolicy());
} else {
automatedBackupPolicy = null;
}

return new Table(
Expand All @@ -191,14 +192,14 @@ private Table(
List<ColumnFamily> columnFamilies,
Duration changeStreamRetention,
boolean deletionProtection,
AutomatedBackupPolicy automatedBackupPolicy) {
@Nullable AutomatedBackupPolicy automatedBackupPolicy) {
this.instanceId = tableName.getInstance();
this.id = tableName.getTable();
this.replicationStatesByClusterId = replicationStatesByClusterId;
this.columnFamilies = columnFamilies;
this.changeStreamRetention = changeStreamRetention;
this.deletionProtection = deletionProtection;
Table.automatedBackupPolicy = automatedBackupPolicy;
this.automatedBackupPolicy = automatedBackupPolicy;
}

/** Gets the table's id. */
Expand Down Expand Up @@ -230,10 +231,11 @@ public boolean isDeletionProtected() {

/** Returns whether this table has automated backups enabled. */
public boolean isAutomatedBackupEnabled() {
return automatedBackupPolicy == null ? false : true;
return automatedBackupPolicy != null;
}

/** Returns the automated backup policy config. */
@Nullable
public AutomatedBackupPolicy getAutomatedBackupPolicy() {
return automatedBackupPolicy;
}
Expand All @@ -253,7 +255,7 @@ public boolean equals(Object o) {
&& Objects.equal(columnFamilies, table.columnFamilies)
&& Objects.equal(changeStreamRetention, table.changeStreamRetention)
&& Objects.equal(deletionProtection, table.deletionProtection)
&& Objects.equal(automatedBackupPolicy, Table.automatedBackupPolicy);
&& Objects.equal(automatedBackupPolicy, table.automatedBackupPolicy);
}

@Override
Expand Down
Loading