Skip to content

Commit 9d5ff78

Browse files
refactor(storage): distinguish SST id and object id (close risingwavelabs#8434) (risingwavelabs#8436)
1 parent 6d28cf6 commit 9d5ff78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1440
-1165
lines changed

dashboard/proto/gen/hummock.ts

Lines changed: 46 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/hummock.proto

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ option java_package = "com.risingwave.proto";
1010
option optimize_for = SPEED;
1111

1212
message SstableInfo {
13-
uint64 id = 1;
14-
KeyRange key_range = 2;
15-
uint64 file_size = 3;
16-
repeated uint32 table_ids = 4;
17-
uint64 meta_offset = 5;
18-
uint64 stale_key_count = 6;
19-
uint64 total_key_count = 7;
20-
// When a SST is divided, its divide_version will increase one.
21-
uint64 divide_version = 8;
13+
uint64 object_id = 1;
14+
uint64 sst_id = 2;
15+
KeyRange key_range = 3;
16+
uint64 file_size = 4;
17+
repeated uint32 table_ids = 5;
18+
uint64 meta_offset = 6;
19+
uint64 stale_key_count = 7;
20+
uint64 total_key_count = 8;
2221
uint64 min_epoch = 9;
2322
uint64 max_epoch = 10;
2423
uint64 uncompressed_file_size = 11;
@@ -64,6 +63,7 @@ message GroupConstruct {
6463
uint64 parent_group_id = 2;
6564
repeated uint32 table_ids = 3;
6665
uint64 group_id = 4;
66+
uint64 new_sst_start_id = 5;
6767
}
6868

6969
message GroupMetaChange {
@@ -117,7 +117,7 @@ message HummockVersionDelta {
117117
// Reads against such an epoch will fail.
118118
uint64 safe_epoch = 5;
119119
bool trivial_move = 6;
120-
repeated uint64 gc_sst_ids = 7;
120+
repeated uint64 gc_object_ids = 7;
121121
}
122122

123123
message HummockVersionDeltas {
@@ -232,7 +232,7 @@ message CompactTask {
232232
INVALID_GROUP_CANCELED = 8;
233233
EXECUTE_FAILED = 9;
234234
JOIN_HANDLE_FAILED = 10;
235-
TRACK_SST_ID_FAILED = 11;
235+
TRACK_SST_OBJECT_ID_FAILED = 11;
236236
}
237237
// SSTs to be compacted, which will be removed from LSM after compaction
238238
repeated InputLevel input_ssts = 1;
@@ -390,7 +390,7 @@ message SubscribeCompactTasksResponse {
390390

391391
// Delete SSTs in object store
392392
message VacuumTask {
393-
repeated uint64 sstable_ids = 1;
393+
repeated uint64 sstable_object_ids = 1;
394394
}
395395

396396
// Scan object store to get candidate orphan SSTs.
@@ -425,7 +425,7 @@ message TriggerManualCompactionResponse {
425425
}
426426

427427
message ReportFullScanTaskRequest {
428-
repeated uint64 sst_ids = 1;
428+
repeated uint64 object_ids = 1;
429429
}
430430

431431
message ReportFullScanTaskResponse {

src/compute/src/server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ pub async fn compute_node_serve(
179179

180180
let mut extra_info_sources: Vec<ExtraInfoSourceRef> = vec![];
181181
if let Some(storage) = state_store.as_hummock_trait() {
182-
extra_info_sources.push(storage.sstable_id_manager().clone());
182+
extra_info_sources.push(storage.sstable_object_id_manager().clone());
183183
if embedded_compactor_enabled {
184184
tracing::info!("start embedded compactor");
185185
let read_memory_limiter = Arc::new(MemoryLimiter::new(
@@ -194,7 +194,7 @@ pub async fn compute_node_serve(
194194
compaction_executor: Arc::new(CompactionExecutor::new(Some(1))),
195195
filter_key_extractor_manager: storage.filter_key_extractor_manager().clone(),
196196
read_memory_limiter,
197-
sstable_id_manager: storage.sstable_id_manager().clone(),
197+
sstable_object_id_manager: storage.sstable_object_id_manager().clone(),
198198
task_progress_manager: Default::default(),
199199
compactor_runtime_config: Arc::new(tokio::sync::Mutex::new(
200200
CompactorRuntimeConfig {

0 commit comments

Comments
 (0)