Skip to content

Commit c67261f

Browse files
authored
Merge branch 'main' into fix_native_union_column_name
2 parents eeac8c7 + 3091aaf commit c67261f

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

cpp/velox/operators/serializer/VeloxGpuColumnarBatchSerializer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ std::shared_ptr<ColumnarBatch> VeloxGpuColumnarBatchSerializer::deserialize(uint
4848
dynamic_pointer_cast<VeloxColumnarBatch>(vb)->getRowVector(), veloxPool_.get(), stream, cudf_velox::get_output_mr());
4949
stream.synchronize();
5050
auto vector = std::make_shared<cudf_velox::CudfVector>(
51-
veloxPool_.get(), rowType_, size, std::move(table), stream);
51+
veloxPool_.get(), rowType_, vb->numRows(), std::move(table), stream);
5252
return std::make_shared<VeloxColumnarBatch>(vector, vb->numColumns());
5353
}
5454

package/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@
197197
<exclude>*spark3.3*</exclude>
198198
<exclude>*spark3.4*</exclude>
199199
<exclude>*spark3.5*</exclude>
200+
<exclude>*spark4.0*</exclude>
201+
<exclude>*spark4.1*</exclude>
200202
</excludes>
201203
<followSymlinks>false</followSymlinks>
202204
</fileset>

tools/workload/benchmark_velox/analysis/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ attrs==23.2.0
88
Babel>=2.9.1
99
bcrypt==3.2.0
1010
beautifulsoup4==4.12.3
11-
black==24.4.2
11+
black==26.3.1
1212
bleach==6.1.0
1313
blinker==1.4
1414
certifi>=2023.7.22

0 commit comments

Comments
 (0)