[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[
https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142263=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142263
]
ASF GitHub Bot logged work on BEAM-5301:
Author: ASF GitHub Bot
Created on: 07/Sep/18 18:12
Start Date: 07/Sep/18 18:12
Worklog Time Spent: 10m
Work Description: pabloem closed pull request #6333: [BEAM-5301] migrate
datastore_worcount python integration test to Beam
URL: https://github.com/apache/beam/pull/6333
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/python/apache_beam/examples/cookbook/datastore_wordcount.py
b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
index b8c4213643e..2e5dab8a160 100644
--- a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
+++ b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
@@ -69,12 +69,6 @@
import uuid
from builtins import object
-from google.cloud.proto.datastore.v1 import entity_pb2
-from google.cloud.proto.datastore.v1 import query_pb2
-from googledatastore import helper as datastore_helper
-from googledatastore import PropertyFilter
-from past.builtins import unicode
-
import apache_beam as beam
from apache_beam.io import ReadFromText
from apache_beam.io.gcp.datastore.v1.datastoreio import ReadFromDatastore
@@ -84,6 +78,18 @@
from apache_beam.options.pipeline_options import PipelineOptions
from apache_beam.options.pipeline_options import SetupOptions
+# Protect against environments where datastore library is not available.
+# pylint: disable=wrong-import-order, wrong-import-position
+try:
+ from google.cloud.proto.datastore.v1 import entity_pb2
+ from google.cloud.proto.datastore.v1 import query_pb2
+ from googledatastore import helper as datastore_helper
+ from googledatastore import PropertyFilter
+ from past.builtins import unicode
+except ImportError:
+ pass
+# pylint: enable=wrong-import-order, wrong-import-position
+
class WordExtractingDoFn(beam.DoFn):
"""Parse each line of input text into words."""
diff --git
a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
new file mode 100644
index 000..5005a6081e5
--- /dev/null
+++ b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
@@ -0,0 +1,67 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+"""End-to-end test for Datastore Wordcount example."""
+
+from __future__ import absolute_import
+
+import logging
+import time
+import unittest
+
+from hamcrest.core.core.allof import all_of
+from nose.plugins.attrib import attr
+
+from apache_beam.examples.cookbook import datastore_wordcount
+from apache_beam.testing.pipeline_verifiers import FileChecksumMatcher
+from apache_beam.testing.pipeline_verifiers import PipelineStateMatcher
+from apache_beam.testing.test_pipeline import TestPipeline
+
+
+class DatastoreWordCountIT(unittest.TestCase):
+
+ DATASTORE_WORDCOUNT_KIND = "DatastoreWordCount"
+ EXPECTED_CHECKSUM = '826f69ed0275858c2e098f1e8407d4e3ba5a4b3f'
+
+ @attr('IT')
+ def test_datastore_wordcount_it(self):
+test_pipeline = TestPipeline(is_integration_test=True)
+dataset = test_pipeline.get_option("project")
+kind = self.DATASTORE_WORDCOUNT_KIND
+output = '/'.join([test_pipeline.get_option('output'),
+ str(int(time.time())),
+ 'datastore_wordcount_results'])
+
+arg_sleep_secs = test_pipeline.get_option('sleep_secs')
+sleep_secs = int(arg_sleep_secs) if arg_sleep_secs is not None else None
+pipeline_verifiers = [PipelineStateMatcher(),
+ FileChecksumMatcher(output + '*-of-*',
+ self.EXPECTED_CHECKSUM,
+ sleep_secs)]
+extra_opts = {'dataset': dataset,
+ 'kind': kind,
+
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142262=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142262 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 18:12 Start Date: 07/Sep/18 18:12 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #6333: [BEAM-5301] migrate datastore_worcount python integration test to Beam URL: https://github.com/apache/beam/pull/6333#discussion_r216044404 ## File path: sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py ## @@ -84,6 +78,18 @@ from apache_beam.options.pipeline_options import PipelineOptions from apache_beam.options.pipeline_options import SetupOptions +# Protect against environments where datastore library is not available. +# pylint: disable=wrong-import-order, wrong-import-position +try: + from google.cloud.proto.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 + from googledatastore import helper as datastore_helper + from googledatastore import PropertyFilter + from past.builtins import unicode +except ImportError: + pass Review comment: Thank you! 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: 142262) Time Spent: 1h 50m (was: 1h 40m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 1h 50m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142260=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142260 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 18:10 Start Date: 07/Sep/18 18:10 Worklog Time Spent: 10m Work Description: yifanzou commented on a change in pull request #6333: [BEAM-5301] migrate datastore_worcount python integration test to Beam URL: https://github.com/apache/beam/pull/6333#discussion_r216044012 ## File path: sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py ## @@ -84,6 +78,18 @@ from apache_beam.options.pipeline_options import PipelineOptions from apache_beam.options.pipeline_options import SetupOptions +# Protect against environments where datastore library is not available. +# pylint: disable=wrong-import-order, wrong-import-position +try: + from google.cloud.proto.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 + from googledatastore import helper as datastore_helper + from googledatastore import PropertyFilter + from past.builtins import unicode +except ImportError: + pass Review comment: The test will be skipped because --test-pipeline-options is not specified. Adding the try-catch to make sure the code could be interpreted. Otherwise, exceptions will be through when we import the datastore_wordcount into the IT test. 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: 142260) Time Spent: 1h 40m (was: 1.5h) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 1h 40m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142257=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142257 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 17:56 Start Date: 07/Sep/18 17:56 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #6333: [BEAM-5301] migrate datastore_worcount python integration test to Beam URL: https://github.com/apache/beam/pull/6333#discussion_r216039826 ## File path: sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py ## @@ -84,6 +78,18 @@ from apache_beam.options.pipeline_options import PipelineOptions from apache_beam.options.pipeline_options import SetupOptions +# Protect against environments where datastore library is not available. +# pylint: disable=wrong-import-order, wrong-import-position +try: + from google.cloud.proto.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 + from googledatastore import helper as datastore_helper + from googledatastore import PropertyFilter + from past.builtins import unicode +except ImportError: + pass Review comment: Maybe we should be able to skip the test is we're unable to install Datastore? What happens if Datastore is not available and we run the test? 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: 142257) Time Spent: 1h 20m (was: 1h 10m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 1h 20m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142258=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142258 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 17:56 Start Date: 07/Sep/18 17:56 Worklog Time Spent: 10m Work Description: pabloem commented on issue #6333: [BEAM-5301] migrate datastore_worcount python integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-419518195 Thanks Yifan, this is great. LGTM. Just added one question. 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: 142258) Time Spent: 1.5h (was: 1h 20m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 1.5h > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142248=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142248 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 16:55 Start Date: 07/Sep/18 16:55 Worklog Time Spent: 10m Work Description: yifanzou commented on issue #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-419501605 +R: @pabloem 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: 142248) Time Spent: 1h 10m (was: 1h) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 1h 10m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142233=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142233 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 16:07 Start Date: 07/Sep/18 16:07 Worklog Time Spent: 10m Work Description: yifanzou commented on issue #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-419487949 Run Python PostCommit 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: 142233) Time Spent: 1h (was: 50m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 1h > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=142067=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-142067 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 07:25 Start Date: 07/Sep/18 07:25 Worklog Time Spent: 10m Work Description: yifanzou commented on issue #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-419348330 Run Python PostCommit 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: 142067) Time Spent: 50m (was: 40m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 50m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=141996=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-141996 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 07/Sep/18 01:36 Start Date: 07/Sep/18 01:36 Worklog Time Spent: 10m Work Description: yifanzou commented on issue #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-419292809 Run Python PostCommit 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: 141996) Time Spent: 40m (was: 0.5h) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 40m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=141963=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-141963 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 06/Sep/18 23:30 Start Date: 06/Sep/18 23:30 Worklog Time Spent: 10m Work Description: yifanzou commented on issue #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-419273892 Run Python PostCommit 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: 141963) Time Spent: 0.5h (was: 20m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 0.5h > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=141531=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-141531 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 05/Sep/18 20:59 Start Date: 05/Sep/18 20:59 Worklog Time Spent: 10m Work Description: yifanzou commented on issue #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333#issuecomment-418879614 Run Python PreCommit 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: 141531) Time Spent: 20m (was: 10m) > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 20m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-5301) Migrate integration tests for datastore_wordcount
[ https://issues.apache.org/jira/browse/BEAM-5301?focusedWorklogId=141090=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-141090 ] ASF GitHub Bot logged work on BEAM-5301: Author: ASF GitHub Bot Created on: 05/Sep/18 01:24 Start Date: 05/Sep/18 01:24 Worklog Time Spent: 10m Work Description: yifanzou opened a new pull request #6333: [BEAM-5301] migrate datastore_worcount integration test to Beam URL: https://github.com/apache/beam/pull/6333 **Please** add a meaningful description for your change here Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). It will help us expedite review of your Pull Request if you tag someone (e.g. `@username`) to look at it. Post-Commit Tests Status (on master branch) Lang | SDK | Apex | Dataflow | Flink | Gearpump | Samza | Spark --- | --- | --- | --- | --- | --- | --- | --- Go | [](https://builds.apache.org/job/beam_PostCommit_Go_GradleBuild/lastCompletedBuild/) | --- | --- | --- | --- | --- | --- Java | [](https://builds.apache.org/job/beam_PostCommit_Java_GradleBuild/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Apex_Gradle/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Gradle/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Gradle/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Gearpump_Gradle/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza_Gradle/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark_Gradle/lastCompletedBuild/) Python | [](https://builds.apache.org/job/beam_PostCommit_Python_Verify/lastCompletedBuild/) | --- | [](https://builds.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/) [](https://builds.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/) | --- | --- | --- | --- 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: 141090) Time Spent: 10m Remaining Estimate: 0h > Migrate integration tests for datastore_wordcount > - > > Key: BEAM-5301 > URL: https://issues.apache.org/jira/browse/BEAM-5301 > Project: Beam > Issue Type: Bug > Components: testing >Reporter: yifan zou >Assignee: yifan zou >Priority: Major > Time Spent: 10m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
