ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

index: fix change id resolution test to not depend on deterministic order

Browse source 
Since IdIndex sorts the entries by using .sort_unstable_by_key(), the order of
the same-key elements is undefined. Perhaps, it's stable for short arrays, and
the test passes because of that.
This commit is contained in:
Yuya Nishihara 2024-02-12 12:30:12 +09:00
parent 8b1dfa7157
commit e2c8a8fabd
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/index.rs
View file

@ -127,6 +127,8 @@ pub trait MutableIndex {
pub trait ChangeIdIndex: Send + Sync { pub trait ChangeIdIndex: Send + Sync {
/// Resolve an unambiguous change ID prefix to the commit IDs in the index. /// Resolve an unambiguous change ID prefix to the commit IDs in the index.
///
/// The order of the returned commit IDs is unspecified.
fn resolve_prefix(&self, prefix: &HexPrefix) -> PrefixResolution<Vec<CommitId>>; fn resolve_prefix(&self, prefix: &HexPrefix) -> PrefixResolution<Vec<CommitId>>;
/// This function returns the shortest length of a prefix of `key` that /// This function returns the shortest length of a prefix of `key` that

34
lib/tests/test_index.rs
View file

@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::collections::HashSet;
use std::fs; use std::fs;
use std::sync::Arc; use std::sync::Arc;
@ -28,6 +29,7 @@ use jj_lib::object_id::{HexPrefix, ObjectId as _, PrefixResolution};
use jj_lib::op_store::{RefTarget, RemoteRef}; use jj_lib::op_store::{RefTarget, RemoteRef};
use jj_lib::repo::{MutableRepo, ReadonlyRepo, Repo}; use jj_lib::repo::{MutableRepo, ReadonlyRepo, Repo};
use jj_lib::settings::UserSettings; use jj_lib::settings::UserSettings;
use maplit::hashset;
use testutils::test_backend::TestBackend; use testutils::test_backend::TestBackend;
use testutils::{ use testutils::{
commit_transactions, create_random_commit, load_repo_at_head, write_random_commit, commit_transactions, create_random_commit, load_repo_at_head, write_random_commit,
@ -780,36 +782,39 @@ fn test_change_id_index() {
assert_eq!(prefix_len(&commit_3), 6); assert_eq!(prefix_len(&commit_3), 6);
assert_eq!(prefix_len(&commit_4), 1); assert_eq!(prefix_len(&commit_4), 1);
assert_eq!(prefix_len(&commit_5), 1); assert_eq!(prefix_len(&commit_5), 1);
let resolve_prefix = let resolve_prefix = |prefix: &str| {
|prefix: &str| change_id_index.resolve_prefix(&HexPrefix::new(prefix).unwrap()); change_id_index
.resolve_prefix(&HexPrefix::new(prefix).unwrap())
.map(HashSet::from_iter)
};
// Ambiguous matches // Ambiguous matches
assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch); assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch);
assert_eq!(resolve_prefix("aaaaa"), PrefixResolution::AmbiguousMatch); assert_eq!(resolve_prefix("aaaaa"), PrefixResolution::AmbiguousMatch);
// Exactly the necessary length // Exactly the necessary length
assert_eq!( assert_eq!(
resolve_prefix("0"), resolve_prefix("0"),
PrefixResolution::SingleMatch(vec![root_commit.id().clone()]) PrefixResolution::SingleMatch(hashset! {root_commit.id().clone()})
); );
assert_eq!( assert_eq!(
resolve_prefix("aaaaaa"), resolve_prefix("aaaaaa"),
PrefixResolution::SingleMatch(vec![commit_3.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_3.id().clone()})
); );
assert_eq!( assert_eq!(
resolve_prefix("aaaaab"), resolve_prefix("aaaaab"),
PrefixResolution::SingleMatch(vec![commit_2.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_2.id().clone()})
); );
assert_eq!( assert_eq!(
resolve_prefix("ab"), resolve_prefix("ab"),
PrefixResolution::SingleMatch(vec![commit_1.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_1.id().clone()})
); );
assert_eq!( assert_eq!(
resolve_prefix("b"), resolve_prefix("b"),
PrefixResolution::SingleMatch(vec![commit_5.id().clone(), commit_4.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_4.id().clone(), commit_5.id().clone()})
); );
// Longer than necessary // Longer than necessary
assert_eq!( assert_eq!(
resolve_prefix("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), resolve_prefix("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
PrefixResolution::SingleMatch(vec![commit_3.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_3.id().clone()})
); );
// No match // No match
assert_eq!(resolve_prefix("ba"), PrefixResolution::NoMatch); assert_eq!(resolve_prefix("ba"), PrefixResolution::NoMatch);
@ -822,19 +827,22 @@ fn test_change_id_index() {
assert_eq!(prefix_len(&commit_1), 2); assert_eq!(prefix_len(&commit_1), 2);
assert_eq!(prefix_len(&commit_2), 2); assert_eq!(prefix_len(&commit_2), 2);
assert_eq!(prefix_len(&commit_3), 6); assert_eq!(prefix_len(&commit_3), 6);
let resolve_prefix = let resolve_prefix = |prefix: &str| {
|prefix: &str| change_id_index.resolve_prefix(&HexPrefix::new(prefix).unwrap()); change_id_index
.resolve_prefix(&HexPrefix::new(prefix).unwrap())
.map(HashSet::from_iter)
};
assert_eq!( assert_eq!(
resolve_prefix("0"), resolve_prefix("0"),
PrefixResolution::SingleMatch(vec![root_commit.id().clone()]) PrefixResolution::SingleMatch(hashset! {root_commit.id().clone()})
); );
assert_eq!( assert_eq!(
resolve_prefix("aa"), resolve_prefix("aa"),
PrefixResolution::SingleMatch(vec![commit_2.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_2.id().clone()})
); );
assert_eq!( assert_eq!(
resolve_prefix("ab"), resolve_prefix("ab"),
PrefixResolution::SingleMatch(vec![commit_1.id().clone()]) PrefixResolution::SingleMatch(hashset! {commit_1.id().clone()})
); );
assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch); assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch);
assert_eq!(resolve_prefix("b"), PrefixResolution::NoMatch); assert_eq!(resolve_prefix("b"), PrefixResolution::NoMatch);