Repository: vxquery Updated Branches: refs/heads/site dabe1a520 -> d270323ba
A few little clean up items. - Removing unused code. - Commented out a broken rewrite rule. (temporary) - More consistent code. Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/4b01e4b4 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/4b01e4b4 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/4b01e4b4 Branch: refs/heads/site Commit: 4b01e4b4955f0ceb4a06638aa215bfcd904565b9 Parents: 9c0c1b2 Author: Preston Carman <[email protected]> Authored: Thu May 29 16:55:36 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Thu May 29 16:55:36 2014 -0700 ---------------------------------------------------------------------- vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java | 6 ------ .../org/apache/vxquery/compiler/rewriter/RewriteRuleset.java | 2 +- .../apache/vxquery/xmlquery/translator/XMLQueryTranslator.java | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/4b01e4b4/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java ---------------------------------------------------------------------- diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java index 94efba2..02697e9 100644 --- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java +++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java @@ -374,12 +374,6 @@ public class VXQuery { ccConfig.clusterNetIpAddress = "127.0.0.1"; ccConfig.clusterNetPort = 39001; ccConfig.profileDumpPeriod = 10000; - File outDir = new File("target/ClusterController"); - outDir.mkdirs(); - File ccRoot = File.createTempFile(VXQuery.class.getName(), ".data", outDir); - ccRoot.delete(); - ccRoot.mkdir(); - ccConfig.ccRoot = ccRoot.getAbsolutePath(); cc = new ClusterControllerService(ccConfig); cc.start(); http://git-wip-us.apache.org/repos/asf/vxquery/blob/4b01e4b4/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java index ab0d535..f1d41d8 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java @@ -138,7 +138,7 @@ public class RewriteRuleset { normalization.add(new RemoveUnusedAssignAndAggregateRule()); // Find assign for scalar aggregate function. - normalization.add(new ConvertAssignToAggregateRule()); + // normalization.add(new ConvertAssignToAggregateRule()); // Use two step aggregate operators if possible. normalization.add(new IntroduceTwoStepAggregateRule()); http://git-wip-us.apache.org/repos/asf/vxquery/blob/4b01e4b4/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java index dad7485..3afb9a3 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java @@ -1538,8 +1538,8 @@ public class XMLQueryTranslator { SequenceType forVarType = SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_ONE); XQueryVariable forVar = new XQueryVariable(XMLQueryCompilerConstants.DOT_VAR_NAME, forVarType, forLVar); tCtx.varScope.registerVariable(forVar); - XQueryVariable posVar = new XQueryVariable(XMLQueryCompilerConstants.POS_VAR_NAME, SequenceType.create( - BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), posLVar); + SequenceType posVarType = SequenceType.create(BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE); + XQueryVariable posVar = new XQueryVariable(XMLQueryCompilerConstants.POS_VAR_NAME, posVarType, posLVar); tCtx.varScope.registerVariable(posVar); unnest.getInputs().add(mutable(tCtx.op)); tCtx.op = unnest;
