Skip to content

Commit e9d4abc

Browse files
authored
chore: cpplint for more directories (#16)
1 parent 99c9b2a commit e9d4abc

File tree

238 files changed

+1074
-578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+1074
-578
lines changed

.github/workflows/build_docs.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ on:
2121
paths:
2222
- 'apidoc/**'
2323
- 'docs/**'
24-
- 'src/**'
2524
- 'include/**'
2625

2726
concurrency:

.pre-commit-config.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,5 @@ repos:
8383
- c++
8484
exclude: |
8585
(?x)^(
86-
(third_party)/.*|
87-
(test)/.*|
88-
(src)/.*
86+
(third_party)/.*
8987
)$

src/paimon/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ if(PAIMON_BUILD_TESTS)
288288
common/memory/memory_segment_utils_test.cpp
289289
STATIC_LINK_LIBS
290290
paimon_shared
291+
test_utils_static
291292
fmt
292293
${GTEST_LINK_TOOLCHAIN})
293294

src/paimon/common/data/binary_array_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TEST(BinaryArrayTest, TestBinaryArraySimple) {
3838
std::srand(seed);
3939
std::vector<int64_t> values(100, 0);
4040
for (auto& value : values) {
41-
value = rand() % 10000000 + 1;
41+
value = paimon::test::RandomNumber(0, 10000000);
4242
}
4343
auto binary_array = BinaryArray::FromLongArray(values, pool.get());
4444
ASSERT_EQ(values.size(), binary_array.Size()) << "seed:" << seed;

src/paimon/common/data/binary_row_test.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ class BinaryRowTest : public testing::Test {
4343
void AssertTestWriterRow(const BinaryRow& row) {
4444
ASSERT_EQ(row.GetString(0).ToString(), "1");
4545
ASSERT_EQ(row.GetInt(8), 88);
46-
ASSERT_EQ(row.GetShort(11), (short)292);
46+
ASSERT_EQ(row.GetShort(11), static_cast<int16_t>(292));
4747
ASSERT_EQ(row.GetLong(10), 284);
48-
ASSERT_EQ(row.GetByte(2), (char)99);
49-
ASSERT_EQ(row.GetDouble(6), (double)87.1);
48+
ASSERT_EQ(row.GetByte(2), static_cast<char>(99));
49+
ASSERT_EQ(row.GetDouble(6), static_cast<double>(87.1));
5050
ASSERT_EQ(row.GetFloat(7), 26.1f);
5151
ASSERT_TRUE(row.GetBoolean(1));
5252
ASSERT_EQ(row.GetString(3).ToString(), "1234567");
@@ -101,12 +101,12 @@ TEST_F(BinaryRowTest, TestSetAndGet) {
101101

102102
ASSERT_EQ(row.GetInt(1), 11);
103103
ASSERT_TRUE(row.IsNullAt(0));
104-
ASSERT_EQ(row.GetShort(5), (short)55);
104+
ASSERT_EQ(row.GetShort(5), static_cast<int16_t>(55));
105105
ASSERT_EQ(row.GetLong(2), 22L);
106106
ASSERT_TRUE(row.GetBoolean(4));
107-
ASSERT_EQ(row.GetByte(6), (char)66);
108-
ASSERT_EQ(row.GetFloat(7), (float)77);
109-
ASSERT_EQ(row.GetDouble(3), (double)33);
107+
ASSERT_EQ(row.GetByte(6), static_cast<char>(66));
108+
ASSERT_EQ(row.GetFloat(7), static_cast<float>(77));
109+
ASSERT_EQ(row.GetDouble(3), static_cast<double>(33));
110110
}
111111

112112
TEST_F(BinaryRowTest, TestHeaderSize) {
@@ -330,7 +330,7 @@ TEST_F(BinaryRowTest, TestSingleSegmentBinaryRowHashCode) {
330330
writer2.Complete();
331331
hash_codes.insert(row2.HashCode());
332332
}
333-
ASSERT_TRUE(hash_codes.size() > (size_t)(count * 0.997));
333+
ASSERT_GT(hash_codes.size(), static_cast<size_t>(count * 0.997));
334334
}
335335

336336
TEST_F(BinaryRowTest, TestHeader) {
@@ -433,7 +433,7 @@ TEST_F(BinaryRowTest, TestZeroOutPaddingString) {
433433

434434
writer.Reset();
435435
for (int32_t i = 0; i < bytes_size; i++) {
436-
(*bytes)[i] = rand() % 256;
436+
(*bytes)[i] = paimon::test::RandomNumber(0, 255);
437437
}
438438
writer.WriteBinary(0, *bytes);
439439
writer.Reset();
@@ -443,7 +443,7 @@ TEST_F(BinaryRowTest, TestZeroOutPaddingString) {
443443

444444
writer.Reset();
445445
for (int32_t i = 0; i < bytes_size; i++) {
446-
(*bytes)[i] = rand() % 256;
446+
(*bytes)[i] = paimon::test::RandomNumber(0, 255);
447447
}
448448
writer.WriteBinary(0, *bytes);
449449
writer.Reset();
@@ -557,15 +557,15 @@ TEST_F(BinaryRowTest, TestBinaryRowSerializer) {
557557
int32_t bytes_size = 1024;
558558
std::shared_ptr<Bytes> bytes = Bytes::AllocateBytes(1024, pool.get());
559559
for (int32_t i = 0; i < bytes_size; i++) {
560-
(*bytes)[i] = rand() % 256;
560+
(*bytes)[i] = paimon::test::RandomNumber(0, 255);
561561
}
562562
int32_t str_size = 1024;
563563
std::string test_string1, test_string2;
564564
test_string1.reserve(str_size);
565565
test_string2.reserve(str_size);
566566
for (int32_t j = 0; j < str_size; j++) {
567-
test_string1 += rand() % 26 + 'a';
568-
test_string2 += rand() % 26 + 'a';
567+
test_string1 += paimon::test::RandomNumber(0, 25) + 'a';
568+
test_string2 += paimon::test::RandomNumber(0, 25) + 'a';
569569
}
570570
std::shared_ptr<Bytes> bytes1 = Bytes::AllocateBytes(test_string1, pool.get());
571571
std::shared_ptr<Bytes> bytes2 = Bytes::AllocateBytes(test_string2, pool.get());
@@ -579,7 +579,7 @@ TEST_F(BinaryRowTest, TestBinaryRowSerializer) {
579579
PAIMON_UNIQUE_PTR<Bytes> bytes_serialize =
580580
MemorySegmentUtils::CopyToBytes(out.Segments(), 0, out.CurrentSize(), pool.get());
581581
std::string str_serialize = std::string(bytes_serialize->data(), bytes_serialize->size());
582-
ASSERT_TRUE(str_serialize.size() >= bytes_size + test_string1.size() + test_string2.size());
582+
ASSERT_GE(str_serialize.size(), bytes_size + test_string1.size() + test_string2.size());
583583
std::string str_serialize1 = str_serialize.substr(
584584
str_serialize.size() - test_string1.size() - test_string2.size(), test_string1.size());
585585
std::string str_serialize2 =

src/paimon/common/data/binary_row_writer_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ TEST(BinaryRowWriterTest, TestFieldSetter) {
205205
/*use_view=*/true));
206206

207207
ASSERT_EQ(DataDefine::GetVariantValue<bool>(getter0(row)), true);
208-
ASSERT_EQ(DataDefine::GetVariantValue<char>(getter1(row)), (char)1);
209-
ASSERT_EQ(DataDefine::GetVariantValue<int16_t>(getter2(row)), (int16_t)2);
210-
ASSERT_EQ(DataDefine::GetVariantValue<int32_t>(getter3(row)), (int32_t)3);
211-
ASSERT_EQ(DataDefine::GetVariantValue<int64_t>(getter4(row)), (int64_t)4);
212-
ASSERT_EQ(DataDefine::GetVariantValue<float>(getter5(row)), (float)5.5);
213-
ASSERT_EQ(DataDefine::GetVariantValue<double>(getter6(row)), (double)6.66);
208+
ASSERT_EQ(DataDefine::GetVariantValue<char>(getter1(row)), static_cast<char>(1));
209+
ASSERT_EQ(DataDefine::GetVariantValue<int16_t>(getter2(row)), static_cast<int16_t>(2));
210+
ASSERT_EQ(DataDefine::GetVariantValue<int32_t>(getter3(row)), static_cast<int32_t>(3));
211+
ASSERT_EQ(DataDefine::GetVariantValue<int64_t>(getter4(row)), static_cast<int64_t>(4));
212+
ASSERT_EQ(DataDefine::GetVariantValue<float>(getter5(row)), static_cast<float>(5.5));
213+
ASSERT_EQ(DataDefine::GetVariantValue<double>(getter6(row)), static_cast<double>(6.66));
214214

215215
ASSERT_EQ(DataDefine::GetVariantValue<BinaryString>(getter7(row)).ToString(), data);
216216
ASSERT_EQ(*DataDefine::GetVariantValue<std::shared_ptr<Bytes>>(getter8(row)),

src/paimon/common/data/binary_section_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "binary_section.h"
17+
#include "paimon/common/data/binary_section.h"
1818

1919
#include "gtest/gtest.h"
2020
#include "paimon/memory/memory_pool.h"

src/paimon/common/data/binary_string_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ TEST_F(BinaryStringTest, TestCopy) {
371371
std::shared_ptr<Bytes> bytes = Bytes::AllocateBytes(s, pool.get());
372372
BinaryString binary_string = BinaryString::FromBytes(bytes, 0, 6);
373373
BinaryString copy_binary_string = binary_string.Copy(pool.get());
374-
ASSERT_TRUE(binary_string == copy_binary_string);
375-
ASSERT_TRUE(copy_binary_string.ByteAt(2) == 'h');
374+
ASSERT_EQ(binary_string, copy_binary_string);
375+
ASSERT_EQ(copy_binary_string.ByteAt(2), 'h');
376376
}
377377

378378
TEST_F(BinaryStringTest, TestByteAt) {
@@ -384,8 +384,8 @@ TEST_F(BinaryStringTest, TestByteAt) {
384384
std::vector<MemorySegment> mem_segs({MemorySegment::Wrap(bytes1), MemorySegment::Wrap(bytes2)});
385385
auto binary_string = BinaryString::FromAddress(mem_segs, /*offset=*/2,
386386
/*num_bytes=*/str1.length() + str2.length() - 2);
387-
ASSERT_TRUE(binary_string.ByteAt(0) == 'l');
388-
ASSERT_TRUE(binary_string.ByteAt(5) == 'r');
387+
ASSERT_EQ(binary_string.ByteAt(0), 'l');
388+
ASSERT_EQ(binary_string.ByteAt(5), 'r');
389389
}
390390

391391
TEST_F(BinaryStringTest, TestNumChars) {

src/paimon/common/data/data_define.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ class DataDefine {
7979
return arg ? "true" : "false";
8080
} else if constexpr (std::is_same_v<T, std::shared_ptr<Bytes>>) {
8181
return std::string(arg->data(), arg->size());
82-
} else if constexpr (std::is_same_v<T, BinaryString> ||
82+
} else if constexpr (std::is_same_v<T, // NOLINT(readability/braces)
83+
BinaryString> ||
8384
std::is_same_v<T, Timestamp> || std::is_same_v<T, Decimal>) {
8485
return arg.ToString();
8586
} else if constexpr (std::is_same_v<T, std::shared_ptr<InternalRow>>) {

src/paimon/common/data/data_getters.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616

1717
#pragma once
1818

19+
#include <memory>
20+
1921
#include "paimon/common/data/binary_string.h"
2022
#include "paimon/common/data/data_define.h"
2123
#include "paimon/data/decimal.h"
2224
#include "paimon/data/timestamp.h"
25+
2326
namespace paimon {
2427
class Bytes;
2528
class Decimal;

0 commit comments

Comments
 (0)