Skip to content

Commit 728080e

Browse files
committed
chore: rename ServiceAccessor => ServiceBackend
1 parent f718735 commit 728080e

File tree

8 files changed

+47
-46
lines changed

8 files changed

+47
-46
lines changed

core/src/services/cacache/backend.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl Builder for CacacheBuilder {
6868
..Default::default()
6969
});
7070

71-
Ok(CacacheAccessor {
71+
Ok(CacacheBackend {
7272
core: Arc::new(core),
7373
info: Arc::new(info),
7474
})
@@ -77,12 +77,12 @@ impl Builder for CacacheBuilder {
7777

7878
/// Backend for cacache services.
7979
#[derive(Debug, Clone)]
80-
pub struct CacacheAccessor {
80+
pub struct CacacheBackend {
8181
core: Arc<CacacheCore>,
8282
info: Arc<AccessorInfo>,
8383
}
8484

85-
impl Access for CacacheAccessor {
85+
impl Access for CacacheBackend {
8686
type Reader = Buffer;
8787
type Writer = CacacheWriter;
8888
type Lister = ();

core/src/services/cloudflare_kv/backend.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl Builder for CloudflareKvBuilder {
142142
.as_str(),
143143
);
144144

145-
Ok(CloudflareKvAccessor {
145+
Ok(CloudflareKvBackend {
146146
core: Arc::new(CloudflareKvCore {
147147
api_token,
148148
account_id,
@@ -197,17 +197,17 @@ impl Builder for CloudflareKvBuilder {
197197
}
198198

199199
#[derive(Debug, Clone)]
200-
pub struct CloudflareKvAccessor {
201-
core: std::sync::Arc<CloudflareKvCore>,
200+
pub struct CloudflareKvBackend {
201+
core: Arc<CloudflareKvCore>,
202202
}
203203

204-
impl Access for CloudflareKvAccessor {
204+
impl Access for CloudflareKvBackend {
205205
type Reader = Buffer;
206206
type Writer = oio::OneShotWriter<CloudflareWriter>;
207207
type Lister = oio::PageLister<CloudflareKvLister>;
208208
type Deleter = oio::BatchDeleter<CloudflareKvDeleter>;
209209

210-
fn info(&self) -> std::sync::Arc<AccessorInfo> {
210+
fn info(&self) -> Arc<AccessorInfo> {
211211
self.core.info.clone()
212212
}
213213

core/src/services/dashmap/backend.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@ impl Builder for DashmapBuilder {
6969
cache: DashMap::new(),
7070
};
7171

72-
Ok(DashmapAccessor::new(core, root))
72+
Ok(DashmapBackend::new(core, root))
7373
}
7474
}
7575

7676
#[derive(Debug, Clone)]
77-
pub struct DashmapAccessor {
77+
pub struct DashmapBackend {
7878
core: Arc<DashmapCore>,
7979
root: String,
8080
info: Arc<AccessorInfo>,
8181
}
8282

83-
impl DashmapAccessor {
83+
impl DashmapBackend {
8484
fn new(core: DashmapCore, root: String) -> Self {
8585
let info = AccessorInfo::default();
8686
info.set_scheme(DASHMAP_SCHEME);
@@ -111,7 +111,7 @@ impl DashmapAccessor {
111111
}
112112
}
113113

114-
impl Access for DashmapAccessor {
114+
impl Access for DashmapBackend {
115115
type Reader = Buffer;
116116
type Writer = DashmapWriter;
117117
type Lister = oio::HierarchyLister<DashmapLister>;

core/src/services/etcd/backend.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl Builder for EtcdBuilder {
166166
options,
167167
};
168168

169-
Ok(EtcdAccessor::new(core, &root))
169+
Ok(EtcdBackend::new(core, &root))
170170
}
171171
}
172172

@@ -178,12 +178,12 @@ impl EtcdBuilder {
178178
}
179179

180180
#[derive(Debug, Clone)]
181-
pub struct EtcdAccessor {
181+
pub struct EtcdBackend {
182182
core: Arc<EtcdCore>,
183183
info: Arc<AccessorInfo>,
184184
}
185185

186-
impl EtcdAccessor {
186+
impl EtcdBackend {
187187
fn new(core: EtcdCore, root: &str) -> Self {
188188
let info = AccessorInfo::default();
189189
info.set_scheme(ETCD_SCHEME);
@@ -211,7 +211,7 @@ impl EtcdAccessor {
211211
}
212212
}
213213

214-
impl Access for EtcdAccessor {
214+
impl Access for EtcdBackend {
215215
type Reader = Buffer;
216216
type Writer = EtcdWriter;
217217
type Lister = oio::HierarchyLister<EtcdLister>;

core/src/services/memory/backend.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ impl Builder for MemoryBuilder {
5050
let root = normalize_root(self.config.root.as_deref().unwrap_or("/"));
5151

5252
let core = MemoryCore::new();
53-
Ok(MemoryAccessor::new(core).with_normalized_root(root))
53+
Ok(MemoryBackend::new(core).with_normalized_root(root))
5454
}
5555
}
5656

5757
/// MemoryAccessor implements Access trait directly
5858
#[derive(Debug, Clone)]
59-
pub struct MemoryAccessor {
59+
pub struct MemoryBackend {
6060
core: Arc<MemoryCore>,
6161
root: String,
6262
info: Arc<AccessorInfo>,
6363
}
6464

65-
impl MemoryAccessor {
65+
impl MemoryBackend {
6666
fn new(core: MemoryCore) -> Self {
6767
let info = AccessorInfo::default();
6868
info.set_scheme(MEMORY_SCHEME);
@@ -98,7 +98,7 @@ impl MemoryAccessor {
9898
}
9999
}
100100

101-
impl Access for MemoryAccessor {
101+
impl Access for MemoryBackend {
102102
type Reader = Buffer;
103103
type Writer = MemoryWriter;
104104
type Lister = oio::HierarchyLister<MemoryLister>;

core/src/services/moka/backend.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,19 @@ impl Builder for MokaBuilder {
178178
cache: builder.build(),
179179
};
180180

181-
Ok(MokaAccessor::new(core).with_normalized_root(root))
181+
Ok(MokaBackend::new(core).with_normalized_root(root))
182182
}
183183
}
184184

185185
/// MokaAccessor implements Access trait directly
186186
#[derive(Debug, Clone)]
187-
pub struct MokaAccessor {
187+
pub struct MokaBackend {
188188
core: Arc<MokaCore>,
189189
root: String,
190190
info: Arc<AccessorInfo>,
191191
}
192192

193-
impl MokaAccessor {
193+
impl MokaBackend {
194194
fn new(core: MokaCore) -> Self {
195195
let info = AccessorInfo::default();
196196
info.set_scheme(MOKA_SCHEME);
@@ -225,7 +225,7 @@ impl MokaAccessor {
225225
}
226226
}
227227

228-
impl Access for MokaAccessor {
228+
impl Access for MokaBackend {
229229
type Reader = Buffer;
230230
type Writer = MokaWriter;
231231
type Lister = oio::HierarchyLister<MokaLister>;

core/src/services/redis/backend.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717

1818
use std::path::PathBuf;
19+
use std::sync::Arc;
1920
use std::time::Duration;
2021

2122
use http::Uri;
@@ -153,7 +154,7 @@ impl Builder for RedisBuilder {
153154

154155
let conn = OnceCell::new();
155156

156-
Ok(RedisAccessor::new(RedisCore {
157+
Ok(RedisBackend::new(RedisCore {
157158
addr: endpoints,
158159
client: None,
159160
cluster_client: Some(client),
@@ -178,7 +179,7 @@ impl Builder for RedisBuilder {
178179
})?;
179180

180181
let conn = OnceCell::new();
181-
Ok(RedisAccessor::new(RedisCore {
182+
Ok(RedisBackend::new(RedisCore {
182183
addr: endpoint,
183184
client: Some(client),
184185
cluster_client: None,
@@ -250,13 +251,13 @@ impl RedisBuilder {
250251

251252
/// RedisAccessor implements Access trait directly
252253
#[derive(Debug, Clone)]
253-
pub struct RedisAccessor {
254-
core: std::sync::Arc<RedisCore>,
254+
pub struct RedisBackend {
255+
core: Arc<RedisCore>,
255256
root: String,
256-
info: std::sync::Arc<AccessorInfo>,
257+
info: Arc<AccessorInfo>,
257258
}
258259

259-
impl RedisAccessor {
260+
impl RedisBackend {
260261
fn new(core: RedisCore) -> Self {
261262
let info = AccessorInfo::default();
262263
info.set_scheme(REDIS_SCHEME);
@@ -273,9 +274,9 @@ impl RedisAccessor {
273274
});
274275

275276
Self {
276-
core: std::sync::Arc::new(core),
277+
core: Arc::new(core),
277278
root: "/".to_string(),
278-
info: std::sync::Arc::new(info),
279+
info: Arc::new(info),
279280
}
280281
}
281282

@@ -286,13 +287,13 @@ impl RedisAccessor {
286287
}
287288
}
288289

289-
impl Access for RedisAccessor {
290+
impl Access for RedisBackend {
290291
type Reader = Buffer;
291292
type Writer = RedisWriter;
292293
type Lister = ();
293294
type Deleter = oio::OneShotDeleter<RedisDeleter>;
294295

295-
fn info(&self) -> std::sync::Arc<AccessorInfo> {
296+
fn info(&self) -> Arc<AccessorInfo> {
296297
self.info.clone()
297298
}
298299

core/src/services/sqlite/backend.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
use std::fmt::Debug;
1918
use std::str::FromStr;
19+
use std::sync::Arc;
2020

2121
use sqlx::sqlite::SqliteConnectOptions;
2222
use tokio::sync::OnceCell;
@@ -136,7 +136,7 @@ impl Builder for SqliteBuilder {
136136

137137
let root = normalize_root(self.config.root.as_deref().unwrap_or("/"));
138138

139-
Ok(SqliteAccessor::new(SqliteCore {
139+
Ok(SqliteBackend::new(SqliteCore {
140140
pool: OnceCell::new(),
141141
config,
142142
table,
@@ -168,13 +168,13 @@ pub fn parse_sqlite_error(err: sqlx::Error) -> Error {
168168

169169
/// SqliteAccessor implements Access trait directly
170170
#[derive(Debug, Clone)]
171-
pub struct SqliteAccessor {
172-
core: std::sync::Arc<SqliteCore>,
171+
pub struct SqliteBackend {
172+
core: Arc<SqliteCore>,
173173
root: String,
174-
info: std::sync::Arc<AccessorInfo>,
174+
info: Arc<AccessorInfo>,
175175
}
176176

177-
impl SqliteAccessor {
177+
impl SqliteBackend {
178178
fn new(core: SqliteCore) -> Self {
179179
let info = AccessorInfo::default();
180180
info.set_scheme(Scheme::Sqlite.into());
@@ -193,9 +193,9 @@ impl SqliteAccessor {
193193
});
194194

195195
Self {
196-
core: std::sync::Arc::new(core),
196+
core: Arc::new(core),
197197
root: "/".to_string(),
198-
info: std::sync::Arc::new(info),
198+
info: Arc::new(info),
199199
}
200200
}
201201

@@ -206,13 +206,13 @@ impl SqliteAccessor {
206206
}
207207
}
208208

209-
impl Access for SqliteAccessor {
209+
impl Access for SqliteBackend {
210210
type Reader = Buffer;
211211
type Writer = SqliteWriter;
212212
type Lister = ();
213213
type Deleter = oio::OneShotDeleter<SqliteDeleter>;
214214

215-
fn info(&self) -> std::sync::Arc<AccessorInfo> {
215+
fn info(&self) -> Arc<AccessorInfo> {
216216
self.info.clone()
217217
}
218218

@@ -331,7 +331,7 @@ mod test {
331331
value_field: "value".to_string(),
332332
};
333333

334-
let accessor = SqliteAccessor::new(core);
334+
let accessor = SqliteBackend::new(core);
335335

336336
// Verify basic properties
337337
assert_eq!(accessor.root, "/");
@@ -355,7 +355,7 @@ mod test {
355355
value_field: "value".to_string(),
356356
};
357357

358-
let accessor = SqliteAccessor::new(core).with_normalized_root("/test/".to_string());
358+
let accessor = SqliteBackend::new(core).with_normalized_root("/test/".to_string());
359359

360360
assert_eq!(accessor.root, "/test/");
361361
assert_eq!(accessor.info.root(), "/test/".into());

0 commit comments

Comments
 (0)