Merge branch 'branch-21.10' into protect-scalar-ctors

rapidsai · Jul 28, 2021 · ee30d95 · ee30d95
2 parents 8e99468 + 904222b
commit ee30d95
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/cpp/src/io/orc/writer_impl.cu b/cpp/src/io/orc/writer_impl.cu
@@ -575,8 +575,8 @@ orc_streams writer::impl::create_streams(host_span<orc_column_view> columns,
         break;
       }
       case TypeKind::TIMESTAMP:
-        add_RLE_stream(gpu::CI_DATA, DATA, TypeKind::INT);
-        add_RLE_stream(gpu::CI_DATA2, SECONDARY, TypeKind::INT);
+        add_RLE_stream(gpu::CI_DATA, DATA, TypeKind::LONG);
+        add_RLE_stream(gpu::CI_DATA2, SECONDARY, TypeKind::LONG);
         column.set_orc_encoding(DIRECT_V2);
         break;
       case TypeKind::DECIMAL:

diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt
@@ -293,6 +293,14 @@ target_compile_definitions(cudfjni
 
 if(USE_GDS)
     add_library(cufilejni SHARED "src/CuFileJni.cpp")
+    SET_TARGET_PROPERTIES(cufilejni
+        PROPERTIES BUILD_RPATH "\$ORIGIN"
+                   # set target compile options
+                   CXX_STANDARD                        17
+                   CXX_STANDARD_REQUIRED               ON
+                   CUDA_STANDARD                       17
+                   CUDA_STANDARD_REQUIRED              ON
+    )
     target_include_directories(cufilejni PRIVATE "${cuFile_INCLUDE_DIRS}")
     target_link_libraries(cufilejni PRIVATE cudfjni "${cuFile_LIBRARIES}")
 endif(USE_GDS)

diff --git a/python/cudf/cudf/tests/data/orc/TestOrcFile.largeTimestamps.orc b/python/cudf/cudf/tests/data/orc/TestOrcFile.largeTimestamps.orc
diff --git a/python/cudf/cudf/tests/test_orc.py b/python/cudf/cudf/tests/test_orc.py
@@ -1152,3 +1152,22 @@ def test_chunked_orc_writer_lists():
 
     got = pa.orc.ORCFile(buffer).read().to_pandas()
     assert_eq(expect, got)
+
+
+def test_writer_timestamp_stream_size(datadir, tmpdir):
+    pdf_fname = datadir / "TestOrcFile.largeTimestamps.orc"
+    gdf_fname = tmpdir.join("gdf.orc")
+
+    try:
+        orcfile = pa.orc.ORCFile(pdf_fname)
+    except Exception as excpr:
+        if type(excpr).__name__ == "ArrowIOError":
+            pytest.skip(".orc file is not found")
+        else:
+            print(type(excpr).__name__)
+
+    expect = orcfile.read().to_pandas()
+    cudf.from_pandas(expect).to_orc(gdf_fname.strpath)
+    got = pa.orc.ORCFile(gdf_fname).read().to_pandas()
+
+    assert_eq(expect, got)