From 99b599aa8a674ccd584d612e8e871fdca7670620 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Mon, 26 Jul 2021 22:53:44 -0700
Subject: remote.mount

---
 other/java/client/src/main/proto/filer.proto | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'other/java/client/src')

diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto
index 803a2ce32..23c841f18 100644
--- a/other/java/client/src/main/proto/filer.proto
+++ b/other/java/client/src/main/proto/filer.proto
@@ -92,6 +92,12 @@ message ListEntriesResponse {
     Entry entry = 1;
 }
 
+message RemoteEntry {
+    int64 last_modified_at = 1;
+    int64 size = 2;
+    string e_tag = 3;
+    string storage_name = 4;
+}
 message Entry {
     string name = 1;
     bool is_directory = 2;
@@ -102,12 +108,7 @@ message Entry {
     int32 hard_link_counter = 8; // only exists in hard link meta data
     bytes content = 9; // if not empty, the file content
 
-    message Remote {
-        int64 last_modified_at = 1;
-        int64 size = 2;
-        string e_tag = 3;
-    }
-    Remote remote = 10;
+    RemoteEntry remote_entry = 10;
 }
 
 message FullEntry {
-- 
cgit v1.2.3


From 4b94b03d90a97dfd6fecc55e7091055bf5fc329c Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Tue, 27 Jul 2021 01:16:28 -0700
Subject: directory to remote storage mapping

---
 other/java/client/src/main/proto/filer.proto | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'other/java/client/src')

diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto
index 23c841f18..12f9a8505 100644
--- a/other/java/client/src/main/proto/filer.proto
+++ b/other/java/client/src/main/proto/filer.proto
@@ -344,7 +344,9 @@ message LocateBrokerResponse {
     repeated Resource resources = 2;
 }
 
+/////////////////////////
 // Key-Value operations
+/////////////////////////
 message KvGetRequest {
     bytes key = 1;
 }
@@ -360,7 +362,9 @@ message KvPutResponse {
     string error = 1;
 }
 
+/////////////////////////
 // path-based configurations
+/////////////////////////
 message FilerConf {
     int32 version = 1;
     message PathConf {
@@ -376,6 +380,9 @@ message FilerConf {
     repeated PathConf locations = 2;
 }
 
+/////////////////////////
+// Remote Storage related
+/////////////////////////
 message RemoteConf {
     string type = 1;
     string name = 2;
@@ -384,3 +391,11 @@ message RemoteConf {
     string s3_region = 6;
     string s3_endpoint = 7;
 }
+
+message RemoteStorageMappingList {
+    repeated RemoteStorageMapping mappings = 1;
+}
+message RemoteStorageMapping {
+    string dir = 1;
+    string remote_storage_name = 2;
+}
-- 
cgit v1.2.3


From 1752eeb53803736f72d85d35f504997744288716 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Tue, 27 Jul 2021 03:26:35 -0700
Subject: remote.mount saves the mapping

---
 other/java/client/src/main/proto/filer.proto | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'other/java/client/src')

diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto
index 12f9a8505..efecc4e97 100644
--- a/other/java/client/src/main/proto/filer.proto
+++ b/other/java/client/src/main/proto/filer.proto
@@ -392,10 +392,6 @@ message RemoteConf {
     string s3_endpoint = 7;
 }
 
-message RemoteStorageMappingList {
-    repeated RemoteStorageMapping mappings = 1;
-}
 message RemoteStorageMapping {
-    string dir = 1;
-    string remote_storage_name = 2;
+    map<string,string> mappings = 1;
 }
-- 
cgit v1.2.3


From 899963ac20556f6a48aad431eec8ec995e982dd3 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Thu, 29 Jul 2021 02:08:55 -0700
Subject: remote storage location changed to struct

---
 other/java/client/src/main/proto/filer.proto | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'other/java/client/src')

diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto
index efecc4e97..1a5cfe79b 100644
--- a/other/java/client/src/main/proto/filer.proto
+++ b/other/java/client/src/main/proto/filer.proto
@@ -393,5 +393,10 @@ message RemoteConf {
 }
 
 message RemoteStorageMapping {
-    map<string,string> mappings = 1;
+    map<string,RemoteStorageLocation> mappings = 1;
+}
+message RemoteStorageLocation {
+    string name = 1;
+    string bucket = 2;
+    string path = 3;
 }
-- 
cgit v1.2.3