Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a clang-format GitHub action #82

Merged
merged 1 commit into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ on:
- '.github/workflows/**'

jobs:
clang-format:
runs-on: ubuntu-24.04

steps:
- name: Checkout pg_duckdb extension code
uses: actions/checkout@v4
- name: Fetch main branch
run: git fetch --depth=1 origin +main:refs/remotes/origin/main
- name: Install clang-format
run: sudo apt-get install clang-format
- name: Run clang-format
run: git clang-format refs/remotes/origin/main --diff
build-and-test:
strategy:
fail-fast: false
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,7 @@ lintcheck:
$(RM) -f .depend
$(foreach SRC,$(SRCS),$(CXX) $(CPPFLAGS) -I$(INCLUDEDIR) -I$(INCLUDEDIR_SERVER) -MM -MT $(SRC:.cpp=.o) $(SRC) >> .depend;)

format:
git clang-format origin/main

include .depend
1 change: 0 additions & 1 deletion src/pgduckdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ _PG_init(void) {
duckdb_init_hooks();
duckdb_init_node();
}

}

/* clang-format off */
Expand Down
2 changes: 1 addition & 1 deletion src/pgduckdb_hooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ duckdb_planner(Query *parse, const char *query_string, int cursorOptions, ParamL

static void
duckdb_utility(PlannedStmt *pstmt, const char *queryString, bool readOnlyTree, ProcessUtilityContext context,
ParamListInfo params, struct QueryEnvironment *queryEnv, DestReceiver *dest, QueryCompletion *qc) {
ParamListInfo params, struct QueryEnvironment *queryEnv, DestReceiver *dest, QueryCompletion *qc) {
Node *parsetree = pstmt->utilityStmt;
if (duckdb_execution && is_duckdb_extension_registered() && IsA(parsetree, CopyStmt)) {
uint64 processed;
Expand Down
2 changes: 1 addition & 1 deletion src/pgduckdb_memory_allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DuckdbFree(duckdb::PrivateAllocatorData *private_data, duckdb::data_ptr_t pointe

duckdb::data_ptr_t
DuckdbReallocate(duckdb::PrivateAllocatorData *private_data, duckdb::data_ptr_t pointer, duckdb::idx_t old_size,
duckdb::idx_t size) {
duckdb::idx_t size) {
return reinterpret_cast<duckdb::data_ptr_t>(repalloc(pointer, size));
}

Expand Down
4 changes: 2 additions & 2 deletions src/pgduckdb_planner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ duckdb_create_plan(Query *query, const char *queryString, ParamListInfo boundPar
Var *var = makeVar(INDEX_VAR, i + 1, postgresColumnOid, typtup->typtypmod, typtup->typcollation, 0);

duckdbNode->custom_scan_tlist =
lappend(duckdbNode->custom_scan_tlist,
makeTargetEntry((Expr *)var, i + 1, (char *)preparedQuery->GetNames()[i].c_str(), false));
lappend(duckdbNode->custom_scan_tlist,
makeTargetEntry((Expr *)var, i + 1, (char *)preparedQuery->GetNames()[i].c_str(), false));

ReleaseSysCache(tp);
}
Expand Down
2 changes: 1 addition & 1 deletion src/utility/copy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ duckdb_copy(PlannedStmt *pstmt, const char *queryString, struct QueryEnvironment
/* Copy `filename` should start with S3/GS/R2 prefix */
if (duckdb::string(copyStmt->filename).rfind(duckdbCopyS3FilenamePrefix, 0) &&
duckdb::string(copyStmt->filename).rfind(duckdbCopyGCSFilenamePrefix, 0) &&
duckdb::string(copyStmt->filename).rfind(duckdbCopyR2FilenamePrefix, 0)) {
duckdb::string(copyStmt->filename).rfind(duckdbCopyR2FilenamePrefix, 0)) {
return false;
}

Expand Down