8000 Json v9 by l-wang · Pull Request #3 · l-wang/postgres · GitHub
[go: up one dir, main page]
Skip to content

Json v9 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Json v9 #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd946db
Allow transformation of only a sublist of subscripts
Oct 14, 2022
050703c
Allow Generic Type Subscripting to Accept Dot Notation (.) as Input
Apr 1, 2023
6029a27
Export jsonPathFromParseResult()
Apr 1, 2023
f03fa16
Extract coerce_jsonpath_subscript()
l-wang Feb 26, 2025
9e46413
Eanble String node as field accessors in generic subscripting
Apr 1, 2023
11321c2
Implement read-only dot notation for jsonb
Apr 1, 2023
8000
26c41cc
Allow wild card member access for jsonb
Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Eanble String node as field accessors in generic subscripting 
Now that we are allowing container generic subscripting to take dot
notation in the list of indirections, and it is transformed as a
String node.

For jsonb, we want to represent field accessors as String nodes in
refupperexprs for distinguishing from ordinary text subscripts which
can be needed for correct EXPLAIN.

Strings node is no longer a valid expression nodes, so added special
handling for them in walkers in nodeFuncs etc.
  • Loading branch information
@l-wang
Nikita Glukhov authored and l-wang committed Feb 27, 2025
commit 9e46413c7dfe4508e0ba78efb7733c845789b054
24 changes: 18 additions & 6 deletions src/backend/executor/execExpr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3328,9 +3328,15 @@ ExecInitSubscriptingRef(ExprEvalStep *scratch, SubscriptingRef *sbsref,
{
sbsrefstate->upperprovided[i] = true;
/* Each subscript is evaluated into appropriate array entry */
ExecInitExprRec(e, state,
&sbsrefstate->upperindex[i],
&sbsrefstate->upperindexnull[i]);
if (IsA(e, String))
{
sbsrefstate->upperindex[i] = CStringGetTextDatum(strVal(e));
sbsrefstate->upperindexnull[i] = false;
}
else
ExecInitExprRec(e, state,
&sbsrefstate->upperindex[i],
&sbsrefstate->upperindexnull[i]);
}
i++;
}
Expand All @@ -3351,9 +3357,15 @@ ExecInitSubscriptingRef(ExprEvalStep *scratch, SubscriptingRef *sbsref,
{
sbsrefstate->lowerprovided[i] = true;
/* Each subscript is evaluated into appropriate array entry */
ExecInitExprRec(e, state,
&sbsrefstate->lowerindex[i],
&sbsrefstate->lowerindexnull[i]);
if (IsA(e, String))
{
sbsrefstate->lowerindex[i] = CStringGetTextDatum(strVal(e));
sbsrefstate->lowerindexnull[i] = false;
}
else
ExecInitExprRec(e, state,
&sbsrefstate->lowerindex[i],
&sbsrefstate->lowerindexnull[i]);
}
i++;
}
Expand Down
73 changes: 64 additions & 9 deletions src/backend/nodes/nodeFuncs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,12 +2182,28 @@ expression_tree_walker_impl(Node *node,
case T_SubscriptingRef:
{
SubscriptingRef *sbsref = (SubscriptingRef *) node;
ListCell *lc;

/*
* Recurse directly for upper/lower container index lists,
* skipping String subscripts used for dot notation.
*/
foreach(lc, sbsref->refupperindexpr)
{
Node *expr = lfirst(lc);

if (expr && !IsA(expr, String) && WALK(expr))
return true;
}

foreach(lc, sbsref->reflowerindexpr)
{
Node *expr = lfirst(lc);

if (expr && !IsA(expr, String) && WALK(expr))
return true;
}

/* recurse directly for upper/lower container index lists */
if (LIST_WALK(sbsref->refupperindexpr))
return true;
if (LIST_WALK(sbsref->reflowerindexpr))
return true;
/* walker must see the refexpr and refassgnexpr, however */
if (WALK(sbsref->refexpr))
return true;
Expand Down Expand Up @@ -3082,12 +3098,51 @@ expression_tree_mutator_impl(Node *node,
{
SubscriptingRef *sbsref = (SubscriptingRef *) node;
SubscriptingRef *newnode;
ListCell *lc;
List *exprs = NIL;

FLATCOPY(newnode, sbsref, SubscriptingRef);
MUTATE(newnode->refupperindexpr, sbsref->refupperindexpr,
List *);
MUTATE(newnode->reflowerindexpr, sbsref->reflowerindexpr,
List *);

foreach(lc, sbsref->refupperindexpr)
{
Node *expr = lfirst(lc);

if (expr && IsA(expr, String))
{
String *str;

FLATCOPY(str, expr, String);
expr = (Node *) str;
}
else
expr = mutator(expr, context);

exprs = lappend(exprs, expr);
}

newnode->refupperindexpr = exprs;

exprs = NIL;

foreach(lc, sbsref->reflowerindexpr)
{
Node *expr = lfirst(lc);

if (expr && IsA(expr, String))
{
String *str;

FLATCOPY(str, expr, String);
expr = (Node *) str;
}
else
expr = mutator(expr, context);

exprs = lappend(exprs, expr);
}

newnode->reflowerindexpr = exprs;

MUTATE(newnode->refexpr, sbsref->refexpr,
Expr *);
MUTATE(newnode->refassgnexpr, sbsref->refassgnexpr,
Expand Down
22 changes: 18 additions & 4 deletions src/backend/parser/parse_collate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,11 +680,25 @@ assign_collations_walker(Node *node, assign_collations_context *context)
* contribute anything.)
*/
SubscriptingRef *sbsref = (SubscriptingRef *) node;
ListCell *lc;

/* skip String subscripts used for dot notation */
foreach(lc, sbsref->refupperindexpr)
{
Node *expr = lfirst(lc);

if (expr && !IsA(expr, String))
assign_expr_collations(context->pstate, expr);
}

foreach(lc, sbsref->reflowerindexpr)
{
Node *expr = lfirst(lc);

if (expr && !IsA(expr, String))
assign_expr_collations(context->pstate, expr);
}

assign_expr_collations(context->pstate,
(Node *) sbsref->refupperindexpr);
assign_expr_collations(context->pstate,
(Node *) sbsref->reflowerindexpr);
(void) assign_collations_walker((Node *) sbsref->refexpr,
&loccontext);
(void) assign_collations_walker((Node *) sbsref->refassgnexpr,
Expand Down
29 changes: 21 additions & 8 deletions src/backend/utils/adt/ruleutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "nodes/subscripting.h"
#include "optimizer/optimizer.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
Expand Down Expand Up @@ -12923,17 +12924,29 @@ printSubscripts(SubscriptingRef *sbsref, deparse_context *context)
lowlist_item = list_head(sbsref->reflowerindexpr); /* could be NULL */
foreach(uplist_item, sbsref->refupperindexpr)
{
appendStringInfoChar(buf, '[');
if (lowlist_item)
Node *up = (Node *) lfirst(uplist_item);

if (IsA(up, String))
{
appendStringInfoChar(buf, '.');
appendStringInfoString(buf, quote_identifier(strVal(up)));
}
else
{
appendStringInfoChar(buf, '[');
if (lowlist_item)
{
/* If subexpression is NULL, get_rule_expr prints nothing */
get_rule_expr((Node *) lfirst(lowlist_item), context, false);
appendStringInfoChar(buf, ':');
}
/* If subexpression is NULL, get_rule_expr prints nothing */
get_rule_expr((Node *) lfirst(lowlist_item), context, false);
appendStringInfoChar(buf, ':');
lowlist_item = lnext(sbsref->reflowerindexpr, lowlist_item);
get_rule_expr((Node *) lfirst(uplist_item), context, false);
appendStringInfoChar(buf, ']');
}
/* If subexpression is NULL, get_rule_expr prints nothing */
get_rule_expr((Node *) lfirst(uplist_item), context, false);
appendStringInfoChar(buf, ']');

if (lowlist_item)
lowlist_item = lnext(sbsref->reflowerindexpr, lowlist_item);
}
}

Expand Down
0