You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2015/06/28 20:30:44 UTC
[03/11] vxquery git commit: comments removed
comments removed
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/58ee9244
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/58ee9244
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/58ee9244
Branch: refs/heads/master
Commit: 58ee9244dd175c77c768b8ff72ddcb21c0a5a231
Parents: 911bc5b
Author: Shivani Mall <sm...@ucr.edu>
Authored: Mon Jun 22 15:32:12 2015 -0700
Committer: Shivani Mall <sm...@ucr.edu>
Committed: Mon Jun 22 15:32:12 2015 -0700
----------------------------------------------------------------------
.../EliminateUnnestAggregateSubplanRule.java | 4 +-
vxquery-xtest/src/test/resources/DocTest.xml | 47 -----
.../src/test/resources/VXQueryCatalog.xml | 189 -------------------
3 files changed, 2 insertions(+), 238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/58ee9244/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
index 3504d7d..c9e9586 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
@@ -78,10 +78,10 @@ public class EliminateUnnestAggregateSubplanRule implements IAlgebraicRewriteRul
return false;
}
AbstractFunctionCallExpression functionCall = (AbstractFunctionCallExpression) logicalExpression;
- /*
+
if (!functionCall.getFunctionIdentifier().equals(BuiltinOperators.ITERATE.getFunctionIdentifier())) {
return false;
- }*/
+ }
AbstractLogicalOperator op2 = (AbstractLogicalOperator) unnest.getInputs().get(0).getValue();
if (op2.getOperatorTag() != LogicalOperatorTag.SUBPLAN) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/58ee9244/vxquery-xtest/src/test/resources/DocTest.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/DocTest.xml b/vxquery-xtest/src/test/resources/DocTest.xml
deleted file mode 100644
index d38f112..0000000
--- a/vxquery-xtest/src/test/resources/DocTest.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE test-suite [
-
-<!ENTITY SingleQuery SYSTEM "cat/SingleQuery.xml">
-
-<!ENTITY XMarkQueries SYSTEM "cat/XMarkOriginalQueries.xml">
-
-<!ENTITY TestRewriteRules SYSTEM "cat/TestRewriteRules.xml">
-
-]>
-<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- CatalogDesignDate="2014-04-01"
- version="0.0.1"
- SourceOffsetPath="./"
- ResultOffsetPath="ExpectedTestResults/"
- XQueryQueryOffsetPath="Queries/XQuery/"
- XQueryXQueryOffsetPath="Queries/XQueryX/"
- XQueryFileExtension=".xq"
- XQueryXFileExtension=".xqx"
- xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
-
-
- <source ID="station_xml_file" FileName="TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml" Creator="Shivani Mall">
- <description last-mod="2015-03-25">Collection of files</description>
- </source>
-
- <test-group name="XMarkQueriesExecutionTests" featureOwner="Shivani Mall">
- &TestRewriteRules;
- </test-group>
-</test-suite>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/58ee9244/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
index aa4953d..e69de29 100644
--- a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<!DOCTYPE test-suite [
-
-<!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">
-<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
-<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
-
-<!ENTITY FunctionsAndOperatorsOnNumericsQueries SYSTEM "cat/FunctionsAndOperatorsOnNumericsQueries.xml">
-<!ENTITY FunctionsAndOperatorsThatGenerateSequences SYSTEM "cat/FunctionsAndOperatorsThatGenerateSequences.xml">
-
-<!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
-<!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
-<!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
-
-<!ENTITY GhcndRecordsPartition1Queries SYSTEM "cat/GhcndRecordsPartition1Queries.xml">
-<!ENTITY GhcndRecordsPartition2Queries SYSTEM "cat/GhcndRecordsPartition2Queries.xml">
-<!ENTITY GhcndRecordsPartition4Queries SYSTEM "cat/GhcndRecordsPartition4Queries.xml">
-
-<!ENTITY GhcndCountPartition1Queries SYSTEM "cat/GhcndCountPartition1Queries.xml">
-<!ENTITY GhcndCountPartition2Queries SYSTEM "cat/GhcndCountPartition2Queries.xml">
-<!ENTITY GhcndCountPartition4Queries SYSTEM "cat/GhcndCountPartition4Queries.xml">
-
-<!ENTITY SingleQuery SYSTEM "cat/SingleQuery.xml">
-<!ENTITY SingleAlternateQuery SYSTEM "cat/SingleAlternateQuery.xml">
-
-]>
-<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- CatalogDesignDate="2014-04-01"
- version="0.0.1"
- SourceOffsetPath="./"
- ResultOffsetPath="ExpectedTestResults/"
- XQueryQueryOffsetPath="Queries/XQuery/"
- XQueryXQueryOffsetPath="Queries/XQueryX/"
- XQueryFileExtension=".xq"
- XQueryXFileExtension=".xqx"
- xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
- <test-suite-info>
- <title>VXQuery Test Suite</title>
- <description>
- Test Suite for VXQuery.
- </description>
- </test-suite-info>
- <sources>
- <source ID="VXQueryCatalog" FileName="VXQueryCatalog.xml" Creator="VXQuery team">
- <description last-mod="2014-04-02">VXQuery Test Suite Catalog</description>
- </source>
- <source ID="ghcnd" FileName="TestSources/ghcnd" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_half_1" FileName="TestSources/ghcnd/half_1" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_half_2" FileName="TestSources/ghcnd/half_2" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_1" FileName="TestSources/ghcnd/half_1/quarter_1" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_2" FileName="TestSources/ghcnd/half_1/quarter_2" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_3" FileName="TestSources/ghcnd/half_2/quarter_3" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_4" FileName="TestSources/ghcnd/half_2/quarter_4" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="station_xml_file" FileName="TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml" Creator="Shivani Mall">
- <description last-mod="2015-06-19">File</description>
- </source>
- </sources>
- <test-group name="BasicQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Basic Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="SingleTestAdd" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Test Add</title>
- <description/>
- </GroupInfo>
- &SingleQuery;
- </test-group>
- <test-group name="SingleTestList" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Test List</title>
- </GroupInfo>
- &SingleAlternateQuery;
- </test-group>
- </test-group>
- <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Aggregate Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Aggregate Parallel Execution Tests</title>
- <description/>
- </GroupInfo>
- &AggregatePartition1Queries;
- &AggregatePartition2Queries;
- &AggregatePartition4Queries;
- </test-group>
- </test-group>
- <test-group name="FunctionsAndOperatorsOnNumericsQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Functions And Operators On Numerics Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="FunctionsAndOperatorsOnNumericsExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Functions And Operators On Numerics Execution Tests</title>
- <description/>
- </GroupInfo>
- &FunctionsAndOperatorsOnNumericsQueries;
- </test-group>
- </test-group>
- <test-group name="FunctionsAndOperatorsThatGenerateSequences" featureOwner="Shiavni Mall">
- <GroupInfo>
- <title>Functions and Operators that Generate Sequences</title>
- <description/>
- </GroupInfo>
- &FunctionsAndOperatorsThatGenerateSequences;
- </test-group>
- <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>GHCND Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Parallel Execution Tests</title>
- <description/>
- </GroupInfo>
- &GhcndPartition1Queries;
- &GhcndPartition2Queries;
- &GhcndPartition4Queries;
- </test-group>
- </test-group>
- <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>GHCND Count Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Parallel Execution Tests</title>
- <description/>
- </GroupInfo>
- &GhcndCountPartition1Queries;
- &GhcndCountPartition2Queries;
- &GhcndCountPartition4Queries;
- </test-group>
- </test-group>
- <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>GHCND Records Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Records Parallel Execution Tests</title>
- <description/>
- </GroupInfo>
- &GhcndRecordsPartition1Queries;
- &GhcndRecordsPartition2Queries;
- &GhcndRecordsPartition4Queries;
- </test-group>
- </test-group>
-</test-suite>