>From Ali Alsuliman <[email protected]>:
Ali Alsuliman has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20207 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/ionic'
* [NO ISSUE][OTH] Extend create/drop view/synonym calls with the request
parameters
Ext-ref: MB-55519
Change-Id: I10e0da93dd001608a572665451a1ef8ac7b98f57
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
2 files changed, 23 insertions(+), 39 deletions(-)
Approvals:
Jenkins: Verified
Ali Alsuliman: Looks good to me, but someone else must approve; Verified
Michael Blow: Looks good to me, approved
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 531ca51..f921ff0 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
@@ -473,12 +473,8 @@
handleLibraryDropStatement(metadataProvider, stmt,
hcc, requestParameters);
break;
case CREATE_SYNONYM:
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
handleCreateSynonymStatement(metadataProvider, stmt,
requestParameters,
Creator.DEFAULT_CREATOR);
-=======
- handleCreateSynonymStatement(metadataProvider, stmt,
requestParameters);
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
break;
case SYNONYM_DROP:
handleDropSynonymStatement(metadataProvider, stmt,
requestParameters);
@@ -3126,21 +3122,13 @@
}
lockUtil.dropDatasetBegin(lockManager, metadataProvider.getLocks(),
databaseName, dataverseName, viewName);
try {
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
doDropView(metadataProvider, stmtDrop, databaseName,
dataverseName, viewName, requestParameters);
-=======
- doDropView(metadataProvider, stmtDrop, dataverseName, viewName,
requestParameters);
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
} finally {
metadataProvider.getLocks().unlock();
}
}
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
protected boolean doDropView(MetadataProvider metadataProvider,
ViewDropStatement stmtViewDrop, String databaseName,
-=======
- protected boolean doDropView(MetadataProvider metadataProvider,
ViewDropStatement stmtViewDrop,
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
DataverseName dataverseName, String viewName, IRequestParameters
requestParameters) throws Exception {
SourceLocation sourceLoc = stmtViewDrop.getSourceLocation();
MetadataTransactionContext mdTxnCtx =
MetadataManager.INSTANCE.beginTransaction();
@@ -3999,11 +3987,7 @@
}
protected void handleCreateSynonymStatement(MetadataProvider
metadataProvider, Statement stmt,
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
IRequestParameters requestParameters, Creator creator) throws
Exception {
-=======
- IRequestParameters requestParameters) throws Exception {
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
CreateSynonymStatement css = (CreateSynonymStatement) stmt;
metadataProvider.validateDatabaseObjectName(css.getNamespace(),
css.getSynonymName(), css.getSourceLocation());
Namespace stmtActiveNamespace = getActiveNamespace(css.getNamespace());
@@ -4017,28 +4001,18 @@
}
lockUtil.createSynonymBegin(lockManager, metadataProvider.getLocks(),
databaseName, dataverseName, synonymName);
try {
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
doCreateSynonym(metadataProvider, css, stmtActiveNamespace,
synonymName, objectNamespace, objectName,
- creator);
-=======
- doCreateSynonym(metadataProvider, css, dataverseName, synonymName,
objectDataverseName, objectName,
- requestParameters, true);
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ creator, requestParameters, true);
} finally {
metadataProvider.getLocks().unlock();
}
}
protected CreateResult doCreateSynonym(MetadataProvider metadataProvider,
CreateSynonymStatement css,
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
- Namespace namespace, String synonymName, Namespace
objectNamespace, String objectName, Creator creator)
- throws Exception {
+ Namespace namespace, String synonymName, Namespace
objectNamespace, String objectName, Creator creator,
+ IRequestParameters requestParameters, boolean
viaCreateSynonymStatement) throws Exception {
String databaseName = namespace.getDatabaseName();
DataverseName dataverseName = namespace.getDataverseName();
-=======
- DataverseName dataverseName, String synonymName, DataverseName
objectDataverseName, String objectName,
- IRequestParameters requestParameters, boolean
viaCreateSynonymStatement) throws Exception {
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
MetadataTransactionContext mdTxnCtx =
MetadataManager.INSTANCE.beginTransaction();
metadataProvider.setMetadataTxnContext(mdTxnCtx);
try {
@@ -4087,23 +4061,16 @@
}
lockUtil.dropSynonymBegin(lockManager, metadataProvider.getLocks(),
databaseName, dataverseName, synonymName);
try {
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
- doDropSynonym(metadataProvider, stmtSynDrop, databaseName,
dataverseName, synonymName);
-=======
- doDropSynonym(metadataProvider, stmtSynDrop, dataverseName,
synonymName, requestParameters, true);
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ doDropSynonym(metadataProvider, stmtSynDrop, databaseName,
dataverseName, synonymName, requestParameters,
+ true);
} finally {
metadataProvider.getLocks().unlock();
}
}
protected boolean doDropSynonym(MetadataProvider metadataProvider,
SynonymDropStatement stmtSynDrop,
-<<<<<<< HEAD (2f34b3 [NO ISSUE][STO] Fixed multiple issue)
- String databaseName, DataverseName dataverseName, String
synonymName) throws Exception {
-=======
- DataverseName dataverseName, String synonymName,
IRequestParameters requestParameters,
+ String databaseName, DataverseName dataverseName, String
synonymName, IRequestParameters requestParameters,
boolean viaDropSynonymStatement) throws Exception {
->>>>>>> BRANCH (d23cc2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
MetadataTransactionContext mdTxnCtx =
MetadataManager.INSTANCE.beginTransaction();
metadataProvider.setMetadataTxnContext(mdTxnCtx);
try {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20207
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: I10e0da93dd001608a572665451a1ef8ac7b98f57
Gerrit-Change-Number: 20207
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
