From cc7a95d0723113c61867e4a6acd7f6595c7f7760 Mon Sep 17 00:00:00 2001 From: Mark Liu Date: Mon, 25 Jul 2016 10:16:13 -0700 Subject: [PATCH 1/4] [Beam-124] Run WorldCountIT with Spark and Flink runner --- examples/java/pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 8b98288ece71..148438643494 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -34,6 +34,10 @@ jar + + 1.6.2 + + @@ -282,6 +286,34 @@ ${project.version} + + org.apache.beam + beam-runners-flink_2.10 + ${project.version} + runtime + + + + org.apache.beam + beam-runners-spark + ${project.version} + runtime + + + + org.apache.spark + spark-core_2.10 + ${spark.version} + runtime + + + + org.apache.spark + spark-streaming_2.10 + ${spark.version} + runtime + + org.slf4j slf4j-jdk14 From a2a231bfdd953b28b3ef405b62738b1032017a4b Mon Sep 17 00:00:00 2001 From: Mark Liu Date: Mon, 25 Jul 2016 12:25:50 -0700 Subject: [PATCH 2/4] Adding test input source --- .../java/org/apache/beam/examples/WordCountIT.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java index 6ba46d7bf35f..c6d963ce88a8 100644 --- a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java +++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java @@ -53,6 +53,16 @@ /** * End-to-end tests of WordCount. + * + *

Input text document is available from the following sources: + *

    + *
  • Using GCS (default): + * gs://dataflow-samples/shakespeare/kinglear.tx + *
    • + *
  • Using local fs: + * curl http://www.gutenberg.org/cache/epub/1128/pg1128.txt > /tmp/kinglear.txt + *
    • + *
*/ @RunWith(JUnit4.class) public class WordCountIT { From 1770eebd0d9fe20425ae334d43c231a10894938a Mon Sep 17 00:00:00 2001 From: Mark Liu Date: Fri, 29 Jul 2016 16:59:02 -0700 Subject: [PATCH 3/4] change default WordCount input file to apache lisence --- examples/java/pom.xml | 2 - .../org/apache/beam/examples/WordCount.java | 24 ++- .../org/apache/beam/examples/WordCountIT.java | 10 - examples/java/src/test/resources/LICENSE | 202 ++++++++++++++++++ 4 files changed, 225 insertions(+), 13 deletions(-) create mode 100644 examples/java/src/test/resources/LICENSE diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 148438643494..c13e2703cd4e 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -277,7 +277,6 @@ beam-runners-direct-java ${project.version} runtime - true @@ -297,7 +296,6 @@ org.apache.beam beam-runners-spark ${project.version} - runtime diff --git a/examples/java/src/main/java/org/apache/beam/examples/WordCount.java b/examples/java/src/main/java/org/apache/beam/examples/WordCount.java index af16c445a7ac..3f65db979b75 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/WordCount.java +++ b/examples/java/src/main/java/org/apache/beam/examples/WordCount.java @@ -17,6 +17,7 @@ */ package org.apache.beam.examples; +import org.apache.beam.runners.spark.SparkRunner; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.io.TextIO; import org.apache.beam.sdk.options.Default; @@ -166,7 +167,7 @@ public PCollection> apply(PCollection lines) { */ public static interface WordCountOptions extends PipelineOptions { @Description("Path of the file to read from") - @Default.String("gs://dataflow-samples/shakespeare/kinglear.txt") + @Default.InstanceFactory(InputFactory.class) String getInputFile(); void setInputFile(String value); @@ -196,6 +197,27 @@ public String create(PipelineOptions options) { } } + /** + * Return default input file path according to runner type. + * + *

    + *
  • SparkRunner: + * .../src/test/resources/LICENSE
    • + *
  • other runners: + * gs://dataflow-samples/apache/LICENSE
    • + *
+ */ + public static class InputFactory implements DefaultValueFactory { + @Override + public String create(PipelineOptions options) { + if (options.getRunner().isAssignableFrom(SparkRunner.class)) { + return WordCount.class.getClass().getResource("/LICENSE").getPath(); + } else { + return "gs://dataflow-samples/apache/LICENSE"; + } + } + } + } public static void main(String[] args) { diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java index c6d963ce88a8..6ba46d7bf35f 100644 --- a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java +++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java @@ -53,16 +53,6 @@ /** * End-to-end tests of WordCount. - * - *

Input text document is available from the following sources: - *

    - *
  • Using GCS (default): - * gs://dataflow-samples/shakespeare/kinglear.tx - *
    • - *
  • Using local fs: - * curl http://www.gutenberg.org/cache/epub/1128/pg1128.txt > /tmp/kinglear.txt - *
    • - *
*/ @RunWith(JUnit4.class) public class WordCountIT { diff --git a/examples/java/src/test/resources/LICENSE b/examples/java/src/test/resources/LICENSE new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/examples/java/src/test/resources/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. From 6fec07dc858d4c269b81907f127979bdff39b1ba Mon Sep 17 00:00:00 2001 From: Mark Liu Date: Mon, 1 Aug 2016 16:44:19 -0700 Subject: [PATCH 4/4] change test checksum to file apache license --- .../src/test/java/org/apache/beam/examples/WordCountIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java index 6ba46d7bf35f..c087c67d8391 100644 --- a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java +++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java @@ -86,7 +86,7 @@ static class WordCountOnSuccessMatcher extends TypeSafeMatcher private static final Logger LOG = LoggerFactory.getLogger(WordCountOnSuccessMatcher.class); - private static final String EXPECTED_CHECKSUM = "8ae94f799f97cfd1cb5e8125951b32dfb52e1f12"; + private static final String EXPECTED_CHECKSUM = "c04722202dee29c442b55ead54c6000693e85e77"; private String actualChecksum; private final String outputPath;