diff --git a/hail/python/test/hail/matrixtable/test_matrix_table.py b/hail/python/test/hail/matrixtable/test_matrix_table.py index 206f88ba198..a4bfdaba5f8 100644 --- a/hail/python/test/hail/matrixtable/test_matrix_table.py +++ b/hail/python/test/hail/matrixtable/test_matrix_table.py @@ -392,7 +392,7 @@ def test_table_product_join(self): left = hl.utils.range_matrix_table(5, 1) right = hl.utils.range_table(5) right = right.annotate(i=hl.range(right.idx + 1, 5)).explode('i').key_by('i') - left = left.annotate_rows(matches=right.index(left.row_key, product=True)) + left = left.annotate_rows(matches=right.index(left.row_key, all_matches=True)) rows = left.rows() self.assertTrue(rows.all(rows.matches.map(lambda x: x.idx) == hl.range(0, rows.row_idx))) @@ -553,7 +553,7 @@ def test_interval_product_join(self): 1 + (intervals.idx // 5) * 10 + (intervals.idx % 5), (1 + intervals.idx // 5) * 10 - (intervals.idx % 5))) intervals = intervals.annotate(i=intervals.idx % 5) - left = left.annotate_rows(interval_matches=intervals.index(left.row_key, product=True)) + left = left.annotate_rows(interval_matches=intervals.index(left.row_key, all_matches=True)) rows = left.rows() self.assertTrue(rows.all(hl.sorted(rows.interval_matches.map(lambda x: x.i)) == hl.range(0, hl.min(rows.row_idx % 10, 10 - rows.row_idx % 10)))) diff --git a/hail/python/test/hail/table/test_table.py b/hail/python/test/hail/table/test_table.py index 0fa252f9b40..6decbd1d837 100644 --- a/hail/python/test/hail/table/test_table.py +++ b/hail/python/test/hail/table/test_table.py @@ -402,7 +402,7 @@ def test_interval_product_join(self): 1 + (intervals.idx // 5) * 10 + (intervals.idx % 5), (1 + intervals.idx // 5) * 10 - (intervals.idx % 5))) intervals = intervals.annotate(i=intervals.idx % 5) - left = left.annotate(interval_matches=intervals.index(left.key, product=True)) + left = left.annotate(interval_matches=intervals.index(left.key, all_matches=True)) self.assertTrue(left.all(hl.sorted(left.interval_matches.map(lambda x: x.i)) == hl.range(0, hl.min(left.idx % 10, 10 - left.idx % 10)))) @@ -420,7 +420,7 @@ def test_product_join(self): left = hl.utils.range_table(5) right = hl.utils.range_table(5) right = right.annotate(i=hl.range(right.idx + 1, 5)).explode('i').key_by('i') - left = left.annotate(matches=right.index(left.key, product=True)) + left = left.annotate(matches=right.index(left.key, all_matches=True)) self.assertTrue(left.all(left.matches.length() == left.idx)) self.assertTrue(left.all(left.matches.map(lambda x: x.idx) == hl.range(0, left.idx)))