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

Reorganize ORC reader into multiple files and perform some small fixes to cuIO code #14665

Merged
merged 47 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
451817f
Add default constructor
ttnghia Dec 18, 2023
9bb8bea
Change order of initialization
ttnghia Dec 18, 2023
f39ec89
Implementing chunk reader
ttnghia Dec 21, 2023
4f4563d
Merge branch 'branch-24.02' into orc_reader
ttnghia Dec 21, 2023
18e88c4
Fix compile errors
ttnghia Dec 21, 2023
2d24847
Tests pass
ttnghia Dec 21, 2023
27fc3c1
Minor changes
ttnghia Dec 30, 2023
40c7653
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Dec 30, 2023
1fe0590
Cleanup
ttnghia Dec 31, 2023
4e40847
Rewrite function
ttnghia Jan 1, 2024
451323f
Remove (unused) chunking code
ttnghia Jan 2, 2024
7153fcf
Update copyright year
ttnghia Jan 2, 2024
ad0ea2b
Remove unused chunking code
ttnghia Jan 2, 2024
b7a98c3
Break dependency
ttnghia Jan 2, 2024
2f039d8
Reorder variables
ttnghia Jan 2, 2024
1df55a6
Cleanup
ttnghia Jan 2, 2024
62afe56
Cleanup
ttnghia Jan 2, 2024
3fb08f7
Change namespace
ttnghia Jan 2, 2024
46cb03d
Update copyright year
ttnghia Jan 2, 2024
e8d482c
Update cpp/include/cudf/io/orc.hpp
ttnghia Jan 2, 2024
322ad6c
Remove redundant namespace import
ttnghia Jan 2, 2024
4212960
Remove prefix namespace
ttnghia Jan 2, 2024
84e09c7
Merge branch 'branch-24.02' into refactor_orc_namespace
ttnghia Jan 2, 2024
05bc865
Merge branch 'refactor_orc_namespace' into refactor_orc_reader
ttnghia Jan 2, 2024
173235b
Adopt changes
ttnghia Jan 2, 2024
b891d32
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 3, 2024
ea13634
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 7, 2024
0d971f1
Remove namespace import
ttnghia Jan 9, 2024
087357b
Merge branch 'orc_chunked_reader' into refactor_orc_reader
ttnghia Jan 9, 2024
68f7d2d
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 9, 2024
549bace
Rename variable
ttnghia Jan 10, 2024
b557546
Update docs
ttnghia Jan 10, 2024
1b14b96
Return metadata even if there is no column
ttnghia Jan 10, 2024
aa167b7
Rename function
ttnghia Jan 10, 2024
0f682cd
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 10, 2024
8e7075f
Revert "Return metadata even if there is no column"
ttnghia Jan 10, 2024
6013b9a
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 10, 2024
0f10df8
Remove redundant declaration
ttnghia Jan 10, 2024
56886d9
Remove unused function
ttnghia Jan 10, 2024
bf68f57
Some more cleanup
ttnghia Jan 11, 2024
0a42078
Merge branch 'branch-24.02' into refactor_orc_reader
vuule Jan 11, 2024
acaf936
Remove unused variables
ttnghia Jan 13, 2024
8d0b824
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 13, 2024
af03f3a
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 16, 2024
bd5cf9b
Add more comment
ttnghia Jan 16, 2024
3aba72d
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 17, 2024
08e76dd
Merge branch 'branch-24.02' into refactor_orc_reader
ttnghia Jan 17, 2024
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
4 changes: 3 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -380,6 +380,8 @@ add_library(
src/io/orc/dict_enc.cu
src/io/orc/orc.cpp
src/io/orc/reader_impl.cu
src/io/orc/reader_impl_helpers.cpp
src/io/orc/reader_impl_preprocess.cu
src/io/orc/stats_enc.cu
src/io/orc/stripe_data.cu
src/io/orc/stripe_enc.cu
Expand Down
4 changes: 3 additions & 1 deletion cpp/src/io/orc/aggregate_orc_metadata.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023, NVIDIA CORPORATION.
* Copyright (c) 2021-2024, NVIDIA CORPORATION.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file has some small fixes with compiler markup.

*
* 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,6 +14,8 @@
* limitations under the License.
*/

#pragma once

#include "orc.hpp"

#include <map>
Expand Down
Loading
Loading