Skip to content

[BEAM-151] Move over some more Dataflow specific classes. #243

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

Closed
lukecwik wants to merge 4 commits into from
Closed

[BEAM-151] Move over some more Dataflow specific classes. #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
106cefe
[BEAM-151] Move over some more Dataflow specific classes.
lukecwik Apr 26, 2016
28b5842
[BEAM-151] Rebase onto apache/master updating packages to new structure
lukecwik Apr 27, 2016
06fe253
[BEAM-151] Update worker image name that corresponds to class moves.
lukecwik Apr 27, 2016
243ed43
[BEAM-151] !fixup Fix whitespace in pom files.
lukecwik Apr 28, 2016
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
7 changes: 7 additions & 0 deletions runners/google-cloud-dataflow-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,13 @@
<optional>true</optional>
</dependency>

<dependency>
Copy link
Member

@davorbonaci davorbonaci Apr 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty line above

<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...oud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.beam.runners.dataflow;

import static org.apache.beam.sdk.util.TimeUtil.fromCloudTime;
import static org.apache.beam.runners.dataflow.util.TimeUtil.fromCloudTime;

import org.apache.beam.runners.dataflow.internal.DataflowAggregatorTransforms;
import org.apache.beam.runners.dataflow.internal.DataflowMetricUpdateExtractor;
Expand Down
12 changes: 6 additions & 6 deletions ...-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
import org.apache.beam.runners.dataflow.DataflowPipelineTranslator.TranslationContext;
import org.apache.beam.runners.dataflow.internal.AssignWindows;
import org.apache.beam.runners.dataflow.internal.DataflowAggregatorTransforms;
import org.apache.beam.runners.dataflow.internal.IsmFormat;
import org.apache.beam.runners.dataflow.internal.IsmFormat.IsmRecord;
import org.apache.beam.runners.dataflow.internal.IsmFormat.IsmRecordCoder;
import org.apache.beam.runners.dataflow.internal.IsmFormat.MetadataKeyCoder;
import org.apache.beam.runners.dataflow.internal.PubsubIOTranslator;
import org.apache.beam.runners.dataflow.internal.ReadTranslator;
import org.apache.beam.runners.dataflow.options.DataflowPipelineDebugOptions;
Expand Down Expand Up @@ -70,10 +74,6 @@
import org.apache.beam.sdk.runners.AggregatorPipelineExtractor;
import org.apache.beam.sdk.runners.PipelineRunner;
import org.apache.beam.sdk.runners.TransformTreeNode;
import org.apache.beam.sdk.runners.worker.IsmFormat;
import org.apache.beam.sdk.runners.worker.IsmFormat.IsmRecord;
import org.apache.beam.sdk.runners.worker.IsmFormat.IsmRecordCoder;
import org.apache.beam.sdk.runners.worker.IsmFormat.MetadataKeyCoder;
import org.apache.beam.sdk.transforms.Aggregator;
import org.apache.beam.sdk.transforms.Combine;
import org.apache.beam.sdk.transforms.Combine.CombineFn;
Expand Down Expand Up @@ -217,9 +217,9 @@ public class DataflowPipelineRunner extends PipelineRunner<DataflowPipelineJob>
// Default Docker container images that execute Dataflow worker harness, residing in Google
// Container Registry, separately for Batch and Streaming.
public static final String BATCH_WORKER_HARNESS_CONTAINER_IMAGE
= "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160426";
= "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160427";
public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE
= "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160426";
= "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160427";

// The limit of CreateJob request size.
private static final int CREATE_JOB_REQUEST_LIMIT_BYTES = 10 * 1024 * 1024;
Expand Down
4 changes: 2 additions & 2 deletions ...aflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import org.apache.beam.runners.dataflow.internal.PubsubIOTranslator;
import org.apache.beam.runners.dataflow.internal.ReadTranslator;
import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.runners.dataflow.util.DoFnInfo;
import org.apache.beam.runners.dataflow.util.OutputReference;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.Pipeline.PipelineVisitor;
import org.apache.beam.sdk.coders.Coder;
Expand All @@ -57,8 +59,6 @@
import org.apache.beam.sdk.transforms.windowing.Window;
import org.apache.beam.sdk.util.AppliedCombineFn;
import org.apache.beam.sdk.util.CloudObject;
import org.apache.beam.sdk.util.DoFnInfo;
import org.apache.beam.sdk.util.OutputReference;
import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.SerializableUtils;
import org.apache.beam.sdk.util.WindowedValue;
Expand Down
4 changes: 2 additions & 2 deletions ...he/beam/sdk/runners/worker/IsmFormat.java → .../runners/dataflow/internal/IsmFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.runners.worker;
package org.apache.beam.runners.dataflow.internal;

import static org.apache.beam.sdk.util.Structs.addLong;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;

import org.apache.beam.runners.dataflow.util.RandomAccessData;
import org.apache.beam.sdk.coders.AtomicCoder;
import org.apache.beam.sdk.coders.ByteArrayCoder;
import org.apache.beam.sdk.coders.Coder;
Expand All @@ -34,7 +35,6 @@
import org.apache.beam.sdk.coders.VarLongCoder;
import org.apache.beam.sdk.util.CloudObject;
import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.RandomAccessData;
import org.apache.beam.sdk.util.VarInt;
import org.apache.beam.sdk.values.PCollection;

Expand Down
3 changes: 2 additions & 1 deletion ...va/org/apache/beam/sdk/util/DoFnInfo.java → .../beam/runners/dataflow/util/DoFnInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.util;
package org.apache.beam.runners.dataflow.util;

import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.util.WindowingStrategy;
import org.apache.beam.sdk.values.PCollectionView;

import java.io.Serializable;
Expand Down
3 changes: 1 addition & 2 deletions ...oud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
*/
package org.apache.beam.runners.dataflow.util;

import static org.apache.beam.sdk.util.TimeUtil.fromCloudTime;
import static org.apache.beam.runners.dataflow.util.TimeUtil.fromCloudTime;

import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.sdk.PipelineResult.State;
import org.apache.beam.sdk.util.TimeUtil;

import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.Dataflow.Projects.Jobs.Messages;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/beam/sdk/util/OutputReference.java → ...unners/dataflow/util/OutputReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.util;
package org.apache.beam.runners.dataflow.util;

import static com.google.api.client.util.Preconditions.checkNotNull;

Expand Down
3 changes: 2 additions & 1 deletion ...pache/beam/sdk/util/RandomAccessData.java → ...nners/dataflow/util/RandomAccessData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.util;
package org.apache.beam.runners.dataflow.util;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
Expand All @@ -24,6 +24,7 @@
import org.apache.beam.sdk.coders.ByteArrayCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.util.VarInt;

import com.google.common.base.MoreObjects;
import com.google.common.io.ByteStreams;
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/apache/beam/sdk/util/TimeUtil.java → .../beam/runners/dataflow/util/TimeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.util;
package org.apache.beam.runners.dataflow.util;

import org.joda.time.DateTime;
import org.joda.time.Duration;
Expand Down
8 changes: 4 additions & 4 deletions ...aflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
import org.apache.beam.runners.dataflow.DataflowPipelineRunner.BatchViewAsMap;
import org.apache.beam.runners.dataflow.DataflowPipelineRunner.BatchViewAsMultimap;
import org.apache.beam.runners.dataflow.DataflowPipelineRunner.TransformedMap;
import org.apache.beam.runners.dataflow.internal.IsmFormat;
import org.apache.beam.runners.dataflow.internal.IsmFormat.IsmRecord;
import org.apache.beam.runners.dataflow.internal.IsmFormat.IsmRecordCoder;
import org.apache.beam.runners.dataflow.internal.IsmFormat.MetadataKeyCoder;
import org.apache.beam.runners.dataflow.options.DataflowPipelineDebugOptions;
import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.sdk.Pipeline;
Expand All @@ -60,10 +64,6 @@
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.runners.TransformTreeNode;
import org.apache.beam.sdk.runners.dataflow.TestCountingSource;
import org.apache.beam.sdk.runners.worker.IsmFormat;
import org.apache.beam.sdk.runners.worker.IsmFormat.IsmRecord;
import org.apache.beam.sdk.runners.worker.IsmFormat.IsmRecordCoder;
import org.apache.beam.sdk.runners.worker.IsmFormat.MetadataKeyCoder;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFnTester;
import org.apache.beam.sdk.transforms.PTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...w-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.beam.runners.dataflow.DataflowPipelineTranslator.TranslationContext;
import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions;
import org.apache.beam.runners.dataflow.util.OutputReference;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
Expand All @@ -55,7 +56,6 @@
import org.apache.beam.sdk.transforms.View;
import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.util.GcsUtil;
import org.apache.beam.sdk.util.OutputReference;
import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.Structs;
import org.apache.beam.sdk.util.TestCredential;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/apache/beam/runners/dataflow/testing/TestDataflowPipelineRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.beam.runners.dataflow.DataflowPipelineRunner;
import org.apache.beam.runners.dataflow.util.MonitoringUtil;
import org.apache.beam.runners.dataflow.util.MonitoringUtil.JobMessagesHandler;
import org.apache.beam.runners.dataflow.util.TimeUtil;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.PipelineResult.State;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
Expand All @@ -43,7 +44,6 @@
import org.apache.beam.sdk.util.GcsUtil;
import org.apache.beam.sdk.util.NoopPathValidator;
import org.apache.beam.sdk.util.TestCredential;
import org.apache.beam.sdk.util.TimeUtil;
import org.apache.beam.sdk.util.Transport;
import org.apache.beam.sdk.values.PCollection;

Expand Down
1 change: 0 additions & 1 deletion ...dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.beam.sdk.PipelineResult.State;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.util.TestCredential;
import org.apache.beam.sdk.util.TimeUtil;

import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.JobMessage;
Expand Down
4 changes: 2 additions & 2 deletions ...e/beam/sdk/util/RandomAccessDataTest.java → ...s/dataflow/util/RandomAccessDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.util;
package org.apache.beam.runners.dataflow.util;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import org.apache.beam.runners.dataflow.util.RandomAccessData.RandomAccessDataCoder;
import org.apache.beam.sdk.coders.Coder.Context;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.testing.CoderProperties;
import org.apache.beam.sdk.util.RandomAccessData.RandomAccessDataCoder;

import com.google.common.primitives.UnsignedBytes;

Expand Down
10 changes: 5 additions & 5 deletions ...rg/apache/beam/sdk/util/TimeUtilTest.java → ...m/runners/dataflow/util/TimeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.util;
package org.apache.beam.runners.dataflow.util;

import static org.apache.beam.sdk.util.TimeUtil.fromCloudDuration;
import static org.apache.beam.sdk.util.TimeUtil.fromCloudTime;
import static org.apache.beam.sdk.util.TimeUtil.toCloudDuration;
import static org.apache.beam.sdk.util.TimeUtil.toCloudTime;
import static org.apache.beam.runners.dataflow.util.TimeUtil.fromCloudDuration;
import static org.apache.beam.runners.dataflow.util.TimeUtil.fromCloudTime;
import static org.apache.beam.runners.dataflow.util.TimeUtil.toCloudDuration;
import static org.apache.beam.runners.dataflow.util.TimeUtil.toCloudTime;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Expand Down
1 change: 1 addition & 0 deletions sdks/java/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@
<version>1.0-rc2</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
Expand Down
25 changes: 0 additions & 25 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/runners/worker/package-info.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/worker/package-info.java
View file
Open in desktop

This file was deleted.