Skip to content

Commit c565fe4

Browse files
authored
chore: fix semantic merge conflict (#5232)
1 parent 5b862cc commit c565fe4

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

vortex-array/src/arrays/varbin/vtable/operator.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ mod tests {
198198
.execute()
199199
.unwrap()
200200
.into_string();
201-
assert_eq!(strings_vec.get(0), Some("inlined"));
202-
assert_eq!(strings_vec.get(1), None);
203-
assert_eq!(strings_vec.get(2), Some("large string 1"));
204-
assert_eq!(strings_vec.get(3), Some("large string 2"));
205-
assert_eq!(strings_vec.get(4), Some("large string 3"));
201+
assert_eq!(strings_vec.get_ref(0), Some("inlined"));
202+
assert_eq!(strings_vec.get_ref(1), None);
203+
assert_eq!(strings_vec.get_ref(2), Some("large string 1"));
204+
assert_eq!(strings_vec.get_ref(3), Some("large string 2"));
205+
assert_eq!(strings_vec.get_ref(4), Some("large string 3"));
206206
}
207207

208208
#[rstest]
@@ -215,8 +215,8 @@ mod tests {
215215
.unwrap()
216216
.into_string();
217217

218-
assert_eq!(strings_vec.get(0), None);
219-
assert_eq!(strings_vec.get(1), Some("large string 2"));
220-
assert_eq!(strings_vec.get(2), Some("large string 3"));
218+
assert_eq!(strings_vec.get_ref(0), None);
219+
assert_eq!(strings_vec.get_ref(1), Some("large string 2"));
220+
assert_eq!(strings_vec.get_ref(2), Some("large string 3"));
221221
}
222222
}

vortex-array/src/arrays/varbinview/vtable/operator.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ mod tests {
8181
.execute()
8282
.unwrap()
8383
.into_string();
84-
assert_eq!(strings_vec.get(0), Some("inlined"));
85-
assert_eq!(strings_vec.get(1), None);
86-
assert_eq!(strings_vec.get(2), Some("large string 1"));
87-
assert_eq!(strings_vec.get(3), Some("large string 2"));
88-
assert_eq!(strings_vec.get(4), Some("large string 3"));
84+
assert_eq!(strings_vec.get_ref(0), Some("inlined"));
85+
assert_eq!(strings_vec.get_ref(1), None);
86+
assert_eq!(strings_vec.get_ref(2), Some("large string 1"));
87+
assert_eq!(strings_vec.get_ref(3), Some("large string 2"));
88+
assert_eq!(strings_vec.get_ref(4), Some("large string 3"));
8989
}
9090

9191
#[rstest]
@@ -98,8 +98,8 @@ mod tests {
9898
.unwrap()
9999
.into_string();
100100

101-
assert_eq!(strings_vec.get(0), None);
102-
assert_eq!(strings_vec.get(1), Some("large string 2"));
103-
assert_eq!(strings_vec.get(2), Some("large string 3"));
101+
assert_eq!(strings_vec.get_ref(0), None);
102+
assert_eq!(strings_vec.get_ref(1), Some("large string 2"));
103+
assert_eq!(strings_vec.get_ref(2), Some("large string 3"));
104104
}
105105
}

0 commit comments

Comments
 (0)