Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/branch-22.04' into 8288
Browse files Browse the repository at this point in the history
  • Loading branch information
galipremsagar committed Mar 21, 2022
2 parents 76bb3a4 + 40baeb4 commit f92a86b
Show file tree
Hide file tree
Showing 17 changed files with 762 additions and 562 deletions.
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,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

0 comments on commit f92a86b

Please sign in to comment.