findJsonbValueFromSuperHeader just accepts cstrings
authorPeter Geoghegan <pg@heroku.com>
Mon, 17 Mar 2014 23:25:58 +0000 (16:25 -0700)
committerPeter Geoghegan <pg@heroku.com>
Mon, 17 Mar 2014 23:25:58 +0000 (16:25 -0700)
src/backend/utils/adt/jsonfuncs.c

index 64b66c427bfd1e54ddcce0d54bf693f88fb8a5dd..479912791a28a363c81ebb654f0a3536dab20e73 100644 (file)
@@ -3048,8 +3048,7 @@ populate_recordset_object_field_end(void *state, char *fname, bool isnull)
 }
 
 /*
- * findJsonbValueFromSuperHeader() wrapper that sets up JsonbValue key
- * according to our frequent requirements.
+ * findJsonbValueFromSuperHeader() wrapper that sets up JsonbValue key string.
  */
 static JsonbValue *
 findJsonbValueFromSuperHeaderLen(JsonbSuperHeader sheader, uint32 flags,
@@ -3057,16 +3056,9 @@ findJsonbValueFromSuperHeaderLen(JsonbSuperHeader sheader, uint32 flags,
 {
    JsonbValue  k;
 
-   if (key == NULL)
-   {
-       k.type = jbvNull;
-   }
-   else
-   {
-       k.type = jbvString;
-       k.string.val = key;
-       k.string.len = keylen;
-   }
+   k.type = jbvString;
+   k.string.val = key;
+   k.string.len = keylen;
 
    return findJsonbValueFromSuperHeader(sheader, flags, lowbound, &k);
 }