[ https://issues.apache.org/jira/browse/BEAM-5420?focusedWorklogId=148878&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-148878 ]
ASF GitHub Bot logged work on BEAM-5420: ---------------------------------------- Author: ASF GitHub Bot Created on: 27/Sep/18 20:15 Start Date: 27/Sep/18 20:15 Worklog Time Spent: 10m Work Description: aaltay closed pull request #6501: [BEAM-5420] When getting display data from a runtime parameter, don't call get() URL: https://github.com/apache/beam/pull/6501 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java index edad185323c..45394cfdcc7 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java @@ -1095,7 +1095,7 @@ public void validate() { public void populateDisplayData(DisplayData.Builder builder) { super.populateDisplayData(builder); - builder.add(DisplayData.item("tableId", config.getTableId().get()).withLabel("Table ID")); + builder.add(DisplayData.item("tableId", config.getTableId()).withLabel("Table ID")); if (filter != null) { builder.add(DisplayData.item("rowFilter", filter.toString()).withLabel("Table Row Filter")); diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java index cadb908be5a..8fa98924f4a 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java @@ -1060,6 +1060,39 @@ public void testReadingPrimitiveDisplayData() throws IOException, InterruptedExc Matchers.hasItem(hasDisplayItem("rowFilter"))); } + @Test + public void testReadingDisplayDataFromRuntimeParameters() { + ReadOptions options = PipelineOptionsFactory.fromArgs().withValidation().as(ReadOptions.class); + BigtableIO.Read read = + BigtableIO.read() + .withBigtableOptions(BIGTABLE_OPTIONS) + .withProjectId(options.getBigtableProject()) + .withInstanceId(options.getBigtableInstanceId()) + .withTableId(options.getBigtableTableId()); + DisplayData displayData = DisplayData.from(read); + assertThat( + displayData, + hasDisplayItem( + allOf( + hasKey("projectId"), + hasLabel("Bigtable Project Id"), + hasValue("RuntimeValueProvider{propertyName=bigtableProject, default=null}")))); + assertThat( + displayData, + hasDisplayItem( + allOf( + hasKey("instanceId"), + hasLabel("Bigtable Instance Id"), + hasValue("RuntimeValueProvider{propertyName=bigtableInstanceId, default=null}")))); + assertThat( + displayData, + hasDisplayItem( + allOf( + hasKey("tableId"), + hasLabel("Bigtable Table Id"), + hasValue("RuntimeValueProvider{propertyName=bigtableTableId, default=null}")))); + } + @Test public void testReadWithoutValidate() { final String table = "fooTable"; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 148878) Time Spent: 40m (was: 0.5h) > BigtableIO tries to get runtime parameters when collecting display data at > pipeline construction time > ----------------------------------------------------------------------------------------------------- > > Key: BEAM-5420 > URL: https://issues.apache.org/jira/browse/BEAM-5420 > Project: Beam > Issue Type: Bug > Components: io-java-gcp > Reporter: Kevin Si > Assignee: Chamikara Jayalath > Priority: Minor > Time Spent: 40m > Remaining Estimate: 0h > > For example: > [https://github.com/apache/beam/blob/master/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableConfig.java#L165] > At Dataflow pipeline construction time calling getProjectId() gives an error. -- This message was sent by Atlassian JIRA (v7.6.3#76005)