Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support nanosecond timestamps in parquet #10063

Merged
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
be17b06
Fix a typo
PointKernel Jan 17, 2022
c3c1ff4
Add nano into parquet logical type
PointKernel Jan 17, 2022
e6b18de
Merge remote-tracking branch 'upstream/branch-22.04' into parquet-nan…
PointKernel Feb 1, 2022
bc73332
Add nanosecond logical type in parquet writer
PointKernel Feb 1, 2022
6d6c3ab
Add nanosecond handling via logical type
PointKernel Feb 1, 2022
dc33aa4
Add logical type into ColumnChunkDesc
PointKernel Feb 1, 2022
aa74fe9
Add nanosecond handling in parquet reader
PointKernel Feb 2, 2022
02df1bf
Update copyright
PointKernel Feb 2, 2022
2c601ee
Merge remote-tracking branch 'upstream/branch-22.04' into parquet-nan…
PointKernel Mar 8, 2022
00084a6
Add logical type compact protocol writer
PointKernel Mar 8, 2022
2467672
Minor cleanups: remove unused code
PointKernel Mar 8, 2022
3113ede
Update comments
PointKernel Mar 8, 2022
3535ead
Fix a bug: do not set logical type for int96 timestamps
PointKernel Mar 8, 2022
9c5d22b
Fix a bug: set time scale
PointKernel Mar 8, 2022
0e08355
Remove python changes
PointKernel Mar 8, 2022
aa35d6d
Fix time scale bugs in libcudf
PointKernel Mar 8, 2022
f1672c7
Remove duration nanosecond support in parquet
PointKernel Mar 11, 2022
ace68ba
Move CompactProtocolReader to a new file
PointKernel Mar 11, 2022
a0f9418
Remove default ctor to avoid shared memory dynamic initialization war…
PointKernel Mar 11, 2022
f4b9452
Update if condition
PointKernel Mar 14, 2022
0ba9613
Fix a statistics bug for int96 timestamp
PointKernel Mar 15, 2022
18e00a7
Minor updates: write timestamp logical type only
PointKernel Mar 16, 2022
03a3432
Merge remote-tracking branch 'upstream/branch-22.04' into parquet-nan…
PointKernel Mar 16, 2022
d4d9abc
Minor cleanups
PointKernel Mar 18, 2022
f2f597f
Use enum instead of bool + disable int96 stats writing
PointKernel Mar 18, 2022
dc3cdb8
Minor cleanup
PointKernel Mar 18, 2022
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
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,12 @@ add_library(
src/io/orc/stripe_init.cu
src/io/orc/timezone.cpp
src/io/orc/writer_impl.cu
src/io/parquet/compact_protocol_reader.cpp
src/io/parquet/compact_protocol_writer.cpp
src/io/parquet/page_data.cu
src/io/parquet/chunk_dict.cu
src/io/parquet/page_enc.cu
src/io/parquet/page_hdr.cu
src/io/parquet/parquet.cpp
src/io/parquet/reader_impl.cu
src/io/parquet/writer_impl.cu
src/io/statistics/orc_column_statistics.cu
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2020, NVIDIA CORPORATION.
* Copyright (c) 2018-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,8 +14,11 @@
* limitations under the License.
*/

#include "parquet.hpp"
#include "compact_protocol_reader.hpp"

#include <algorithm>
#include <cstddef>
#include <tuple>

namespace cudf {
namespace io {
Expand Down Expand Up @@ -198,7 +201,8 @@ bool CompactProtocolReader::read(TimestampType* t)
bool CompactProtocolReader::read(TimeUnit* u)
{
auto op = std::make_tuple(ParquetFieldUnion(1, u->isset.MILLIS, u->MILLIS),
ParquetFieldUnion(2, u->isset.MICROS, u->MICROS));
ParquetFieldUnion(2, u->isset.MICROS, u->MICROS),
ParquetFieldUnion(3, u->isset.NANOS, u->NANOS));
return function_builder(this, op);
}

Expand Down
Loading