Skip to content

Commit 1401522

Browse files
authored
Remove unused fields from SourceTrackingInfoForProcessing. (#227)
1 parent bea12d5 commit 1401522

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

src/execution/db_tracking.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,21 @@ pub type TrackedTargetKey = (serde_json::Value, i64, Option<Fingerprint>);
99
pub type TrackedTargetKeyForSource = Vec<(i32, Vec<TrackedTargetKey>)>;
1010

1111
#[derive(sqlx::FromRow, Debug)]
12-
pub struct SourceTrackingInfo {
13-
pub max_process_ordinal: i64,
14-
pub staging_target_keys: sqlx::types::Json<TrackedTargetKeyForSource>,
12+
pub struct SourceTrackingInfoForProcessing {
1513
pub memoization_info: Option<sqlx::types::Json<Option<StoredMemoizationInfo>>>,
1614

1715
pub processed_source_ordinal: Option<i64>,
1816
pub process_logic_fingerprint: Option<Vec<u8>>,
19-
pub process_ordinal: Option<i64>,
20-
pub process_time_micros: Option<i64>,
21-
pub target_keys: Option<sqlx::types::Json<TrackedTargetKeyForSource>>,
2217
}
2318

24-
pub async fn read_source_tracking_info(
19+
pub async fn read_source_tracking_info_for_processing(
2520
source_id: i32,
2621
source_key_json: &serde_json::Value,
2722
db_setup: &TrackingTableSetupState,
2823
pool: &PgPool,
29-
) -> Result<Option<SourceTrackingInfo>> {
24+
) -> Result<Option<SourceTrackingInfoForProcessing>> {
3025
let query_str = format!(
31-
"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",
26+
"SELECT memoization_info, processed_source_ordinal, process_logic_fingerprint FROM {} WHERE source_id = $1 AND source_key = $2",
3227
db_setup.table_name
3328
);
3429
let tracking_info = sqlx::query_as(&query_str)

src/execution/indexer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use sqlx::PgPool;
88
use std::collections::{HashMap, HashSet};
99
use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};
1010

11-
use super::db_tracking::{self, read_source_tracking_info, TrackedTargetKey};
11+
use super::db_tracking::{self, read_source_tracking_info_for_processing, TrackedTargetKey};
1212
use super::db_tracking_setup;
1313
use super::memoization::{EvaluationMemory, EvaluationMemoryOptions, StoredMemoizationInfo};
1414
use crate::base::schema;
@@ -442,7 +442,7 @@ pub async fn evaluate_source_entry_with_memory(
442442
) -> Result<Option<ScopeValueBuilder>> {
443443
let stored_info = if options.enable_cache || !options.evaluation_only {
444444
let source_key_json = serde_json::to_value(key)?;
445-
let existing_tracking_info = read_source_tracking_info(
445+
let existing_tracking_info = read_source_tracking_info_for_processing(
446446
source_op.source_id,
447447
&source_key_json,
448448
&plan.tracking_table_setup,
@@ -481,7 +481,7 @@ pub async fn update_source_entry(
481481
let process_timestamp = chrono::Utc::now();
482482

483483
// Phase 1: Evaluate with memoization info.
484-
let existing_tracking_info = read_source_tracking_info(
484+
let existing_tracking_info = read_source_tracking_info_for_processing(
485485
source_op.source_id,
486486
&source_key_json,
487487
&plan.tracking_table_setup,

0 commit comments

Comments
 (0)