Fossil SCM
In is_a_leaf(), count_nonbranch_children(), and leaf_rebuild(), ensure that cancel tags are filtered out. This was discovered by LLM analysis of libfossil, which unsurprisingly shares these same queries.
Commit
a822071af824a55cf3205919a928694980665558442e4bca3f247e75695749e1
Parent
3506473c271d33d…
1 file changed
+12
-6
+12
-6
| --- src/leaf.c | ||
| +++ src/leaf.c | ||
| @@ -35,13 +35,15 @@ | ||
| 35 | 35 | int rc; |
| 36 | 36 | static const char zSql[] = |
| 37 | 37 | @ SELECT 1 FROM plink |
| 38 | 38 | @ WHERE pid=%d |
| 39 | 39 | @ AND coalesce((SELECT value FROM tagxref |
| 40 | - @ WHERE tagid=%d AND rid=plink.pid), 'trunk') | |
| 40 | + @ WHERE tagid=%d AND rid=plink.pid | |
| 41 | + @ AND tagtype>0), 'trunk') | |
| 41 | 42 | @ =coalesce((SELECT value FROM tagxref |
| 42 | - @ WHERE tagid=%d AND rid=plink.cid), 'trunk') | |
| 43 | + @ WHERE tagid=%d AND rid=plink.cid | |
| 44 | + @ AND tagtype>0), 'trunk') | |
| 43 | 45 | ; |
| 44 | 46 | rc = db_int(0, zSql /*works-like:"%d,%d,%d"*/, |
| 45 | 47 | rid, TAG_BRANCH, TAG_BRANCH); |
| 46 | 48 | return rc==0; |
| 47 | 49 | } |
| @@ -60,13 +62,15 @@ | ||
| 60 | 62 | static Stmt q; |
| 61 | 63 | static const char zSql[] = |
| 62 | 64 | @ SELECT count(*) FROM plink |
| 63 | 65 | @ WHERE pid=:pid AND isprim |
| 64 | 66 | @ AND coalesce((SELECT value FROM tagxref |
| 65 | - @ WHERE tagid=%d AND rid=plink.pid), 'trunk') | |
| 67 | + @ WHERE tagid=%d AND rid=plink.pid | |
| 68 | + @ AND tagtype>0), 'trunk') | |
| 66 | 69 | @ =coalesce((SELECT value FROM tagxref |
| 67 | - @ WHERE tagid=%d AND rid=plink.cid), 'trunk') | |
| 70 | + @ WHERE tagid=%d AND rid=plink.cid | |
| 71 | + @ AND tagtype>0), 'trunk') | |
| 68 | 72 | ; |
| 69 | 73 | db_static_prepare(&q, zSql /*works-like: "%d,%d"*/, TAG_BRANCH, TAG_BRANCH); |
| 70 | 74 | db_bind_int(&q, ":pid", pid); |
| 71 | 75 | if( db_step(&q)==SQLITE_ROW ){ |
| 72 | 76 | nNonBranch = db_column_int(&q, 0); |
| @@ -88,13 +92,15 @@ | ||
| 88 | 92 | "INSERT OR IGNORE INTO leaf" |
| 89 | 93 | " SELECT cid FROM plink" |
| 90 | 94 | " EXCEPT" |
| 91 | 95 | " SELECT pid FROM plink" |
| 92 | 96 | " WHERE coalesce((SELECT value FROM tagxref" |
| 93 | - " WHERE tagid=%d AND rid=plink.pid),'trunk')" | |
| 97 | + " WHERE tagid=%d AND rid=plink.pid" | |
| 98 | + " AND tagtype>0),'trunk')" | |
| 94 | 99 | " == coalesce((SELECT value FROM tagxref" |
| 95 | - " WHERE tagid=%d AND rid=plink.cid),'trunk')", | |
| 100 | + " WHERE tagid=%d AND rid=plink.cid" | |
| 101 | + " AND tagtype>0),'trunk')", | |
| 96 | 102 | TAG_BRANCH, TAG_BRANCH |
| 97 | 103 | ); |
| 98 | 104 | } |
| 99 | 105 | |
| 100 | 106 | /* |
| 101 | 107 |
| --- src/leaf.c | |
| +++ src/leaf.c | |
| @@ -35,13 +35,15 @@ | |
| 35 | int rc; |
| 36 | static const char zSql[] = |
| 37 | @ SELECT 1 FROM plink |
| 38 | @ WHERE pid=%d |
| 39 | @ AND coalesce((SELECT value FROM tagxref |
| 40 | @ WHERE tagid=%d AND rid=plink.pid), 'trunk') |
| 41 | @ =coalesce((SELECT value FROM tagxref |
| 42 | @ WHERE tagid=%d AND rid=plink.cid), 'trunk') |
| 43 | ; |
| 44 | rc = db_int(0, zSql /*works-like:"%d,%d,%d"*/, |
| 45 | rid, TAG_BRANCH, TAG_BRANCH); |
| 46 | return rc==0; |
| 47 | } |
| @@ -60,13 +62,15 @@ | |
| 60 | static Stmt q; |
| 61 | static const char zSql[] = |
| 62 | @ SELECT count(*) FROM plink |
| 63 | @ WHERE pid=:pid AND isprim |
| 64 | @ AND coalesce((SELECT value FROM tagxref |
| 65 | @ WHERE tagid=%d AND rid=plink.pid), 'trunk') |
| 66 | @ =coalesce((SELECT value FROM tagxref |
| 67 | @ WHERE tagid=%d AND rid=plink.cid), 'trunk') |
| 68 | ; |
| 69 | db_static_prepare(&q, zSql /*works-like: "%d,%d"*/, TAG_BRANCH, TAG_BRANCH); |
| 70 | db_bind_int(&q, ":pid", pid); |
| 71 | if( db_step(&q)==SQLITE_ROW ){ |
| 72 | nNonBranch = db_column_int(&q, 0); |
| @@ -88,13 +92,15 @@ | |
| 88 | "INSERT OR IGNORE INTO leaf" |
| 89 | " SELECT cid FROM plink" |
| 90 | " EXCEPT" |
| 91 | " SELECT pid FROM plink" |
| 92 | " WHERE coalesce((SELECT value FROM tagxref" |
| 93 | " WHERE tagid=%d AND rid=plink.pid),'trunk')" |
| 94 | " == coalesce((SELECT value FROM tagxref" |
| 95 | " WHERE tagid=%d AND rid=plink.cid),'trunk')", |
| 96 | TAG_BRANCH, TAG_BRANCH |
| 97 | ); |
| 98 | } |
| 99 | |
| 100 | /* |
| 101 |
| --- src/leaf.c | |
| +++ src/leaf.c | |
| @@ -35,13 +35,15 @@ | |
| 35 | int rc; |
| 36 | static const char zSql[] = |
| 37 | @ SELECT 1 FROM plink |
| 38 | @ WHERE pid=%d |
| 39 | @ AND coalesce((SELECT value FROM tagxref |
| 40 | @ WHERE tagid=%d AND rid=plink.pid |
| 41 | @ AND tagtype>0), 'trunk') |
| 42 | @ =coalesce((SELECT value FROM tagxref |
| 43 | @ WHERE tagid=%d AND rid=plink.cid |
| 44 | @ AND tagtype>0), 'trunk') |
| 45 | ; |
| 46 | rc = db_int(0, zSql /*works-like:"%d,%d,%d"*/, |
| 47 | rid, TAG_BRANCH, TAG_BRANCH); |
| 48 | return rc==0; |
| 49 | } |
| @@ -60,13 +62,15 @@ | |
| 62 | static Stmt q; |
| 63 | static const char zSql[] = |
| 64 | @ SELECT count(*) FROM plink |
| 65 | @ WHERE pid=:pid AND isprim |
| 66 | @ AND coalesce((SELECT value FROM tagxref |
| 67 | @ WHERE tagid=%d AND rid=plink.pid |
| 68 | @ AND tagtype>0), 'trunk') |
| 69 | @ =coalesce((SELECT value FROM tagxref |
| 70 | @ WHERE tagid=%d AND rid=plink.cid |
| 71 | @ AND tagtype>0), 'trunk') |
| 72 | ; |
| 73 | db_static_prepare(&q, zSql /*works-like: "%d,%d"*/, TAG_BRANCH, TAG_BRANCH); |
| 74 | db_bind_int(&q, ":pid", pid); |
| 75 | if( db_step(&q)==SQLITE_ROW ){ |
| 76 | nNonBranch = db_column_int(&q, 0); |
| @@ -88,13 +92,15 @@ | |
| 92 | "INSERT OR IGNORE INTO leaf" |
| 93 | " SELECT cid FROM plink" |
| 94 | " EXCEPT" |
| 95 | " SELECT pid FROM plink" |
| 96 | " WHERE coalesce((SELECT value FROM tagxref" |
| 97 | " WHERE tagid=%d AND rid=plink.pid" |
| 98 | " AND tagtype>0),'trunk')" |
| 99 | " == coalesce((SELECT value FROM tagxref" |
| 100 | " WHERE tagid=%d AND rid=plink.cid" |
| 101 | " AND tagtype>0),'trunk')", |
| 102 | TAG_BRANCH, TAG_BRANCH |
| 103 | ); |
| 104 | } |
| 105 | |
| 106 | /* |
| 107 |