Add database information to getDatabase calls

Cherry-pick of existing commit. orig-pr: #10796 orig-commit: 6a11b4b orig-commit-author: David Zhu <david@alluxio.com> pr-link: #10797 change-id: cid-697a204557028e2bc83640f6469ad633b78f3066
Alluxio · Jan 24, 2020 · 827b9a2 · 827b9a2
1 parent 5525fff
commit 827b9a2
Show file tree

Hide file tree

Showing 19 changed files with 2,758 additions and 278 deletions.
diff --git a/core/server/common/src/main/java/alluxio/master/journal/JournalEntryAssociation.java b/core/server/common/src/main/java/alluxio/master/journal/JournalEntryAssociation.java
@@ -60,6 +60,7 @@ public static String getMasterForEntry(JournalEntry entry) {
     if (entry.hasAttachDb()
         || entry.hasAddTable()
         || entry.hasDetachDb()
+        || entry.hasUpdateDatabaseInfo()
         || entry.hasAddTransformJobInfo()
         || entry.hasRemoveTransformJobInfo()
         || entry.hasCompleteTransformTable()) {

diff --git a/core/server/common/src/test/java/alluxio/master/journal/JournalEntryAssociationTest.java b/core/server/common/src/test/java/alluxio/master/journal/JournalEntryAssociationTest.java
@@ -89,6 +89,7 @@ public class JournalEntryAssociationTest {
       JournalEntry.newBuilder().setRename(RenameEntry.getDefaultInstance()).build(),
       JournalEntry.newBuilder().setSetAcl(SetAclEntry.getDefaultInstance()).build(),
       JournalEntry.newBuilder().setSetAttribute(SetAttributeEntry.getDefaultInstance()).build(),
+      JournalEntry.newBuilder().setUpdateDatabaseInfo(Table.UpdateDatabaseInfoEntry.getDefaultInstance()).build(),
       JournalEntry.newBuilder().setUpdateUfsMode(UpdateUfsModeEntry.getDefaultInstance()).build(),
       JournalEntry.newBuilder().setUpdateInode(UpdateInodeEntry.getDefaultInstance()).build(),
       JournalEntry.newBuilder().setUpdateInodeDirectory(UpdateInodeDirectoryEntry.getDefaultInstance()).build(),

diff --git a/core/transport/src/grpc/table/table_master.proto b/core/transport/src/grpc/table/table_master.proto
@@ -20,11 +20,19 @@ message Schema {
     repeated FieldSchema cols = 1;
 }
 
+enum PrincipalType {
+    USER = 0;
+    ROLE = 1;
+}
+
 message Database {
     optional string db_name = 1;
     optional string description = 2;
     optional string location = 3;
     map<string, string> parameter = 4;
+    optional string owner_name = 5;
+    optional PrincipalType owner_type = 6;
+    optional string comment = 7;
 }
 
 message TableInfo {