Skip to content

Commit 3a97fc6

Browse files
andyfengHKUandyfengHKU
committed
Run clang-format
1 parent e2e77a5 commit 3a97fc6

25 files changed

+121
-109
lines changed

‎src/binder/bind/bind_ddl.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ BoundCreateTableInfo Binder::bindCreateNodeTableInfo(const CreateTableInfo& info
141141
std::move(boundExtraInfo));
142142
}
143143

144-
static PropertyDefinition getDefinition(const std::vector<PropertyDefinition>& definitions, const std::string& name) {
144+
static PropertyDefinition getDefinition(const std::vector<PropertyDefinition>& definitions,
145+
const std::string& name) {
145146
for (auto& definition : definitions) {
146147
if (definition.getName() == name) {
147148
return definition.copy();
@@ -164,14 +165,17 @@ BoundCreateTableInfo Binder::bindCreateExternalNodeTableInfo(const CreateTableIn
164165
auto pkDefinition = getDefinition(propertyDefinitions, extraInfo.pkName);
165166
std::vector<PropertyDefinition> physicalPropertyDefinitions;
166167
physicalPropertyDefinitions.push_back(pkDefinition.copy());
167-
auto boundPhysicalExtraInfo = std::make_unique<BoundExtraCreateNodeTableInfo>(extraInfo.pkName, std::move(physicalPropertyDefinitions));
168-
auto boundPhysicalCreateInfo = BoundCreateTableInfo(TableType::NODE,
169-
getPhysicalTableName(info.tableName), ConflictAction::ON_CONFLICT_THROW,
170-
std::move(boundPhysicalExtraInfo));
168+
auto boundPhysicalExtraInfo = std::make_unique<BoundExtraCreateNodeTableInfo>(extraInfo.pkName,
169+
std::move(physicalPropertyDefinitions));
170+
auto boundPhysicalCreateInfo =
171+
BoundCreateTableInfo(TableType::NODE, getPhysicalTableName(info.tableName),
172+
ConflictAction::ON_CONFLICT_THROW, std::move(boundPhysicalExtraInfo));
171173
// Bind create node table reference info
172174
auto boundExtraInfo = std::make_unique<BoundExtraCreateExternalNodeTableInfo>(extraInfo.pkName,
173-
extraInfo.dbName, extraInfo.tableName, std::move(boundPhysicalCreateInfo), copyVector(propertyDefinitions));
174-
return BoundCreateTableInfo(TableType::EXTERNAL_NODE, info.tableName, info.onConflict, std::move(boundExtraInfo));
175+
extraInfo.dbName, extraInfo.tableName, std::move(boundPhysicalCreateInfo),
176+
copyVector(propertyDefinitions));
177+
return BoundCreateTableInfo(TableType::EXTERNAL_NODE, info.tableName, info.onConflict,
178+
std::move(boundExtraInfo));
175179
}
176180

177181
BoundCreateTableInfo Binder::bindCreateRelTableInfo(const CreateTableInfo& info) {

‎src/binder/bind/bind_external.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "binder/binder.h"
2-
#include "main/database_manager.h"
2+
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
33
#include "common/exception/binder.h"
44
#include "main/client_context.h"
5-
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
5+
#include "main/database_manager.h"
66

77
using namespace kuzu::common;
88
using namespace kuzu::catalog;
@@ -23,19 +23,20 @@ catalog::TableCatalogEntry* Binder::bindExternalTableEntry(const std::string& db
2323

2424
void Binder::bindExternalTableEntry(NodeOrRelExpression& nodeOrRel) {
2525
if (nodeOrRel.isMultiLabeled() || nodeOrRel.isEmpty()) {
26-
return ;
26+
return;
2727
}
2828
auto entry = nodeOrRel.getSingleEntry();
2929
switch (entry->getType()) {
3030
case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY: {
3131
auto& tableEntry = entry->constCast<ExternalNodeTableCatalogEntry>();
32-
auto externalEntry = bindExternalTableEntry(tableEntry.getExternalDBName(), tableEntry.getExternalTableName());
32+
auto externalEntry = bindExternalTableEntry(tableEntry.getExternalDBName(),
33+
tableEntry.getExternalTableName());
3334
nodeOrRel.setExternalEntry(externalEntry);
34-
} break ;
35+
} break;
3536
default:
3637
break;
3738
}
3839
}
3940

40-
}
41-
}
41+
} // namespace binder
42+
} // namespace kuzu

‎src/binder/bind/bind_graph_pattern.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
#include "catalog/catalog_entry/rdf_graph_catalog_entry.h"
1010
#include "catalog/catalog_entry/rel_group_catalog_entry.h"
1111
#include "catalog/catalog_entry/rel_table_catalog_entry.h"
12+
#include "common/distinct_vector.h"
1213
#include "common/exception/binder.h"
1314
#include "common/keyword/rdf_keyword.h"
1415
#include "common/string_format.h"
1516
#include "function/cast/functions/cast_from_string_functions.h"
1617
#include "main/client_context.h"
17-
#include "common/distinct_vector.h"
1818

1919
using namespace kuzu::common;
2020
using namespace kuzu::parser;
@@ -286,15 +286,15 @@ std::shared_ptr<RelExpression> Binder::createNonRecursiveQueryRel(const std::str
286286
for (auto& tableID : rdfGraphTableIDSet) {
287287
auto entry = catalog->getTableCatalogEntry(transaction, tableID);
288288
auto& rdfGraphEntry = entry->constCast<RDFGraphCatalogEntry>();
289-
resourceEntries.push_back(catalog->getTableCatalogEntry(transaction, rdfGraphEntry.getResourceTableID()));
289+
resourceEntries.push_back(
290+
catalog->getTableCatalogEntry(transaction, rdfGraphEntry.getResourceTableID()));
290291
}
291292
auto pID =
292293
expressionBinder.bindNodeOrRelPropertyExpression(*queryRel, std::string(rdf::PID));
293294
auto rdfInfo = std::make_unique<RdfPredicateInfo>(resourceEntries, std::move(pID));
294295
queryRel->setRdfPredicateInfo(std::move(rdfInfo));
295296
// Mock existence of pIRI property.
296-
auto pIRI =
297-
createPropertyExpression(std::string(rdf::IRI), *queryRel, resourceEntries);
297+
auto pIRI = createPropertyExpression(std::string(rdf::IRI), *queryRel, resourceEntries);
298298
queryRel->addPropertyExpression(std::string(rdf::IRI), std::move(pIRI));
299299
}
300300
std::vector<StructField> fields;

‎src/binder/bind/copy/bind_copy_from.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include "binder/binder.h"
22
#include "binder/copy/bound_copy_from.h"
33
#include "catalog/catalog.h"
4+
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
45
#include "catalog/catalog_entry/node_table_catalog_entry.h"
56
#include "catalog/catalog_entry/rdf_graph_catalog_entry.h"
67
#include "catalog/catalog_entry/rel_table_catalog_entry.h"
7-
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
88
#include "common/enums/table_type.h"
99
#include "common/exception/binder.h"
1010
#include "common/string_format.h"

‎src/binder/bind/ddl/bound_create_table_info.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ void BoundExtraCreateExternalNodeTableInfo::serialize(Serializer& serializer) co
9494
physicalInfo.serialize(serializer);
9595
}
9696

97-
std::unique_ptr<BoundExtraCreateExternalNodeTableInfo> BoundExtraCreateExternalNodeTableInfo::deserialize(Deserializer& deserializer) {
97+
std::unique_ptr<BoundExtraCreateExternalNodeTableInfo>
98+
BoundExtraCreateExternalNodeTableInfo::deserialize(Deserializer& deserializer) {
9899
std::string primaryKeyName;
99100
std::string externalDBName;
100101
std::string externalTableName;

‎src/catalog/catalog.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ table_id_t Catalog::createTableEntry(Transaction* transaction, const BoundCreate
197197
} break;
198198
case TableType::EXTERNAL_NODE: {
199199
entry = createExternalNodeTableEntry(transaction, info);
200-
} break ;
200+
} break;
201201
case TableType::REL: {
202202
entry = createRelTableEntry(transaction, info);
203203
} break;
@@ -531,14 +531,13 @@ std::unique_ptr<TableCatalogEntry> Catalog::createNodeTableEntry(Transaction*,
531531
return nodeTableEntry;
532532
}
533533

534-
535534
std::unique_ptr<TableCatalogEntry> Catalog::createExternalNodeTableEntry(Transaction* transaction,
536-
const BoundCreateTableInfo& info) const {
535+
const BoundCreateTableInfo& info) const {
537536
auto extraInfo = info.extraInfo->constPtrCast<BoundExtraCreateExternalNodeTableInfo>();
538537
auto physicalEntry = createNodeTableEntry(transaction, extraInfo->physicalInfo);
539538
auto entry = std::make_unique<ExternalNodeTableCatalogEntry>(tables.get(), info.tableName,
540-
extraInfo->externalDBName, extraInfo->externalTableName,
541-
std::move(physicalEntry), extraInfo->primaryKeyName);
539+
extraInfo->externalDBName, extraInfo->externalTableName, std::move(physicalEntry),
540+
extraInfo->primaryKeyName);
542541
entry->addProperties(extraInfo->propertyDefinitions);
543542
return entry;
544543
}
@@ -554,7 +553,6 @@ std::unique_ptr<TableCatalogEntry> Catalog::createRelTableEntry(Transaction*,
554553
return relTableEntry;
555554
}
556555

557-
558556
std::unique_ptr<TableCatalogEntry> Catalog::createRelTableGroupEntry(Transaction* transaction,
559557
const BoundCreateTableInfo& info) {
560558
auto extraInfo = info.extraInfo->ptrCast<BoundExtraCreateRelTableGroupInfo>();

‎src/catalog/catalog_entry/external_node_table_catalog_entry.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
22

3-
#include "common/serializer/deserializer.h"
43
#include "binder/ddl/bound_create_table_info.h"
4+
#include "common/serializer/deserializer.h"
55

66
using namespace kuzu::binder;
77
using namespace kuzu::common;
@@ -15,7 +15,8 @@ void ExternalNodeTableCatalogEntry::serialize(Serializer& serializer) const {
1515
serializer.write(primaryKeyName);
1616
}
1717

18-
std::unique_ptr<ExternalNodeTableCatalogEntry> ExternalNodeTableCatalogEntry::deserialize(Deserializer& deserializer) {
18+
std::unique_ptr<ExternalNodeTableCatalogEntry> ExternalNodeTableCatalogEntry::deserialize(
19+
Deserializer& deserializer) {
1920
std::string primaryKeyName;
2021
deserializer.deserializeValue(primaryKeyName);
2122
auto entry = std::make_unique<ExternalNodeTableCatalogEntry>();
@@ -30,10 +31,12 @@ std::unique_ptr<TableCatalogEntry> ExternalNodeTableCatalogEntry::copy() const {
3031
return result;
3132
}
3233

33-
std::unique_ptr<binder::BoundExtraCreateCatalogEntryInfo> ExternalNodeTableCatalogEntry::getBoundExtraCreateInfo(Transaction* transaction) const {
34+
std::unique_ptr<binder::BoundExtraCreateCatalogEntryInfo>
35+
ExternalNodeTableCatalogEntry::getBoundExtraCreateInfo(Transaction* transaction) const {
3436
return std::make_unique<BoundExtraCreateExternalNodeTableInfo>(primaryKeyName, externalDBName,
35-
externalTableName, physicalEntry->getBoundCreateTableInfo(transaction), copyVector(getProperties()));
37+
externalTableName, physicalEntry->getBoundCreateTableInfo(transaction),
38+
copyVector(getProperties()));
3639
}
3740

38-
}
39-
}
41+
} // namespace catalog
42+
} // namespace kuzu

‎src/catalog/catalog_entry/external_table_catalog_entry.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "catalog/catalog_entry/external_table_catalog_entry.h"
2+
23
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
34
#include "common/serializer/deserializer.h"
45

@@ -34,7 +35,7 @@ std::unique_ptr<ExternalTableCatalogEntry> ExternalTableCatalogEntry::deserializ
3435
switch (type) {
3536
case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY: {
3637
entry = ExternalNodeTableCatalogEntry::deserialize(deserializer);
37-
} break ;
38+
} break;
3839
default:
3940
KU_UNREACHABLE;
4041
}
@@ -44,7 +45,5 @@ std::unique_ptr<ExternalTableCatalogEntry> ExternalTableCatalogEntry::deserializ
4445
return entry;
4546
}
4647

47-
48-
49-
}
50-
}
48+
} // namespace catalog
49+
} // namespace kuzu

‎src/catalog/catalog_entry/table_catalog_entry.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "catalog/catalog_entry/table_catalog_entry.h"
22

33
#include "binder/ddl/bound_alter_info.h"
4+
#include "catalog/catalog_entry/external_table_catalog_entry.h"
45
#include "catalog/catalog_entry/node_table_catalog_entry.h"
56
#include "catalog/catalog_entry/rdf_graph_catalog_entry.h"
67
#include "catalog/catalog_entry/rel_group_catalog_entry.h"
78
#include "catalog/catalog_entry/rel_table_catalog_entry.h"
8-
#include "catalog/catalog_entry/external_table_catalog_entry.h"
99
#include "common/serializer/deserializer.h"
1010

1111
using namespace kuzu::binder;
@@ -77,7 +77,8 @@ common::column_id_t TableCatalogEntry::getColumnID(const std::string& propertyNa
7777
return propertyCollection.getColumnID(propertyName);
7878
}
7979

80-
void TableCatalogEntry::addProperties(const std::vector<binder::PropertyDefinition>& propertyDefinitions) {
80+
void TableCatalogEntry::addProperties(
81+
const std::vector<binder::PropertyDefinition>& propertyDefinitions) {
8182
for (auto& definition : propertyDefinitions) {
8283
propertyCollection.add(definition);
8384
}
@@ -119,7 +120,7 @@ std::unique_ptr<TableCatalogEntry> TableCatalogEntry::deserialize(
119120
} break;
120121
case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY: {
121122
result = ExternalTableCatalogEntry::deserialize(deserializer, type);
122-
} break ;
123+
} break;
123124
case CatalogEntryType::REL_TABLE_ENTRY: {
124125
result = RelTableCatalogEntry::deserialize(deserializer);
125126
} break;

‎src/catalog/catalog_set.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "binder/ddl/bound_alter_info.h"
44
#include "catalog/catalog_entry/dummy_catalog_entry.h"
5-
#include "catalog/catalog_entry/table_catalog_entry.h"
65
#include "catalog/catalog_entry/external_node_table_catalog_entry.h"
6+
#include "catalog/catalog_entry/table_catalog_entry.h"
77
#include "common/assert.h"
88
#include "common/exception/catalog.h"
99
#include "common/serializer/deserializer.h"

‎src/include/binder/ddl/bound_create_table_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ struct BoundExtraCreateExternalNodeTableInfo : public BoundExtraCreateTableInfo
114114
return std::make_unique<BoundExtraCreateExternalNodeTableInfo>(*this);
115115
}
116116

117-
void serialize(common::Serializer &serializer) const override;
117+
void serialize(common::Serializer& serializer) const override;
118118
static std::unique_ptr<BoundExtraCreateExternalNodeTableInfo> deserialize(
119119
common::Deserializer& deserializer);
120120
};

‎src/include/binder/expression/node_rel_expression.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,9 @@ class NodeOrRelExpression : public Expression {
3838
void addEntries(const std::vector<catalog::TableCatalogEntry*> entries_);
3939
catalog::TableCatalogEntry* getSingleEntry() const;
4040

41-
void setExternalEntry(catalog::TableCatalogEntry* entry) {
42-
externalEntry = entry;
43-
}
44-
bool hasExternalEntry() const {
45-
return externalEntry != nullptr;
46-
}
47-
catalog::TableCatalogEntry* getExternalEntry() const {
48-
return externalEntry;
49-
}
41+
void setExternalEntry(catalog::TableCatalogEntry* entry) { externalEntry = entry; }
42+
bool hasExternalEntry() const { return externalEntry != nullptr; }
43+
catalog::TableCatalogEntry* getExternalEntry() const { return externalEntry; }
5044

5145
void addPropertyExpression(const std::string& propertyName,
5246
std::unique_ptr<Expression> property);

‎src/include/catalog/catalog.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ class KUZU_API Catalog {
176176
const binder::BoundAlterInfo& info) const;
177177
std::unique_ptr<TableCatalogEntry> createNodeTableEntry(transaction::Transaction* transaction,
178178
const binder::BoundCreateTableInfo& info) const;
179-
std::unique_ptr<TableCatalogEntry> createExternalNodeTableEntry(transaction::Transaction* transaction,
180-
const binder::BoundCreateTableInfo& info) const;
179+
std::unique_ptr<TableCatalogEntry> createExternalNodeTableEntry(
180+
transaction::Transaction* transaction, const binder::BoundCreateTableInfo& info) const;
181181
std::unique_ptr<TableCatalogEntry> createRelTableEntry(transaction::Transaction* transaction,
182182
const binder::BoundCreateTableInfo& info) const;
183-
std::unique_ptr<TableCatalogEntry> createRelTableGroupEntry(transaction::Transaction* transaction,
184-
const binder::BoundCreateTableInfo& info);
183+
std::unique_ptr<TableCatalogEntry> createRelTableGroupEntry(
184+
transaction::Transaction* transaction, const binder::BoundCreateTableInfo& info);
185185
std::unique_ptr<TableCatalogEntry> createRdfGraphEntry(transaction::Transaction* transaction,
186186
const binder::BoundCreateTableInfo& info);
187187

‎src/include/catalog/catalog_entry/external_node_table_catalog_entry.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@ namespace catalog {
77

88
class ExternalNodeTableCatalogEntry : public ExternalTableCatalogEntry {
99
static constexpr CatalogEntryType entryType_ = CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY;
10+
1011
public:
1112
ExternalNodeTableCatalogEntry() = default;
1213
ExternalNodeTableCatalogEntry(CatalogSet* set, std::string name, std::string externalDBName,
1314
std::string externalTableName, std::unique_ptr<TableCatalogEntry> physicalEntry,
1415
std::string primaryKeyName)
1516
: ExternalTableCatalogEntry{set, entryType_, name, externalDBName, externalTableName,
16-
std::move(physicalEntry)}, primaryKeyName{std::move(primaryKeyName)} {}
17+
std::move(physicalEntry)},
18+
primaryKeyName{std::move(primaryKeyName)} {}
1719

18-
common::TableType getTableType() const override {
19-
return common::TableType::EXTERNAL_NODE;
20-
}
20+
common::TableType getTableType() const override { return common::TableType::EXTERNAL_NODE; }
2121

2222
void serialize(common::Serializer& serializer) const override;
23-
static std::unique_ptr<ExternalNodeTableCatalogEntry> deserialize(common::Deserializer& deserializer);
23+
static std::unique_ptr<ExternalNodeTableCatalogEntry> deserialize(
24+
common::Deserializer& deserializer);
2425

2526
std::unique_ptr<TableCatalogEntry> copy() const override;
2627

@@ -32,5 +33,5 @@ class ExternalNodeTableCatalogEntry : public ExternalTableCatalogEntry {
3233
std::string primaryKeyName;
3334
};
3435

35-
}
36-
}
36+
} // namespace catalog
37+
} // namespace kuzu

‎src/include/catalog/catalog_entry/external_table_catalog_entry.h

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,25 @@ class ExternalTableCatalogEntry : public TableCatalogEntry {
1212
std::string externalDBName, std::string externalTableName,
1313
std::unique_ptr<TableCatalogEntry> physicalEntry)
1414
: TableCatalogEntry{set, entryType, std::move(name)},
15-
externalDBName{std::move(externalDBName)}, externalTableName{std::move(externalTableName)}, physicalEntry{std::move(physicalEntry)} {}
16-
17-
std::string getExternalDBName() const {
18-
return externalDBName;
19-
}
20-
std::string getExternalTableName() const {
21-
return externalTableName;
22-
}
23-
TableCatalogEntry* getPhysicalEntry() const {
24-
return physicalEntry.get();
15+
externalDBName{std::move(externalDBName)},
16+
externalTableName{std::move(externalTableName)}, physicalEntry{std::move(physicalEntry)} {
2517
}
2618

27-
void copyFrom(const CatalogEntry &other) override;
19+
std::string getExternalDBName() const { return externalDBName; }
20+
std::string getExternalTableName() const { return externalTableName; }
21+
TableCatalogEntry* getPhysicalEntry() const { return physicalEntry.get(); }
22+
23+
void copyFrom(const CatalogEntry& other) override;
2824

29-
void serialize(common::Serializer &serializer) const override;
30-
static std::unique_ptr<ExternalTableCatalogEntry> deserialize(common::Deserializer& deserializer, CatalogEntryType type);
25+
void serialize(common::Serializer& serializer) const override;
26+
static std::unique_ptr<ExternalTableCatalogEntry> deserialize(
27+
common::Deserializer& deserializer, CatalogEntryType type);
3128

3229
protected:
3330
std::string externalDBName;
3431
std::string externalTableName;
3532
std::unique_ptr<TableCatalogEntry> physicalEntry;
3633
};
3734

38-
}
39-
}
35+
} // namespace catalog
36+
} // namespace kuzu

0 commit comments

Comments
 (0)