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 2014/04/06 18:09:34 UTC
[1/2] git commit: Removed extra collection context variables.
Repository: incubator-vxquery
Updated Branches:
refs/heads/prestonc/hash_join 55c809b15 -> e55354408
Removed extra collection context variables.
Set collection only counts the number of collections instead of adding each one to the context.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/e5535440
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/e5535440
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/e5535440
Branch: refs/heads/prestonc/hash_join
Commit: e55354408f5732d0d1dafb6f26661a480d0076f2
Parents: e229502
Author: Preston Carman <pr...@apache.org>
Authored: Sun Apr 6 09:09:01 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:09:08 2014 -0700
----------------------------------------------------------------------
.../rewriter/VXQueryOptimizationContext.java | 18 ------------------
.../rules/SetCollectionDataSourceRule.java | 17 ++---------------
2 files changed, 2 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e5535440/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
index f86b9d6..b2a6f1a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality;
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentorder.DocumentOrder;
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes;
-import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;
@@ -37,7 +36,6 @@ public class VXQueryOptimizationContext extends AlgebricksOptimizationContext {
private final Map<ILogicalOperator, HashMap<Integer, UniqueNodes>> uniqueNodesOperatorVariableMap = new HashMap<ILogicalOperator, HashMap<Integer, UniqueNodes>>();
private final Map<ILogicalOperator, Cardinality> cardinalityOperatorMap = new HashMap<ILogicalOperator, Cardinality>();
- private final Map<String, VXQueryCollectionDataSource> dataSourceScanMap = new HashMap<String, VXQueryCollectionDataSource>();
private int totalDataSources = 0;
private int collectionId = 0;
@@ -49,22 +47,6 @@ public class VXQueryOptimizationContext extends AlgebricksOptimizationContext {
nullableTypeComputer, physicalOptimizationConfig, prettyPrintVisitor);
}
- public VXQueryCollectionDataSource getCollectionDataSourceMap(String collectionName) {
- if (dataSourceScanMap.containsKey(collectionName)) {
- return dataSourceScanMap.get(collectionName);
- } else {
- return null;
- }
- }
-
- public int getCollectionDataSourceMapSize() {
- return dataSourceScanMap.size();
- }
-
- public void putCollectionDataSourceMap(String collectionName, VXQueryCollectionDataSource ds) {
- this.dataSourceScanMap.put(collectionName, ds);
- }
-
public void incrementTotalDataSources() {
totalDataSources++;
}
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e5535440/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
index 2ddee4d..496a99c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
@@ -18,10 +18,6 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
-import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
-import org.apache.vxquery.types.AnyItemType;
-import org.apache.vxquery.types.Quantifier;
-import org.apache.vxquery.types.SequenceType;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
@@ -38,17 +34,8 @@ public class SetCollectionDataSourceRule extends AbstractCollectionRule {
return false;
}
VXQueryOptimizationContext vxqueryContext = (VXQueryOptimizationContext) context;
- String collectionName = getCollectionName(opRef);
-
- // Build the new collection.
- if (collectionName != null && vxqueryContext.getCollectionDataSourceMap(collectionName) == null) {
- int collectionId = vxqueryContext.getCollectionDataSourceMapSize() + 1;
- VXQueryCollectionDataSource ds = VXQueryCollectionDataSource.create(collectionId, collectionName,
- SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR));
- vxqueryContext.putCollectionDataSourceMap(collectionName, ds);
-
- context.addToDontApplySet(this, opRef.getValue());
- }
+ vxqueryContext.incrementTotalDataSources();
+ context.addToDontApplySet(this, opRef.getValue());
return false;
}
}
[2/2] git commit: Fixed benchmark reference to query files.
Posted by pr...@apache.org.
Fixed benchmark reference to query files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/e2295023
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/e2295023
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/e2295023
Branch: refs/heads/prestonc/hash_join
Commit: e2295023bf6b063ed9d0bd52677fec935508a32d
Parents: 55c809b
Author: Preston Carman <pr...@apache.org>
Authored: Sun Apr 6 08:37:54 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:09:08 2014 -0700
----------------------------------------------------------------------
.../main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e2295023/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
index be95ef8..081f80a 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
@@ -35,7 +35,7 @@ class WeatherBenchmark:
QUERY_REPLACEMENT_KEY = "/tmp/1.0_partition_ghcnd_all_xml/"
QUERY_MASTER_FOLDER = "../queries/"
QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq", "q04.xq", "q05.xq", "q06.xq", "q07.xq"]
- QUERY_UTILITY_LIST = ["sensor_count.xq", "station_count.xq", "q04_sensor.xq", "q04_station.xq", "q05_sensor.xq", "q05_station.xq", "q06_tmin.xq", "q06_tmax.xq", "q07_sensor.xq", "q07_station.xq"]
+ QUERY_UTILITY_LIST = ["sensor_count.xq", "station_count.xq", "q04_sensor.xq", "q04_station.xq", "q05_sensor.xq", "q05_station.xq", "q06_sensor.xq", "q06_station.xq", "q07_tmin.xq", "q07_tmax.xq"]
BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"]
BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"]
QUERY_COLLECTIONS = ["sensors", "stations"]