rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-03 02:56:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove remnants of a JENTRY_ISFIRST flag bit.

Browse Source 
I removed the flag earlier, but missed a few references in jsonb.h.
This commit is contained in:
Heikki Linnakangas 2014-08-15 09:39:38 +03:00
parent f669b61476
commit c07693f0c7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/utils/jsonb.h
View File

@ -104,10 +104,9 @@ typedef struct JsonbValue JsonbValue;
* To encode the length and offset of the variable-length portion of each * To encode the length and offset of the variable-length portion of each
* node in a compact way, the JEntry stores only the end offset within the * node in a compact way, the JEntry stores only the end offset within the
* variable-length portion of the container node. For the first JEntry in the * variable-length portion of the container node. For the first JEntry in the
* container's JEntry array, that equals to the length of the node data. For * container's JEntry array, that equals to the length of the node data. The
* convenience, the JENTRY_ISFIRST flag is set. The begin offset and length * begin offset and length of the rest of the entries can be calculated using
* of the rest of the entries can be calculated using the end offset of the * the end offset of the previous JEntry in the array.
* previous JEntry in the array.
* *
* Overall, the Jsonb struct requires 4-bytes alignment. Within the struct, * Overall, the Jsonb struct requires 4-bytes alignment. Within the struct,
* the variable-length portion of some node types is aligned to a 4-byte * the variable-length portion of some node types is aligned to a 4-byte
@ -124,7 +123,7 @@ typedef struct JsonbValue JsonbValue;
* The least significant 28 bits store the end offset of the entry (see * The least significant 28 bits store the end offset of the entry (see
* JBE_ENDPOS, JBE_OFF, JBE_LEN macros below). The next three bits * JBE_ENDPOS, JBE_OFF, JBE_LEN macros below). The next three bits
* are used to store the type of the entry. The most significant bit * are used to store the type of the entry. The most significant bit
* is set on the first entry in an array of JEntrys. * is unused, and should be set to zero.
*/ */
typedef uint32 JEntry; typedef uint32 JEntry;
@ -140,7 +139,6 @@ typedef uint32 JEntry;
#define JENTRY_ISCONTAINER 0x50000000 /* array or object */ #define JENTRY_ISCONTAINER 0x50000000 /* array or object */
/* Note possible multiple evaluations */ /* Note possible multiple evaluations */
#define JBE_ISFIRST(je_) (((je_) & JENTRY_ISFIRST) != 0)
#define JBE_ISSTRING(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISSTRING) #define JBE_ISSTRING(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISSTRING)
#define JBE_ISNUMERIC(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISNUMERIC) #define JBE_ISNUMERIC(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISNUMERIC)
#define JBE_ISCONTAINER(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISCONTAINER) #define JBE_ISCONTAINER(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISCONTAINER)