Change in asterixdb[stabilization-0795ad31de]: [NO ISSUE]: add dataset for index and synonym

[AsterixDB Code Review]

>From Janhavi Tripurwar <janhavi.tripur...@couchbase.com>:

Janhavi Tripurwar has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20169 )


Change subject: [NO ISSUE]: add dataset for index and synonym
......................................................................

[NO ISSUE]: add dataset for index and synonym

Change-Id: Ia624a58634f394402f1a9f694edf99d000ef5438
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M 
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
2 files changed, 32 insertions(+), 6 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/69/20169/1

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 30c1b8b..ba9fc5d 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
@@ -1674,7 +1674,7 @@
                     stmtCreateIndex.isEnforced(), false, 
MetadataUtil.PENDING_ADD_OP, creator);

             bActiveTxn = false; // doCreateIndexImpl() takes over the current 
transaction
-            EntityDetails entityDetails = EntityDetails.newIndex(databaseName, 
dataverseName, indexName);
+            EntityDetails entityDetails = EntityDetails.newIndex(databaseName, 
dataverseName, datasetName, indexName);
             doCreateIndexImpl(hcc, metadataProvider, ds, newIndex, jobFlags, 
sourceLoc, creator, entityDetails);

         } catch (Exception e) {
@@ -4040,7 +4040,7 @@
                     objectNamespace.getDataverseName(), objectName, creator);
             
MetadataManager.INSTANCE.addSynonym(metadataProvider.getMetadataTxnContext(), 
synonym);
             beforeTxnCommit(metadataProvider, creator,
-                    EntityDetails.newSynonym(databaseName, dataverseName, 
synonymName));
+                    EntityDetails.newSynonym(databaseName, dataverseName, 
objectName, synonymName));
             MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
             return CreateResult.CREATED;
         } catch (Exception e) {
diff --git 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
index 068fb20..3dd430d 100644
--- 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
+++ 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
@@ -48,6 +48,8 @@
     private final EntityType entityType;
     // The number of arguments that the function accepts. Relevant only for 
function entity.
     private int functionArity;
+    // The name of the dataset, only applicable for index and synonym entities.
+    private String datasetName;

     private EntityDetails(String databaseName, DataverseName dataverseName, 
String entityName, EntityType entityType) {
         this.databaseName = databaseName;
@@ -65,6 +67,15 @@
         this.functionArity = functionArity;
     }

+    private EntityDetails(String databaseName, DataverseName dataverseName, 
String datasetName, String entityName,
+            EntityType entityType) {
+        this.databaseName = databaseName;
+        this.dataverseName = dataverseName;
+        this.datasetName = datasetName;
+        this.entityName = entityName;
+        this.entityType = entityType;
+    }
+
     public static EntityDetails newDatabase(String databaseName) {
         return new EntityDetails(databaseName, null, null, 
EntityType.DATABASE);
     }
@@ -96,12 +107,14 @@
                 functionArity);
     }

-    public static EntityDetails newSynonym(String databaseName, DataverseName 
dataverseName, String synonymName) {
-        return new EntityDetails(databaseName, dataverseName, synonymName, 
EntityType.SYNONYM);
+    public static EntityDetails newSynonym(String databaseName, DataverseName 
dataverseName, String datasetName,
+            String synonymName) {
+        return new EntityDetails(databaseName, dataverseName, datasetName, 
synonymName, EntityType.SYNONYM);
     }

-    public static EntityDetails newIndex(String databaseName, DataverseName 
dataverseName, String indexName) {
-        return new EntityDetails(databaseName, dataverseName, indexName, 
EntityType.INDEX);
+    public static EntityDetails newIndex(String databaseName, DataverseName 
dataverseName, String datasetName,
+            String indexName) {
+        return new EntityDetails(databaseName, dataverseName, datasetName, 
indexName, EntityType.INDEX);
     }

     public static EntityDetails newExtension(String extensionName) {
@@ -128,6 +141,10 @@
         return functionArity;
     }

+    public String getDatasetName() {
+        return datasetName;
+    }
+
     public static boolean isBuiltinFunctionSignature(FunctionSignature fs) {
         return 
isBuiltinFunctionDataverse(Objects.requireNonNull(fs.getDataverseName()))
                 || 
BuiltinFunctions.getBuiltinFunctionInfo(fs.createFunctionIdentifier()) != null;

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20169
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-0795ad31de
Gerrit-Change-Id: Ia624a58634f394402f1a9f694edf99d000ef5438
Gerrit-Change-Number: 20169
Gerrit-PatchSet: 1
Gerrit-Owner: Janhavi Tripurwar <janhavi.tripur...@couchbase.com>
Gerrit-MessageType: newchange