external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Random warning fixes (#6974) 

Citus build with PG16 fails because of the following warnings:
 - using char* instead of Datum
 - using pointer instead of oid
 - candidate function for format attribute
 - remove old definition from PG11 compatibility 62bf571ced

This commit fixes the above.
pull/6938/head
Naisila Puka 2023-06-09 14:36:43 +03:00 committed by GitHub
parent 8b2024b730
commit 2ba3bffe1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/columnar/columnar_reader.c
View File

@ -1557,7 +1557,7 @@ DeserializeDatumArray(StringInfo datumBuffer, bool *existsArray, uint32 datumCou
datumTypeLength); datumTypeLength);
currentDatumDataOffset = att_addlength_datum(currentDatumDataOffset, currentDatumDataOffset = att_addlength_datum(currentDatumDataOffset,
datumTypeLength, datumTypeLength,
currentDatumDataPointer); datumArray[datumIndex]);
currentDatumDataOffset = att_align_nominal(currentDatumDataOffset, currentDatumDataOffset = att_align_nominal(currentDatumDataOffset,
datumTypeAlign); datumTypeAlign);

8
src/backend/distributed/metadata/node_metadata.c
View File

@ -2871,15 +2871,15 @@ TupleToWorkerNode(TupleDesc tupleDescriptor, HeapTuple heapTuple)
*/ */
heap_deform_tuple(heapTuple, tupleDescriptor, datumArray, isNullArray); heap_deform_tuple(heapTuple, tupleDescriptor, datumArray, isNullArray);
char *nodeName = DatumGetCString(datumArray[Anum_pg_dist_node_nodename - 1]); char *nodeName = TextDatumGetCString(datumArray[Anum_pg_dist_node_nodename - 1]);
char *nodeRack = DatumGetCString(datumArray[Anum_pg_dist_node_noderack - 1]); char *nodeRack = TextDatumGetCString(datumArray[Anum_pg_dist_node_noderack - 1]);
WorkerNode *workerNode = (WorkerNode *) palloc0(sizeof(WorkerNode)); WorkerNode *workerNode = (WorkerNode *) palloc0(sizeof(WorkerNode));
workerNode->nodeId = DatumGetUInt32(datumArray[Anum_pg_dist_node_nodeid - 1]); workerNode->nodeId = DatumGetUInt32(datumArray[Anum_pg_dist_node_nodeid - 1]);
workerNode->workerPort = DatumGetUInt32(datumArray[Anum_pg_dist_node_nodeport - 1]); workerNode->workerPort = DatumGetUInt32(datumArray[Anum_pg_dist_node_nodeport - 1]);
workerNode->groupId = DatumGetInt32(datumArray[Anum_pg_dist_node_groupid - 1]); workerNode->groupId = DatumGetInt32(datumArray[Anum_pg_dist_node_groupid - 1]);
strlcpy(workerNode->workerName, TextDatumGetCString(nodeName), WORKER_LENGTH); strlcpy(workerNode->workerName, nodeName, WORKER_LENGTH);
strlcpy(workerNode->workerRack, TextDatumGetCString(nodeRack), WORKER_LENGTH); strlcpy(workerNode->workerRack, nodeRack, WORKER_LENGTH);
workerNode->hasMetadata = DatumGetBool(datumArray[Anum_pg_dist_node_hasmetadata - 1]); workerNode->hasMetadata = DatumGetBool(datumArray[Anum_pg_dist_node_hasmetadata - 1]);
workerNode->metadataSynced = workerNode->metadataSynced =
DatumGetBool(datumArray[Anum_pg_dist_node_metadatasynced - 1]); DatumGetBool(datumArray[Anum_pg_dist_node_metadatasynced - 1]);

4
src/backend/distributed/test/foreign_key_relationship_query.c
View File

@ -119,7 +119,7 @@ get_referencing_relation_id_list(PG_FUNCTION_ARGS)
wrapper->listCell = lnext(wrapper->list, wrapper->listCell); wrapper->listCell = lnext(wrapper->list, wrapper->listCell);
SRF_RETURN_NEXT(functionContext, PointerGetDatum(refId)); SRF_RETURN_NEXT(functionContext, ObjectIdGetDatum(refId));
} }
else else
{ {
@ -178,7 +178,7 @@ get_referenced_relation_id_list(PG_FUNCTION_ARGS)
wrapper->listCell = lnext(wrapper->list, wrapper->listCell); wrapper->listCell = lnext(wrapper->list, wrapper->listCell);
SRF_RETURN_NEXT(functionContext, PointerGetDatum(refId)); SRF_RETURN_NEXT(functionContext, ObjectIdGetDatum(refId));
} }
else else
{ {

4
src/backend/distributed/utils/citus_safe_lib.c
View File

@ -23,8 +23,6 @@
#include "distributed/citus_safe_lib.h" #include "distributed/citus_safe_lib.h"
#include "lib/stringinfo.h" #include "lib/stringinfo.h"
#define citus_vsnprintf pg_vsnprintf
/* /*
* ereport_constraint_handler is a constraint handler that calls ereport. A * ereport_constraint_handler is a constraint handler that calls ereport. A
@ -338,7 +336,7 @@ SafeSnprintf(char *restrict buffer, rsize_t bufsz, const char *restrict format,
va_list args; va_list args;
va_start(args, format); va_start(args, format);
size_t result = citus_vsnprintf(buffer, bufsz, format, args); int result = pg_vsnprintf(buffer, bufsz, format, args);
va_end(args); va_end(args);
return result; return result;
} }

3
src/include/distributed/citus_safe_lib.h
View File

@ -25,7 +25,8 @@ extern void SafeQsort(void *ptr, rsize_t count, rsize_t size,
int (*comp)(const void *, const void *)); int (*comp)(const void *, const void *));
void * SafeBsearch(const void *key, const void *ptr, rsize_t count, rsize_t size, void * SafeBsearch(const void *key, const void *ptr, rsize_t count, rsize_t size,
int (*comp)(const void *, const void *)); int (*comp)(const void *, const void *));
int SafeSnprintf(char *str, rsize_t count, const char *fmt, ...); int SafeSnprintf(char *str, rsize_t count, const char *fmt, ...) pg_attribute_printf(3,
0);
#define memset_struct_0(variable) memset(&variable, 0, sizeof(variable)) #define memset_struct_0(variable) memset(&variable, 0, sizeof(variable))