mirror of
https://github.com/postgres/postgres.git
synced 2025-11-04 20:11:56 +03:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
119 lines
3.0 KiB
C
119 lines
3.0 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* arrayaccess.h
|
|
* Declarations for element-by-element access to Postgres arrays.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/arrayaccess.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef ARRAYACCESS_H
|
|
#define ARRAYACCESS_H
|
|
|
|
#include "access/tupmacs.h"
|
|
#include "utils/array.h"
|
|
|
|
|
|
/*
|
|
* Functions for iterating through elements of a flat or expanded array.
|
|
* These require a state struct "array_iter iter".
|
|
*
|
|
* Use "array_iter_setup(&iter, arrayptr);" to prepare to iterate, and
|
|
* "datumvar = array_iter_next(&iter, &isnullvar, index, ...);" to fetch
|
|
* the next element into datumvar/isnullvar.
|
|
* "index" must be the zero-origin element number; we make caller provide
|
|
* this since caller is generally counting the elements anyway. Despite
|
|
* that, these functions can only fetch elements sequentially.
|
|
*/
|
|
|
|
typedef struct array_iter
|
|
{
|
|
/* datumptr being NULL or not tells if we have flat or expanded array */
|
|
|
|
/* Fields used when we have an expanded array */
|
|
Datum *datumptr; /* Pointer to Datum array */
|
|
bool *isnullptr; /* Pointer to isnull array */
|
|
|
|
/* Fields used when we have a flat array */
|
|
char *dataptr; /* Current spot in the data area */
|
|
bits8 *bitmapptr; /* Current byte of the nulls bitmap, or NULL */
|
|
int bitmask; /* mask for current bit in nulls bitmap */
|
|
} array_iter;
|
|
|
|
|
|
static inline void
|
|
array_iter_setup(array_iter *it, AnyArrayType *a)
|
|
{
|
|
if (VARATT_IS_EXPANDED_HEADER(a))
|
|
{
|
|
if (a->xpn.dvalues)
|
|
{
|
|
it->datumptr = a->xpn.dvalues;
|
|
it->isnullptr = a->xpn.dnulls;
|
|
/* we must fill all fields to prevent compiler warnings */
|
|
it->dataptr = NULL;
|
|
it->bitmapptr = NULL;
|
|
}
|
|
else
|
|
{
|
|
/* Work with flat array embedded in the expanded datum */
|
|
it->datumptr = NULL;
|
|
it->isnullptr = NULL;
|
|
it->dataptr = ARR_DATA_PTR(a->xpn.fvalue);
|
|
it->bitmapptr = ARR_NULLBITMAP(a->xpn.fvalue);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
it->datumptr = NULL;
|
|
it->isnullptr = NULL;
|
|
it->dataptr = ARR_DATA_PTR(&a->flt);
|
|
it->bitmapptr = ARR_NULLBITMAP(&a->flt);
|
|
}
|
|
it->bitmask = 1;
|
|
}
|
|
|
|
static inline Datum
|
|
array_iter_next(array_iter *it, bool *isnull, int i,
|
|
int elmlen, bool elmbyval, char elmalign)
|
|
{
|
|
Datum ret;
|
|
|
|
if (it->datumptr)
|
|
{
|
|
ret = it->datumptr[i];
|
|
*isnull = it->isnullptr ? it->isnullptr[i] : false;
|
|
}
|
|
else
|
|
{
|
|
if (it->bitmapptr && (*(it->bitmapptr) & it->bitmask) == 0)
|
|
{
|
|
*isnull = true;
|
|
ret = (Datum) 0;
|
|
}
|
|
else
|
|
{
|
|
*isnull = false;
|
|
ret = fetch_att(it->dataptr, elmbyval, elmlen);
|
|
it->dataptr = att_addlength_pointer(it->dataptr, elmlen,
|
|
it->dataptr);
|
|
it->dataptr = (char *) att_align_nominal(it->dataptr, elmalign);
|
|
}
|
|
it->bitmask <<= 1;
|
|
if (it->bitmask == 0x100)
|
|
{
|
|
if (it->bitmapptr)
|
|
it->bitmapptr++;
|
|
it->bitmask = 1;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#endif /* ARRAYACCESS_H */
|