rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve comments for AdjustIntervalForTypmod. 

Blank line adjustments.
This commit is contained in:
Bruce Momjian 2005-07-12 16:05:12 +00:00
parent 62abb039df
commit 7f0b690334
6 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/utils/adt/nabstime.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.134 2005/06/29 22:51:56 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.135 2005/07/12 16:04:56 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -833,7 +833,6 @@ interval_reltime(PG_FUNCTION_ARGS)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 span; int64 span;
#else #else
double span; double span;
#endif #endif

4
src/backend/utils/adt/selfuncs.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.183 2005/06/29 22:51:56 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.184 2005/07/12 16:04:57 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2802,7 +2802,7 @@ convert_timevalue_to_scalar(Datum value, Oid typid)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (interval->status != 0) if (interval->status != 0)
return ((interval->data[1] - interval->data[0]) *1000000.0); return ((interval->data[1] - interval->data[0]) * 1000000.0);
#else #else
if (interval->status != 0) if (interval->status != 0)
return interval->data[1] - interval->data[0]; return interval->data[1] - interval->data[0];

17
src/backend/utils/adt/timestamp.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.131 2005/07/12 15:17:44 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.132 2005/07/12 16:04:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -47,7 +47,6 @@ TimestampTz PgStartTime;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec); static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec);
#else #else
static double time2t(const int hour, const int min, const int sec, const fsec_t fsec); static double time2t(const int hour, const int min, const int sec, const fsec_t fsec);
#endif #endif
@ -642,7 +641,10 @@ interval_scale(PG_FUNCTION_ARGS)
PG_RETURN_INTERVAL_P(result); PG_RETURN_INTERVAL_P(result);
} }
/*
* Adjust interval for specified precision, in both YEAR to SECOND
* range and sub-second precision.
*/
static void static void
AdjustIntervalForTypmod(Interval *interval, int32 typmod) AdjustIntervalForTypmod(Interval *interval, int32 typmod)
{ {
@ -722,7 +724,6 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 day; int64 day;
#else #else
double day; double day;
#endif #endif
@ -744,7 +745,6 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 hour; int64 hour;
#else #else
double hour; double hour;
#endif #endif
@ -887,7 +887,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
else else
elog(ERROR, "unrecognized interval typmod: %d", typmod); elog(ERROR, "unrecognized interval typmod: %d", typmod);
/* Need to adjust precision? If not, don't even try! */ /* Need to adjust subsecond precision? */
if (precision != INTERVAL_FULL_PRECISION) if (precision != INTERVAL_FULL_PRECISION)
{ {
if (precision < 0 || precision > MAX_INTERVAL_PRECISION) if (precision < 0 || precision > MAX_INTERVAL_PRECISION)
@ -990,7 +990,6 @@ dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 time; int64 time;
#else #else
double time; double time;
#endif #endif
@ -1171,7 +1170,6 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int date; int date;
int64 time; int64 time;
#else #else
double date, double date,
time; time;
@ -1211,7 +1209,6 @@ interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 time; int64 time;
#else #else
double time; double time;
#endif #endif
@ -1648,7 +1645,6 @@ interval_cmp_internal(Interval *interval1, Interval *interval2)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 span1, int64 span1,
span2; span2;
#else #else
double span1, double span1,
span2; span2;
@ -2192,7 +2188,6 @@ interval_mul(PG_FUNCTION_ARGS)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 months; int64 months;
#else #else
double months; double months;
#endif #endif

1
src/interfaces/ecpg/pgtypeslib/dt_common.c
View File

@ -1237,7 +1237,6 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 time; int64 time;
#else #else
double time; double time;
#endif #endif

9
src/interfaces/ecpg/pgtypeslib/interval.c
View File

@ -416,7 +416,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
sec = (*fsec / USECS_PER_SEC); sec = (*fsec / USECS_PER_SEC);
*fsec -= (sec * USECS_PER_SEC); *fsec -= (sec * USECS_PER_SEC);
#else #else
TMODULO(*fsec, sec, 1e0); TMODULO(*fsec, sec, 1.0);
#endif #endif
tm->tm_sec += sec; tm->tm_sec += sec;
} }
@ -674,7 +674,6 @@ interval2tm(interval span, struct tm * tm, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 time; int64 time;
#else #else
double time; double time;
#endif #endif
@ -704,9 +703,9 @@ interval2tm(interval span, struct tm * tm, fsec_t *fsec)
*fsec = (time - (tm->tm_sec * USECS_PER_SEC)); *fsec = (time - (tm->tm_sec * USECS_PER_SEC));
#else #else
TMODULO(time, tm->tm_mday, (double)SECS_PER_DAY); TMODULO(time, tm->tm_mday, (double)SECS_PER_DAY);
TMODULO(time, tm->tm_hour, 3600e0); TMODULO(time, tm->tm_hour, 3600.0);
TMODULO(time, tm->tm_min, 60e0); TMODULO(time, tm->tm_min, 60.0);
TMODULO(time, tm->tm_sec, 1e0); TMODULO(time, tm->tm_sec, 1.0);
*fsec = time; *fsec = time;
#endif #endif

5
src/interfaces/ecpg/pgtypeslib/timestamp.c
View File

@ -103,7 +103,6 @@ dt2time(timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 time; int64 time;
#else #else
double time; double time;
#endif #endif
@ -148,7 +147,6 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
int dDate, int dDate,
date0; date0;
int64 time; int64 time;
#else #else
double dDate, double dDate,
date0; date0;
@ -280,7 +278,6 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 noresult = 0; int64 noresult = 0;
#else #else
double noresult = 0.0; double noresult = 0.0;
#endif #endif
@ -572,7 +569,7 @@ dttofmtasc_replace(timestamp *ts, date dDate, int dow, struct tm * tm,
break; break;
case 's': case 's':
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
replace_val.int64_val = (*ts - SetEpochTimestamp()) / 1000000e0; replace_val.int64_val = (*ts - SetEpochTimestamp()) / 1000000.0;
replace_type = PGTYPES_TYPE_INT64; replace_type = PGTYPES_TYPE_INT64;
#else #else
replace_val.double_val = *ts - SetEpochTimestamp(); replace_val.double_val = *ts - SetEpochTimestamp();