You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2021/03/31 05:23:59 UTC
[arrow] branch master updated: ARROW-7830: [C++][Parquet] Use Arrow
version number for parquet
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 7a0d334 ARROW-7830: [C++][Parquet] Use Arrow version number for parquet
7a0d334 is described below
commit 7a0d334f02533bc3234bdfc2ab83b5d893b46890
Author: Micah Kornfield <em...@gmail.com>
AuthorDate: Wed Mar 31 14:22:41 2021 +0900
ARROW-7830: [C++][Parquet] Use Arrow version number for parquet
Closes #9831 from emkornfield/ARROW-7830
Lead-authored-by: Micah Kornfield <em...@gmail.com>
Co-authored-by: emkornfield <mi...@google.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/src/parquet/.parquetcppversion | 1 -
cpp/src/parquet/CMakeLists.txt | 18 ------------------
cpp/src/parquet/ParquetConfig.cmake.in | 2 +-
cpp/src/parquet/parquet.pc.in | 2 +-
cpp/src/parquet/parquet_version.h.in | 8 ++++----
5 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/cpp/src/parquet/.parquetcppversion b/cpp/src/parquet/.parquetcppversion
deleted file mode 100644
index f825f7c..0000000
--- a/cpp/src/parquet/.parquetcppversion
+++ /dev/null
@@ -1 +0,0 @@
-1.5.1-SNAPSHOT
diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt
index 4dacdbd..3f3ca5a 100644
--- a/cpp/src/parquet/CMakeLists.txt
+++ b/cpp/src/parquet/CMakeLists.txt
@@ -21,24 +21,6 @@ add_custom_target(parquet-benchmarks)
add_custom_target(parquet-tests)
add_dependencies(parquet-all parquet parquet-tests parquet-benchmarks)
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/.parquetcppversion" PARQUET_VERSION)
-string(REPLACE "\n" "" PARQUET_VERSION "${PARQUET_VERSION}")
-string(REGEX MATCH "^([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?)" VERSION ${PARQUET_VERSION})
-if(NOT VERSION)
- message(FATAL_ERROR "invalid .parquetcppversion")
-endif()
-set(PARQUET_VERSION "${PARQUET_VERSION}" PARENT_SCOPE)
-
-string(REGEX
- REPLACE "^([0-9]+)\.[0-9]+\.[0-9]+(-.+)?$" "\\1" PARQUET_VERSION_MAJOR
- "${PARQUET_VERSION}")
-string(REGEX
- REPLACE "^[0-9]+\.([0-9]+)\.[0-9]+(-.+)?$" "\\1" PARQUET_VERSION_MINOR
- "${PARQUET_VERSION}")
-string(REGEX
- REPLACE "^[0-9]+\.[0-9]+\.([0-9]+)(-.+)?$" "\\1" PARQUET_VERSION_PATCH
- "${PARQUET_VERSION}")
-
function(ADD_PARQUET_TEST REL_TEST_NAME)
set(one_value_args)
set(multi_value_args EXTRA_DEPENDENCIES LABELS)
diff --git a/cpp/src/parquet/ParquetConfig.cmake.in b/cpp/src/parquet/ParquetConfig.cmake.in
index e4a00fc..afdecc5 100644
--- a/cpp/src/parquet/ParquetConfig.cmake.in
+++ b/cpp/src/parquet/ParquetConfig.cmake.in
@@ -32,7 +32,7 @@
include(CMakeFindDependencyMacro)
find_dependency(Arrow)
-set(PARQUET_VERSION "@PARQUET_VERSION@")
+set(PARQUET_VERSION "@ARROW_VERSION@")
set(PARQUET_SO_VERSION "@ARROW_SO_VERSION@")
set(PARQUET_FULL_SO_VERSION "@ARROW_FULL_SO_VERSION@")
diff --git a/cpp/src/parquet/parquet.pc.in b/cpp/src/parquet/parquet.pc.in
index 178f4b1..3b29263 100644
--- a/cpp/src/parquet/parquet.pc.in
+++ b/cpp/src/parquet/parquet.pc.in
@@ -25,7 +25,7 @@ full_so_version=@ARROW_FULL_SO_VERSION@
Name: Apache Parquet
Description: Apache Parquet is a columnar storage format.
-Version: @PARQUET_VERSION@
+Version: @ARROW_VERSION@
Requires: arrow
Libs: -L${libdir} -lparquet
Cflags: -I${includedir}
diff --git a/cpp/src/parquet/parquet_version.h.in b/cpp/src/parquet/parquet_version.h.in
index 2b207a4..b7d9576 100644
--- a/cpp/src/parquet/parquet_version.h.in
+++ b/cpp/src/parquet/parquet_version.h.in
@@ -18,14 +18,14 @@
#ifndef PARQUET_VERSION_H
#define PARQUET_VERSION_H
-#define PARQUET_VERSION_MAJOR @PARQUET_VERSION_MAJOR@
-#define PARQUET_VERSION_MINOR @PARQUET_VERSION_MINOR@
-#define PARQUET_VERSION_PATCH @PARQUET_VERSION_PATCH@
+#define PARQUET_VERSION_MAJOR @ARROW_VERSION_MAJOR@
+#define PARQUET_VERSION_MINOR @ARROW_VERSION_MINOR@
+#define PARQUET_VERSION_PATCH @ARROW_VERSION_PATCH@
#define PARQUET_SO_VERSION "@ARROW_SO_VERSION@"
#define PARQUET_FULL_SO_VERSION "@ARROW_FULL_SO_VERSION@"
// define the parquet created by version
-#define CREATED_BY_VERSION "parquet-cpp version @PARQUET_VERSION@"
+#define CREATED_BY_VERSION "parquet-cpp-arrow version @ARROW_VERSION@"
#endif // PARQUET_VERSION_H