diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2021-11-11 16:00:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 16:00:21 +0800 |
| commit | 34240606f78395345ca7f6d7fe66a223c9bdf072 (patch) | |
| tree | 914f76c6587989a39fe1c0f421782126248fbe8e /other/java/client | |
| parent | b5389c3b23502da7315dd258715e146be7cc0fc9 (diff) | |
| parent | 835e2d2ddf959dc8dd234021ac3cde72bd9e9246 (diff) | |
| download | seaweedfs-34240606f78395345ca7f6d7fe66a223c9bdf072.tar.xz seaweedfs-34240606f78395345ca7f6d7fe66a223c9bdf072.zip | |
Merge pull request #87 from chrislusf/master
sync
Diffstat (limited to 'other/java/client')
| -rw-r--r-- | other/java/client/pom.xml | 4 | ||||
| -rw-r--r-- | other/java/client/pom.xml.deploy | 4 | ||||
| -rw-r--r-- | other/java/client/pom_debug.xml | 4 | ||||
| -rw-r--r-- | other/java/client/src/main/java/seaweedfs/client/RemoteUtil.java | 6 | ||||
| -rw-r--r-- | other/java/client/src/main/proto/filer.proto | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 751ac59d1..309c2b1ed 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -5,7 +5,7 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>1.6.9</version> + <version>1.7.0</version> <parent> <groupId>org.sonatype.oss</groupId> @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.5.6</version> + <version>4.5.13</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/other/java/client/pom.xml.deploy b/other/java/client/pom.xml.deploy index 0c961f215..8b96c9801 100644 --- a/other/java/client/pom.xml.deploy +++ b/other/java/client/pom.xml.deploy @@ -5,7 +5,7 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>1.6.9</version> + <version>1.7.0</version> <parent> <groupId>org.sonatype.oss</groupId> @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.5.6</version> + <version>4.5.13</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/other/java/client/pom_debug.xml b/other/java/client/pom_debug.xml index e31ff4f57..de120869d 100644 --- a/other/java/client/pom_debug.xml +++ b/other/java/client/pom_debug.xml @@ -5,7 +5,7 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>1.6.9</version> + <version>1.7.0</version> <parent> <groupId>org.sonatype.oss</groupId> @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.5.6</version> + <version>4.5.13</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/other/java/client/src/main/java/seaweedfs/client/RemoteUtil.java b/other/java/client/src/main/java/seaweedfs/client/RemoteUtil.java index 39c17644b..0d912272b 100644 --- a/other/java/client/src/main/java/seaweedfs/client/RemoteUtil.java +++ b/other/java/client/src/main/java/seaweedfs/client/RemoteUtil.java @@ -14,10 +14,10 @@ public class RemoteUtil { String dir = SeaweedOutputStream.getParentDirectory(fullpath); String name = SeaweedOutputStream.getFileName(fullpath); - final FilerProto.DownloadToLocalResponse downloadToLocalResponse = filerClient.getBlockingStub() - .downloadToLocal(FilerProto.DownloadToLocalRequest.newBuilder() + final FilerProto.CacheRemoteObjectToLocalClusterResponse response = filerClient.getBlockingStub() + .cacheRemoteObjectToLocalCluster(FilerProto.CacheRemoteObjectToLocalClusterRequest.newBuilder() .setDirectory(dir).setName(name).build()); - return downloadToLocalResponse.getEntry(); + return response.getEntry(); } } diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto index 24b651fe9..921ffc674 100644 --- a/other/java/client/src/main/proto/filer.proto +++ b/other/java/client/src/main/proto/filer.proto @@ -69,7 +69,7 @@ service SeaweedFiler { rpc KvPut (KvPutRequest) returns (KvPutResponse) { } - rpc DownloadToLocal (DownloadToLocalRequest) returns (DownloadToLocalResponse) { + rpc CacheRemoteObjectToLocalCluster (CacheRemoteObjectToLocalClusterRequest) returns (CacheRemoteObjectToLocalClusterResponse) { } } @@ -403,10 +403,10 @@ message FilerConf { ///////////////////////// // Remote Storage related ///////////////////////// -message DownloadToLocalRequest { +message CacheRemoteObjectToLocalClusterRequest { string directory = 1; string name = 2; } -message DownloadToLocalResponse { +message CacheRemoteObjectToLocalClusterResponse { Entry entry = 1; } |