fix up the macro

duckdb · Jun 18, 2024 · b40716e · b40716e
1 parent 65e4345
commit b40716e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/include/quack/quack_error.hpp b/include/quack/quack_error.hpp
@@ -19,15 +19,18 @@ extern "C" {
 };
 
 #define elog_quack(elevel, ...)  						\
-	quack::Logger::GetLock().lock(); 									\
+	do {												\
+	auto &l = quack::Logger::GetLock();					\
+	l.lock(); 											\
 	PG_TRY();											\
 	{													\
 		ereport(elevel, errmsg_internal(__VA_ARGS__)); 	\
 	}													\
-	PG_CATCH();										\
+	PG_CATCH();											\
 	{													\
-		quack::Logger::GetLock().unlock();								\
+		l.unlock();										\
 		PG_RE_THROW();									\
 	}													\
-	quack::Logger::GetLock().unlock();									\
 	PG_END_TRY();										\
+	l.unlock();											\
+	} while(0)
diff --git a/src/quack_planner.cpp b/src/quack_planner.cpp
@@ -78,8 +78,9 @@ quack_create_plan(Query *query, const char *queryString, ParamListInfo boundPara
 		Form_pg_type typtup;
 
 		tp = SearchSysCache1(TYPEOID, ObjectIdGetDatum(postgresColumnOid));
-		if (!HeapTupleIsValid(tp))
+		if (!HeapTupleIsValid(tp)) {
 			elog_quack(ERROR, "cache lookup failed for type %u", postgresColumnOid);
+		}
 
 		typtup = (Form_pg_type)GETSTRUCT(tp);