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

Remove HAVE_INTTYPES_H ifdefs 

I've been seeing warnings on OS X/clang for a while about these lines
and finally got tired of it. The main problem is that PRIu64 expects a
uint64_t but we were passing a uint64 (a PostgreSQL-defined type). In
PostgreSQL 9.5, we now have INT64_MODIFIER, so can build our own zero-
padded unsigned 64-bit int format modifier that expects a PostgreSQL-
provided uint64 type.

This simplifies the code slightly (no more ifdefs) and gets rid of the
warning that's been annoying me since April (my TODO creation time).
pull/807/head
Jason Petersen 2016-08-03 15:57:23 -07:00
parent a091353c0c
commit 9ea36bb375
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/distributed/worker/worker_merge_protocol.c
View File

@ -17,10 +17,6 @@
#include "funcapi.h"
#include "miscadmin.h"
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
#include "access/htup_details.h"
#include "access/xact.h"
#include "catalog/dependency.h"
@ -253,19 +249,9 @@ worker_cleanup_job_schema_cache(PG_FUNCTION_ARGS)
StringInfo
JobSchemaName(uint64 jobId)
{
/*
* We need to apply padding on our 64-bit job id, and therefore cannot use
* UINT64_FORMAT here.
*/
#ifdef HAVE_INTTYPES_H
StringInfo jobSchemaName = makeStringInfo();
appendStringInfo(jobSchemaName, "%s%0*" PRIu64, JOB_SCHEMA_PREFIX,
appendStringInfo(jobSchemaName, "%s%0*" INT64_MODIFIER "u", JOB_SCHEMA_PREFIX,
MIN_JOB_DIRNAME_WIDTH, jobId);
#else
StringInfo jobSchemaName = makeStringInfo();
appendStringInfo(jobSchemaName, "%s%0*llu",
JOB_SCHEMA_PREFIX, MIN_JOB_DIRNAME_WIDTH, jobId);
#endif
return jobSchemaName;
}

15
src/backend/distributed/worker/worker_partition_protocol.c
View File

@ -18,9 +18,6 @@
#include "funcapi.h"
#include <arpa/inet.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
#include <netinet/in.h>
#include <sys/stat.h>
#include <unistd.h>
@ -449,20 +446,12 @@ StringInfo
JobDirectoryName(uint64 jobId)
{
/*
* We use the default tablespace in {datadir}/base. Further, we need to
* apply padding on our 64-bit job id, and hence can't use UINT64_FORMAT.
* We use the default tablespace in {datadir}/base.
*/
#ifdef HAVE_INTTYPES_H
StringInfo jobDirectoryName = makeStringInfo();
appendStringInfo(jobDirectoryName, "base/%s/%s%0*" PRIu64,
appendStringInfo(jobDirectoryName, "base/%s/%s%0*" INT64_MODIFIER "u",
PG_JOB_CACHE_DIR, JOB_DIRECTORY_PREFIX,
MIN_JOB_DIRNAME_WIDTH, jobId);
#else
StringInfo jobDirectoryName = makeStringInfo();
appendStringInfo(jobDirectoryName, "base/%s/%s%0*llu",
PG_JOB_CACHE_DIR, JOB_DIRECTORY_PREFIX,
MIN_JOB_DIRNAME_WIDTH, jobId);
#endif
return jobDirectoryName;
}