Skip to content

Remove unused fields from SourceTrackingInfoForProcessing. #227

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
merged 1 commit into from
Mar 29, 2025
Merged

Remove unused fields from SourceTrackingInfoForProcessing. #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 4 additions & 9 deletions src/execution/db_tracking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,21 @@ pub type TrackedTargetKey = (serde_json::Value, i64, Option<Fingerprint>);
pub type TrackedTargetKeyForSource = Vec<(i32, Vec<TrackedTargetKey>)>;

#[derive(sqlx::FromRow, Debug)]
pub struct SourceTrackingInfo {
pub max_process_ordinal: i64,
pub staging_target_keys: sqlx::types::Json<TrackedTargetKeyForSource>,
pub struct SourceTrackingInfoForProcessing {
pub memoization_info: Option<sqlx::types::Json<Option<StoredMemoizationInfo>>>,

pub processed_source_ordinal: Option<i64>,
pub process_logic_fingerprint: Option<Vec<u8>>,
pub process_ordinal: Option<i64>,
pub process_time_micros: Option<i64>,
pub target_keys: Option<sqlx::types::Json<TrackedTargetKeyForSource>>,
}

pub async fn read_source_tracking_info(
pub async fn read_source_tracking_info_for_processing(
source_id: i32,
source_key_json: &serde_json::Value,
db_setup: &TrackingTableSetupState,
pool: &PgPool,
) -> Result<Option<SourceTrackingInfo>> {
) -> Result<Option<SourceTrackingInfoForProcessing>> {
let query_str = format!(
"SELECT max_process_ordinal, staging_target_keys, memoization_info, processed_source_ordinal, process_logic_fingerprint, process_ordinal, process_time_micros, target_keys FROM {} WHERE source_id = $1 AND source_key = $2",
"SELECT memoization_info, processed_source_ordinal, process_logic_fingerprint FROM {} WHERE source_id = $1 AND source_key = $2",
db_setup.table_name
);
let tracking_info = sqlx::query_as(&query_str)
Expand Down
6 changes: 3 additions & 3 deletions src/execution/indexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use sqlx::PgPool;
use std::collections::{HashMap, HashSet};
use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};

use super::db_tracking::{self, read_source_tracking_info, TrackedTargetKey};
use super::db_tracking::{self, read_source_tracking_info_for_processing, TrackedTargetKey};
use super::db_tracking_setup;
use super::memoization::{EvaluationMemory, EvaluationMemoryOptions, StoredMemoizationInfo};
use crate::base::schema;
Expand Down Expand Up @@ -442,7 +442,7 @@ pub async fn evaluate_source_entry_with_memory(
) -> Result<Option<ScopeValueBuilder>> {
let stored_info = if options.enable_cache || !options.evaluation_only {
let source_key_json = serde_json::to_value(key)?;
let existing_tracking_info = read_source_tracking_info(
let existing_tracking_info = read_source_tracking_info_for_processing(
source_op.source_id,
&source_key_json,
&plan.tracking_table_setup,
Expand Down Expand Up @@ -481,7 +481,7 @@ pub async fn update_source_entry(
let process_timestamp = chrono::Utc::now();

// Phase 1: Evaluate with memoization info.
let existing_tracking_info = read_source_tracking_info(
let existing_tracking_info = read_source_tracking_info_for_processing(
source_op.source_id,
&source_key_json,
&plan.tracking_table_setup,
Expand Down