From 8fd14a46fb771a0a0bc34eaba49a266bbe25e8bd Mon Sep 17 00:00:00 2001 From: Tao He Date: Sat, 20 Jan 2024 21:49:25 +0800 Subject: [PATCH] Bump up vineyard version to v0.20.1 and fixes a bug in typenames Signed-off-by: Tao He --- CMakeLists.txt | 2 +- charts/vineyard-operator/Chart.yaml | 4 ++-- k8s/cmd/main.go | 2 +- modules/basic/ds/arrow_utils.cc | 4 ++-- setup.cfg | 2 +- src/common/util/config.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d14dafa..d564e330 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3) set(VINEYARD_MAJOR_VERSION 0) set(VINEYARD_MINOR_VERSION 20) -set(VINEYARD_PATCH_VERSION 1) +set(VINEYARD_PATCH_VERSION 2) set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION}) message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.") diff --git a/charts/vineyard-operator/Chart.yaml b/charts/vineyard-operator/Chart.yaml index 4a16bcec..645249b4 100644 --- a/charts/vineyard-operator/Chart.yaml +++ b/charts/vineyard-operator/Chart.yaml @@ -24,9 +24,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.20.1 +version: 0.20.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.20.1 +appVersion: 0.20.2 diff --git a/k8s/cmd/main.go b/k8s/cmd/main.go index a7dbdd3f..3bad83f3 100644 --- a/k8s/cmd/main.go +++ b/k8s/cmd/main.go @@ -48,7 +48,7 @@ var cmdLong = util.LongDesc(` var cmd = &cobra.Command{ Use: "vineyardctl [command]", - Version: "v0.20.1", + Version: "v0.20.2", Short: "vineyardctl is the command-line tool for interact with the Vineyard Operator.", Long: cmdLong, } diff --git a/modules/basic/ds/arrow_utils.cc b/modules/basic/ds/arrow_utils.cc index d1446263..5942888c 100644 --- a/modules/basic/ds/arrow_utils.cc +++ b/modules/basic/ds/arrow_utils.cc @@ -730,11 +730,11 @@ std::shared_ptr type_name_to_arrow_type( return vineyard::ConvertToArrowType::TypeValue(); } else if (name == "int32_t" || name == "int32" || name == "int") { return vineyard::ConvertToArrowType::TypeValue(); - } else if (name == "uint32_t" || name == "uint32") { + } else if (name == "uint32_t" || name == "uint32" || name == "uint") { return vineyard::ConvertToArrowType::TypeValue(); } else if (name == "int64_t" || name == "int64" || name == "long") { return vineyard::ConvertToArrowType::TypeValue(); - } else if (name == "uint64_t" || name == "uint64") { + } else if (name == "uint64_t" || name == "uint64" || name == "ulong") { return vineyard::ConvertToArrowType::TypeValue(); } else if (name == "float") { return vineyard::ConvertToArrowType::TypeValue(); diff --git a/setup.cfg b/setup.cfg index 11a8634e..f297c93e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -version = 0.20.1 +version = 0.20.2 [pycodestyle] max_line_length = 88 diff --git a/src/common/util/config.h b/src/common/util/config.h index 57037bca..61faadd1 100644 --- a/src/common/util/config.h +++ b/src/common/util/config.h @@ -18,11 +18,11 @@ limitations under the License. #define VINEYARD_VERSION_MAJOR 0 #define VINEYARD_VERSION_MINOR 20 -#define VINEYARD_VERSION_PATCH 1 +#define VINEYARD_VERSION_PATCH 2 #define VINEYARD_VERSION \ ((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \ VINEYARD_VERSION_PATCH -#define VINEYARD_VERSION_STRING "0.20.1" +#define VINEYARD_VERSION_STRING "0.20.2" #endif // SRC_COMMON_UTIL_CONFIG_H_