You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [0366806e] Color rank rows by vote mass within each group, not list position. Min–max normalization keeps similar scores visually close while still using the full gradient as groups grow and absolute mass dilutes. Co-authored-by: Cursor Side A — unified diff (full patch): diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index a58cbbee3490a08a625cb06df06848c59a615d65..4eff2e19ed4d303ff8e80c1eabd8a15b4990e643 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -264,12 +264,19 @@ pub fn scope_theme_style(parent: &ItemId) -> String { ) } -fn rank_row_style(parent: &ItemId, ordinal: usize, total: usize) -> String { - let t = if total <= 1 { - 0.0 - } else { - ordinal as f64 / (total - 1) as f64 - }; +/// Map vote mass to gradient position using the group's score range, not raw mass or +/// list position. Vote mass sums to 1 across the component, so absolute values dilute +/// as N grows; min–max within the visible list preserves similar scores → similar colors. +fn score_gradient_t(score: f64, min_score: f64, max_score: f64) -> f64 { + let spread = max_score - min_score; + if spread < 1e-9 { + return 0.5; + } + ((max_score - score) / spread).clamp(0.0, 1.0) +} + +fn rank_row_style(parent: &ItemId, score: f64, min_score: f64, max_score: f64) -> String { + let t = score_gradient_t(score, min_score, max_score); let base_hue = scope_base_hue(parent); let hue = (base_hue + 118.0 * t) % 360.0; let lightness = 0.74 - 0.34 * t; @@ -295,14 +302,15 @@ fn rank_list( highlighted: &HashSet, tree: &GlobalTree, ) -> Markup { - let group_len = items.len(); + let min_score = items.iter().map(|r| r.score).fold(f64::INFINITY, f64::min); + let max_score = items.iter().map(|r| r.score).fold(f64::NEG_INFINITY, f64::max); html! { @if !items.is_empty() { h3 class="rank-heading muted small" { (label) } ol class="rank-list" { @for (i, r) in items.iter().enumerate() { @let href = item_href(&r.item); - @let style = rank_row_style(parent, i, group_len); + @let style = rank_row_style(parent, r.score, min_score, max_score); @let class = rank_row_class(&r.item, highlighted); li class=(class) data-rank-item=(r.item.as_str()) @@ -517,19 +525,37 @@ pub async fn browse(State(state): State, uri: Uri) -> impl IntoRespons #[cfg(test)] mod tests { - use super::{rank_row_style, SORTER_UI_JS}; + use super::{rank_row_style, score_gradient_t, SORTER_UI_JS}; use crate::path_types::ItemId; #[test] - fn rank_row_style_gradients_per_group_not_globally() { + fn score_gradient_t_uses_group_range_not_absolute_mass() { + assert!((score_gradient_t(0.12, 0.08, 0.12) - 0.0).abs() < 1e-9); + assert!((score_gradient_t(0.08, 0.08, 0.12) - 1.0).abs() < 1e-9); + // Raw 12% mass would map near the dark end globally; within this group it's the top. + assert!(score_gradient_t(0.12, 0.08, 0.12) < score_gradient_t(0.12, 0.0, 1.0)); + } + + #[test] + fn score_gradient_t_similar_scores_similar_t() { + let a = score_gradient_t(0.41, 0.20, 0.60); + let b = score_gradient_t(0.40, 0.20, 0.60); + assert!((a - b).abs() < 0.05); + assert!((a - score_gradient_t(0.60, 0.20, 0.60)).abs() > 0.3); + } + + #[test] + fn score_gradient_t_tied_scores_neutral() { + assert!((score_gradient_t(0.25, 0.25, 0.25) - 0.5).abs() < 1e-9); + } + + #[test] + fn rank_row_style_same_inputs_same_color() { let parent = ItemId::opaque("test-scope"); - let first_in_four = rank_row_style(&parent, 0, 4); - let last_in_four = rank_row_style(&parent, 3, 4); - let first_in_two = rank_row_style(&parent, 0, 2); - let last_in_two = rank_row_style(&parent, 1, 2); - assert_eq!(first_in_four, first_in_two); - assert_eq!(last_in_four, last_in_two); - assert_ne!(first_in_four, last_in_four); + assert_eq!( + rank_row_style(&parent, 0.33, 0.20, 0.60), + rank_row_style(&parent, 0.33, 0.20, 0.60), + ); } #[test] Side B — contributor: tommy-mor Side B — commit message: [1531154d] dequeue -> vec Side B — unified diff (full patch): diff --git a/server/src/projection_apply.rs b/server/src/projection_apply.rs index 9c8990a8af927f35d3344c8d0872a516aba56b86..ad404bacb8bcdd5ae0e682cff97f974fd44528ea 100644 --- a/server/src/projection_apply.rs +++ b/server/src/projection_apply.rs @@ -6,8 +6,6 @@ //! batch as the (non-idempotent) edge merges guarantees exactly-once application //! across replay. -use std::collections::BTreeSet; - use crate::{ event_log::EventLogError, events::{Event, EventRecord}, @@ -44,7 +42,6 @@ pub fn apply_records( let db = projection_store.db(); let mut batch = db.batch(); - let mut vote_parents: BTreeSet = BTreeSet::new(); let mut last_seq = 0u64; for record in records { @@ -70,7 +67,6 @@ pub fn apply_records( *ts, ) .map_err(|e| EventLogError::Apply(e.to_string()))?; - vote_parents.insert(parent); } Event::NodeEnsured { id } => { let parsed = parse_event_id(id)?; @@ -85,11 +81,5 @@ pub fn apply_records( .commit_with(durable::Durability::DisableWal) .map_err(|e| EventLogError::Apply(e.to_string()))?; - for parent in vote_parents { - projection_store - .trim_recent_votes(&parent) - .map_err(|e| EventLogError::Apply(e.to_string()))?; - } - Ok(()) } diff --git a/server/src/projection_store.rs b/server/src/projection_store.rs index 8576d671f351004426207894ac35594ddb0f70cf..9a8953d010029d3639dc3987687554bab8b7663e 100644 --- a/server/src/projection_store.rs +++ b/server/src/projection_store.rs @@ -18,7 +18,7 @@ use crate::{ const PROJECTION_CURSOR_KEY: &str = "cursor"; const PROJECTION_SCHEMA_KEY: &str = "schema_version"; -const PROJECTION_SCHEMA_VERSION: u64 = 3; +const PROJECTION_SCHEMA_VERSION: u64 = 4; #[derive(Debug, thiserror::Error)] pub enum ProjectionStoreError { @@ -142,16 +142,6 @@ impl ProjectionStore { Ok(tree) } - /// Cap a node's recent-vote window after applying votes (best-effort, blind). - pub(crate) fn trim_recent_votes(&self, parent: &ItemId) -> Result<(), ProjectionStoreError> { - node(parent).recent_votes().truncate_back( - &self.db, - crate::storage_schema::RECENT_VOTES_CAP, - Durability::DisableWal, - )?; - Ok(()) - } - /// Cache Reddit display content outside the event log (must be evicted per policy). pub fn put_ephemeral_content( &self, diff --git a/server/src/reducer.rs b/server/src/reducer.rs index 0c75c85150bb9e5f578bbadf58b3e43f8a80be4b..759918b8c0eb8f8bf1ed0911d8877adaa55c8ea6 100644 --- a/server/src/reducer.rs +++ b/server/src/reducer.rs @@ -1,4 +1,4 @@ -use std::collections::{HashMap, HashSet, VecDeque}; +use std::collections::{HashMap, HashSet}; use serde::{Deserialize, Serialize}; @@ -52,7 +52,7 @@ pub struct GroupState { pub idx_to_item: Vec, pub edges: HashMap<(usize, usize), f64>, pub voted_pairs: HashSet<(usize, usize)>, - pub recent_votes: VecDeque, + pub recent_votes: Vec, } impl GroupState { @@ -62,7 +62,7 @@ impl GroupState { idx_to_item: Vec::new(), edges: HashMap::new(), voted_pairs: HashSet::new(), - recent_votes: VecDeque::with_capacity(200), + recent_votes: Vec::new(), } } @@ -111,10 +111,7 @@ impl GroupState { self.add_edge_weight(b_idx, a_idx, w_a); self.add_edge_weight(a_idx, b_idx, w_b); - self.recent_votes.push_front(vote); - while self.recent_votes.len() > 200 { - self.recent_votes.pop_back(); - } + self.recent_votes.push(vote); } } diff --git a/server/src/storage_dto.rs b/server/src/storage_dto.rs index 9dfb13c53efe4389277625a6ab3bfc18f566a453..3fd6db5cb909ac4896bd8a3ecace796de5f08781 100644 --- a/server/src/storage_dto.rs +++ b/server/src/storage_dto.rs @@ -39,7 +39,7 @@ pub struct StoredEntityDataV1 { pub link_url: Option, } -/// One vote stored in a node's `recent_votes` deque. +/// One vote stored in a node's `recent_votes` list. #[derive(Debug, Clone, Serialize, Deserialize)] pub struct StoredVoteV1 { pub version: u32, diff --git a/server/src/storage_schema.rs b/server/src/storage_schema.rs index bd26e665e084b95b10fdfff091c31e8dc84d07b8..5d2bb1d56927fb61c7c6d2d8602bd6882327f862 100644 --- a/server/src/storage_schema.rs +++ b/server/src/storage_schema.rs @@ -2,13 +2,13 @@ //! durable collections instead of one blob per node. //! //! A vote updates a handful of keys: a few edge-weight merges, a voted-pair flag, -//! a recent-vote deque push, and child-link set entries. The in-memory +//! a recent-vote list append, and child-link set entries. The in-memory //! [`crate::reducer::GroupState`] is reconstructed from these keys on read for //! rank-centrality. use std::collections::{BTreeSet, HashMap, HashSet}; -use durable::{Batch, Db, Deque, Durable, Leaf, Map, Sum}; +use durable::{Batch, Db, Durable, Leaf, List, Map, Sum}; use crate::{ path_types::ItemId, @@ -38,8 +38,8 @@ pub struct NodeSchema { pub edges: Map>, /// Voted pairs `(min, max) -> true`. pub voted_pairs: Map>, - /// Recent votes, newest at the front (capped on write). - pub recent_votes: Deque>, + /// Recent votes, append-only oldest-first (cap applied on read). + pub recent_votes: List>, /// When ephemeral Reddit display content was last fetched (ms); absent after eviction. pub fetched_at: Leaf, } @@ -55,7 +55,7 @@ pub struct Store { pub view_meta: Map>, } -/// Cap on the per-node recent-vote window (matches the in-memory reducer). +/// Max recent votes returned when loading a node (query-time cap only). pub const RECENT_VOTES_CAP: u64 = 200; fn id_key(id: &ItemId) -> String { @@ -148,11 +148,14 @@ fn build_group_state( } } - // Deque is front=newest; in-memory VecDeque is also front=newest. - let mut recent_votes = std::collections::VecDeque::new(); - for stored in np.recent_votes().iter(db)? { - recent_votes.push_back(decode_vote(stored).map_err(durable::Error::Deserialize)?); - } + // List is index order (oldest first); keep the newest RECENT_VOTES_CAP entries. + let stored = np.recent_votes().iter(db)?; + let cap = RECENT_VOTES_CAP as usize; + let start = stored.len().saturating_sub(cap); + let recent_votes = stored[start..] + .iter() + .map(|s| decode_vote(s.clone()).map_err(durable::Error::Deserialize)) + .collect::, _>>()?; Ok(GroupState { item_to_idx, @@ -248,7 +251,7 @@ pub fn vote_writes( }; batch.write(pnode.voted_pairs().key(&(lo, hi)).set(&true)); - // Recent votes (newest at front). + // Recent votes (append-only; cap on read). let stored = encode_vote(&VoteData { ts, a: a_id, @@ -260,7 +263,7 @@ pub fn vote_writes( delegate: None, thread_tag: "default".to_string(), }); - batch.push_front(&pnode.recent_votes(), &stored)?; + batch.push(&pnode.recent_votes(), &stored)?; Ok(()) } @@ -314,6 +317,35 @@ mod tests { assert!(load_node_state(&db, &parent).unwrap().is_none()); } + #[test] + fn load_caps_recent_votes_at_query_time() { + let dir = tempfile::tempdir().unwrap(); + let db = Db::open(dir.path()).unwrap(); + let parent = ItemId::root(); + + let mut batch = db.batch(); + for i in 0..RECENT_VOTES_CAP + 10 { + vote_writes(&mut batch, &parent, "alpha", "beta", 1, 0, i as i64).unwrap(); + } + batch.commit().unwrap(); + + assert_eq!( + node(&parent).recent_votes().len(&db).unwrap(), + RECENT_VOTES_CAP + 10 + ); + + let node_state = load_node_state(&db, &parent).unwrap().unwrap(); + assert_eq!(node_state.local_ranking.recent_votes.len(), RECENT_VOTES_CAP as usize); + assert_eq!( + node_state.local_ranking.recent_votes.first().map(|v| v.ts), + Some(10) + ); + assert_eq!( + node_state.local_ranking.recent_votes.last().map(|v| v.ts), + Some(RECENT_VOTES_CAP as i64 + 9) + ); + } + #[test] fn missing_node_is_none() { let dir = tempfile::tempdir().unwrap();