From ca74fbf6f164ad6fa9c6bd79050dc57cdcd69388 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 24 May 2020 02:05:04 +0000 Subject: Improvements to parse-tree tracing logic. No changes in deliverable code. FossilOrigin-Name: f7e5a68a7ebbb97a5beb050a75b3b4cf2fd6adc54653da993a8950fb3a5799f7 --- src/treeview.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/treeview.c') diff --git a/src/treeview.c b/src/treeview.c index 45c0d748b..f167e588c 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -582,8 +582,9 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){ #endif } if( pExpr->op==TK_AGG_FUNCTION ){ - sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s", - pExpr->op2, pExpr->u.zToken, zFlgs); + sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s iAgg=%d agg=%p", + pExpr->op2, pExpr->u.zToken, zFlgs, + pExpr->iAgg, pExpr->pAggInfo); }else if( pExpr->op2!=0 ){ const char *zOp2; char zBuf[8]; -- cgit v1.2.3 From a0365c487c1267af6d3ab101399c6fa35f5184a3 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 5 Jun 2020 04:01:50 +0000 Subject: In the debugging treeview output, change the name of "SELECT-expr" expression nodes to be "subquery-expr", so as to not confuse them with actual SELECT nodes. FossilOrigin-Name: c1c8937a30feff6aa4385b0c264fd8e70d54422a0629c2ce38082d85d3334a57 --- src/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/treeview.c') diff --git a/src/treeview.c b/src/treeview.c index f167e588c..8ae06261e 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -616,7 +616,7 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){ break; } case TK_SELECT: { - sqlite3TreeViewLine(pView, "SELECT-expr flags=0x%x", pExpr->flags); + sqlite3TreeViewLine(pView, "subquery-expr flags=0x%x", pExpr->flags); sqlite3TreeViewSelect(pView, pExpr->x.pSelect, 0); break; } -- cgit v1.2.3 From e26d428a5900bb0cbfbb4e3857ff6343e7664cfe Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 9 Jun 2020 11:59:15 +0000 Subject: Improved tree-view debugging output for aggregate functions. FossilOrigin-Name: b5711b4eead10ef4b0b61f2e2c54768d215a4105f6d47d2ea78991b6e53a6831 --- src/treeview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/treeview.c') diff --git a/src/treeview.c b/src/treeview.c index 8ae06261e..187f1a07d 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -582,8 +582,9 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){ #endif } if( pExpr->op==TK_AGG_FUNCTION ){ - sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s iAgg=%d agg=%p", + sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s agg=%d[%d]/%p", pExpr->op2, pExpr->u.zToken, zFlgs, + pExpr->pAggInfo ? pExpr->pAggInfo->selId : 0, pExpr->iAgg, pExpr->pAggInfo); }else if( pExpr->op2!=0 ){ const char *zOp2; -- cgit v1.2.3