rebase master

datafuselabs · Sep 17, 2022 · a3a1c3c · a3a1c3c
1 parent 08dfd06
commit a3a1c3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/query/service/src/pipelines/processors/transforms/hash_join/result_blocks.rs b/src/query/service/src/pipelines/processors/transforms/hash_join/result_blocks.rs
@@ -554,9 +554,9 @@ impl JoinHashTable {
                 build_indexes.extend_from_slice(probe_result_ptrs);
                 for row_ptr in probe_result_ptrs.iter() {
                     row_state
-                        .entry(row_ptr.clone())
+                        .entry(*row_ptr)
                         .and_modify(|e| *e += 1)
-                        .or_insert(1 as usize);
+                        .or_insert(1_usize);
                 }
                 probe_indexes.extend(std::iter::repeat(i as u32).take(probe_result_ptrs.len()));
                 validity.extend_constant(probe_result_ptrs.len(), true);

diff --git a/tests/logictest/suites/crdb/join b/tests/logictest/suites/crdb/join
@@ -920,13 +920,13 @@ SELECT * FROM foo JOIN bar USING (a, b) WHERE foo.c = bar.c AND foo.d = bar.d;
 3 3 3.0 3.0 3.0 3
 
 statement query TII
-SELECT * FROM onecolumn AS a(x) RIGHT JOIN twocolumn ON false;
+SELECT * FROM onecolumn AS a(x) RIGHT JOIN twocolumn ON false order by y;
 
 ----
-44 51 NULL
-NULL 52 NULL
-42 53 NULL
-45 45 NULL
+NULL 45 45
+NULL 44 51
+NULL NULL 52
+NULL 42 53
 
 -- statement query
 -- SELECT column1, column1+1FROM  (SELECT * FROM    (VALUES (NULL, NULL)) AS t      NATURAL FULL OUTER JOIN    (VALUES (1, 1)) AS u);