You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/03/31 22:24:18 UTC

[2/2] incubator-beam git commit: This closes #88

This closes #88


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cab0c57c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cab0c57c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cab0c57c

Branch: refs/heads/master
Commit: cab0c57c0b9d9b15d593b50f8590b0cb379eb665
Parents: 96e286f 1792965
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Mar 31 13:24:05 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Mar 31 13:24:05 2016 -0700

----------------------------------------------------------------------
 .../cloud/dataflow/sdk/transforms/Count.java    | 81 +++++++++++++++++---
 1 file changed, 69 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cab0c57c/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
----------------------------------------------------------------------
diff --cc sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
index d5350bc,5ce4d2e..e3e7947
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
@@@ -1,23 -1,27 +1,28 @@@
  /*
 - * Copyright (C) 2015 Google Inc.
 + * 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
   *
 - * 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
 + *     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.
 + * 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.
   */
 -
  package com.google.cloud.dataflow.sdk.transforms;
  
+ import com.google.cloud.dataflow.sdk.coders.Coder;
+ import com.google.cloud.dataflow.sdk.coders.CoderException;
+ import com.google.cloud.dataflow.sdk.coders.CoderRegistry;
+ import com.google.cloud.dataflow.sdk.coders.CustomCoder;
  import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn;
+ import com.google.cloud.dataflow.sdk.util.VarInt;
  import com.google.cloud.dataflow.sdk.values.KV;
  import com.google.cloud.dataflow.sdk.values.PCollection;