From: drh <>
Date: Sun, 11 Feb 2024 18:53:48 +0000 (+0000)
Subject: Improved AggInfo tracing in debug builds.  No changes to deliverable code.
X-Git-Tag: version-3.46.0~220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ece3567aec217b9e302e56295968966d8d7a3782;p=thirdparty%2Fsqlite.git

Improved AggInfo tracing in debug builds.  No changes to deliverable code.

FossilOrigin-Name: bb31f9c44794e02a46ed3edbcc96eb48c5870d3f82cb404586ded9a3efa7a859
---

diff --git a/manifest b/manifest
index 7fa4237cf2..4216332915 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sclarify\ssqlite3_exec()\scallback\sparameter\slifetime.
-D 2024-02-10T03:11:42.492
+C Improved\sAggInfo\stracing\sin\sdebug\sbuilds.\s\sNo\schanges\sto\sdeliverable\scode.
+D 2024-02-11T18:53:48.466
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -739,7 +739,7 @@ F src/printf.c 18fbdf028345c8fbe6044f5f5bfda5a10d48d6287afef088cc21b0ca57985640
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 0ed10ebb70d15dcf3f1882051931ccfaf9c3f4debe67dbd114047d9e2adb9523
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
+F src/select.c 43fabfc01bf87addd15e39f112f1e2ade15b19594835ab8a9e5bd50839d4e1b1
 F src/shell.c.in c6cb773b7703d76677529de19d1c40584520701966422c33da3e9334498a7099
 F src/sqlite.h.in 020d7b7307dda51420dc48b47e5334eaface77baba6bd9818375d392eb3ab5b5
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2162,8 +2162,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 717f67f3189a59842f5c17a25e8db0e24ec4405886fc22ab6eeb3954fba5a964
-R 64f77dbf6c9a67d1a6681b063264b76b
-U larrybr
-Z 925b1d0fbc30e91dd097edf85eb7f5c3
+P 993a1a843177b19a9cb5598f57d1e05c01e1695f164faaa9ae22810ad4533eba
+R b08d58139ab071fec772aaa3f5cfa8ae
+U drh
+Z 8c006f746e6086c64fa306e943cc82cc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 153c997809..764a7523c6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-993a1a843177b19a9cb5598f57d1e05c01e1695f164faaa9ae22810ad4533eba
\ No newline at end of file
+bb31f9c44794e02a46ed3edbcc96eb48c5870d3f82cb404586ded9a3efa7a859
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 1215727791..81e802d6e4 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6444,6 +6444,8 @@ void sqlite3SelectPrep(
 */
 static void printAggInfo(AggInfo *pAggInfo){
   int ii;
+  sqlite3DebugPrintf("AggInfo %d/%p:\n",
+     pAggInfo->selId, pAggInfo);
   for(ii=0; ii<pAggInfo->nColumn; ii++){
     struct AggInfo_col *pCol = &pAggInfo->aCol[ii];
     sqlite3DebugPrintf(
@@ -8546,6 +8548,12 @@ select_end:
   sqlite3ExprListDelete(db, pMinMaxOrderBy);
 #ifdef SQLITE_DEBUG
   if( pAggInfo && !db->mallocFailed ){
+#if TREETRACE_ENABLED
+    if( sqlite3TreeTrace & 0x20 ){
+      TREETRACE(0x20,pParse,p,("Finished with AggInfo\n"));
+      printAggInfo(pAggInfo);
+    }
+#endif
     for(i=0; i<pAggInfo->nColumn; i++){
       Expr *pExpr = pAggInfo->aCol[i].pCExpr;
       if( pExpr==0 ) continue;