This is an automated email from the ASF dual-hosted git repository.
dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 12ff505 [NO ISSUE][COMP] Drop synonyms in MetadataNode
12ff505 is described below
commit 12ff50586b9990e1a0e974059ccde968846610bb
Author: Dmitry Lychagin <[email protected]>
AuthorDate: Wed Jan 15 15:30:22 2020 -0800
[NO ISSUE][COMP] Drop synonyms in MetadataNode
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Move code that drops synonyms when their dataverse
is deleted from QueryTranslator to MetadataNode
Change-Id: I97233a6c264d058166d5029d396bcfc539b4d35b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/4724
Tested-by: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Contrib: Jenkins <[email protected]>
Reviewed-by: Dmitry Lychagin <[email protected]>
Reviewed-by: Ali Alsuliman <[email protected]>
---
.../java/org/apache/asterix/app/translator/QueryTranslator.java | 8 --------
.../src/main/java/org/apache/asterix/metadata/MetadataNode.java | 6 ++++++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index b35d022..d87d9d9 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -1368,9 +1368,6 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
}
jobsToExecute.add(DataverseUtil.dropDataverseJobSpec(dv,
metadataProvider));
- // #. gather all synonyms in this dataverse
- List<Synonym> synonyms =
MetadataManager.INSTANCE.getDataverseSynonyms(mdTxnCtx, dataverseName);
-
// #. mark PendingDropOp on the dataverse record by
// first, deleting the dataverse record from the DATAVERSE_DATASET
// second, inserting the dataverse record with the PendingDropOp
value into the
@@ -1391,11 +1388,6 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
bActiveTxn = true;
metadataProvider.setMetadataTxnContext(mdTxnCtx);
- // #. delete synonyms in this dataverse
- for (Synonym synonym : synonyms) {
- MetadataManager.INSTANCE.dropSynonym(mdTxnCtx,
synonym.getDataverseName(), synonym.getSynonymName());
- }
-
// #. finally, delete the dataverse.
MetadataManager.INSTANCE.dropDataverse(mdTxnCtx, dataverseName);
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 4177c64..9413b3b 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -518,6 +518,12 @@ public class MetadataNode implements IMetadataNode {
try {
confirmDataverseCanBeDeleted(txnId, dataverseName);
+ // Drop all synonyms in this dataverse.
+ List<Synonym> dataverseSynonyms = getDataverseSynonyms(txnId,
dataverseName);
+ for (Synonym synonym : dataverseSynonyms) {
+ dropSynonym(txnId, dataverseName, synonym.getSynonymName());
+ }
+
// As a side effect, acquires an S lock on the 'Function' dataset
// on behalf of txnId.
List<Function> dataverseFunctions = getDataverseFunctions(txnId,
dataverseName);
