Fossil SCM
Avoid unnecessary no-op write transactions on the server during a pull.
Commit
b4dffdac5e706980d911a0e672526ad461ec0640
Parent
ab00f2b007d5229…
1 file changed
+7
-5
+7
-5
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1540,15 +1540,17 @@ | ||
| 1540 | 1540 | db_step(&u); |
| 1541 | 1541 | db_reset(&u); |
| 1542 | 1542 | } |
| 1543 | 1543 | db_finalize(&q); |
| 1544 | 1544 | db_finalize(&u); |
| 1545 | - db_multi_exec( | |
| 1546 | - "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" | |
| 1547 | - " WHERE objid IN (SELECT mid FROM time_fudge);" | |
| 1548 | - "DROP TABLE time_fudge;" | |
| 1549 | - ); | |
| 1545 | + if( db_exists("SELECT 1 FROM time_fudge") ){ | |
| 1546 | + db_multi_exec( | |
| 1547 | + "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" | |
| 1548 | + " WHERE objid IN (SELECT mid FROM time_fudge);" | |
| 1549 | + ); | |
| 1550 | + } | |
| 1551 | + db_multi_exec("DROP TABLE time_fudge;"); | |
| 1550 | 1552 | |
| 1551 | 1553 | db_end_transaction(0); |
| 1552 | 1554 | manifest_crosslink_busy = 0; |
| 1553 | 1555 | return ( rc!=TH_ERROR ); |
| 1554 | 1556 | } |
| 1555 | 1557 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1540,15 +1540,17 @@ | |
| 1540 | db_step(&u); |
| 1541 | db_reset(&u); |
| 1542 | } |
| 1543 | db_finalize(&q); |
| 1544 | db_finalize(&u); |
| 1545 | db_multi_exec( |
| 1546 | "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" |
| 1547 | " WHERE objid IN (SELECT mid FROM time_fudge);" |
| 1548 | "DROP TABLE time_fudge;" |
| 1549 | ); |
| 1550 | |
| 1551 | db_end_transaction(0); |
| 1552 | manifest_crosslink_busy = 0; |
| 1553 | return ( rc!=TH_ERROR ); |
| 1554 | } |
| 1555 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1540,15 +1540,17 @@ | |
| 1540 | db_step(&u); |
| 1541 | db_reset(&u); |
| 1542 | } |
| 1543 | db_finalize(&q); |
| 1544 | db_finalize(&u); |
| 1545 | if( db_exists("SELECT 1 FROM time_fudge") ){ |
| 1546 | db_multi_exec( |
| 1547 | "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" |
| 1548 | " WHERE objid IN (SELECT mid FROM time_fudge);" |
| 1549 | ); |
| 1550 | } |
| 1551 | db_multi_exec("DROP TABLE time_fudge;"); |
| 1552 | |
| 1553 | db_end_transaction(0); |
| 1554 | manifest_crosslink_busy = 0; |
| 1555 | return ( rc!=TH_ERROR ); |
| 1556 | } |
| 1557 |