Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/src/parquet/encryption/encryption_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "parquet/encryption/openssl_internal.h"
#include "parquet/properties.h"
#include "parquet/types.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"

using parquet::ParquetCipher;
using ::arrow::util::span;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//TODO: figure out the licensing.

#include "parquet/encryption/external/dbpa_library_wrapper.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"

#include <stdexcept>
#include <functional>
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parquet/encryption/external/dbpa_library_wrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <memory>
#include <functional>

#include "parquet/encryption/external/dbpa_interface.h"
#include "span.hpp"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "borrowed/span.hpp"

using tcb::span;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
#include <map>

#include "gtest/gtest.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "parquet/encryption/external/dbpa_library_wrapper.h"

#include "parquet/test_util.h"
#include "span.hpp"
#include "borrowed/span.hpp"

using tcb::span;

Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parquet/encryption/external/dbpa_test_agent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include "parquet/exception.h"
#include "parquet/encryption/external/dbpa_test_agent.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "span.hpp"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "borrowed/span.hpp"

using tcb::span;
using dbps::external::EncryptionResult;
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parquet/encryption/external/dbpa_test_agent.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <memory>
#include <string>

#include "parquet/encryption/external/dbpa_interface.h"
#include "span.hpp"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "borrowed/span.hpp"

using tcb::span;

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/encryption/external/dbpa_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <stdexcept>

#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "parquet/types.h"
#include "arrow/type_fwd.h" // For arrow::Compression

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//TODO: figure out the licensing.

#include "parquet/encryption/external/loadable_encryptor_utils.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "parquet/encryption/external/dbpa_library_wrapper.h"

#include "arrow/util/io_util.h" //utils for loading shared libraries
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <string>

#include "parquet/platform.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"

using dbps::external::DataBatchProtectionAgentInterface;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "gtest/gtest.h"
#include "parquet/encryption/external/loadable_encryptor_utils.h"
#include "parquet/encryption/external/dbpa_interface.h"
#include "parquet/encryption/external/borrowed/dbpa_interface.h"
#include "parquet/encryption/external/dbpa_library_wrapper.h"
#include "arrow/util/span.h"
#include "parquet/test_util.h"
Expand Down
Loading