aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2014-08-15 09:39:38 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2014-08-15 09:41:28 +0300
commitc07693f0c7cde7d269025fe714a124223a189e71 (patch)
tree7f621a5768a27a789769e721a761429aba86d5be /src
parentf669b61476b2efd79701a7a104e9de2fe11e4e42 (diff)
downloadpostgresql-c07693f0c7cde7d269025fe714a124223a189e71.tar.gz
postgresql-c07693f0c7cde7d269025fe714a124223a189e71.zip
Remove remnants of a JENTRY_ISFIRST flag bit.
I removed the flag earlier, but missed a few references in jsonb.h.
Diffstat (limited to 'src')
-rw-r--r--src/include/utils/jsonb.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
index 5f2594b11f8..91e3e140b4d 100644
--- a/src/include/utils/jsonb.h
+++ b/src/include/utils/jsonb.h
@@ -104,10 +104,9 @@ typedef struct JsonbValue JsonbValue;
* 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
* 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
- * convenience, the JENTRY_ISFIRST flag is set. The begin offset and length
- * of the rest of the entries can be calculated using the end offset of the
- * previous JEntry in the array.
+ * container's JEntry array, that equals to the length of the node data. The
+ * begin offset and length of the rest of the entries can be calculated using
+ * the end offset of the previous JEntry in the array.
*
* 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
@@ -124,7 +123,7 @@ typedef struct JsonbValue JsonbValue;
* 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
* 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;
@@ -140,7 +139,6 @@ typedef uint32 JEntry;
#define JENTRY_ISCONTAINER 0x50000000 /* array or object */
/* Note possible multiple evaluations */
-#define JBE_ISFIRST(je_) (((je_) & JENTRY_ISFIRST) != 0)
#define JBE_ISSTRING(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISSTRING)
#define JBE_ISNUMERIC(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISNUMERIC)
#define JBE_ISCONTAINER(je_) (((je_) & JENTRY_TYPEMASK) == JENTRY_ISCONTAINER)