From fb302acfd3eb0bc7553527341502206bf5158d28 Mon Sep 17 00:00:00 2001 From: zhilingc Date: Wed, 22 Apr 2020 15:32:32 +0800 Subject: [PATCH 1/2] Change hyphens to underscores to follow proto --- serving/src/main/resources/application.yml | 6 +++--- .../bigquery/retriever/BigQueryHistoricalRetriever.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/serving/src/main/resources/application.yml b/serving/src/main/resources/application.yml index 053fddfaff..0e5ff3a405 100644 --- a/serving/src/main/resources/application.yml +++ b/serving/src/main/resources/application.yml @@ -36,11 +36,11 @@ feast: # to download the batch features. # For example: gs://mybucket/myprefix # Please omit the trailing slash in the URI. - staging-location: gs://mybucket/myprefix + staging_location: gs://mybucket/myprefix # Retry options for BigQuery retrieval jobs - bigquery-initial-retry-delay-secs: 1 + bigquery_initial_retry_delay_secs: 1 # BigQuery timeout for retrieval jobs - bigquery-total-timeout-secs: 21600 + bigquery_total_timeout_secs: 21600 subscriptions: - name: "*" project: "*" diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java index cd372511c0..cc7a2f2695 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java @@ -73,9 +73,9 @@ public static HistoricalRetriever create(Map config) { .setBigquery(bigquery) .setDatasetId(config.get("dataset_id")) .setProjectId(config.get("project_id")) - .setJobStagingLocation(config.get("staging-location")) - .setInitialRetryDelaySecs(Integer.parseInt(config.get("bigquery-initial-retry-delay-secs"))) - .setTotalTimeoutSecs(Integer.parseInt(config.get("bigquery-total-timeout-secs"))) + .setJobStagingLocation(config.get("staging_location")) + .setInitialRetryDelaySecs(Integer.parseInt(config.get("bigquery_initial_retry_delay_secs"))) + .setTotalTimeoutSecs(Integer.parseInt(config.get("bigquery_total_timeout_secs"))) .setStorage(storage) .build(); } From 2832d80cb9035fafc6ef2d7d2489d710ef054ce4 Mon Sep 17 00:00:00 2001 From: zhilingc Date: Wed, 22 Apr 2020 16:53:44 +0800 Subject: [PATCH 2/2] Remove bigquery prefix --- serving/src/main/resources/application.yml | 4 ++-- .../bigquery/retriever/BigQueryHistoricalRetriever.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/serving/src/main/resources/application.yml b/serving/src/main/resources/application.yml index 0e5ff3a405..f6eaccf3cd 100644 --- a/serving/src/main/resources/application.yml +++ b/serving/src/main/resources/application.yml @@ -38,9 +38,9 @@ feast: # Please omit the trailing slash in the URI. staging_location: gs://mybucket/myprefix # Retry options for BigQuery retrieval jobs - bigquery_initial_retry_delay_secs: 1 + initial_retry_delay_seconds: 1 # BigQuery timeout for retrieval jobs - bigquery_total_timeout_secs: 21600 + total_timeout_seconds: 21600 subscriptions: - name: "*" project: "*" diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java index cc7a2f2695..0edcf67806 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java @@ -55,7 +55,7 @@ public static HistoricalRetriever create(Map config) { BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService(); Storage storage = StorageOptions.getDefaultInstance().getService(); - String jobStagingLocation = config.get("staging-location"); + String jobStagingLocation = config.get("staging_location"); if (!jobStagingLocation.contains("://")) { throw new IllegalArgumentException( String.format("jobStagingLocation is not a valid URI: %s", jobStagingLocation)); @@ -74,8 +74,8 @@ public static HistoricalRetriever create(Map config) { .setDatasetId(config.get("dataset_id")) .setProjectId(config.get("project_id")) .setJobStagingLocation(config.get("staging_location")) - .setInitialRetryDelaySecs(Integer.parseInt(config.get("bigquery_initial_retry_delay_secs"))) - .setTotalTimeoutSecs(Integer.parseInt(config.get("bigquery_total_timeout_secs"))) + .setInitialRetryDelaySecs(Integer.parseInt(config.get("initial_retry_delay_seconds"))) + .setTotalTimeoutSecs(Integer.parseInt(config.get("total_timeout_seconds"))) .setStorage(storage) .build(); }