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

Add support for Monthly/Yearly BigQuery Partitioning #4067

Merged
merged 2 commits into from
Oct 7, 2020
Merged

Add support for Monthly/Yearly BigQuery Partitioning #4067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a8727
Add support for Monthly/Yearly BigQuery Partitioning
Dev25 Oct 7, 2020
dd45728
update docs
danawillow Oct 7, 2020
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
8 changes: 4 additions & 4 deletions third_party/terraform/resources/resource_bigquery_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,13 +451,13 @@ func resourceBigQueryTable() *schema.Resource {
Description: `Number of milliseconds for which to keep the storage for a partition.`,
},

// Type: [Required] The supported types are DAY and HOUR, which will generate
// one partition per day or hour based on data loading time.
// Type: [Required] The supported types are DAY, HOUR, MONTH, and YEAR, which will generate
// one partition per day, hour, month, and year, respectively.
"type": {
Type: schema.TypeString,
Required: true,
Description: `The supported types are DAY and HOUR, which will generate one partition per day or hour based on data loading time.`,
ValidateFunc: validation.StringInSlice([]string{"DAY", "HOUR"}, false),
Description: `The supported types are DAY, HOUR, MONTH, and YEAR, which will generate one partition per day, hour, month, and year, respectively.`,
ValidateFunc: validation.StringInSlice([]string{"DAY", "HOUR", "MONTH", "YEAR"}, false),
},

// Field: [Optional] The field used to determine how to create a time-based
Expand Down
129 changes: 67 additions & 62 deletions third_party/terraform/tests/resource_bigquery_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestAccBigQueryTable_Basic(t *testing.T) {
CheckDestroy: testAccCheckBigQueryTableDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccBigQueryTableDailyTimePartitioning(datasetID, tableID),
Config: testAccBigQueryTableTimePartitioning(datasetID, tableID, "DAY"),
},
{
ResourceName: "google_bigquery_table.test",
Expand Down Expand Up @@ -76,7 +76,69 @@ func TestAccBigQueryTable_HourlyTimePartitioning(t *testing.T) {
CheckDestroy: testAccCheckBigQueryTableDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccBigQueryTableHourlyTimePartitioning(datasetID, tableID),
Config: testAccBigQueryTableTimePartitioning(datasetID, tableID, "HOUR"),
},
{
ResourceName: "google_bigquery_table.test",
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccBigQueryTableUpdated(datasetID, tableID),
},
{
ResourceName: "google_bigquery_table.test",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccBigQueryTable_MonthlyTimePartitioning(t *testing.T) {
t.Parallel()

datasetID := fmt.Sprintf("tf_test_%s", randString(t, 10))
tableID := fmt.Sprintf("tf_test_%s", randString(t, 10))

vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckBigQueryTableDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccBigQueryTableTimePartitioning(datasetID, tableID, "MONTH"),
},
{
ResourceName: "google_bigquery_table.test",
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccBigQueryTableUpdated(datasetID, tableID),
},
{
ResourceName: "google_bigquery_table.test",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccBigQueryTable_YearlyTimePartitioning(t *testing.T) {
t.Parallel()

datasetID := fmt.Sprintf("tf_test_%s", randString(t, 10))
tableID := fmt.Sprintf("tf_test_%s", randString(t, 10))

vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckBigQueryTableDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccBigQueryTableTimePartitioning(datasetID, tableID, "YEAR"),
},
{
ResourceName: "google_bigquery_table.test",
Expand Down Expand Up @@ -400,7 +462,7 @@ func testAccCheckBigQueryTableDestroyProducer(t *testing.T) func(s *terraform.St
}
}

func testAccBigQueryTableDailyTimePartitioning(datasetID, tableID string) string {
func testAccBigQueryTableTimePartitioning(datasetID, tableID, partitioningType string) string {
return fmt.Sprintf(`
resource "google_bigquery_dataset" "test" {
dataset_id = "%s"
Expand All @@ -411,7 +473,7 @@ resource "google_bigquery_table" "test" {
dataset_id = google_bigquery_dataset.test.dataset_id

time_partitioning {
type = "DAY"
type = "%s"
field = "ts"
require_partition_filter = true
}
Expand Down Expand Up @@ -454,64 +516,7 @@ resource "google_bigquery_table" "test" {
EOH

}
`, datasetID, tableID)
}

func testAccBigQueryTableHourlyTimePartitioning(datasetID, tableID string) string {
return fmt.Sprintf(`
resource "google_bigquery_dataset" "test" {
dataset_id = "%s"
}

resource "google_bigquery_table" "test" {
table_id = "%s"
dataset_id = google_bigquery_dataset.test.dataset_id

time_partitioning {
type = "HOUR"
field = "ts"
require_partition_filter = true
}
clustering = ["some_int", "some_string"]
schema = <<EOH
[
{
"name": "ts",
"type": "TIMESTAMP"
},
{
"name": "some_string",
"type": "STRING"
},
{
"name": "some_int",
"type": "INTEGER"
},
{
"name": "city",
"type": "RECORD",
"fields": [
{
"name": "id",
"type": "INTEGER"
},
{
"name": "coord",
"type": "RECORD",
"fields": [
{
"name": "lon",
"type": "FLOAT"
}
]
}
]
}
]
EOH

}
`, datasetID, tableID)
`, datasetID, tableID, partitioningType)
}

func testAccBigQueryTableKms(cryptoKeyName, datasetID, tableID string) string {
Expand Down
4 changes: 2 additions & 2 deletions third_party/terraform/website/docs/r/bigquery_table.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ The `time_partitioning` block supports:
partition. If time-based partitioning is enabled without this value, the
table is partitioned based on the load time.

* `type` - (Required) The only type supported is DAY, which will generate
one partition per day based on data loading time.
* `type` - (Required) The supported types are DAY, HOUR, MONTH, and YEAR,
which will generate one partition per day, hour, month, and year, respectively.

* `require_partition_filter` - (Optional) If set to true, queries over this table
require a partition filter that can be used for partition elimination to be
Expand Down