Repository: vxquery Updated Branches: refs/heads/master 2f54a03ca -> c25bf033f
VXQUERY-221: Removing some extra exception wrapping. Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/876fe82d Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/876fe82d Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/876fe82d Branch: refs/heads/master Commit: 876fe82d4fd73af0f6490cba214665e66fdd6955 Parents: 3d14785 Author: Preston Carman <[email protected]> Authored: Wed Jul 6 16:52:15 2016 -0700 Committer: Preston Carman <[email protected]> Committed: Wed Jul 6 16:52:15 2016 -0700 ---------------------------------------------------------------------- .../VXQueryExpressionRuntimeProvider.java | 22 ++++----------- .../vxquery/exceptions/SystemException.java | 28 +++++++++++--------- ...ctTaggedValueArgumentAggregateEvaluator.java | 6 +---- ...tractTaggedValueArgumentScalarEvaluator.java | 8 ++---- ...ctTaggedValueArgumentUnnestingEvaluator.java | 6 +---- .../xmlquery/query/XMLQueryCompiler.java | 20 ++++---------- 6 files changed, 29 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/876fe82d/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java index 1246141..04d15e7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java @@ -53,7 +53,8 @@ public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvi IOperatorSchema[] inputSchemas, JobGenContext context) throws AlgebricksException { switch (expr.getExpressionTag()) { case CONSTANT: - IAlgebricksConstantValue constantValue = (IAlgebricksConstantValue) ((ConstantExpression) expr).getValue(); + IAlgebricksConstantValue constantValue = (IAlgebricksConstantValue) ((ConstantExpression) expr) + .getValue(); if (constantValue.isFalse()) { IPointable p = (BooleanPointable) BooleanPointable.FACTORY.createPointable(); XDMConstants.setFalse(p); @@ -81,12 +82,7 @@ public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvi IScalarEvaluatorFactory[] argFactories = createArgumentEvaluatorFactories(env, inputSchemas, context, fcExpr.getArguments()); - - try { - return fn.createScalarEvaluatorFactory(argFactories); - } catch (SystemException e) { - throw new AlgebricksException(e); - } + return fn.createScalarEvaluatorFactory(argFactories); } throw new UnsupportedOperationException("Cannot create runtime for " + expr.getExpressionTag()); } @@ -110,11 +106,7 @@ public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvi IScalarEvaluatorFactory[] argFactories = createArgumentEvaluatorFactories(env, inputSchemas, context, expr.getArguments()); - try { - return fn.createAggregateEvaluatorFactory(argFactories); - } catch (SystemException e) { - throw new AlgebricksException(e); - } + return fn.createAggregateEvaluatorFactory(argFactories); } @Override @@ -139,10 +131,6 @@ public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvi IScalarEvaluatorFactory[] argFactories = createArgumentEvaluatorFactories(env, inputSchemas, context, expr.getArguments()); - try { - return fn.createUnnestingEvaluatorFactory(argFactories); - } catch (SystemException e) { - throw new AlgebricksException(e); - } + return fn.createUnnestingEvaluatorFactory(argFactories); } } http://git-wip-us.apache.org/repos/asf/vxquery/blob/876fe82d/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java index 39b12b9..fccbc55 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java @@ -19,23 +19,13 @@ package org.apache.vxquery.exceptions; import java.text.MessageFormat; import java.util.Arrays; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.vxquery.util.SourceLocation; -public class SystemException extends Exception { +public class SystemException extends AlgebricksException { private static final long serialVersionUID = 1L; - private ErrorCode code; - - private static String message(ErrorCode code, SourceLocation loc) { - String description = code.getDescription(); - return code + ": " + (loc == null ? "" : loc + " ") + (description != null ? description : ""); - } - - private static String message(ErrorCode code, SourceLocation loc, Object... params) { - String description = code.getDescription(); - return code + ": " + (loc == null ? "" : loc + " ") - + (description != null ? MessageFormat.format(description, params) : Arrays.deepToString(params)); - } + private final ErrorCode code; public SystemException(ErrorCode code) { super(message(code, null)); @@ -65,4 +55,16 @@ public class SystemException extends Exception { public ErrorCode getCode() { return code; } + + private static String message(ErrorCode code, SourceLocation loc) { + String description = code.getDescription(); + return code + ": " + (loc == null ? "" : loc + " ") + (description != null ? description : ""); + } + + private static String message(ErrorCode code, SourceLocation loc, Object... params) { + String description = code.getDescription(); + return code + ": " + (loc == null ? "" : loc + " ") + + (description != null ? MessageFormat.format(description, params) : Arrays.deepToString(params)); + } + } http://git-wip-us.apache.org/repos/asf/vxquery/blob/876fe82d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java index 965e110..895294a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java @@ -46,11 +46,7 @@ public abstract class AbstractTaggedValueArgumentAggregateEvaluator implements I for (int i = 0; i < args.length; ++i) { args[i].evaluate(tuple, tvps[i]); } - try { - step(tvps); - } catch (SystemException e) { - throw new AlgebricksException(e); - } + step(tvps); } protected abstract void step(TaggedValuePointable[] args) throws SystemException; http://git-wip-us.apache.org/repos/asf/vxquery/blob/876fe82d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java index e0229c2..d7770b0 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java @@ -30,7 +30,7 @@ public abstract class AbstractTaggedValueArgumentScalarEvaluator implements ISca private final IScalarEvaluator[] args; private final TaggedValuePointable[] tvps; - + protected final PointablePool ppool = PointablePoolFactory.INSTANCE.createPointablePool(); public AbstractTaggedValueArgumentScalarEvaluator(IScalarEvaluator[] args) { @@ -46,11 +46,7 @@ public abstract class AbstractTaggedValueArgumentScalarEvaluator implements ISca for (int i = 0; i < args.length; ++i) { args[i].evaluate(tuple, tvps[i]); } - try { - evaluate(tvps, result); - } catch (SystemException e) { - throw new AlgebricksException(e); - } + evaluate(tvps, result); } protected abstract void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException; http://git-wip-us.apache.org/repos/asf/vxquery/blob/876fe82d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java index 4aa30d7..3db1a0e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java @@ -46,11 +46,7 @@ public abstract class AbstractTaggedValueArgumentUnnestingEvaluator implements I for (int i = 0; i < args.length; ++i) { args[i].evaluate(tuple, tvps[i]); } - try { - init(tvps); - } catch (SystemException e) { - throw new AlgebricksException(e); - } + init(tvps); } protected abstract void init(TaggedValuePointable[] args) throws SystemException; http://git-wip-us.apache.org/repos/asf/vxquery/blob/876fe82d/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java index 8a044ea..fcc35ef 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java @@ -62,8 +62,6 @@ import org.apache.vxquery.compiler.algebricks.VXQueryPrinterFactoryProvider; import org.apache.vxquery.compiler.algebricks.prettyprint.VXQueryLogicalExpressionPrettyPrintVisitor; import org.apache.vxquery.compiler.rewriter.RewriteRuleset; import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext; -import org.apache.vxquery.exceptions.ErrorCode; -import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.metadata.VXQueryMetadataProvider; import org.apache.vxquery.runtime.provider.VXQueryBinaryHashFunctionFactoryProvider; import org.apache.vxquery.runtime.provider.VXQueryBinaryHashFunctionFamilyProvider; @@ -217,7 +215,7 @@ public class XMLQueryCompiler { } public void compile(String name, Reader query, CompilerControlBlock ccb, int optimizationLevel) - throws SystemException { + throws AlgebricksException { moduleNode = XMLQueryParser.parse(name, query); listener.notifyParseResult(moduleNode); module = new XMLQueryTranslator(ccb).translateModule(moduleNode); @@ -229,19 +227,11 @@ public class XMLQueryCompiler { listener.notifyTranslationResult(module); XMLQueryTypeChecker.typeCheckModule(module); listener.notifyTypecheckResult(module); - try { - compiler.optimize(); - } catch (AlgebricksException e) { - throw new SystemException(ErrorCode.SYSE0001, e); - } + compiler.optimize(); listener.notifyOptimizedResult(module); JobSpecification jobSpec; - try { - jobSpec = compiler.createJob(null, null); - jobSpec.setFrameSize(frameSize); - } catch (AlgebricksException e) { - throw new SystemException(ErrorCode.SYSE0001, e); - } + jobSpec = compiler.createJob(null, null); + jobSpec.setFrameSize(frameSize); module.setHyracksJobSpecification(jobSpec); listener.notifyCodegenResult(module); } @@ -255,7 +245,7 @@ public class XMLQueryCompiler { } private static List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> buildDefaultLogicalRewrites() { - List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> defaultLogicalRewrites = new ArrayList<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>>(); + List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> defaultLogicalRewrites = new ArrayList<>(); SequentialFixpointRuleController seqCtrlNoDfs = new SequentialFixpointRuleController(false); SequentialFixpointRuleController seqCtrlFullDfs = new SequentialFixpointRuleController(true); SequentialOnceRuleController seqOnceCtrl = new SequentialOnceRuleController(true);
