fix: compatible with postgres17

adjust · Aug 2, 2023 · c8a301c · c8a301c
1 parent 3ee46aa
commit c8a301c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 regression.diffs
 regression.out
 results
+.cache
+compile_commands.json
diff --git a/README.md b/README.md
@@ -14,6 +14,9 @@ make install
 or in case when PostgreSQL is installed in a custom location:
 ```sh
 make install PG_CONFIG=/path/to/pg_config
+
+# generate compile_commands.json
+sudo bear -- make install PG_CONFIG=/usr/local/pgsql/bin/pg_config
 ```
 It is possible to pass additional compilation flags through either custom
 `CCFLAGS` or standard `PG_CFLAGS`, `PG_CXXFLAGS`, `PG_CPPFLAGS` variables.

diff --git a/src/common.cpp b/src/common.cpp
@@ -27,7 +27,7 @@ exc_palloc(std::size_t size)
 	void	   *ret;
 	MemoryContext context = CurrentMemoryContext;
 
-	AssertArg(MemoryContextIsValid(context));
+	Assert(MemoryContextIsValid(context));
 
 	if (!AllocSizeIsValid(size))
 		throw std::bad_alloc();

diff --git a/src/parquet_impl.cpp b/src/parquet_impl.cpp
@@ -130,7 +130,7 @@ struct ParquetFdwPlanState
 static int
 get_strategy(Oid type, Oid opno, Oid am)
 {
-        Oid opclass;
+    Oid opclass;
     Oid opfamily;
 
     opclass = GetDefaultOpClass(type, am);
@@ -331,8 +331,7 @@ convert_const(Const *c, Oid dst_oid)
                 getTypeOutputInfo(c->consttype, &output_fn, &isvarlena);
                 getTypeInputInfo(dst_oid, &input_fn, &input_param);
 
-                str = DatumGetCString(OidOutputFunctionCall(output_fn,
-                                                            c->constvalue));
+                str = OidOutputFunctionCall(output_fn, c->constvalue);
                 newc->constvalue = OidInputFunctionCall(input_fn, str,
                                                         input_param, 0);
 
@@ -950,7 +949,7 @@ get_filenames_from_userfunc(const char *funcname, const char *funcarg)
 {
     Jsonb      *j = NULL;
     Oid         funcid;
-    List       *f = stringToQualifiedNameList(funcname);
+    List       *f = stringToQualifiedNameList(funcname, NULL);
     Datum       filenames;
     Oid         jsonboid = JSONBOID;
     Datum      *values;
@@ -1265,9 +1264,8 @@ parquetGetForeignPaths(PlannerInfo *root,
                                  NULL);
 
         /* Create PathKey for the attribute from "sorted" option */
-        attr_pathkeys = build_expression_pathkey(root, (Expr *) var, NULL,
-                                                sort_op, baserel->relids,
-                                                true);
+        attr_pathkeys = build_expression_pathkey(root, (Expr *) var, sort_op,
+                                                 baserel->relids, true);
 
         if (attr_pathkeys != NIL)
         {
@@ -2081,7 +2079,7 @@ parquet_fdw_validator_impl(PG_FUNCTION_ARGS)
         else if (strcmp(def->defname, "files_func") == 0)
         {
             Oid     jsonboid = JSONBOID;
-            List   *funcname = stringToQualifiedNameList(defGetString(def));
+            List   *funcname = stringToQualifiedNameList(defGetString(def), NULL);
             Oid     funcoid;
             Oid     rettype;