Repository: parquet-cpp Updated Branches: refs/heads/master edeabeb67 -> 7e1a13053
PARQUET-1003: Modify DEFAULT_CREATED_BY value for every new release v⦠â¦ersion Author: Deepak Majeti <[email protected]> Closes #350 from majetideepak/PARQUET-1003 and squashes the following commits: f2f21f9 [Deepak Majeti] checkin parquet_version.h ca321b4 [Deepak Majeti] PARQUET-1003: Modify DEFAULT_CREATED_BY value for every new release version Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/7e1a1305 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/7e1a1305 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/7e1a1305 Branch: refs/heads/master Commit: 7e1a13053f9181cb639afc9d821c17cae58260d8 Parents: edeabeb Author: Deepak Majeti <[email protected]> Authored: Sun Jun 11 14:28:45 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Sun Jun 11 14:28:45 2017 -0400 ---------------------------------------------------------------------- src/parquet/CMakeLists.txt | 13 +++++++++++-- src/parquet/column/properties.h | 3 ++- src/parquet/parquet_version.h | 24 ++++++++++++++++++++++++ src/parquet/parquet_version.h.in | 24 ++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7e1a1305/src/parquet/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/parquet/CMakeLists.txt b/src/parquet/CMakeLists.txt index 85da887..ed3fe56 100644 --- a/src/parquet/CMakeLists.txt +++ b/src/parquet/CMakeLists.txt @@ -24,12 +24,21 @@ install(FILES types.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/parquet") +configure_file(parquet_version.h.in + "${CMAKE_CURRENT_BINARY_DIR}/parquet_version.h" + @ONLY) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/parquet_version.h" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/parquet") + # pkg-config support configure_file(parquet.pc.in "${CMAKE_CURRENT_BINARY_DIR}/parquet.pc" @ONLY) -install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/parquet.pc" + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/parquet.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") ADD_PARQUET_TEST(compression-test) http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7e1a1305/src/parquet/column/properties.h ---------------------------------------------------------------------- diff --git a/src/parquet/column/properties.h b/src/parquet/column/properties.h index 29c011d..3ebc3b7 100644 --- a/src/parquet/column/properties.h +++ b/src/parquet/column/properties.h @@ -23,6 +23,7 @@ #include <unordered_map> #include "parquet/exception.h" +#include "parquet/parquet_version.h" #include "parquet/schema.h" #include "parquet/types.h" #include "parquet/util/memory.h" @@ -85,7 +86,7 @@ static constexpr bool DEFAULT_ARE_STATISTICS_ENABLED = true; static constexpr Encoding::type DEFAULT_ENCODING = Encoding::PLAIN; static constexpr ParquetVersion::type DEFAULT_WRITER_VERSION = ParquetVersion::PARQUET_1_0; -static const char DEFAULT_CREATED_BY[] = "parquet-cpp version 1.0.0"; +static const char DEFAULT_CREATED_BY[] = CREATED_BY_VERSION; static constexpr Compression::type DEFAULT_COMPRESSION_TYPE = Compression::UNCOMPRESSED; class PARQUET_EXPORT ColumnProperties { http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7e1a1305/src/parquet/parquet_version.h ---------------------------------------------------------------------- diff --git a/src/parquet/parquet_version.h b/src/parquet/parquet_version.h new file mode 100644 index 0000000..453af5e --- /dev/null +++ b/src/parquet/parquet_version.h @@ -0,0 +1,24 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +#ifndef PARQUET_VERSION_H +#define PARQUET_VERSION_H + +// define the parquet created by version +#define CREATED_BY_VERSION "parquet-cpp version 1.1.1-SNAPSHOT" + +#endif // PARQUET_VERSION_H http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7e1a1305/src/parquet/parquet_version.h.in ---------------------------------------------------------------------- diff --git a/src/parquet/parquet_version.h.in b/src/parquet/parquet_version.h.in new file mode 100644 index 0000000..7036d2f --- /dev/null +++ b/src/parquet/parquet_version.h.in @@ -0,0 +1,24 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +#ifndef PARQUET_VERSION_H +#define PARQUET_VERSION_H + +// define the parquet created by version +#define CREATED_BY_VERSION "parquet-cpp version @PARQUET_VERSION@" + +#endif // PARQUET_VERSION_H
