Skip to content

Commit fdbe8d7

Browse files
sfc-gh-jrosesfc-gh-jrose
authored
SNOW-1009811: Enable clang-format precommit-hook (snowflakedb#1851)
1 parent 25f2547 commit fdbe8d7

Some content is hidden

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

50 files changed

+31468
-20051
lines changed

‎.clang-format

+269
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,269 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: Google
4+
AccessModifierOffset: -1
5+
AlignAfterOpenBracket: Align
6+
AlignArrayOfStructures: None
7+
AlignConsecutiveAssignments:
8+
Enabled: false
9+
AcrossEmptyLines: false
10+
AcrossComments: false
11+
AlignCompound: false
12+
PadOperators: true
13+
AlignConsecutiveBitFields:
14+
Enabled: false
15+
AcrossEmptyLines: false
16+
AcrossComments: false
17+
AlignCompound: false
18+
PadOperators: false
19+
AlignConsecutiveDeclarations:
20+
Enabled: false
21+
AcrossEmptyLines: false
22+
AcrossComments: false
23+
AlignCompound: false
24+
PadOperators: false
25+
AlignConsecutiveMacros:
26+
Enabled: false
27+
AcrossEmptyLines: false
28+
AcrossComments: false
29+
AlignCompound: false
30+
PadOperators: false
31+
AlignConsecutiveShortCaseStatements:
32+
Enabled: false
33+
AcrossEmptyLines: false
34+
AcrossComments: false
35+
AlignCaseColons: false
36+
AlignEscapedNewlines: Left
37+
AlignOperands: Align
38+
AlignTrailingComments:
39+
Kind: Always
40+
OverEmptyLines: 0
41+
AllowAllArgumentsOnNextLine: true
42+
AllowAllParametersOfDeclarationOnNextLine: true
43+
AllowShortBlocksOnASingleLine: Never
44+
AllowShortCaseLabelsOnASingleLine: false
45+
AllowShortEnumsOnASingleLine: true
46+
AllowShortFunctionsOnASingleLine: All
47+
AllowShortIfStatementsOnASingleLine: WithoutElse
48+
AllowShortLambdasOnASingleLine: All
49+
AllowShortLoopsOnASingleLine: true
50+
AlwaysBreakAfterDefinitionReturnType: None
51+
AlwaysBreakAfterReturnType: None
52+
AlwaysBreakBeforeMultilineStrings: true
53+
AlwaysBreakTemplateDeclarations: Yes
54+
AttributeMacros:
55+
- __capability
56+
BinPackArguments: true
57+
BinPackParameters: true
58+
BitFieldColonSpacing: Both
59+
BraceWrapping:
60+
AfterCaseLabel: false
61+
AfterClass: false
62+
AfterControlStatement: Never
63+
AfterEnum: false
64+
AfterExternBlock: false
65+
AfterFunction: false
66+
AfterNamespace: false
67+
AfterObjCDeclaration: false
68+
AfterStruct: false
69+
AfterUnion: false
70+
BeforeCatch: false
71+
BeforeElse: false
72+
BeforeLambdaBody: false
73+
BeforeWhile: false
74+
IndentBraces: false
75+
SplitEmptyFunction: true
76+
SplitEmptyRecord: true
77+
SplitEmptyNamespace: true
78+
BreakAfterAttributes: Never
79+
BreakAfterJavaFieldAnnotations: false
80+
BreakArrays: true
81+
BreakBeforeBinaryOperators: None
82+
BreakBeforeConceptDeclarations: Always
83+
BreakBeforeBraces: Attach
84+
BreakBeforeInlineASMColon: OnlyMultiline
85+
BreakBeforeTernaryOperators: true
86+
BreakConstructorInitializers: BeforeColon
87+
BreakInheritanceList: BeforeColon
88+
BreakStringLiterals: true
89+
ColumnLimit: 80
90+
CommentPragmas: '^ IWYU pragma:'
91+
CompactNamespaces: false
92+
ConstructorInitializerIndentWidth: 4
93+
ContinuationIndentWidth: 4
94+
Cpp11BracedListStyle: true
95+
DerivePointerAlignment: true
96+
DisableFormat: false
97+
EmptyLineAfterAccessModifier: Never
98+
EmptyLineBeforeAccessModifier: LogicalBlock
99+
ExperimentalAutoDetectBinPacking: false
100+
FixNamespaceComments: true
101+
ForEachMacros:
102+
- foreach
103+
- Q_FOREACH
104+
- BOOST_FOREACH
105+
IfMacros:
106+
- KJ_IF_MAYBE
107+
IncludeBlocks: Regroup
108+
IncludeCategories:
109+
- Regex: '^<ext/.*\.h>'
110+
Priority: 2
111+
SortPriority: 0
112+
CaseSensitive: false
113+
- Regex: '^<.*\.h>'
114+
Priority: 1
115+
SortPriority: 0
116+
CaseSensitive: false
117+
- Regex: '^<.*'
118+
Priority: 2
119+
SortPriority: 0
120+
CaseSensitive: false
121+
- Regex: '.*'
122+
Priority: 3
123+
SortPriority: 0
124+
CaseSensitive: false
125+
IncludeIsMainRegex: '([-_](test|unittest))?$'
126+
IncludeIsMainSourceRegex: ''
127+
IndentAccessModifiers: false
128+
IndentCaseBlocks: false
129+
IndentCaseLabels: true
130+
IndentExternBlock: AfterExternBlock
131+
IndentGotoLabels: true
132+
IndentPPDirectives: None
133+
IndentRequiresClause: true
134+
IndentWidth: 2
135+
IndentWrappedFunctionNames: false
136+
InsertBraces: false
137+
InsertNewlineAtEOF: false
138+
InsertTrailingCommas: None
139+
IntegerLiteralSeparator:
140+
Binary: 0
141+
BinaryMinDigits: 0
142+
Decimal: 0
143+
DecimalMinDigits: 0
144+
Hex: 0
145+
HexMinDigits: 0
146+
JavaScriptQuotes: Leave
147+
JavaScriptWrapImports: true
148+
KeepEmptyLinesAtTheStartOfBlocks: false
149+
KeepEmptyLinesAtEOF: false
150+
LambdaBodyIndentation: Signature
151+
LineEnding: DeriveLF
152+
MacroBlockBegin: ''
153+
MacroBlockEnd: ''
154+
MaxEmptyLinesToKeep: 1
155+
NamespaceIndentation: None
156+
ObjCBinPackProtocolList: Never
157+
ObjCBlockIndentWidth: 2
158+
ObjCBreakBeforeNestedBlockParam: true
159+
ObjCSpaceAfterProperty: false
160+
ObjCSpaceBeforeProtocolList: true
161+
PackConstructorInitializers: NextLine
162+
PenaltyBreakAssignment: 2
163+
PenaltyBreakBeforeFirstCallParameter: 1
164+
PenaltyBreakComment: 300
165+
PenaltyBreakFirstLessLess: 120
166+
PenaltyBreakOpenParenthesis: 0
167+
PenaltyBreakString: 1000
168+
PenaltyBreakTemplateDeclaration: 10
169+
PenaltyExcessCharacter: 1000000
170+
PenaltyIndentedWhitespace: 0
171+
PenaltyReturnTypeOnItsOwnLine: 200
172+
PointerAlignment: Left
173+
PPIndentWidth: -1
174+
QualifierAlignment: Leave
175+
RawStringFormats:
176+
- Language: Cpp
177+
Delimiters:
178+
- cc
179+
- CC
180+
- cpp
181+
- Cpp
182+
- CPP
183+
- 'c++'
184+
- 'C++'
185+
CanonicalDelimiter: ''
186+
BasedOnStyle: google
187+
- Language: TextProto
188+
Delimiters:
189+
- pb
190+
- PB
191+
- proto
192+
- PROTO
193+
EnclosingFunctions:
194+
- EqualsProto
195+
- EquivToProto
196+
- PARSE_PARTIAL_TEXT_PROTO
197+
- PARSE_TEST_PROTO
198+
- PARSE_TEXT_PROTO
199+
- ParseTextOrDie
200+
- ParseTextProtoOrDie
201+
- ParseTestProto
202+
- ParsePartialTestProto
203+
CanonicalDelimiter: pb
204+
BasedOnStyle: google
205+
ReferenceAlignment: Pointer
206+
ReflowComments: true
207+
RemoveBracesLLVM: false
208+
RemoveParentheses: Leave
209+
RemoveSemicolon: false
210+
RequiresClausePosition: OwnLine
211+
RequiresExpressionIndentation: OuterScope
212+
SeparateDefinitionBlocks: Leave
213+
ShortNamespaceLines: 1
214+
SortIncludes: CaseSensitive
215+
SortJavaStaticImport: Before
216+
SortUsingDeclarations: LexicographicNumeric
217+
SpaceAfterCStyleCast: false
218+
SpaceAfterLogicalNot: false
219+
SpaceAfterTemplateKeyword: true
220+
SpaceAroundPointerQualifiers: Default
221+
SpaceBeforeAssignmentOperators: true
222+
SpaceBeforeCaseColon: false
223+
SpaceBeforeCpp11BracedList: false
224+
SpaceBeforeCtorInitializerColon: true
225+
SpaceBeforeInheritanceColon: true
226+
SpaceBeforeJsonColon: false
227+
SpaceBeforeParens: ControlStatements
228+
SpaceBeforeParensOptions:
229+
AfterControlStatements: true
230+
AfterForeachMacros: true
231+
AfterFunctionDefinitionName: false
232+
AfterFunctionDeclarationName: false
233+
AfterIfMacros: true
234+
AfterOverloadedOperator: false
235+
AfterRequiresInClause: false
236+
AfterRequiresInExpression: false
237+
BeforeNonEmptyParentheses: false
238+
SpaceBeforeRangeBasedForLoopColon: true
239+
SpaceBeforeSquareBrackets: false
240+
SpaceInEmptyBlock: false
241+
SpacesBeforeTrailingComments: 2
242+
SpacesInAngles: Never
243+
SpacesInContainerLiterals: true
244+
SpacesInLineCommentPrefix:
245+
Minimum: 1
246+
Maximum: -1
247+
SpacesInParens: Never
248+
SpacesInParensOptions:
249+
InCStyleCasts: false
250+
InConditionalStatements: false
251+
InEmptyParentheses: false
252+
Other: false
253+
SpacesInSquareBrackets: false
254+
Standard: Auto
255+
StatementAttributeLikeMacros:
256+
- Q_EMIT
257+
StatementMacros:
258+
- Q_UNUSED
259+
- QT_REQUIRE_VERSION
260+
TabWidth: 8
261+
UseTab: Never
262+
VerilogBreakBetweenInstancePorts: true
263+
WhitespaceSensitiveMacros:
264+
- BOOST_PP_STRINGIZE
265+
- CF_SWIFT_NAME
266+
- NS_SWIFT_NAME
267+
- PP_STRINGIZE
268+
- STRINGIZE
269+
...

‎.pre-commit-config.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,12 @@ repos:
126126
args:
127127
- --safe
128128
language_version: python3
129+
- repo: https://github.com/pre-commit/mirrors-clang-format
130+
rev: v17.0.6
131+
hooks:
132+
- id: clang-format
133+
types_or: [c++, c]
134+
exclude: >
135+
(?x)^(
136+
src/snowflake/connector/nanoarrow_cpp/ArrowIterator/flatcc/.*\.h|
137+
)$

‎MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ exclude .pre-commit-config.yaml
1818
exclude license_header.txt
1919
exclude tox.ini
2020
exclude mypy.ini
21+
exclude .clang-format
2122

2223
prune ci
2324
prune benchmark

‎src/snowflake/connector/nanoarrow_cpp/ArrowIterator/BinaryConverter.cpp

+7-10
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
//
44

55
#include "BinaryConverter.hpp"
6+
67
#include <memory>
78

8-
namespace sf
9-
{
10-
Logger* BinaryConverter::logger = new Logger("snowflake.connector.BinaryConverter");
9+
namespace sf {
10+
Logger* BinaryConverter::logger =
11+
new Logger("snowflake.connector.BinaryConverter");
1112

12-
BinaryConverter::BinaryConverter(ArrowArrayView* array)
13-
: m_array(array)
14-
{
15-
}
13+
BinaryConverter::BinaryConverter(ArrowArrayView* array) : m_array(array) {}
1614

17-
PyObject* BinaryConverter::toPyObject(int64_t rowIndex) const
18-
{
19-
if(ArrowArrayViewIsNull(m_array, rowIndex)) {
15+
PyObject* BinaryConverter::toPyObject(int64_t rowIndex) const {
16+
if (ArrowArrayViewIsNull(m_array, rowIndex)) {
2017
Py_RETURN_NONE;
2118
}
2219
ArrowStringView stringView = ArrowArrayViewGetStringUnsafe(m_array, rowIndex);

‎src/snowflake/connector/nanoarrow_cpp/ArrowIterator/BinaryConverter.hpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
#ifndef PC_BINARYCONVERTER_HPP
66
#define PC_BINARYCONVERTER_HPP
77

8+
#include <memory>
9+
810
#include "IColumnConverter.hpp"
911
#include "logging.hpp"
1012
#include "nanoarrow.h"
11-
#include <memory>
1213

13-
namespace sf
14-
{
14+
namespace sf {
1515

16-
class BinaryConverter : public IColumnConverter
17-
{
18-
public:
16+
class BinaryConverter : public IColumnConverter {
17+
public:
1918
explicit BinaryConverter(ArrowArrayView* array);
2019

2120
PyObject* toPyObject(int64_t rowIndex) const override;
2221

23-
private:
22+
private:
2423
ArrowArrayView* m_array;
2524

2625
static Logger* logger;

‎src/snowflake/connector/nanoarrow_cpp/ArrowIterator/BooleanConverter.cpp

+7-11
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,23 @@
33
//
44

55
#include "BooleanConverter.hpp"
6+
67
#include <memory>
78

8-
namespace sf
9-
{
9+
namespace sf {
1010

11-
BooleanConverter::BooleanConverter(ArrowArrayView* array)
12-
: m_array(array)
13-
{
14-
}
11+
BooleanConverter::BooleanConverter(ArrowArrayView* array) : m_array(array) {}
1512

16-
PyObject* BooleanConverter::toPyObject(int64_t rowIndex) const
17-
{
18-
if(ArrowArrayViewIsNull(m_array, rowIndex)) {
13+
PyObject* BooleanConverter::toPyObject(int64_t rowIndex) const {
14+
if (ArrowArrayViewIsNull(m_array, rowIndex)) {
1915
Py_RETURN_NONE;
2016
}
2117

22-
if(ArrowArrayViewGetIntUnsafe(m_array, rowIndex)) {
18+
if (ArrowArrayViewGetIntUnsafe(m_array, rowIndex)) {
2319
Py_RETURN_TRUE;
2420
} else {
2521
Py_RETURN_FALSE;
26-
}
22+
}
2723
}
2824

2925
} // namespace sf

0 commit comments

Comments
 (0)