Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the merge pivot finder so that it honors time-warp fixes. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: | cf6fa2f34a1dd1cea32ba25bd3d44e866336c2261a38659a1aefba16cd5d56ba |
| User & Date: | drh 2018-05-31 14:40:09 |
Context
|
2018-05-31
| ||
| 15:21 | Improvement to the pivot-finder so that it works even if there are time-warps in the graph. check-in: 917f1c21 user: drh tags: trunk | |
| 14:40 | Fix the merge pivot finder so that it honors time-warp fixes. check-in: cf6fa2f3 user: drh tags: trunk | |
| 14:32 | Fix over-length source code lines in merge.c. check-in: 5a88b5f6 user: drh tags: trunk | |
Changes
Changes to src/pivot.c.
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
);
/* Add to the queue all ancestors of :rid.
*/
db_prepare(&i1,
"INSERT OR IGNORE INTO aqueue "
"SELECT plink.pid,"
" coalesce((SELECT mtime FROM plink X WHERE X.cid=plink.pid), 0.0),"
" 1,"
" aqueue.src "
" FROM plink, aqueue"
" WHERE plink.cid=:rid"
" AND aqueue.rid=:rid %s",
ignoreMerges ? "AND plink.isprim" : ""
);
|
| |
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
);
/* Add to the queue all ancestors of :rid.
*/
db_prepare(&i1,
"INSERT OR IGNORE INTO aqueue "
"SELECT plink.pid,"
" coalesce((SELECT mtime FROM event X WHERE X.objid=plink.pid), 0.0),"
" 1,"
" aqueue.src "
" FROM plink, aqueue"
" WHERE plink.cid=:rid"
" AND aqueue.rid=:rid %s",
ignoreMerges ? "AND plink.isprim" : ""
);
|