Skip to content

Commit 49caaa1

Browse files
committed
modify some details
1 parent ce130f6 commit 49caaa1

File tree

5 files changed

+43
-32
lines changed

5 files changed

+43
-32
lines changed

.github/workflows/rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Install C++ Build Tools (macOS)
8888
if: runner.os == 'macOS'
8989
run: |
90-
brew install cmake ninja openssl
90+
brew reinstall cmake ninja openssl
9191
9292
- name: Checkout
9393
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

dev/release/release.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ rc=$2
3838
git_origin_url="$(git remote get-url origin)"
3939
repository="${git_origin_url#*github.com?}"
4040
repository="${repository%.git}"
41+
4142
if [ "${git_origin_url}" != "[email protected]:apache/iceberg-cpp.git" ]; then
4243
echo "This script must be ran with a working copy of apache/iceberg-cpp."
4344
echo "The origin's URL: ${git_origin_url}"
@@ -61,13 +62,22 @@ svn \
6162

6263
svn co "${dist_url}/${release_id}"
6364
pushd "${release_id}"
65+
66+
echo "Renaming artifacts to their final release names..."
67+
for fname in ./*; do
68+
mv "${fname}" "${fname//-rc${rc}/}"
69+
done
70+
echo "Renamed files:"
71+
ls -l
72+
6473
gh release create "${tag}" \
74+
--repo "${repository}" \
6575
--title "Apache Iceberg C++ ${version}" \
6676
--generate-notes \
6777
--verify-tag \
68-
${release_id}.tar.gz \
69-
${release_id}.tar.gz.asc \
70-
${release_id}.tar.gz.sha512
78+
*.tar.gz \
79+
*.tar.gz.asc \
80+
*.tar.gz.sha512
7181
popd
7282

7383
rm -rf "${release_id}"
@@ -93,11 +103,12 @@ echo
93103
echo "Add this release to ASF's report database:"
94104
echo " https://reporter.apache.org/addrelease.html?iceberg"
95105

96-
echo "Draft email for [email protected] mailing list"
106+
echo "Draft email for announcement"
97107
echo ""
98108
echo "---------------------------------------------------------"
99109
cat <<MAIL
100-
110+
111+
101112
Hello everyone,
102113
103114
I'm pleased to announce the release of Apache Iceberg C++ v${version}!

dev/release/release_rc.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@ if [ "${RELEASE_SIGN}" -gt 0 ]; then
9696

9797
mkdir -p "${id}"
9898

99-
echo "Downloading .tar.gz from GitHub Releases"
99+
echo "Downloading .tar.gz and .sha512 from GitHub Releases"
100100
gh release download "${rc_tag}" \
101101
--dir "${id}" \
102102
--pattern "${tar_gz}" \
103+
--pattern "${tar_gz}.sha512" \
103104
--repo "${repository}" \
104105
--skip-existing
105106

src/iceberg/transform.cc

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,6 @@ constexpr std::string_view kHourName = "hour";
3939
constexpr std::string_view kVoidName = "void";
4040
} // namespace
4141

42-
constexpr std::string_view TransformTypeToString(TransformType type) {
43-
switch (type) {
44-
case TransformType::kUnknown:
45-
return kUnknownName;
46-
case TransformType::kIdentity:
47-
return kIdentityName;
48-
case TransformType::kBucket:
49-
return kBucketName;
50-
case TransformType::kTruncate:
51-
return kTruncateName;
52-
case TransformType::kYear:
53-
return kYearName;
54-
case TransformType::kMonth:
55-
return kMonthName;
56-
case TransformType::kDay:
57-
return kDayName;
58-
case TransformType::kHour:
59-
return kHourName;
60-
case TransformType::kVoid:
61-
return kVoidName;
62-
}
63-
std::unreachable();
64-
}
65-
6642
std::shared_ptr<Transform> Transform::Identity() {
6743
static auto instance =
6844
std::shared_ptr<Transform>(new Transform(TransformType::kIdentity));

src/iceberg/transform.h

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include <cstdint>
2525
#include <memory>
26+
#include <utility>
2627
#include <variant>
2728

2829
#include "iceberg/expression/literal.h"
@@ -57,7 +58,29 @@ enum class TransformType {
5758
};
5859

5960
/// \brief Get the relative transform name
60-
ICEBERG_EXPORT constexpr std::string_view TransformTypeToString(TransformType type);
61+
ICEBERG_EXPORT constexpr std::string_view TransformTypeToString(TransformType type) {
62+
switch (type) {
63+
case TransformType::kUnknown:
64+
return "unknown";
65+
case TransformType::kIdentity:
66+
return "identity";
67+
case TransformType::kBucket:
68+
return "bucket";
69+
case TransformType::kTruncate:
70+
return "truncate";
71+
case TransformType::kYear:
72+
return "year";
73+
case TransformType::kMonth:
74+
return "month";
75+
case TransformType::kDay:
76+
return "day";
77+
case TransformType::kHour:
78+
return "hour";
79+
case TransformType::kVoid:
80+
return "void";
81+
}
82+
std::unreachable();
83+
}
6184

6285
/// \brief Represents a transform used in partitioning or sorting in Iceberg.
6386
///

0 commit comments

Comments
 (0)