Merge pull request #15153 from bdice/branch-24.04-merge-24.02

Forward-merge branch-24.02 to branch-24.04

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -62,7 +62,7 @@ dependencies:
 - numpy>=1.21
 - numpydoc
 - nvcc_linux-64=11.8
-- nvcomp==3.0.5
+- nvcomp==3.0.6
 - nvtx>=0.2.1
 - packaging
 - pandas>=2.0,<2.2.2dev0

conda/environments/all_cuda-122_arch-x86_64.yaml

@@ -60,7 +60,7 @@ dependencies:
 - numba>=0.57
 - numpy>=1.21
 - numpydoc
-- nvcomp==3.0.5
+- nvcomp==3.0.6
 - nvtx>=0.2.1
 - packaging
 - pandas>=2.0,<2.2.2dev0

conda/recipes/libcudf/conda_build_config.yaml

@@ -38,7 +38,7 @@ spdlog_version:
   - ">=1.12.0,<1.13"
 
 nvcomp_version:
-  - "=3.0.5"
+  - "=3.0.6"
 
 zlib_version:
   - ">=1.2.13"

dependencies.yaml

@@ -243,7 +243,7 @@ dependencies:
           - libkvikio==24.4.*
           - librdkafka>=1.9.0,<1.10.0a0
           # Align nvcomp version with rapids-cmake
-          - nvcomp==3.0.5
+          - nvcomp==3.0.6
           - spdlog>=1.12.0,<1.13
   build_wheels:
     common:

python/cudf/cudf/tests/test_parquet.py

@@ -3132,3 +3132,14 @@ def test_writer_lz4():
 
     got = pd.read_parquet(buffer)
     assert_eq(gdf, got)
+
+
+def test_parquet_reader_zstd_huff_tables(datadir):
+    # Ensure that this zstd-compressed file does not overrun buffers. The
+    # problem was fixed in nvcomp 3.0.6.
+    # See https://github.com/rapidsai/cudf/issues/15096
+    fname = datadir / "zstd_huff_tables_bug.parquet"
+
+    expected = pa.parquet.read_table(fname).to_pandas()
+    actual = cudf.read_parquet(fname)
+    assert_eq(actual, expected)