Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions bsup/ztests/dynamic-same-type.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This previously output values in the wrong order due to a
# vector/vbuild.DynamicBuilder bug in handling a vector.Dyanmic
# containing same-type vectors.
script: |
super -f bsup -c 'from in.sup | fuse' | super -i bsup -s -

inputs:
- name: in.sup
data: &in_sup |
"a"
1
"b"
2

outputs:
- name: stdout
data: *in_sup
8 changes: 4 additions & 4 deletions bsup/ztests/pushdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ outputs:
- name: stderr
data: |
=== x > 51 ===
{bytes_scanned:10768,values_scanned:49,frames_scanned:10,frames_skipped_search_filter:0,frames_skipped_meta_filter:5,frames_skipped_data_filter:0,values_skipped_data_filter:41,meta_bytes_loaded:8066,data_bytes_loaded:1072,type_bytes_loaded:0}
{bytes_scanned:10777,values_scanned:49,frames_scanned:10,frames_skipped_search_filter:0,frames_skipped_meta_filter:5,frames_skipped_data_filter:0,values_skipped_data_filter:41,meta_bytes_loaded:8066,data_bytes_loaded:1076,type_bytes_loaded:0}
=== tag='foo18' ===
{bytes_scanned:10768,values_scanned:1,frames_scanned:10,frames_skipped_search_filter:9,frames_skipped_meta_filter:0,frames_skipped_data_filter:0,values_skipped_data_filter:9,meta_bytes_loaded:8066,data_bytes_loaded:856,type_bytes_loaded:0}
{bytes_scanned:10777,values_scanned:1,frames_scanned:10,frames_skipped_search_filter:9,frames_skipped_meta_filter:0,frames_skipped_data_filter:0,values_skipped_data_filter:9,meta_bytes_loaded:8066,data_bytes_loaded:865,type_bytes_loaded:0}
=== count() ===
{bytes_scanned:10768,values_scanned:100,frames_scanned:10,frames_skipped_search_filter:0,frames_skipped_meta_filter:0,frames_skipped_data_filter:0,values_skipped_data_filter:0,meta_bytes_loaded:8066,data_bytes_loaded:0,type_bytes_loaded:0}
{bytes_scanned:10777,values_scanned:100,frames_scanned:10,frames_skipped_search_filter:0,frames_skipped_meta_filter:0,frames_skipped_data_filter:0,values_skipped_data_filter:0,meta_bytes_loaded:8066,data_bytes_loaded:0,type_bytes_loaded:0}
=== values tag | this='foo18' | count() ===
{bytes_scanned:10768,values_scanned:100,frames_scanned:10,frames_skipped_search_filter:0,frames_skipped_meta_filter:0,frames_skipped_data_filter:0,values_skipped_data_filter:0,meta_bytes_loaded:8066,data_bytes_loaded:712,type_bytes_loaded:0}
{bytes_scanned:10777,values_scanned:100,frames_scanned:10,frames_skipped_search_filter:0,frames_skipped_meta_filter:0,frames_skipped_data_filter:0,values_skipped_data_filter:0,meta_bytes_loaded:8066,data_bytes_loaded:721,type_bytes_loaded:0}
5 changes: 5 additions & 0 deletions vector/vbuild/dynamic.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ func NewDynamicBuilder() *DynamicBuilder {
}

func (d *DynamicBuilder) Write(vec vector.Any) {
if dynamic, ok := vec.(*vector.Dynamic); ok {
// There's one Builder per type so merge same-type vectors to
// preserve order.
vec = MergeSameTypesInDynamic(dynamic)
}
if dynamic, ok := vec.(*vector.Dynamic); ok {
tagMap := make([]uint32, len(dynamic.Values))
for i, vec := range dynamic.Values {
Expand Down
Loading