Merged asterix_stabilization r197:r199.
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix-fix-issue-9@200 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java
index f3dc2d4..32b5058 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java
@@ -155,10 +155,14 @@
IDatasetDetails datasetDetails = null;
Dataset ds = MetadataManager.INSTANCE.getDataset(mdTxnCtx, compiledDeclarations.getDataverseName(),
datasetName);
- if (ds != null && !dd.getIfNotExists()) {
- throw new AlgebricksException("A dataset with this name " + datasetName
- + " already exists.");
- }
+ if (ds != null) {
+ if (dd.getIfNotExists()) {
+ continue;
+ } else {
+ throw new AlgebricksException("A dataset with this name " + datasetName
+ + " already exists.");
+ }
+ }
itemTypeName = dd.getItemTypeName().getValue();
Datatype dt = MetadataManager.INSTANCE.getDatatype(mdTxnCtx,
compiledDeclarations.getDataverseName(), itemTypeName);
diff --git a/asterix-app/src/test/resources/runtimets/ignore.txt b/asterix-app/src/test/resources/runtimets/ignore.txt
index 5d6711f..bfeb30a 100644
--- a/asterix-app/src/test/resources/runtimets/ignore.txt
+++ b/asterix-app/src/test/resources/runtimets/ignore.txt
@@ -15,3 +15,4 @@
fuzzyjoin
failure/q1_pricing_summary_report_failure.aql
open-closed
+dml/insert-into-empty-dataset-with-index_02.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index_01.aql
similarity index 90%
rename from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
rename to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index_01.aql
index f88b897..2be5372 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index_01.aql
@@ -27,7 +27,7 @@
let $z:=3
return {
"l_orderkey": $x,
- "l_partkey": $y,
+ "l_linenumber": $y,
"l_suppkey": $z
}
);
@@ -38,13 +38,12 @@
let $z:=4
return {
"l_orderkey": $x,
- "l_partkey": $y,
+ "l_linenumber": $y,
"l_suppkey": $z
}
);
-write output to nc1:"rttest/dml_insert-into-empty-dataset-with-index.adm";
+write output to nc1:"rttest/dml_insert-into-empty-dataset-with-index_01.adm";
for $c in dataset('LineID')
-where $c.l_suppkey < 100 and $c.l_linenumber<5
order by $c.l_orderkey, $c.l_linenumber
return $c
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index_02.aql
similarity index 90%
copy from asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
copy to asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index_02.aql
index f88b897..947b4d4 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset-with-index_02.aql
@@ -27,7 +27,7 @@
let $z:=3
return {
"l_orderkey": $x,
- "l_partkey": $y,
+ "l_linenumber": $y,
"l_suppkey": $z
}
);
@@ -38,13 +38,12 @@
let $z:=4
return {
"l_orderkey": $x,
- "l_partkey": $y,
+ "l_linenumber": $y,
"l_suppkey": $z
}
);
-write output to nc1:"rttest/dml_insert-into-empty-dataset-with-index.adm";
+write output to nc1:"rttest/dml_insert-into-empty-dataset-with-index_02.adm";
for $c in dataset('LineID')
-where $c.l_suppkey < 100 and $c.l_linenumber<5
order by $c.l_orderkey, $c.l_linenumber
return $c
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql
index ad7e3b2..ec20108 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-into-empty-dataset.aql
@@ -24,7 +24,7 @@
let $z:=3
return {
"l_orderkey": $x,
- "l_partkey": $y,
+ "l_linenumber": $y,
"l_suppkey": $z
}
);
@@ -35,12 +35,12 @@
let $z:=4
return {
"l_orderkey": $x,
- "l_partkey": $y,
+ "l_linenumber": $y,
"l_suppkey": $z
}
);
-write output to nc1:"rttest/dml_insert-into-empty-dataset.adm";
+write output to nc1:"rttest/dml_insert-into-empty-dataset_01.adm";
for $c in dataset('LineID')
where $c.l_suppkey < 100 and $c.l_linenumber<5
order by $c.l_orderkey, $c.l_linenumber
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index_01.adm
similarity index 100%
rename from asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm
rename to asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index_01.adm
diff --git a/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm b/asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index_02.adm
similarity index 100%
copy from asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index.adm
copy to asterix-app/src/test/resources/runtimets/results/dml/insert-into-empty-dataset-with-index_02.adm