Skip to content

Drop: Unused chunks_metadata table #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OpsBotPrime merged 2 commits into from
Jul 10, 2026
Merged

Drop: Unused chunks_metadata table #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fecec7
Drop: Chunks metadata table
ReinierMaas Jul 10, 2026
5935222
Merge #123: Drop: Unused `chunks_metadata` table
OpsBotPrime Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions opsqueue/migrations/20260710113337_drop_chunks_metadata.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DROP TABLE chunks_metadata;

@Qqwy Qqwy Jul 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It would be nice to make the migration bidirectional, just like we've been doing for most others.

(While double-checking this nit I saw that we did not do this correctly in the last two migrations either. I'll open an issue for that)

EDIT: #124

89 changes: 0 additions & 89 deletions opsqueue/src/common/chunk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ impl Chunk {
pub mod db {
use super::*;
use crate::common::errors::{ChunkNotFound, DatabaseError, SubmissionNotFound, E};
use crate::common::StrategicMetadataMap;
use crate::db::{Connection, True, WriterConnection};
use axum_prometheus::metrics::{counter, gauge};
use sqlx::{query, query_as};
Expand Down Expand Up @@ -277,33 +276,6 @@ pub mod db {
Ok(())
}

#[tracing::instrument(skip(conn))]
pub async fn insert_chunk_metadata(
chunk: Chunk,
metadata_key: &[u8],
metadata_value: &[u8],
mut conn: impl WriterConnection,
) -> sqlx::Result<()> {
query!(
"
INSERT INTO chunks_metadata
( submission_id
, chunk_index
, metadata_key
, metadata_value
)
VALUES ($1, $2, $3, $4)
",
chunk.submission_id,
chunk.chunk_index,
metadata_key,
metadata_value,
)
.execute(conn.get_inner())
.await?;
Ok(())
}

#[tracing::instrument(skip(conn))]
pub async fn complete_chunk(
chunk_id: ChunkId,
Expand Down Expand Up @@ -530,33 +502,6 @@ pub mod db {
.await
}

/// Retrieves the earlier stored strategic metadata.
///
/// Primarily for testing and introspection.
///
/// Be aware that the strategic metadata for individual chunks
/// is cleaned up once the chunk is marked as completed or failed.
/// (At that time it is still available on the submission level).
pub async fn get_chunk_strategic_metadata(
full_chunk_id: ChunkId,
mut conn: impl Connection,
) -> Result<StrategicMetadataMap, DatabaseError> {
use futures::{future, TryStreamExt};
let metadata = query!(
r#"
SELECT metadata_key, metadata_value FROM chunks_metadata
WHERE submission_id = $1 AND chunk_index = $2
"#,
full_chunk_id.submission_id,
full_chunk_id.chunk_index,
)
.fetch(conn.get_inner())
.and_then(|row| future::ok((row.metadata_key, row.metadata_value)))
.try_collect()
.await?;
Ok(metadata)
}

#[tracing::instrument(skip(chunks, conn))]
pub async fn insert_many_chunks(
chunks: &[Chunk],
Expand Down Expand Up @@ -584,40 +529,6 @@ pub mod db {
Ok(())
}

pub async fn insert_many_chunks_metadata(
chunks: &[Chunk],
metadata: &StrategicMetadataMap,
mut conn: impl WriterConnection,
) -> sqlx::Result<()> {
use itertools::Itertools;
const ROWS_PER_QUERY: usize = 1000;

let mut iter = chunks.iter().cartesian_product(metadata).peekable();
while iter.peek().is_some() {
let query_rows = iter.by_ref().take(ROWS_PER_QUERY);

let mut query_builder: QueryBuilder<Sqlite> = QueryBuilder::new(
"
INSERT INTO chunks_metadata
( submission_id
, chunk_index
, metadata_key
, metadata_value
)
",
);
query_builder.push_values(query_rows, |mut b, (chunk, metadata)| {
b.push_bind(chunk.submission_id)
.push_bind(chunk.chunk_index)
.push_bind(metadata.0)
.push_bind(metadata.1);
});
let query = query_builder.build();
query.execute(conn.get_inner()).await?;
}
Ok(())
}

#[tracing::instrument(skip(conn))]
pub async fn skip_remaining_chunks(
submission_id: SubmissionId,
Expand Down
25 changes: 1 addition & 24 deletions opsqueue/src/common/submission.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,12 +392,6 @@ pub mod db {
)
.await?;
super::chunk::db::insert_many_chunks(&chunks, &mut tx).await?;
super::chunk::db::insert_many_chunks_metadata(
&chunks,
&submission.strategic_metadata,
&mut tx,
)
.await?;
Ok(())
}
.boxed()
Expand Down Expand Up @@ -1255,24 +1249,7 @@ pub mod test {
let fetched_metadata = get_submission_strategic_metadata(submission_id, &mut conn)
.await
.unwrap();
assert!(fetched_metadata == strategic_metadata);

let res = sqlx::query!("SELECT * FROM chunks_metadata;")
.fetch_all(conn.get_inner())
.await
.unwrap();
dbg!(res);

let chunk_id = (submission_id, ChunkIndex::zero()).into();
let chunk_fetched_metadata = chunk::db::get_chunk_strategic_metadata(chunk_id, &mut conn)
.await
.unwrap();

dbg!(&strategic_metadata);
dbg!(&fetched_metadata);
dbg!(&chunk_fetched_metadata);

assert_eq!(chunk_fetched_metadata, strategic_metadata);
assert_eq!(fetched_metadata, strategic_metadata);
}

#[sqlx::test]
Expand Down
Loading