This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 5a74acd20e9 [Bug](mark-join) fix mark join report error when probe
block have column do not output (#27360) (#28796)
5a74acd20e9 is described below
commit 5a74acd20e96a87725983d1ea0b132ab1cfbf6a7
Author: Pxl <[email protected]>
AuthorDate: Fri Dec 22 11:25:14 2023 +0800
[Bug](mark-join) fix mark join report error when probe block have column do
not output (#27360) (#28796)
---
be/src/vec/exec/join/vhash_join_node.cpp | 4 +-
regression-test/data/query_p0/join/jira8317.out | 815 +++++++++++++++++++++
.../suites/query_p0/join/jira8317.groovy | 46 ++
3 files changed, 862 insertions(+), 3 deletions(-)
diff --git a/be/src/vec/exec/join/vhash_join_node.cpp
b/be/src/vec/exec/join/vhash_join_node.cpp
index d0ac9c1ca5e..df5c4faaa17 100644
--- a/be/src/vec/exec/join/vhash_join_node.cpp
+++ b/be/src/vec/exec/join/vhash_join_node.cpp
@@ -551,9 +551,7 @@ Status HashJoinNode::pull(doris::RuntimeState* state,
vectorized::Block* output_
Block temp_block;
//get probe side output column
for (int i = 0; i < _left_output_slot_flags.size(); ++i) {
- if (_left_output_slot_flags[i]) {
- temp_block.insert(_probe_block.get_by_position(i));
- }
+ temp_block.insert(_probe_block.get_by_position(i));
}
auto mark_column =
ColumnNullable::create(ColumnUInt8::create(block_rows, 0),
ColumnUInt8::create(block_rows, 1));
diff --git a/regression-test/data/query_p0/join/jira8317.out
b/regression-test/data/query_p0/join/jira8317.out
new file mode 100644
index 00000000000..795b1ba3421
--- /dev/null
+++ b/regression-test/data/query_p0/join/jira8317.out
@@ -0,0 +1,815 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !sql --
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+17
+19
+21
+22
+24
+25
+27
+28
+29
+30
+31
+32
+33
+34
+36
+37
+39
+40
+41
+42
+45
+47
+48
+49
+50
+51
+52
+53
+54
+55
+57
+58
+59
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+82
+83
+85
+86
+87
+89
+90
+91
+92
+93
+94
+95
+96
+98
+99
+100
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+130
+131
+132
+133
+134
+136
+137
+138
+139
+140
+141
+142
+144
+145
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+173
+174
+175
+176
+177
+178
+179
+180
+181
+184
+185
+186
+187
+188
+191
+192
+193
+194
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+209
+210
+211
+215
+216
+219
+221
+222
+223
+224
+227
+228
+229
+230
+231
+232
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+246
+247
+248
+249
+250
+251
+253
+254
+255
+257
+258
+259
+260
+261
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+282
+283
+284
+285
+287
+288
+289
+290
+291
+293
+294
+295
+296
+297
+298
+299
+301
+302
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+317
+318
+319
+320
+321
+322
+323
+325
+327
+328
+329
+330
+331
+334
+335
+336
+337
+338
+339
+340
+341
+346
+347
+348
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+368
+369
+370
+371
+372
+373
+375
+376
+377
+378
+379
+380
+381
+382
+383
+385
+387
+388
+389
+390
+392
+394
+395
+397
+398
+399
+400
+401
+402
+403
+404
+405
+407
+408
+410
+412
+414
+415
+416
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+433
+434
+435
+436
+437
+439
+440
+441
+442
+443
+444
+445
+446
+448
+449
+450
+452
+454
+455
+456
+458
+459
+460
+461
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+483
+484
+485
+487
+488
+489
+490
+491
+493
+494
+496
+497
+498
+499
+501
+502
+504
+505
+506
+507
+508
+509
+511
+512
+514
+516
+517
+518
+519
+521
+522
+523
+524
+525
+526
+527
+528
+530
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+544
+546
+548
+549
+550
+551
+552
+553
+554
+557
+558
+559
+560
+561
+562
+563
+564
+565
+566
+567
+568
+571
+572
+574
+575
+576
+578
+579
+581
+582
+583
+585
+586
+587
+588
+589
+590
+591
+592
+593
+594
+595
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+608
+609
+610
+611
+613
+614
+615
+616
+618
+619
+620
+622
+623
+624
+625
+627
+630
+631
+633
+634
+635
+636
+637
+638
+639
+640
+641
+643
+644
+645
+650
+652
+653
+654
+655
+657
+658
+659
+660
+661
+662
+663
+666
+668
+670
+671
+672
+673
+674
+676
+677
+678
+679
+681
+682
+683
+684
+685
+686
+688
+689
+690
+691
+692
+694
+695
+696
+697
+698
+699
+700
+702
+703
+704
+706
+707
+708
+709
+710
+711
+712
+713
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+733
+734
+735
+736
+737
+738
+740
+741
+742
+745
+746
+747
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+761
+762
+763
+764
+765
+766
+767
+768
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+794
+795
+797
+798
+799
+800
+803
+804
+805
+806
+809
+811
+812
+815
+817
+818
+820
+822
+823
+824
+826
+827
+828
+829
+831
+832
+834
+835
+837
+838
+839
+840
+842
+843
+844
+847
+848
+849
+850
+852
+853
+854
+855
+856
+857
+858
+859
+860
+863
+864
+865
+866
+867
+868
+871
+872
+873
+874
+875
+876
+878
+879
+880
+881
+882
+883
+884
+886
+888
+889
+890
+891
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+911
+913
+914
+916
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+932
+933
+934
+935
+936
+937
+938
+939
+940
+942
+943
+944
+946
+947
+948
+949
+950
+951
+952
+954
+955
+956
+957
+958
+959
+961
+962
+963
+966
+969
+970
+971
+972
+974
+975
+978
+980
+981
+982
+983
+984
+986
+987
+988
+989
+990
+991
+992
+993
+994
+996
+999
+
diff --git a/regression-test/suites/query_p0/join/jira8317.groovy
b/regression-test/suites/query_p0/join/jira8317.groovy
new file mode 100644
index 00000000000..a2b2d9ced17
--- /dev/null
+++ b/regression-test/suites/query_p0/join/jira8317.groovy
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("jira8317") {
+ sql """
+ DROP TABLE IF EXISTS `table_1000_undef_undef2`;
+ """
+ sql """
+ CREATE TABLE `table_1000_undef_undef2` (
+ `pk` int(11) NULL,
+ `col_bigint_undef_signed` bigint(20) NULL,
+ `col_bigint_undef_signed2` bigint(20) NULL
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`pk`, `col_bigint_undef_signed`, `col_bigint_undef_signed2`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`pk`) BUCKETS 10
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1",
+ "is_being_synced" = "false",
+ "storage_format" = "V2",
+ "light_schema_change" = "true",
+ "disable_auto_compaction" = "false",
+ "enable_single_replica_compaction" = "false"
+ );
+ """
+ sql """
+ INSERT INTO `table_1000_undef_undef2` VALUES
(1,-19003,-120),(7,-7365641,-8081123887699099479),(39,NULL,8157469758106312693),(45,-27,-8123020834936742524),(58,4999,3743594151072369933),(69,655619458377523526,7519664894086114892),(87,8262093739053643222,1766397486317050982),(91,4704,123),(93,-7587996,18142),(102,-417417511588815387,NULL),(105,6230407775549921021,8109),(111,-9885,1417473),(123,-2555577,-5337152),(125,-59,-1),(126,19,-16894),(134,24543,76),(157,5395653578239812058,-
[...]
+ """
+ qt_sql """
+ SELECT pk AS C1 FROM table_1000_undef_undef2 AS T1 WHERE
`col_bigint_undef_signed` NOT IN (SELECT `col_bigint_undef_signed2` AS C2
FROM table_1000_undef_undef2 AS T2 ) OR `col_bigint_undef_signed2` <> 9 order
by 1;
+ """
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
