11//! ObjectStore implemented based on fs
22
3+ use std:: collections:: HashMap ;
34use std:: fs:: create_dir_all;
45use std:: path:: { Path , PathBuf , MAIN_SEPARATOR } ;
6+ use std:: sync:: Arc ;
57
68use anyhow:: { anyhow, Context , Result } ;
9+ use jsonrpc_core:: futures_util:: { FutureExt , TryFutureExt } ;
710
8- use super :: { ObjResult , ObjectStore } ;
9- use crate :: logging:: trace;
10-
11- const LOG_TARGET : & str = "filestore" ;
11+ use super :: { ObjResult , ObjectStore , ObjectStoreError } ;
12+ use crate :: { logging:: trace, rpc:: sealer:: SealerClient , sealing:: call_rpc} ;
1213
1314/// FileStore
1415pub struct FileStore {
15- sep : String ,
1616 local_path : PathBuf ,
1717 instance : String ,
1818 readonly : bool ,
19+ rpc : Arc < SealerClient > ,
1920}
2021
2122impl FileStore {
@@ -27,7 +28,7 @@ impl FileStore {
2728 }
2829
2930 /// open the file store at given path
30- pub fn open < P : AsRef < Path > > ( p : P , ins : Option < String > , readonly : bool ) -> Result < Self > {
31+ pub fn open < P : AsRef < Path > > ( p : P , ins : Option < String > , readonly : bool , rpc : Arc < SealerClient > ) -> Result < Self > {
3132 let dir_path = p. as_ref ( ) . canonicalize ( ) . context ( "canonicalize dir path" ) ?;
3233 if !dir_path. metadata ( ) . context ( "read dir metadata" ) . map ( |meta| meta. is_dir ( ) ) ? {
3334 return Err ( anyhow ! ( "base path of the file store should a dir" ) ) ;
@@ -39,67 +40,31 @@ impl FileStore {
3940 } ;
4041
4142 Ok ( FileStore {
42- sep : MAIN_SEPARATOR . to_string ( ) ,
4343 local_path : dir_path,
4444 instance,
4545 readonly,
46+ rpc,
4647 } )
4748 }
48-
49- fn path < P : AsRef < Path > > ( & self , sub : P ) -> ObjResult < PathBuf > {
50- let mut p = sub. as_ref ( ) ;
51- if p. starts_with ( "." ) {
52- return Err ( anyhow ! ( "sub path starts with dot" ) . into ( ) ) ;
53- }
54-
55- // try to strip the first any only the first sep
56- if let Ok ( strip) = p. strip_prefix ( & self . sep ) {
57- p = strip;
58- }
59-
60- if p. starts_with ( & self . sep ) {
61- return Err ( anyhow ! ( "sub path starts with separator" ) . into ( ) ) ;
62- }
63-
64- let res = self . local_path . join ( p) ;
65- trace ! ( target: LOG_TARGET , ?res, "get full path" ) ;
66- Ok ( res)
67- }
6849}
6950
7051impl ObjectStore for FileStore {
7152 fn instance ( & self ) -> String {
7253 self . instance . clone ( )
7354 }
7455
75- fn uri ( & self , rel : & Path ) -> ObjResult < PathBuf > {
76- self . path ( rel)
56+ fn uri ( & self , resource_name : & str ) -> ObjResult < String > {
57+ let uri = call_rpc ! {
58+ self . rpc=>store_uri(
59+ self . instance( ) ,
60+ resource_name. to_string( ) ,
61+ )
62+ }
63+ . map_err ( |e| ObjectStoreError :: Other ( e. 1 ) ) ?;
64+ Ok ( self . local_path . join ( uri) . display ( ) . to_string ( ) )
7765 }
7866
7967 fn readonly ( & self ) -> bool {
8068 self . readonly
8169 }
8270}
83-
84- #[ cfg( test) ]
85- mod tests {
86- use super :: * ;
87-
88- #[ test]
89- fn test_path ( ) {
90- let fs = FileStore :: open ( "/tmp" , None , false ) . unwrap ( ) ;
91- assert_eq ! ( fs. path( "/a/b" ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
92- assert_eq ! ( fs. path( "a/b" ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
93- assert_eq ! ( fs. path( "a/b/" ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
94- assert_eq ! ( fs. path( "/a/b/" ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
95- }
96-
97- #[ test]
98- fn test_store_uri ( ) {
99- let fs = FileStore :: open ( "/tmp/" , Some ( "test_store" . to_string ( ) ) , false ) . unwrap ( ) ;
100- assert_eq ! ( fs. uri( Path :: new( "a/b" ) ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
101- assert_eq ! ( fs. uri( Path :: new( "/a/b" ) ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
102- assert_eq ! ( fs. uri( Path :: new( "a/b/" ) ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
103- assert_eq ! ( fs. uri( Path :: new( "/a/b/" ) ) . unwrap( ) , PathBuf :: from( "/tmp/a/b" ) ) ;
104- }
105- }
0 commit comments