You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@horaedb.apache.org by "jiacai2050 (via GitHub)" <gi...@apache.org> on 2024/12/17 09:39:02 UTC
[PR] feat: manifest support delete [horaedb]
jiacai2050 opened a new pull request, #1610:
URL: https://github.com/apache/horaedb/pull/1610
## Rationale
When compact finished, we need to delete the old input sst and expired sst.
## Detailed Changes
- The delta file use `ManifestUpdate` struct.
## Test Plan
CI
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "baojinri (via GitHub)" <gi...@apache.org>.
baojinri merged PR #1610:
URL: https://github.com/apache/horaedb/pull/1610
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "baojinri (via GitHub)" <gi...@apache.org>.
baojinri commented on code in PR #1610:
URL: https://github.com/apache/horaedb/pull/1610#discussion_r1888397150
##########
src/metric_engine/src/manifest.rs:
##########
@@ -399,7 +395,7 @@ impl From<SnapshotRecordV1> for SstFile {
struct Snapshot {
header: SnapshotHeader,
- inner: Bytes,
+ records: Vec<SnapshotRecordV1>,
Review Comment:
Using `SnapshotRecordV1` here, we lose the optimized manifest structure in #1600
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "jiacai2050 (via GitHub)" <gi...@apache.org>.
jiacai2050 commented on code in PR #1610:
URL: https://github.com/apache/horaedb/pull/1610#discussion_r1888458464
##########
src/metric_engine/src/manifest.rs:
##########
@@ -399,7 +395,7 @@ impl From<SnapshotRecordV1> for SstFile {
struct Snapshot {
header: SnapshotHeader,
- inner: Bytes,
+ records: Vec<SnapshotRecordV1>,
Review Comment:
The old format can't support SST delete.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "zealchen (via GitHub)" <gi...@apache.org>.
zealchen commented on code in PR #1610:
URL: https://github.com/apache/horaedb/pull/1610#discussion_r1888819094
##########
src/metric_engine/src/manifest/encoding.rs:
##########
@@ -0,0 +1,68 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use crate::{
+ sst::{FileId, SstFile},
+ Error, Result,
+};
+
+#[derive(Clone, Debug)]
+pub struct ManifestUpdate {
Review Comment:
Why name the file "encoding" if it doesn't contain any encoding-related structure?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "jiacai2050 (via GitHub)" <gi...@apache.org>.
jiacai2050 commented on code in PR #1610:
URL: https://github.com/apache/horaedb/pull/1610#discussion_r1889542505
##########
src/metric_engine/src/compaction/executor.rs:
##########
@@ -31,70 +34,137 @@ use tracing::error;
use crate::{
compaction::Task,
- manifest::ManifestRef,
+ ensure,
+ manifest::{ManifestRef, ManifestUpdate},
read::ParquetReader,
- sst::{allocate_id, FileMeta, SstPathGenerator},
- types::{ObjectStoreRef, StorageSchema},
+ sst::{allocate_id, FileMeta, SstFile, SstPathGenerator},
+ types::{ObjectStoreRef, RuntimeRef, StorageSchema},
Result,
};
#[derive(Clone)]
-pub struct Runner {
+pub struct Executor {
+ inner: Arc<Inner>,
+}
+
+struct Inner {
+ runtime: RuntimeRef,
store: ObjectStoreRef,
schema: StorageSchema,
manifest: ManifestRef,
sst_path_gen: Arc<SstPathGenerator>,
parquet_reader: Arc<ParquetReader>,
write_props: WriterProperties,
+ inused_memory: AtomicU64,
+ mem_limit: u64,
}
-impl Runner {
+impl Executor {
pub fn new(
+ runtime: RuntimeRef,
store: ObjectStoreRef,
schema: StorageSchema,
manifest: ManifestRef,
sst_path_gen: Arc<SstPathGenerator>,
parquet_reader: Arc<ParquetReader>,
write_props: WriterProperties,
+ mem_limit: u64,
) -> Self {
- Self {
+ let inner = Inner {
+ runtime,
store,
schema,
manifest,
sst_path_gen,
parquet_reader,
write_props,
+ mem_limit,
+ inused_memory: AtomicU64::new(0),
+ };
+ Self {
+ inner: Arc::new(inner),
}
}
- // TODO: Merge input sst files into one new sst file
- // and delete the expired sst files
- pub async fn do_compaction(&self, task: Task) -> Result<()> {
+ fn pre_check(&self, task: &Task) -> Result<()> {
assert!(!task.inputs.is_empty());
for f in &task.inputs {
assert!(f.is_compaction());
}
for f in &task.expireds {
assert!(f.is_compaction());
}
+
+ let task_size = task.input_size();
+ let inused = self.inner.inused_memory.load(Ordering::Relaxed);
+ let mem_limit = self.inner.mem_limit;
+ ensure!(
+ inused + task_size > mem_limit,
+ "Compaction memory usage too high, inused:{inused}, task_size:{task_size}, limit:{mem_limit}"
+ );
+
+ self.inner
+ .inused_memory
+ .fetch_add(task.input_size(), Ordering::Relaxed);
+ Ok(())
+ }
+
+ pub fn on_success(&self, task: &Task) {
+ let task_size = task.input_size();
+ self.inner
+ .inused_memory
+ .fetch_add(task_size, Ordering::Relaxed);
Review Comment:
I will fix it in followup PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "zealchen (via GitHub)" <gi...@apache.org>.
zealchen commented on code in PR #1610:
URL: https://github.com/apache/horaedb/pull/1610#discussion_r1888819094
##########
src/metric_engine/src/manifest/encoding.rs:
##########
@@ -0,0 +1,68 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use crate::{
+ sst::{FileId, SstFile},
+ Error, Result,
+};
+
+#[derive(Clone, Debug)]
+pub struct ManifestUpdate {
Review Comment:
Why name the file "encoding" if it doesn't contain any encoding-related structure?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org
Re: [PR] feat: manifest support delete [horaedb]
Posted by "baojinri (via GitHub)" <gi...@apache.org>.
baojinri commented on code in PR #1610:
URL: https://github.com/apache/horaedb/pull/1610#discussion_r1889524778
##########
src/metric_engine/src/compaction/executor.rs:
##########
@@ -31,70 +34,137 @@ use tracing::error;
use crate::{
compaction::Task,
- manifest::ManifestRef,
+ ensure,
+ manifest::{ManifestRef, ManifestUpdate},
read::ParquetReader,
- sst::{allocate_id, FileMeta, SstPathGenerator},
- types::{ObjectStoreRef, StorageSchema},
+ sst::{allocate_id, FileMeta, SstFile, SstPathGenerator},
+ types::{ObjectStoreRef, RuntimeRef, StorageSchema},
Result,
};
#[derive(Clone)]
-pub struct Runner {
+pub struct Executor {
+ inner: Arc<Inner>,
+}
+
+struct Inner {
+ runtime: RuntimeRef,
store: ObjectStoreRef,
schema: StorageSchema,
manifest: ManifestRef,
sst_path_gen: Arc<SstPathGenerator>,
parquet_reader: Arc<ParquetReader>,
write_props: WriterProperties,
+ inused_memory: AtomicU64,
+ mem_limit: u64,
}
-impl Runner {
+impl Executor {
pub fn new(
+ runtime: RuntimeRef,
store: ObjectStoreRef,
schema: StorageSchema,
manifest: ManifestRef,
sst_path_gen: Arc<SstPathGenerator>,
parquet_reader: Arc<ParquetReader>,
write_props: WriterProperties,
+ mem_limit: u64,
) -> Self {
- Self {
+ let inner = Inner {
+ runtime,
store,
schema,
manifest,
sst_path_gen,
parquet_reader,
write_props,
+ mem_limit,
+ inused_memory: AtomicU64::new(0),
+ };
+ Self {
+ inner: Arc::new(inner),
}
}
- // TODO: Merge input sst files into one new sst file
- // and delete the expired sst files
- pub async fn do_compaction(&self, task: Task) -> Result<()> {
+ fn pre_check(&self, task: &Task) -> Result<()> {
assert!(!task.inputs.is_empty());
for f in &task.inputs {
assert!(f.is_compaction());
}
for f in &task.expireds {
assert!(f.is_compaction());
}
+
+ let task_size = task.input_size();
+ let inused = self.inner.inused_memory.load(Ordering::Relaxed);
+ let mem_limit = self.inner.mem_limit;
+ ensure!(
+ inused + task_size > mem_limit,
+ "Compaction memory usage too high, inused:{inused}, task_size:{task_size}, limit:{mem_limit}"
+ );
+
+ self.inner
+ .inused_memory
+ .fetch_add(task.input_size(), Ordering::Relaxed);
+ Ok(())
+ }
+
+ pub fn on_success(&self, task: &Task) {
+ let task_size = task.input_size();
+ self.inner
+ .inused_memory
+ .fetch_add(task_size, Ordering::Relaxed);
Review Comment:
`fetch_sub`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@horaedb.apache.org
For additional commands, e-mail: commits-help@horaedb.apache.org