Skip to content

[BEAM-77] IOs module creation, and reorg of IOs#95

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
jbonofre wants to merge 2 commits into from
Closed

[BEAM-77] IOs module creation, and reorg of IOs #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec45dae
[BEAM-77] Create IOs module and move bigtable IO there
jbonofre Mar 30, 2016
a670258
[BEAM-77] Move hadoop contrib as hdfs IO
jbonofre Mar 30, 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: 0 additions & 7 deletions contrib/hadoop/AUTHORS.md
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions contrib/hadoop/README.md
View file
Open in desktop

This file was deleted.

169 changes: 0 additions & 169 deletions contrib/hadoop/pom.xml
View file
Open in desktop

This file was deleted.

99 changes: 99 additions & 0 deletions ios/bigtable/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

@dhalperidhalperiMar 30, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

call it io, not ios.

bigtable goes in the Google Cloud Platform module -- io.gcp.bigtable?

@jbonofrejbonofreMar 30, 2016

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK, I tried to "mimic" runners, sdks where we have a 's'. However, no problem to use io instead.

For io.gcp.bigtable, I guess you talk about the package to use, right ?

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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.beam</groupId>
<artifactId>ios-parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>bigtable</artifactId>
<packaging>jar</packaging>

<name>Apache Beam :: IOs :: Google Bigtable</name>

<dependencies>
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>java-sdk-all</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>0.12.0</version>
</dependency>

<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-protos</artifactId>
<version>${bigtable.version}</version>
</dependency>

<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core</artifactId>
<version>${bigtable.version}</version>
</dependency>

<!-- Testing -->
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>java-sdk-all</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
10 changes: 3 additions & 7 deletions .../dataflow/sdk/io/bigtable/BigtableIO.java → ...g/apache/beam/io/bigtable/BigtableIO.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,7 @@
* the License.
*/

package com.google.cloud.dataflow.sdk.io.bigtable;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
package org.apache.beam.io.bigtable;

import com.google.bigtable.v1.Mutation;
import com.google.bigtable.v1.Row;
Expand DownExpand Up@@ -50,18 +46,18 @@
import com.google.common.util.concurrent.Futures;
import com.google.protobuf.ByteString;
import com.google.protobuf.Empty;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.ConcurrentLinkedQueue;

import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.*;

/**
* A bounded source and sink for Google Cloud Bigtable.
Expand Down
4 changes: 2 additions & 2 deletions ...flow/sdk/io/bigtable/BigtableService.java → ...che/beam/io/bigtable/BigtableService.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,16 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.google.cloud.dataflow.sdk.io.bigtable;
package org.apache.beam.io.bigtable;

import com.google.bigtable.v1.Mutation;
import com.google.bigtable.v1.Row;
import com.google.bigtable.v1.SampleRowKeysResponse;
import com.google.cloud.dataflow.sdk.io.bigtable.BigtableIO.BigtableSource;
import com.google.cloud.dataflow.sdk.values.KV;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.protobuf.ByteString;
import com.google.protobuf.Empty;
import org.apache.beam.io.bigtable.BigtableIO.BigtableSource;

import java.io.IOException;
import java.io.Serializable;
Expand Down
14 changes: 3 additions & 11 deletions .../sdk/io/bigtable/BigtableServiceImpl.java → ...beam/io/bigtable/BigtableServiceImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,32 +13,24 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.google.cloud.dataflow.sdk.io.bigtable;
package org.apache.beam.io.bigtable;

import com.google.bigtable.admin.table.v1.GetTableRequest;
import com.google.bigtable.v1.MutateRowRequest;
import com.google.bigtable.v1.Mutation;
import com.google.bigtable.v1.ReadRowsRequest;
import com.google.bigtable.v1.Row;
import com.google.bigtable.v1.RowRange;
import com.google.bigtable.v1.SampleRowKeysRequest;
import com.google.bigtable.v1.SampleRowKeysResponse;
import com.google.bigtable.v1.*;
import com.google.cloud.bigtable.config.BigtableOptions;
import com.google.cloud.bigtable.grpc.BigtableSession;
import com.google.cloud.bigtable.grpc.async.AsyncExecutor;
import com.google.cloud.bigtable.grpc.async.HeapSizeManager;
import com.google.cloud.bigtable.grpc.scanner.ResultScanner;
import com.google.cloud.dataflow.sdk.io.bigtable.BigtableIO.BigtableSource;
import com.google.cloud.dataflow.sdk.values.KV;
import com.google.common.base.MoreObjects;
import com.google.common.io.Closer;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.protobuf.ByteString;
import com.google.protobuf.Empty;

import io.grpc.Status.Code;
import io.grpc.StatusRuntimeException;

import org.apache.beam.io.bigtable.BigtableIO.BigtableSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...ataflow/sdk/io/bigtable/package-info.java → ...apache/beam/io/bigtable/package-info.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,4 +19,4 @@
*
* @see com.google.cloud.dataflow.sdk.io.bigtable.BigtableIO
*/
package com.google.cloud.dataflow.sdk.io.bigtable;
package org.apache.beam.io.bigtable;
Loading