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

Merge pull request #701 from citusdata/fix_inttypes_warnings 

Remove HAVE_INTTYPES_H ifdefs

cr: @anarazel
pull/739/head
Jason Petersen 2016-08-18 15:35:11 -06:00 committed by GitHub
parent b59ab75e2b 91578ff149
commit b4e6dc16d3
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 "funcapi.h"
#include "miscadmin.h" #include "miscadmin.h"
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
#include "access/htup_details.h" #include "access/htup_details.h"
#include "access/xact.h" #include "access/xact.h"
#include "catalog/dependency.h" #include "catalog/dependency.h"
@ -253,19 +249,9 @@ worker_cleanup_job_schema_cache(PG_FUNCTION_ARGS)
StringInfo StringInfo
JobSchemaName(uint64 jobId) 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(); 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); 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; return jobSchemaName;
} }

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

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