Skip to content

Commit cdb3074

Browse files
committed
rebase master
1 parent e2bca75 commit cdb3074

File tree

2 files changed

+7
-7
lines changed
  • src/query/service/src/pipelines/processors/transforms/hash_join
  • tests/logictest/suites/crdb

2 files changed

+7
-7
lines changed

src/query/service/src/pipelines/processors/transforms/hash_join/result_blocks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,9 @@ impl JoinHashTable {
554554
build_indexes.extend_from_slice(probe_result_ptrs);
555555
for row_ptr in probe_result_ptrs.iter() {
556556
row_state
557-
.entry(row_ptr.clone())
557+
.entry(*row_ptr)
558558
.and_modify(|e| *e += 1)
559-
.or_insert(1 as usize);
559+
.or_insert(1_usize);
560560
}
561561
probe_indexes.extend(std::iter::repeat(i as u32).take(probe_result_ptrs.len()));
562562
validity.extend_constant(probe_result_ptrs.len(), true);

tests/logictest/suites/crdb/join

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -920,13 +920,13 @@ SELECT * FROM foo JOIN bar USING (a, b) WHERE foo.c = bar.c AND foo.d = bar.d;
920920
3 3 3.0 3.0 3.0 3
921921

922922
statement query TII
923-
SELECT * FROM onecolumn AS a(x) RIGHT JOIN twocolumn ON false;
923+
SELECT * FROM onecolumn AS a(x) RIGHT JOIN twocolumn ON false order by y;
924924

925925
----
926-
44 51 NULL
927-
NULL 52 NULL
928-
42 53 NULL
929-
45 45 NULL
926+
NULL 45 45
927+
NULL 44 51
928+
NULL NULL 52
929+
NULL 42 53
930930

931931
-- statement query
932932
-- SELECT column1, column1+1FROM (SELECT * FROM (VALUES (NULL, NULL)) AS t NATURAL FULL OUTER JOIN (VALUES (1, 1)) AS u);

0 commit comments

Comments
 (0)