Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/2697
Change subject: [NO ISSUE] Remove obsolete support for older HDFS versions ...................................................................... [NO ISSUE] Remove obsolete support for older HDFS versions Change-Id: I84f1bced874f4f262324fa6114a2394c6c5bb3c5 --- D hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml D hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/main/java/org/apache/hyracks/hdfs/ContextFactory.java D hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml 5 files changed, 14 insertions(+), 383 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/97/2697/1 diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml deleted file mode 100644 index aa03551..0000000 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml +++ /dev/null @@ -1,116 +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. - !--> - -<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> - <artifactId>hyracks-hdfs-1.x</artifactId> - <name>hyracks-hdfs-1.x</name> - <parent> - <artifactId>hyracks-hdfs</artifactId> - <groupId>org.apache.hyracks</groupId> - <version>0.3.4-SNAPSHOT</version> - </parent> - <properties> - <root.dir>${basedir}/../../..</root.dir> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <id>hadoop-0.20.2</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>0.20.2</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>0.20.2</version> - <type>jar</type> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>hadoop</name> - <value>1.0.4</value> - </property> - </activation> - <id>hadoop-1.0.4</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>1.0.4</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>1.0.4</version> - <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>1.0.4</version> - <type>jar</type> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> -</project> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/main/java/org/apache/hyracks/hdfs/ContextFactory.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/main/java/org/apache/hyracks/hdfs/ContextFactory.java deleted file mode 100644 index ecee076..0000000 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/main/java/org/apache/hyracks/hdfs/ContextFactory.java +++ /dev/null @@ -1,56 +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.hyracks.hdfs; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.mapreduce.JobContext; -import org.apache.hadoop.mapreduce.JobID; -import org.apache.hadoop.mapreduce.Mapper; -import org.apache.hadoop.mapreduce.TaskAttemptContext; -import org.apache.hadoop.mapreduce.TaskAttemptID; -import org.apache.hyracks.api.exceptions.HyracksDataException; - -/** - * The wrapper to generate TaskTattemptContext - */ -public class ContextFactory { - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public TaskAttemptContext createContext(Configuration conf, TaskAttemptID tid) throws HyracksDataException { - try { - return new Mapper().new Context(conf, tid, null, null, null, null, null); - } catch (Exception e) { - throw HyracksDataException.create(e); - } - } - - public TaskAttemptContext createContext(Configuration conf, int partition) throws HyracksDataException { - try { - TaskAttemptID tid = new TaskAttemptID("", 0, true, partition, 0); - return new TaskAttemptContext(conf, tid); - } catch (Exception e) { - throw HyracksDataException.create(e); - } - } - - public JobContext createJobContext(Configuration conf) { - return new JobContext(conf, new JobID("0", 0)); - } - -} diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java deleted file mode 100644 index d17f1bf..0000000 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java +++ /dev/null @@ -1,35 +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.hyracks.hdfs; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdfs.MiniDFSCluster; - -import org.apache.hyracks.api.exceptions.HyracksDataException; - -public class MiniDFSClusterFactory { - - public MiniDFSCluster getMiniDFSCluster(Configuration conf, int numberOfNC) throws HyracksDataException { - try { - return new MiniDFSCluster(conf, numberOfNC, true, null); - } catch (Exception e) { - throw HyracksDataException.create(e); - } - } -} diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml index 2160294..86472b2 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml @@ -46,186 +46,25 @@ </plugins> </build> - <profiles> - <profile> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>hadoop</name> - <value>2.2.0</value> - </property> - </activation> - <id>hadoop-2.2.0</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>hadoop</name> - <value>0.23.1</value> - </property> - </activation> - <id>hadoop-0.23.1</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-0.23.6</id> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>hadoop</name> - <value>0.23.6</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>0.23.6</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>0.23.6</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>0.23.6</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>0.23.6</version> - <type>jar</type> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>hadoop</name> - <value>cdh-4.2</value> - </property> - </activation> - <id>cdh-4.2</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>2.0.0-cdh4.2.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>2.0.0-cdh4.2.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>2.0.0-cdh4.2.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>2.0.0-cdh4.2.0</version> - <type>jar</type> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>hadoop</name> - <value>cdh-4.1</value> - </property> - </activation> - <id>cdh-4.1</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>2.0.0-cdh4.1.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>2.0.0-cdh4.1.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>2.0.0-cdh4.1.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>2.0.0-cdh4.1.0</version> - <type>jar</type> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index f7fe397..fd56df6 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@ -43,7 +43,6 @@ </licenses> <modules> - <module>hyracks-hdfs-1.x</module> <module>hyracks-hdfs-2.x</module> <module>hyracks-hdfs-core</module> </modules> -- To view, visit https://asterix-gerrit.ics.uci.edu/2697 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84f1bced874f4f262324fa6114a2394c6c5bb3c5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: release-0.9.4-pre-rc Gerrit-Owner: Michael Blow <[email protected]>
