Skip to content

Commit 15b365b

Browse files
authored
fix: rename as_bytes to as_byte in ReadableSize (apache#428) (apache#767)
* fix: rename as_bytes to as_byte in ReadableSize (apache#428) * style: fmt server.rs
1 parent c54d931 commit 15b365b

File tree

6 files changed

+37
-34
lines changed

6 files changed

+37
-34
lines changed

analytic_engine/src/compaction/picker.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ impl LevelPicker for SizeTieredPicker {
239239
segment.to_vec(),
240240
opts.bucket_high,
241241
opts.bucket_low,
242-
opts.min_sstable_size.as_bytes() as f32,
242+
opts.min_sstable_size.as_byte() as f32,
243243
);
244244

245245
let files = Self::most_interesting_bucket(
246246
buckets,
247247
opts.min_threshold,
248248
opts.max_threshold,
249-
opts.max_input_sstable_size.as_bytes(),
249+
opts.max_input_sstable_size.as_byte(),
250250
);
251251

252252
if files.is_some() {
@@ -497,13 +497,13 @@ impl TimeWindowPicker {
497497
bucket.to_vec(),
498498
size_tiered_opts.bucket_high,
499499
size_tiered_opts.bucket_low,
500-
size_tiered_opts.min_sstable_size.as_bytes() as f32,
500+
size_tiered_opts.min_sstable_size.as_byte() as f32,
501501
);
502502
let files = SizeTieredPicker::most_interesting_bucket(
503503
buckets,
504504
size_tiered_opts.min_threshold,
505505
size_tiered_opts.max_threshold,
506-
size_tiered_opts.max_input_sstable_size.as_bytes(),
506+
size_tiered_opts.max_input_sstable_size.as_byte(),
507507
);
508508

509509
if files.is_some() {

analytic_engine/src/compaction/scheduler.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ impl SchedulerImpl {
310310
request_buf: RwLock::new(RequestQueue::default()),
311311
}),
312312
running: running.clone(),
313-
memory_limit: MemoryLimit::new(config.memory_limit.as_bytes() as usize),
313+
memory_limit: MemoryLimit::new(config.memory_limit.as_byte() as usize),
314314
};
315315

316316
let handle = runtime.spawn(async move {

analytic_engine/src/instance/open.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Instance {
7575
space_store.clone(),
7676
bg_runtime.clone(),
7777
scheduler_config,
78-
ctx.config.write_sst_max_buffer_size.as_bytes() as usize,
78+
ctx.config.write_sst_max_buffer_size.as_byte() as usize,
7979
scan_options_for_compaction,
8080
));
8181

@@ -104,11 +104,11 @@ impl Instance {
104104
db_write_buffer_size: ctx.config.db_write_buffer_size,
105105
space_write_buffer_size: ctx.config.space_write_buffer_size,
106106
replay_batch_size: ctx.config.replay_batch_size,
107-
write_sst_max_buffer_size: ctx.config.write_sst_max_buffer_size.as_bytes() as usize,
107+
write_sst_max_buffer_size: ctx.config.write_sst_max_buffer_size.as_byte() as usize,
108108
max_bytes_per_write_batch: ctx
109109
.config
110110
.max_bytes_per_write_batch
111-
.map(|v| v.as_bytes() as usize),
111+
.map(|v| v.as_byte() as usize),
112112
iter_options,
113113
scan_options,
114114
remote_engine: remote_engine_ref,

analytic_engine/src/setup.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ fn open_storage(
462462
}
463463
};
464464

465-
if opts.disk_cache_capacity.as_bytes() > 0 {
465+
if opts.disk_cache_capacity.as_byte() > 0 {
466466
let path = Path::new(&opts.disk_cache_dir).join(DISK_CACHE_DIR_NAME);
467467
tokio::fs::create_dir_all(&path).await.context(CreateDir {
468468
path: path.to_string_lossy().into_owned(),
@@ -471,20 +471,20 @@ fn open_storage(
471471
store = Arc::new(
472472
DiskCacheStore::try_new(
473473
path.to_string_lossy().into_owned(),
474-
opts.disk_cache_capacity.as_bytes() as usize,
475-
opts.disk_cache_page_size.as_bytes() as usize,
474+
opts.disk_cache_capacity.as_byte() as usize,
475+
opts.disk_cache_page_size.as_byte() as usize,
476476
store,
477477
)
478478
.await
479479
.context(OpenObjectStore)?,
480480
) as _;
481481
}
482482

483-
if opts.mem_cache_capacity.as_bytes() > 0 {
483+
if opts.mem_cache_capacity.as_byte() > 0 {
484484
let mem_cache = Arc::new(
485485
MemCache::try_new(
486486
opts.mem_cache_partition_bits,
487-
NonZeroUsize::new(opts.mem_cache_capacity.as_bytes() as usize).unwrap(),
487+
NonZeroUsize::new(opts.mem_cache_capacity.as_byte() as usize).unwrap(),
488488
)
489489
.context(OpenMemCache)?,
490490
);

common_util/src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl ReadableSize {
146146
self.0 / MIB
147147
}
148148

149-
pub const fn as_bytes(self) -> u64 {
149+
pub const fn as_byte(self) -> u64 {
150150
self.0
151151
}
152152
}

server/src/server.rs

+23-20
Original file line numberDiff line numberDiff line change
@@ -355,26 +355,29 @@ impl<Q: QueryExecutor + 'static> Builder<Q> {
355355
.context(BuildMysqlService)?;
356356

357357
let router = self.router.context(MissingRouter)?;
358-
let rpc_services = grpc::Builder::new()
359-
.endpoint(
360-
Endpoint::new(self.server_config.bind_addr, self.server_config.grpc_port)
361-
.to_string(),
362-
)
363-
.local_endpoint(Endpoint::new(self.node_addr, self.server_config.grpc_port).to_string())
364-
.resp_compress_min_length(
365-
self.server_config.resp_compress_min_length.as_bytes() as usize
366-
)
367-
.runtimes(engine_runtimes)
368-
.instance(instance.clone())
369-
.router(router)
370-
.cluster(self.cluster.clone())
371-
.opened_wals(opened_wals)
372-
.schema_config_provider(provider)
373-
.forward_config(self.server_config.forward)
374-
.timeout(self.server_config.timeout.map(|v| v.0))
375-
.auto_create_table(self.server_config.auto_create_table)
376-
.build()
377-
.context(BuildGrpcService)?;
358+
let rpc_services =
359+
grpc::Builder::new()
360+
.endpoint(
361+
Endpoint::new(self.server_config.bind_addr, self.server_config.grpc_port)
362+
.to_string(),
363+
)
364+
.local_endpoint(
365+
Endpoint::new(self.node_addr, self.server_config.grpc_port).to_string(),
366+
)
367+
.resp_compress_min_length(
368+
self.server_config.resp_compress_min_length.as_byte() as usize
369+
)
370+
.runtimes(engine_runtimes)
371+
.instance(instance.clone())
372+
.router(router)
373+
.cluster(self.cluster.clone())
374+
.opened_wals(opened_wals)
375+
.schema_config_provider(provider)
376+
.forward_config(self.server_config.forward)
377+
.timeout(self.server_config.timeout.map(|v| v.0))
378+
.auto_create_table(self.server_config.auto_create_table)
379+
.build()
380+
.context(BuildGrpcService)?;
378381

379382
let server = Server {
380383
http_service,

0 commit comments

Comments
 (0)