Repository: parquet-cpp Updated Branches: refs/heads/master c41a718da -> 7148cf033
PARQUET-908: Fix shared library visibility of some symbols in types.h Author: Wes McKinney <[email protected]> Closes #267 from wesm/PARQUET-908 and squashes the following commits: b5d6330 [Wes McKinney] Fix shared library visibility of some symbols in types.h Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/7148cf03 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/7148cf03 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/7148cf03 Branch: refs/heads/master Commit: 7148cf033fb06c33d40ee57fc76577cdea6cd89a Parents: c41a718 Author: Wes McKinney <[email protected]> Authored: Wed Mar 8 19:06:13 2017 -0500 Committer: Wes McKinney <[email protected]> Committed: Wed Mar 8 19:06:13 2017 -0500 ---------------------------------------------------------------------- src/parquet/encoding.h | 4 ++-- src/parquet/file/metadata.cc | 3 +-- src/parquet/types.h | 13 +++++++------ src/parquet/util/cpu-info.h | 4 +--- 4 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7148cf03/src/parquet/encoding.h ---------------------------------------------------------------------- diff --git a/src/parquet/encoding.h b/src/parquet/encoding.h index 3cea9de..69fc40e 100644 --- a/src/parquet/encoding.h +++ b/src/parquet/encoding.h @@ -66,8 +66,8 @@ class Encoder { Encoding::type encoding() const { return encoding_; } protected: - explicit Encoder(const ColumnDescriptor* descr, Encoding::type encoding, - ::arrow::MemoryPool* pool) + explicit Encoder( + const ColumnDescriptor* descr, Encoding::type encoding, ::arrow::MemoryPool* pool) : descr_(descr), encoding_(encoding), pool_(pool) {} // For accessing type-specific metadata, like FIXED_LEN_BYTE_ARRAY http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7148cf03/src/parquet/file/metadata.cc ---------------------------------------------------------------------- diff --git a/src/parquet/file/metadata.cc b/src/parquet/file/metadata.cc index 5c68e3c..e5b1242 100644 --- a/src/parquet/file/metadata.cc +++ b/src/parquet/file/metadata.cc @@ -29,7 +29,6 @@ #include <boost/algorithm/string.hpp> #include <boost/regex.hpp> - namespace parquet { const ApplicationVersion ApplicationVersion::PARQUET_251_FIXED_VERSION = @@ -496,7 +495,7 @@ ApplicationVersion::ApplicationVersion(const std::string& created_by) { build_ = app_matches[4]; ver_success = boost::regex_match(version_str, ver_matches, ver_regex); } else { - application_ = "unknown"; + application_ = "unknown"; } if (ver_success && ver_matches.size() >= 7) { http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7148cf03/src/parquet/types.h ---------------------------------------------------------------------- diff --git a/src/parquet/types.h b/src/parquet/types.h index 520326b..2b9b11f 100644 --- a/src/parquet/types.h +++ b/src/parquet/types.h @@ -269,17 +269,18 @@ inline std::string format_fwf(int width) { return ss.str(); } -std::string CompressionToString(Compression::type t); +std::string PARQUET_EXPORT CompressionToString(Compression::type t); -std::string EncodingToString(Encoding::type t); +std::string PARQUET_EXPORT EncodingToString(Encoding::type t); -std::string LogicalTypeToString(LogicalType::type t); +std::string PARQUET_EXPORT LogicalTypeToString(LogicalType::type t); -std::string TypeToString(Type::type t); +std::string PARQUET_EXPORT TypeToString(Type::type t); -std::string FormatStatValue(Type::type parquet_type, const char* val); +std::string PARQUET_EXPORT FormatStatValue(Type::type parquet_type, const char* val); + +int PARQUET_EXPORT GetTypeByteSize(Type::type t); -int GetTypeByteSize(Type::type t); } // namespace parquet #endif // PARQUET_TYPES_H http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7148cf03/src/parquet/util/cpu-info.h ---------------------------------------------------------------------- diff --git a/src/parquet/util/cpu-info.h b/src/parquet/util/cpu-info.h index 0becc20..ae59ef0 100644 --- a/src/parquet/util/cpu-info.h +++ b/src/parquet/util/cpu-info.h @@ -55,9 +55,7 @@ class CpuInfo { static int64_t hardware_flags(); /// Returns whether of not the cpu supports this flag - inline static bool IsSupported(int64_t flag) { - return (hardware_flags_ & flag) != 0; - } + inline static bool IsSupported(int64_t flag) { return (hardware_flags_ & flag) != 0; } /// Toggle a hardware feature on and off. It is not valid to turn on a feature /// that the underlying hardware cannot support. This is useful for testing.
