Skip to content

Commit a6c6701

Browse files
authored
refactor(bigquery): amend name for MaxTimeTravel on datasets (#7707)
PR https://togithub.com/googleapis/google-cloud-go/pull/7706 submitted before the edit to shorten the name landed. This PR updates it.
1 parent 22a666c commit a6c6701

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

bigquery/dataset.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ type DatasetMetadata struct {
5858
// More information: https://cloud.google.com/bigquery/docs/reference/standard-sql/collation-concepts
5959
DefaultCollation string
6060

61-
// MaxTimeTravelHours represents the number of hours for the max time travel for all tables
61+
// MaxTimeTravel represents the number of hours for the max time travel for all tables
6262
// in the dataset. Durations are rounded towards zero for the nearest hourly value.
63-
MaxTimeTravelHours time.Duration
63+
MaxTimeTravel time.Duration
6464

6565
// Storage billing model to be used for all tables in the dataset.
6666
// Can be set to PHYSICAL. Default is LOGICAL.
@@ -135,9 +135,9 @@ type DatasetMetadataToUpdate struct {
135135
// created in the dataset.
136136
DefaultCollation optional.String
137137

138-
// MaxTimeTravelHours represents the number of hours for the max time travel for all tables
138+
// MaxTimeTravel represents the number of hours for the max time travel for all tables
139139
// in the dataset. Durations are rounded towards zero for the nearest hourly value.
140-
MaxTimeTravelHours optional.Duration
140+
MaxTimeTravel optional.Duration
141141

142142
// Storage billing model to be used for all tables in the dataset.
143143
// Can be set to PHYSICAL. Default is LOGICAL.
@@ -216,7 +216,7 @@ func (dm *DatasetMetadata) toBQ() (*bq.Dataset, error) {
216216
ds.DefaultTableExpirationMs = int64(dm.DefaultTableExpiration / time.Millisecond)
217217
ds.DefaultPartitionExpirationMs = int64(dm.DefaultPartitionExpiration / time.Millisecond)
218218
ds.DefaultCollation = dm.DefaultCollation
219-
ds.MaxTimeTravelHours = int64(dm.MaxTimeTravelHours / time.Hour)
219+
ds.MaxTimeTravelHours = int64(dm.MaxTimeTravel / time.Hour)
220220
ds.StorageBillingModel = string(dm.StorageBillingModel)
221221
ds.Labels = dm.Labels
222222
var err error
@@ -304,7 +304,7 @@ func bqToDatasetMetadata(d *bq.Dataset, c *Client) (*DatasetMetadata, error) {
304304
DefaultTableExpiration: time.Duration(d.DefaultTableExpirationMs) * time.Millisecond,
305305
DefaultPartitionExpiration: time.Duration(d.DefaultPartitionExpirationMs) * time.Millisecond,
306306
DefaultCollation: d.DefaultCollation,
307-
MaxTimeTravelHours: time.Duration(d.MaxTimeTravelHours) * time.Hour,
307+
MaxTimeTravel: time.Duration(d.MaxTimeTravelHours) * time.Hour,
308308
StorageBillingModel: d.StorageBillingModel,
309309
DefaultEncryptionConfig: bqToEncryptionConfig(d.DefaultEncryptionConfiguration),
310310
Description: d.Description,
@@ -395,8 +395,8 @@ func (dm *DatasetMetadataToUpdate) toBQ() (*bq.Dataset, error) {
395395
ds.DefaultCollation = optional.ToString(dm.DefaultCollation)
396396
forceSend("DefaultCollation")
397397
}
398-
if dm.MaxTimeTravelHours != nil {
399-
dur := optional.ToDuration(dm.MaxTimeTravelHours)
398+
if dm.MaxTimeTravel != nil {
399+
dur := optional.ToDuration(dm.MaxTimeTravel)
400400
if dur == 0 {
401401
// Send a null to delete the field.
402402
ds.NullFields = append(ds.NullFields, "MaxTimeTravelHours")

bigquery/dataset_integration_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,16 @@ func TestIntegration_DatasetUpdateDefaultExpirationAndMaxTimeTravel(t *testing.T
173173
// Set the default expiration time.
174174
md, err := dataset.Update(ctx, DatasetMetadataToUpdate{
175175
DefaultTableExpiration: wantExpiration,
176-
MaxTimeTravelHours: wantTimeTravel,
176+
MaxTimeTravel: wantTimeTravel,
177177
}, "")
178178
if err != nil {
179179
t.Fatal(err)
180180
}
181181
if got := md.DefaultTableExpiration; got != wantExpiration {
182182
t.Fatalf("DefaultTableExpiration want %s got %s", wantExpiration, md.DefaultTableExpiration)
183183
}
184-
if got := md.MaxTimeTravelHours; got != wantTimeTravel {
185-
t.Fatalf("MaxTimeTravelHours want %s got %s", wantTimeTravel, md.MaxTimeTravelHours)
184+
if got := md.MaxTimeTravel; got != wantTimeTravel {
185+
t.Fatalf("MaxTimeTravelHours want %s got %s", wantTimeTravel, md.MaxTimeTravel)
186186
}
187187
// Omitting DefaultTableExpiration doesn't change it.
188188
md, err = dataset.Update(ctx, DatasetMetadataToUpdate{Name: "xyz"}, "")

bigquery/dataset_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ func TestDatasetToBQ(t *testing.T) {
322322
Name: "name",
323323
Description: "desc",
324324
DefaultTableExpiration: time.Hour,
325-
MaxTimeTravelHours: time.Duration(181 * time.Minute),
325+
MaxTimeTravel: time.Duration(181 * time.Minute),
326326
DefaultPartitionExpiration: 24 * time.Hour,
327327
DefaultEncryptionConfig: &EncryptionConfig{
328328
KMSKeyName: "some_key",
@@ -431,7 +431,7 @@ func TestBQToDatasetMetadata(t *testing.T) {
431431
Name: "name",
432432
Description: "desc",
433433
DefaultTableExpiration: time.Hour,
434-
MaxTimeTravelHours: time.Duration(3 * time.Hour),
434+
MaxTimeTravel: time.Duration(3 * time.Hour),
435435
DefaultPartitionExpiration: 24 * time.Hour,
436436
DefaultEncryptionConfig: &EncryptionConfig{
437437
KMSKeyName: "some_key",
@@ -471,7 +471,7 @@ func TestDatasetMetadataToUpdateToBQ(t *testing.T) {
471471
Name: "name",
472472
DefaultTableExpiration: time.Hour,
473473
DefaultPartitionExpiration: 24 * time.Hour,
474-
MaxTimeTravelHours: time.Duration(181 * time.Minute),
474+
MaxTimeTravel: time.Duration(181 * time.Minute),
475475
StorageBillingModel: PhysicalStorageBillingModel,
476476
DefaultEncryptionConfig: &EncryptionConfig{
477477
KMSKeyName: "some_key",

0 commit comments

Comments
 (0)