|
25 | 25 | namespace iceberg { |
26 | 26 |
|
27 | 27 | namespace { |
28 | | -const auto kEpochDate = std::chrono::year{1970} / std::chrono::January / 1; |
29 | | -constexpr int64_t kMicrosPerMillis = 1000; |
30 | | -constexpr int64_t kMicrosPerSecond = 1000000; |
| 28 | +constexpr auto kEpochDate = std::chrono::year{1970} / std::chrono::January / 1; |
| 29 | +constexpr int64_t kMicrosPerMillis = 1'000; |
| 30 | +constexpr int64_t kMicrosPerSecond = 1'000'000; |
31 | 31 | } // namespace |
32 | 32 |
|
33 | 33 | std::string TransformUtil::HumanYear(int32_t year_ordinal) { |
@@ -93,40 +93,49 @@ std::string TransformUtil::HumanTimestampWithZone(int64_t timestamp_micros) { |
93 | 93 | } |
94 | 94 |
|
95 | 95 | std::string TransformUtil::Base64Encode(std::string_view str_to_encode) { |
96 | | - static const std::string base64_chars = |
| 96 | + static constexpr std::string_view kBase64Chars = |
97 | 97 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
98 | 98 | int32_t i = 0; |
99 | 99 | int32_t j = 0; |
100 | | - std::array<char, 3> char_array_3; |
101 | | - std::array<char, 4> char_array_4; |
| 100 | + std::array<unsigned char, 3> char_array_3; |
| 101 | + std::array<unsigned char, 4> char_array_4; |
102 | 102 |
|
103 | 103 | std::string encoded; |
104 | 104 | encoded.reserve((str_to_encode.size() + 2) * 4 / 3); |
105 | 105 |
|
106 | | - for (char byte : str_to_encode) { |
| 106 | + for (unsigned char byte : str_to_encode) { |
107 | 107 | char_array_3[i++] = byte; |
108 | 108 | if (i == 3) { |
109 | 109 | char_array_4[0] = (char_array_3[0] & 0xfc) >> 2; |
110 | 110 | char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4); |
111 | 111 | char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6); |
112 | 112 | char_array_4[3] = char_array_3[2] & 0x3f; |
113 | 113 |
|
114 | | - for (j = 0; j < 4; j++) encoded += base64_chars[char_array_4[j]]; |
| 114 | + for (j = 0; j < 4; j++) { |
| 115 | + encoded += kBase64Chars[char_array_4[j]]; |
| 116 | + } |
| 117 | + |
115 | 118 | i = 0; |
116 | 119 | } |
117 | 120 | } |
118 | 121 |
|
119 | 122 | if (i) { |
120 | | - for (j = i; j < 3; j++) char_array_3[j] = '\0'; |
| 123 | + for (j = i; j < 3; j++) { |
| 124 | + char_array_3[j] = '\0'; |
| 125 | + } |
121 | 126 |
|
122 | 127 | char_array_4[0] = (char_array_3[0] & 0xfc) >> 2; |
123 | 128 | char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4); |
124 | 129 | char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6); |
125 | 130 | char_array_4[3] = char_array_3[2] & 0x3f; |
126 | 131 |
|
127 | | - for (j = 0; j < i + 1; j++) encoded += base64_chars[char_array_4[j]]; |
| 132 | + for (j = 0; j < i + 1; j++) { |
| 133 | + encoded += kBase64Chars[char_array_4[j]]; |
| 134 | + } |
128 | 135 |
|
129 | | - while (i++ < 3) encoded += '='; |
| 136 | + while (i++ < 3) { |
| 137 | + encoded += '='; |
| 138 | + } |
130 | 139 | } |
131 | 140 |
|
132 | 141 | return encoded; |
|
0 commit comments