Repository: asterixdb Updated Branches: refs/heads/master cb92dad73 -> fb7d05bb8
More Dependency Cleanup Change-Id: I9cd6f1c9829c1a71f8b10994823a5f1fbe09d797 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1294 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: abdullah alamoudi <bamou...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/fb7d05bb Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/fb7d05bb Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/fb7d05bb Branch: refs/heads/master Commit: fb7d05bb882c1ad62e6591a9192b49057603ee9f Parents: cb92dad Author: Michael Blow <mb...@apache.org> Authored: Sat Oct 15 14:09:49 2016 -0400 Committer: Michael Blow <mb...@apache.org> Committed: Sat Oct 15 13:05:19 2016 -0700 ---------------------------------------------------------------------- asterixdb/asterix-active/pom.xml | 4 ---- asterixdb/asterix-algebra/pom.xml | 21 ++++++++++++++++++++ ...quivalenceClassForRecordConstructorRule.java | 6 +++--- .../rules/util/EquivalenceClassUtils.java | 5 ++--- .../external/util/ExternalDataConstants.java | 13 ++++-------- .../visitor/SqlppDeleteRewriteVisitor.java | 4 ++-- asterixdb/asterix-runtime/pom.xml | 12 ----------- .../hyracks-hdfs/hyracks-hdfs-core/pom.xml | 16 +++++++++++++++ 8 files changed, 48 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-active/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-active/pom.xml b/asterixdb/asterix-active/pom.xml index aef7e51..9f4e650 100644 --- a/asterixdb/asterix-active/pom.xml +++ b/asterixdb/asterix-active/pom.xml @@ -31,10 +31,6 @@ <artifactId>algebricks-compiler</artifactId> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-hdfs-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-algebra/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml index 779e0d5..703d005 100644 --- a/asterixdb/asterix-algebra/pom.xml +++ b/asterixdb/asterix-algebra/pom.xml @@ -149,6 +149,12 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -168,5 +174,20 @@ <groupId>org.json</groupId> <artifactId>json</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java index b2271a1..ac47b58 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java @@ -19,6 +19,7 @@ package org.apache.asterix.optimizer.rules; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -46,7 +47,6 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogi import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; import org.apache.hyracks.algebricks.rewriter.util.PhysicalOptimizationsUtil; -import org.mortbay.util.SingletonList; /** * Adds equivalent classes for record-constructors. @@ -120,8 +120,8 @@ public class AddEquivalenceClassForRecordConstructorRule implements IAlgebraicRe new MutableObject<ILogicalExpression>(new VariableReferenceExpression(recordVar)), new MutableObject<ILogicalExpression>( new ConstantExpression(new AsterixConstantValue(new AInt32(parameterIndex / 2))))); // Every two parameters corresponds to a field. - EquivalenceClass equivClass = new EquivalenceClass(SingletonList.newSingletonList(fieldVar), fieldVar, - SingletonList.newSingletonList(expr)); + EquivalenceClass equivClass = new EquivalenceClass(Collections.singletonList(fieldVar), fieldVar, + Collections.singletonList(expr)); ecs.put(fieldVar, equivClass); changed = true; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/util/EquivalenceClassUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/util/EquivalenceClassUtils.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/util/EquivalenceClassUtils.java index 0ec12e5..5bfa943 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/util/EquivalenceClassUtils.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/util/EquivalenceClassUtils.java @@ -53,7 +53,6 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.Var import org.apache.hyracks.algebricks.core.algebra.properties.FunctionalDependency; import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil; import org.apache.hyracks.algebricks.rewriter.util.PhysicalOptimizationsUtil; -import org.mortbay.util.SingletonList; public class EquivalenceClassUtils { @@ -122,8 +121,8 @@ public class EquivalenceClassUtils { new MutableObject<ILogicalExpression>(new VariableReferenceExpression(referredRecordVar)), new MutableObject<ILogicalExpression>( new ConstantExpression(new AsterixConstantValue(new AInt32(fieldIndexInRecord))))); - EquivalenceClass equivClass = new EquivalenceClass(SingletonList.newSingletonList(var), var, - SingletonList.newSingletonList(expr)); + EquivalenceClass equivClass = new EquivalenceClass(Collections.singletonList(var), var, + Collections.singletonList(expr)); Map<LogicalVariable, EquivalenceClass> equivalenceMap = context.getEquivalenceClassMap(operator); if (equivalenceMap == null) { equivalenceMap = new HashMap<LogicalVariable, EquivalenceClass>(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java index e795730..a270e88 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java @@ -18,11 +18,6 @@ */ package org.apache.asterix.external.util; -import org.apache.hadoop.hdfs.DistributedFileSystem; -import org.apache.hadoop.hive.ql.io.RCFileInputFormat; -import org.apache.hadoop.mapred.SequenceFileInputFormat; -import org.apache.hadoop.mapred.TextInputFormat; - public class ExternalDataConstants { // TODO: Remove unused variables. /** @@ -110,10 +105,10 @@ public class ExternalDataConstants { /** * HDFS class names */ - public static final String CLASS_NAME_TEXT_INPUT_FORMAT = TextInputFormat.class.getName(); - public static final String CLASS_NAME_SEQUENCE_INPUT_FORMAT = SequenceFileInputFormat.class.getName(); - public static final String CLASS_NAME_RC_INPUT_FORMAT = RCFileInputFormat.class.getName(); - public static final String CLASS_NAME_HDFS_FILESYSTEM = DistributedFileSystem.class.getName(); + public static final String CLASS_NAME_TEXT_INPUT_FORMAT = "org.apache.hadoop.mapred.TextInputFormat"; + public static final String CLASS_NAME_SEQUENCE_INPUT_FORMAT = "org.apache.hadoop.mapred.SequenceFileInputFormat"; + public static final String CLASS_NAME_RC_INPUT_FORMAT = "org.apache.hadoop.hive.ql.io.RCFileInputFormat"; + public static final String CLASS_NAME_HDFS_FILESYSTEM = "org.apache.hadoop.hdfs.DistributedFileSystem"; /** * input formats aliases */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java index a71cc47..503437c 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java @@ -19,6 +19,7 @@ package org.apache.asterix.lang.sqlpp.visitor; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.apache.asterix.common.functions.FunctionConstants; @@ -41,7 +42,6 @@ import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation; import org.apache.asterix.lang.sqlpp.expression.SelectExpression; import org.apache.asterix.lang.sqlpp.struct.SetOperationInput; import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppAstVisitor; -import org.mortbay.util.SingletonList; /** * This class rewrites delete statement to contain a query that specifying @@ -65,7 +65,7 @@ public class SqlppDeleteRewriteVisitor extends AbstractSqlppAstVisitor<Void, Voi VariableExpr var = deleteStmt.getVariableExpr(); FromTerm fromTerm = new FromTerm(callExpression, var, null, null); @SuppressWarnings("unchecked") - FromClause fromClause = new FromClause(SingletonList.newSingletonList(fromTerm)); + FromClause fromClause = new FromClause(Collections.singletonList(fromTerm)); // Where clause. WhereClause whereClause = null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/asterixdb/asterix-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/pom.xml b/asterixdb/asterix-runtime/pom.xml index 4224d19..f14eb49 100644 --- a/asterixdb/asterix-runtime/pom.xml +++ b/asterixdb/asterix-runtime/pom.xml @@ -63,18 +63,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <type>jar</type> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> <version>5.1</version> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/fb7d05bb/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml index 96a30fd..eea6ca3 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml @@ -188,11 +188,27 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>2.2.0</version> + <exclusions> + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <version>2.2.0</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId>
