Skip to content

Commit f7a8898

Browse files
toreggetoregge
authored
Merge pull request #36607 from vespa-engine/arnej/reformat-streamingvisitors
run clang-format in streamingvisitors module
2 parents 3bd7467 + e7de9c7 commit f7a8898

104 files changed

Lines changed: 3411 additions & 4080 deletions

File tree

Some content is hidden

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

‎streamingvisitors/.clang-format‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
AccessModifierOffset: -4
2+
ColumnLimit: 118
3+
IndentWidth: 4
4+
DerivePointerAlignment: false
5+
PointerAlignment: Left
6+
ReferenceAlignment: Pointer
7+
AlignConsecutiveAssignments: None
8+
AlignConsecutiveDeclarations:
9+
Enabled: true
10+
AcrossEmptyLines: false
11+
AcrossComments: false
12+
AlignFunctionDeclarations: false
13+
AlignFunctionPointers: false
14+
AlignEscapedNewlines: LeftWithLastLine
15+
AllowShortFunctionsOnASingleLine: InlineOnly
16+
PackConstructorInitializers: NextLine
17+
BreakBeforeBraces: Custom
18+
BraceWrapping:
19+
AfterCaseLabel: false
20+
AfterClass: false
21+
AfterControlStatement: MultiLine
22+
AfterEnum: false
23+
AfterExternBlock: false
24+
AfterFunction: false
25+
AfterNamespace: false
26+
AfterObjCDeclaration: false
27+
AfterStruct: false
28+
AfterUnion: false
29+
BeforeCatch: false
30+
BeforeElse: false
31+
BeforeLambdaBody: false
32+
BeforeWhile: false
33+
IndentBraces: false
34+
SplitEmptyFunction: false
35+
SplitEmptyRecord: false
36+
SplitEmptyNamespace: false
37+
IncludeBlocks: Regroup
38+
IncludeCategories:
39+
- Regex: '^"'
40+
Priority: 1
41+
SortPriority: 1
42+
- Regex: '^<vespa/log/log[.]h'
43+
Priority: 9
44+
- Regex: '^<vespa/.*[.]h>'
45+
Priority: 3
46+
- Regex: '^<vespa/'
47+
Priority: 4
48+
- Regex: '<.*[.]h>'
49+
Priority: 5
50+
SortPriority: 6
51+
- Regex: '<.*[.]hpp>'
52+
Priority: 5
53+
SortPriority: 7
54+
- Regex: '<.*>'
55+
Priority: 8

‎streamingvisitors/src/tests/charbuffer/charbuffer_test.cpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@
55

66
namespace vsm {
77

8-
TEST(CharBufferTest, empty)
9-
{
8+
TEST(CharBufferTest, empty) {
109
CharBuffer buf;
1110
EXPECT_EQ(buf.getLength(), 0u);
1211
EXPECT_EQ(buf.getPos(), 0u);
1312
EXPECT_EQ(buf.getRemaining(), 0u);
1413
}
1514

16-
TEST(CharBufferTest, explicit_length)
17-
{
15+
TEST(CharBufferTest, explicit_length) {
1816
CharBuffer buf(8);
1917
EXPECT_EQ(buf.getLength(), 8u);
2018
EXPECT_EQ(buf.getPos(), 0u);
2119
EXPECT_EQ(buf.getRemaining(), 8u);
2220
}
2321

24-
TEST(CharBufferTest, resize)
25-
{
22+
TEST(CharBufferTest, resize) {
2623
CharBuffer buf(8);
2724
EXPECT_EQ(buf.getLength(), 8u);
2825
buf.resize(16);
@@ -31,8 +28,7 @@ TEST(CharBufferTest, resize)
3128
EXPECT_EQ(buf.getLength(), 16u);
3229
}
3330

34-
TEST(CharBufferTest, put_with_triggered_resize)
35-
{
31+
TEST(CharBufferTest, put_with_triggered_resize) {
3632
CharBuffer buf(8);
3733
buf.put("123456", 6);
3834
EXPECT_EQ(buf.getLength(), 8u);
@@ -60,6 +56,6 @@ TEST(CharBufferTest, put_with_triggered_resize)
6056
EXPECT_EQ(std::string(buf.getBuffer(), buf.getPos()), "bcd");
6157
}
6258

63-
}
59+
} // namespace vsm
6460

6561
GTEST_MAIN_RUN_ALL_TESTS()

‎streamingvisitors/src/tests/docsum/docsum_test.cpp‎

Lines changed: 36 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,113 @@
11
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
22

3-
#include <vespa/document/fieldvalue/fieldvalues.h>
3+
#include <vespa/document/datatype/mapdatatype.h>
44
#include <vespa/document/datatype/structdatatype.h>
55
#include <vespa/document/datatype/weightedsetdatatype.h>
6-
#include <vespa/document/datatype/mapdatatype.h>
6+
#include <vespa/document/fieldvalue/fieldvalues.h>
7+
#include <vespa/vespalib/data/slime/slime.h>
8+
#include <vespa/vespalib/data/smart_buffer.h>
9+
#include <vespa/vespalib/gtest/gtest.h>
710
#include <vespa/vsm/common/docsum.h>
811
#include <vespa/vsm/common/storagedocument.h>
912
#include <vespa/vsm/vsm/flattendocsumwriter.h>
10-
#include <vespa/vespalib/data/smart_buffer.h>
11-
#include <vespa/vespalib/data/slime/slime.h>
12-
#include <vespa/vespalib/gtest/gtest.h>
1313

1414
using namespace document;
1515

1616
namespace vsm {
1717

18-
template <typename T>
19-
class Vector : public std::vector<T>
20-
{
18+
template <typename T> class Vector : public std::vector<T> {
2119
public:
22-
Vector<T> & add(T v) { this->push_back(v); return *this; }
20+
Vector<T>& add(T v) {
21+
this->push_back(v);
22+
return *this;
23+
}
2324
};
2425

2526
using StringList = Vector<std::string>;
26-
using WeightedStringList = Vector<std::pair<std::string, int32_t> >;
27+
using WeightedStringList = Vector<std::pair<std::string, int32_t>>;
2728

28-
29-
class TestDocument : public vsm::Document
30-
{
29+
class TestDocument : public vsm::Document {
3130
private:
3231
std::vector<FieldValueContainer> _fields;
3332

3433
public:
35-
TestDocument(const search::DocumentIdT & docId, size_t numFields) : vsm::Document(docId, numFields), _fields(numFields) {}
34+
TestDocument(const search::DocumentIdT& docId, size_t numFields)
35+
: vsm::Document(docId, numFields), _fields(numFields) {}
3636
bool setField(FieldIdT fId, document::FieldValue::UP fv) override {
3737
if (fId < _fields.size()) {
3838
_fields[fId].reset(fv.release());
3939
return true;
4040
}
4141
return false;
4242
}
43-
const document::FieldValue * getField(FieldIdT fId) const override {
43+
const document::FieldValue* getField(FieldIdT fId) const override {
4444
if (fId < _fields.size()) {
4545
return _fields[fId].get();
4646
}
4747
return nullptr;
4848
}
4949
};
5050

51-
52-
class DocsumTest : public ::testing::Test
53-
{
51+
class DocsumTest : public ::testing::Test {
5452
protected:
55-
ArrayFieldValue createFieldValue(const StringList & fv);
56-
WeightedSetFieldValue createFieldValue(const WeightedStringList & fv);
53+
ArrayFieldValue createFieldValue(const StringList& fv);
54+
WeightedSetFieldValue createFieldValue(const WeightedStringList& fv);
5755

58-
void assertFlattenDocsumWriter(const FieldValue & fv, const std::string & exp, const std::string& label) {
56+
void assertFlattenDocsumWriter(const FieldValue& fv, const std::string& exp, const std::string& label) {
5957
FlattenDocsumWriter fdw;
6058
assertFlattenDocsumWriter(fdw, fv, exp, label);
6159
}
62-
void assertFlattenDocsumWriter(FlattenDocsumWriter & fdw, const FieldValue & fv, const std::string & exp, const std::string& label);
60+
void assertFlattenDocsumWriter(FlattenDocsumWriter& fdw, const FieldValue& fv, const std::string& exp,
61+
const std::string& label);
6362

6463
DocsumTest();
6564
~DocsumTest() override;
6665
};
6766

68-
DocsumTest::DocsumTest()
69-
: ::testing::Test()
70-
{
67+
DocsumTest::DocsumTest() : ::testing::Test() {
7168
}
7269

7370
DocsumTest::~DocsumTest() = default;
7471

75-
ArrayFieldValue
76-
DocsumTest::createFieldValue(const StringList & fv)
77-
{
72+
ArrayFieldValue DocsumTest::createFieldValue(const StringList& fv) {
7873

7974
static ArrayDataType type(*DataType::STRING);
80-
ArrayFieldValue afv(type);
75+
ArrayFieldValue afv(type);
8176
for (size_t i = 0; i < fv.size(); ++i) {
8277
afv.add(StringFieldValue(fv[i]));
8378
}
8479
return afv;
8580
}
8681

87-
WeightedSetFieldValue
88-
DocsumTest::createFieldValue(const WeightedStringList & fv)
89-
{
82+
WeightedSetFieldValue DocsumTest::createFieldValue(const WeightedStringList& fv) {
9083
static WeightedSetDataType type(*DataType::STRING, false, false);
91-
WeightedSetFieldValue wsfv(type);
84+
WeightedSetFieldValue wsfv(type);
9285
for (size_t i = 0; i < fv.size(); ++i) {
9386
wsfv.add(StringFieldValue(fv[i].first), fv[i].second);
9487
}
9588
return wsfv;
9689
}
9790

98-
void
99-
DocsumTest::assertFlattenDocsumWriter(FlattenDocsumWriter & fdw, const FieldValue & fv, const std::string & exp, const std::string& label)
100-
{
91+
void DocsumTest::assertFlattenDocsumWriter(FlattenDocsumWriter& fdw, const FieldValue& fv, const std::string& exp,
92+
const std::string& label) {
10193
SCOPED_TRACE(label);
10294
FieldPath empty;
10395
fv.iterateNested(empty.getFullRange(), fdw);
10496
std::string actual(fdw.getResult().getBuffer(), fdw.getResult().getPos());
10597
EXPECT_EQ(exp, actual);
10698
}
10799

108-
TEST_F(DocsumTest, flatten_docsum_writer_basic)
109-
{
100+
TEST_F(DocsumTest, flatten_docsum_writer_basic) {
110101
assertFlattenDocsumWriter(StringFieldValue("foo bar"), "foo bar", "string foo bar");
111102
assertFlattenDocsumWriter(RawFieldValue("foo bar"), "foo bar", "raw foo bar");
112103
assertFlattenDocsumWriter(BoolFieldValue(true), "true", "bool true");
113104
assertFlattenDocsumWriter(BoolFieldValue(false), "false", "bool false");
114105
assertFlattenDocsumWriter(LongFieldValue(123456789), "123456789", "long");
115106
assertFlattenDocsumWriter(createFieldValue(StringList().add("foo bar").add("baz").add(" qux ")),
116-
"foo bar baz qux ", "wset");
107+
"foo bar baz qux ", "wset");
117108
}
118109

119-
TEST_F(DocsumTest, flatten_docsum_writer_multiple_invocations)
120-
{
110+
TEST_F(DocsumTest, flatten_docsum_writer_multiple_invocations) {
121111
FlattenDocsumWriter fdw("#");
122112
assertFlattenDocsumWriter(fdw, StringFieldValue("foo"), "foo", "string foo");
123113
assertFlattenDocsumWriter(fdw, StringFieldValue("bar"), "foo#bar", "string bar");
@@ -126,24 +116,23 @@ TEST_F(DocsumTest, flatten_docsum_writer_multiple_invocations)
126116
assertFlattenDocsumWriter(fdw, StringFieldValue("qux"), "baz qux", "string qux");
127117
}
128118

129-
TEST_F(DocsumTest, flatten_docsum_writer_resizing)
130-
{
119+
TEST_F(DocsumTest, flatten_docsum_writer_resizing) {
131120
FlattenDocsumWriter fdw("#");
132121
EXPECT_EQ(fdw.getResult().getPos(), 0u);
133122
EXPECT_EQ(fdw.getResult().getLength(), 32u);
134123
assertFlattenDocsumWriter(fdw, StringFieldValue("aaaabbbbccccddddeeeeffffgggghhhh"),
135-
"aaaabbbbccccddddeeeeffffgggghhhh",
136-
"string long");
124+
"aaaabbbbccccddddeeeeffffgggghhhh", "string long");
137125
EXPECT_EQ(fdw.getResult().getPos(), 32u);
138126
EXPECT_EQ(fdw.getResult().getLength(), 32u);
139-
assertFlattenDocsumWriter(fdw, StringFieldValue("aaaa"), "aaaabbbbccccddddeeeeffffgggghhhh#aaaa", "string second long");
127+
assertFlattenDocsumWriter(fdw, StringFieldValue("aaaa"), "aaaabbbbccccddddeeeeffffgggghhhh#aaaa",
128+
"string second long");
140129
EXPECT_EQ(fdw.getResult().getPos(), 37u);
141130
EXPECT_TRUE(fdw.getResult().getLength() >= 37u);
142131
fdw.clear();
143132
EXPECT_EQ(fdw.getResult().getPos(), 0u);
144133
EXPECT_TRUE(fdw.getResult().getLength() >= 37u);
145134
}
146135

147-
}
136+
} // namespace vsm
148137

149138
GTEST_MAIN_RUN_ALL_TESTS()

‎streamingvisitors/src/tests/document/document_test.cpp‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
22

3-
#include <vespa/document/fieldvalue/fieldvalues.h>
43
#include <vespa/document/datatype/documenttype.h>
5-
#include <vespa/vsm/common/storagedocument.h>
4+
#include <vespa/document/fieldvalue/fieldvalues.h>
65
#include <vespa/vespalib/gtest/gtest.h>
76
#include <vespa/vespalib/stllike/asciistream.h>
7+
#include <vespa/vsm/common/storagedocument.h>
88

99
using namespace document;
1010

1111
namespace vsm {
1212

13-
TEST(DocumentTest, storage_document)
14-
{
13+
TEST(DocumentTest, storage_document) {
1514
DocumentType dt("testdoc", 0);
1615

1716
Field fa("a", 0, *DataType::STRING);
@@ -25,7 +24,7 @@ TEST(DocumentTest, storage_document)
2524

2625
SharedFieldPathMap fpmap(new FieldPathMapT());
2726
fpmap->emplace_back();
28-
dt.buildFieldPath(fpmap->back(),"a");
27+
dt.buildFieldPath(fpmap->back(), "a");
2928
fpmap->emplace_back();
3029
dt.buildFieldPath(fpmap->back(), "b");
3130
fpmap->emplace_back();
@@ -61,12 +60,11 @@ TEST(DocumentTest, storage_document)
6160
EXPECT_TRUE(!sdoc.setField(3, FieldValue::UP(new StringFieldValue("thud"))));
6261

6362
SharedFieldPathMap fim;
64-
StorageDocument s2(std::make_unique<document::Document>(), fim, 0);
63+
StorageDocument s2(std::make_unique<document::Document>(), fim, 0);
6564
EXPECT_EQ(IdString().toString(), s2.docDoc().getId().toString());
6665
}
6766

68-
TEST(DocumentTest, string_field_id_t_map)
69-
{
67+
TEST(DocumentTest, string_field_id_t_map) {
7068
StringFieldIdTMap m;
7169
EXPECT_EQ(0u, m.highestFieldNo());
7270
EXPECT_TRUE(StringFieldIdTMap::npos == m.fieldNo("unknown"));
@@ -93,15 +91,14 @@ TEST(DocumentTest, string_field_id_t_map)
9391
EXPECT_EQ(14u, m.highestFieldNo());
9492
{
9593
vespalib::asciistream os;
96-
StringFieldIdTMap t;
94+
StringFieldIdTMap t;
9795
t.add("b");
9896
t.add("a");
9997
os << t;
10098
EXPECT_EQ(std::string("a = 1\nb = 0\n"), os.view());
10199
}
102-
103100
}
104101

105-
}
102+
} // namespace vsm
106103

107104
GTEST_MAIN_RUN_ALL_TESTS()

0 commit comments

Comments
 (0)
⚡