abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/918
Change subject: ASTERIXDB-1477 Fix Drop Feed If Not Exists
......................................................................
ASTERIXDB-1477 Fix Drop Feed If Not Exists
Change-Id: I9ce76ff5fd6611df5060a1de77742aba9d146ab5
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
A
asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/drop-nonexistent-feed/drop-nonexistent-feed.1.ddl.aql
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
3 files changed, 101 insertions(+), 66 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/18/918/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
index 7a7aa40..6c5f70a 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
@@ -1379,7 +1379,8 @@
}
}
- Map<FeedConnectionId, Pair<JobSpecification, Boolean>>
disconnectJobList = new HashMap<FeedConnectionId, Pair<JobSpecification,
Boolean>>();
+ Map<FeedConnectionId, Pair<JobSpecification, Boolean>>
disconnectJobList =
+ new HashMap<FeedConnectionId, Pair<JobSpecification,
Boolean>>();
if (ds.getDatasetType() == DatasetType.INTERNAL) {
// prepare job spec(s) that would disconnect any active feeds
involving the dataset.
List<FeedConnectionId> feedConnections =
FeedLifecycleListener.INSTANCE.getActiveFeedConnections(null);
@@ -2085,6 +2086,8 @@
if (!stmtFeedDrop.getIfExists()) {
throw new AlgebricksException("There is no feed with this
name " + feedName + ".");
}
+ MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
+ return;
}
FeedId feedId = new FeedId(dataverseName, feedName);
@@ -2133,6 +2136,8 @@
if (!stmtFeedPolicyDrop.getIfExists()) {
throw new AlgebricksException("Unknown policy " +
policyName + " in dataverse " + dataverseName);
}
+ MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
+ return;
}
MetadataManager.INSTANCE.dropFeedPolicy(mdTxnCtx, dataverseName,
policyName);
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/drop-nonexistent-feed/drop-nonexistent-feed.1.ddl.aql
b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/drop-nonexistent-feed/drop-nonexistent-feed.1.ddl.aql
new file mode 100644
index 0000000..5ab70df
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/drop-nonexistent-feed/drop-nonexistent-feed.1.ddl.aql
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+/*
+ * Description : Drop a Non existent feed
+ * Expected Res : Success
+ * Date : 10th Jun 2016
+ */
+drop dataverse experiments if exists;
+create dataverse experiments;
+use dataverse experiments;
+
+drop feed TweetFeed if exists;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
index 3f5ef09..1c9e090 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -28,69 +28,12 @@
ResultOffsetPath="results"
QueryOffsetPath="queries"
QueryFileExtension=".aql">
- <test-group name="external-library">
- <test-case FilePath="external-library">
- <compilation-unit name="typed_adapter">
- <output-dir compare="Text">typed_adapter</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-library">
- <compilation-unit name="classad-parser-new">
- <output-dir compare="Text">classad-parser-new</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-library">
- <compilation-unit name="classad-parser-old">
- <output-dir compare="Text">classad-parser-old</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-library">
- <compilation-unit name="getCapital">
- <output-dir compare="Text">getCapital</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
- <test-group name="external">
- <test-case FilePath="external">
- <compilation-unit name="invalid-format">
- <output-dir compare="Text">invalid-format</output-dir>
- <expected-error>Unknown format</expected-error>
- </compilation-unit>
- </test-case>
- </test-group>
- <test-group name="external-indexing">
- <test-case FilePath="external-indexing">
- <compilation-unit name="text-format">
- <output-dir compare="Text">text-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="sequence-format">
- <output-dir compare="Text">sequence-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="rc-format">
- <output-dir compare="Text">rc-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="feeds">
+ <test-case FilePath="feeds">
+ <compilation-unit name="drop-nonexistent-feed">
+ <output-dir compare="Text">drop-nonexistent-feed</output-dir>
+ </compilation-unit>
+ </test-case>
<test-case FilePath="feeds">
<compilation-unit name="feed-with-multiple-indexes">
<output-dir compare="Text">feed-with-multiple-indexes</output-dir>
@@ -185,13 +128,11 @@
<output-dir compare="Text">feeds_09</output-dir>
</compilation-unit>
</test-case>
-
<test-case FilePath="feeds">
<compilation-unit name="feeds_10">
<output-dir compare="Text">feeds_10</output-dir>
</compilation-unit>
</test-case>
-
<test-case FilePath="feeds">
<compilation-unit name="feeds_11">
<output-dir compare="Text">feeds_11</output-dir>
@@ -202,7 +143,6 @@
<output-dir compare="Text">feeds_12</output-dir>
</compilation-unit>
</test-case>
-
<test-case FilePath="feeds">
<compilation-unit name="issue_230_feeds">
<output-dir compare="Text">issue_230_feeds</output-dir>
@@ -214,6 +154,68 @@
</compilation-unit>
</test-case>-->
</test-group>
+ <test-group name="external-library">
+ <test-case FilePath="external-library">
+ <compilation-unit name="typed_adapter">
+ <output-dir compare="Text">typed_adapter</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-library">
+ <compilation-unit name="classad-parser-new">
+ <output-dir compare="Text">classad-parser-new</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-library">
+ <compilation-unit name="classad-parser-old">
+ <output-dir compare="Text">classad-parser-old</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-library">
+ <compilation-unit name="getCapital">
+ <output-dir compare="Text">getCapital</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ <test-group name="external">
+ <test-case FilePath="external">
+ <compilation-unit name="invalid-format">
+ <output-dir compare="Text">invalid-format</output-dir>
+ <expected-error>Unknown format</expected-error>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ <test-group name="external-indexing">
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="text-format">
+ <output-dir compare="Text">text-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="sequence-format">
+ <output-dir compare="Text">sequence-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="rc-format">
+ <output-dir compare="Text">rc-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="rtree-index">
+ <output-dir compare="Text">rtree-index</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="leftouterjoin">
+ <output-dir compare="Text">leftouterjoin</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="leftouterjoin-rtree">
+ <output-dir compare="Text">leftouterjoin-rtree</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
<test-group name="upsert">
<test-case FilePath="upsert">
<compilation-unit name="filtered-dataset">
--
To view, visit https://asterix-gerrit.ics.uci.edu/918
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ce76ff5fd6611df5060a1de77742aba9d146ab5
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <bamou...@gmail.com>
