flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject [2/5] flink git commit: [FLINK-1266] Update mongodb link and address pull request comments
Date Thu, 08 Jan 2015 15:42:42 GMT
[FLINK-1266] Update mongodb link and address pull request comments


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0af4d3ab
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0af4d3ab
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0af4d3ab

Branch: refs/heads/master
Commit: 0af4d3abf3afdeff89fee479a37413bc303d0ed0
Parents: f290929
Author: Robert Metzger <rmetzger@apache.org>
Authored: Mon Jan 5 14:15:21 2015 +0100
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Thu Jan 8 16:35:47 2015 +0100

----------------------------------------------------------------------
 docs/example_connectors.md                      |   3 +-
 flink-addons/flink-tachyon/pom.xml              |   4 +-
 .../tachyon/TachyonFileSystemWrapperTest.java   |   5 -
 .../flink/core/fs/AbstractHadoopWrapper.java    |  28 -----
 .../org/apache/flink/core/fs/FileSystem.java    |   4 +-
 .../flink/core/fs/HadoopFileSystemWrapper.java  |  28 +++++
 .../flink/runtime/fs/hdfs/HadoopFileSystem.java |   4 +-
 pom.xml                                         | 102 +++++++++++++++++++
 8 files changed, 138 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/docs/example_connectors.md
----------------------------------------------------------------------
diff --git a/docs/example_connectors.md b/docs/example_connectors.md
index a971b54..69c613d 100644
--- a/docs/example_connectors.md
+++ b/docs/example_connectors.md
@@ -175,7 +175,6 @@ The example shows how to access an Azure table and turn data into Flink's
`DataS
 
 ## Access MongoDB
 
-_Note: This example works starting from Flink 0.5 (then called Stratosphere)_
+This [GitHub repository documents how to use MongoDB with Apache Flink (starting from 0.7-incubating)](https://github.com/okkam-it/flink-mongodb-test).
 
-Please see this (slightly outdated) blogpost on [How to access MongoDB with Apache Flink](http://flink.incubator.apache.org/news/2014/01/28/querying_mongodb.html).
 

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/flink-addons/flink-tachyon/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/pom.xml b/flink-addons/flink-tachyon/pom.xml
index c03fac2..08046a3 100644
--- a/flink-addons/flink-tachyon/pom.xml
+++ b/flink-addons/flink-tachyon/pom.xml
@@ -23,7 +23,7 @@ under the License.
 	<parent>
 		<artifactId>flink-addons</artifactId>
 		<groupId>org.apache.flink</groupId>
-		<version>0.8-incubating-SNAPSHOT</version>
+		<version>0.9-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -40,6 +40,7 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-core</artifactId>
 			<version>${project.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
@@ -51,6 +52,7 @@ under the License.
 			<groupId>org.tachyonproject</groupId>
 			<artifactId>tachyon</artifactId>
 			<version>0.5.0</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.tachyonproject</groupId>

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
b/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
index 582e7e7..f425a49 100644
--- a/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
+++ b/flink-addons/flink-tachyon/src/test/java/org/apache/flink/tachyon/TachyonFileSystemWrapperTest.java
@@ -133,11 +133,6 @@ public class TachyonFileSystemWrapperTest {
 
 			WordCount.main(new String[]{input, output});
 
-//			List<Integer> files = client.listFiles("/", true);
-//			for(Integer file : files) {
-//				TachyonFile f = client.getFile(file);
-//				System.out.println("file = "+file+" f = "+f.getPath());
-//			}
 			// verify result
 			TachyonFile resultFile = client.getFile("/" + TACHYON_TEST_OUT_FILE_NAME);
 			Assert.assertNotNull("Result file has not been created", resultFile);

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/flink-core/src/main/java/org/apache/flink/core/fs/AbstractHadoopWrapper.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/AbstractHadoopWrapper.java
b/flink-core/src/main/java/org/apache/flink/core/fs/AbstractHadoopWrapper.java
deleted file mode 100644
index 69f37bc..0000000
--- a/flink-core/src/main/java/org/apache/flink/core/fs/AbstractHadoopWrapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.flink.core.fs;
-
-public interface AbstractHadoopWrapper {
-
-	/**
-	 * Test whether the HadoopWrapper can wrap the given file system scheme.
-	 * @param scheme
-	 * @return
-	 */
-	public Class<?> getHadoopWrapperClassNameForFileSystem(String scheme);
-}

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
index 7980cba..93a9938 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
@@ -305,12 +305,12 @@ public abstract class FileSystem {
 		return fs;
 	}
 
-	private static AbstractHadoopWrapper hadoopWrapper;
+	private static HadoopFileSystemWrapper hadoopWrapper;
 
 	private static Class<?> getHadoopWrapperClassNameForFileSystem(String scheme) {
 		if(hadoopWrapper == null) {
 			try {
-				hadoopWrapper = (AbstractHadoopWrapper) instantiateHadoopFileSystemWrapper(null);
+				hadoopWrapper = (HadoopFileSystemWrapper) instantiateHadoopFileSystemWrapper(null);
 			} catch (IOException e) {
 				throw new RuntimeException("Error creating new Hadoop wrapper", e);
 			}

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/flink-core/src/main/java/org/apache/flink/core/fs/HadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/HadoopFileSystemWrapper.java
b/flink-core/src/main/java/org/apache/flink/core/fs/HadoopFileSystemWrapper.java
new file mode 100644
index 0000000..61ba206
--- /dev/null
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/HadoopFileSystemWrapper.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+package org.apache.flink.core.fs;
+
+public interface HadoopFileSystemWrapper {
+
+	/**
+	 * Test whether the HadoopWrapper can wrap the given file system scheme.
+	 * @param scheme
+	 * @return
+	 */
+	public Class<?> getHadoopWrapperClassNameForFileSystem(String scheme);
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/HadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/HadoopFileSystem.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/HadoopFileSystem.java
index e849d32..32e3f2d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/HadoopFileSystem.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/HadoopFileSystem.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.UnknownHostException;
 
-import org.apache.flink.core.fs.AbstractHadoopWrapper;
+import org.apache.flink.core.fs.HadoopFileSystemWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.flink.configuration.ConfigConstants;
@@ -45,7 +45,7 @@ import org.apache.hadoop.conf.Configuration;
  * distributed file system (HDFS).
  *
  */
-public final class HadoopFileSystem extends FileSystem implements AbstractHadoopWrapper {
+public final class HadoopFileSystem extends FileSystem implements HadoopFileSystemWrapper
{
 	
 	private static final Logger LOG = LoggerFactory.getLogger(HadoopFileSystem.class);
 	

http://git-wip-us.apache.org/repos/asf/flink/blob/0af4d3ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c1798f..1376b52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,6 +433,44 @@ under the License.
 				<groupId>org.apache.hadoop</groupId>
 				<artifactId>hadoop-client</artifactId>
 				<version>${hadoop.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>asm</groupId>
+						<artifactId>asm</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>tomcat</groupId>
+						<artifactId>jasper-compiler</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>tomcat</groupId>
+						<artifactId>jasper-runtime</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.mortbay.jetty</groupId>
+						<artifactId>jetty</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.mortbay.jetty</groupId>
+						<artifactId>jsp-api-2.1</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.mortbay.jetty</groupId>
+						<artifactId>jsp-2.1</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.mortbay.jetty</groupId>
+						<artifactId>jetty-util</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.eclipse.jdt</groupId>
+						<artifactId>core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.hadoop</groupId>
@@ -564,6 +602,38 @@ under the License.
 								<groupId>org.jboss.netty</groupId>
 								<artifactId>netty</artifactId>
 							</exclusion>
+							<exclusion>
+								<groupId>asm</groupId>
+								<artifactId>asm</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>tomcat</groupId>
+								<artifactId>jasper-compiler</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>tomcat</groupId>
+								<artifactId>jasper-runtime</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jetty</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jsp-api-2.1</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jsp-2.1</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jetty-util</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.eclipse.jdt</groupId>
+								<artifactId>core</artifactId>
+							</exclusion>
 						</exclusions>
 					</dependency>
 					<dependency>
@@ -575,6 +645,38 @@ under the License.
 								<groupId>org.jboss.netty</groupId>
 								<artifactId>netty</artifactId>
 							</exclusion>
+							<exclusion>
+								<groupId>asm</groupId>
+								<artifactId>asm</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>tomcat</groupId>
+								<artifactId>jasper-compiler</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>tomcat</groupId>
+								<artifactId>jasper-runtime</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jetty</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jsp-api-2.1</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jsp-2.1</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.mortbay.jetty</groupId>
+								<artifactId>jetty-util</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>org.eclipse.jdt</groupId>
+								<artifactId>core</artifactId>
+							</exclusion>
 						</exclusions>
 					</dependency>
 				</dependencies>


Mime
View raw message