Fossil SCM
Speed enhancement in the findSrcid() routine of content.c. Allow 5 digit numbers on counts while syncing.
Commit
8010bb41e1c777a5a0d57e03edc7f7baea5dab8f
Parent
0afb5e8e39c3865…
2 files changed
+10
-1
+2
-2
+10
-1
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -81,11 +81,20 @@ | ||
| 81 | 81 | /* |
| 82 | 82 | ** Return the srcid associated with rid. Or return 0 if rid is |
| 83 | 83 | ** original content and not a delta. |
| 84 | 84 | */ |
| 85 | 85 | static int findSrcid(int rid){ |
| 86 | - int srcid = db_int(0, "SELECT srcid FROM delta WHERE rid=%d", rid); | |
| 86 | + static Stmt q; | |
| 87 | + int srcid; | |
| 88 | + db_static_prepare(&q, "SELECT srcid FROM delta WHERE rid=:rid"); | |
| 89 | + db_bind_int(&q, ":rid", rid); | |
| 90 | + if( db_step(&q)==SQLITE_ROW ){ | |
| 91 | + srcid = db_column_int(&q, 0); | |
| 92 | + }else{ | |
| 93 | + srcid = 0; | |
| 94 | + } | |
| 95 | + db_reset(&q); | |
| 87 | 96 | return srcid; |
| 88 | 97 | } |
| 89 | 98 | |
| 90 | 99 | /* |
| 91 | 100 | ** Check to see if content is available for artifact "rid". Return |
| 92 | 101 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -81,11 +81,20 @@ | |
| 81 | /* |
| 82 | ** Return the srcid associated with rid. Or return 0 if rid is |
| 83 | ** original content and not a delta. |
| 84 | */ |
| 85 | static int findSrcid(int rid){ |
| 86 | int srcid = db_int(0, "SELECT srcid FROM delta WHERE rid=%d", rid); |
| 87 | return srcid; |
| 88 | } |
| 89 | |
| 90 | /* |
| 91 | ** Check to see if content is available for artifact "rid". Return |
| 92 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -81,11 +81,20 @@ | |
| 81 | /* |
| 82 | ** Return the srcid associated with rid. Or return 0 if rid is |
| 83 | ** original content and not a delta. |
| 84 | */ |
| 85 | static int findSrcid(int rid){ |
| 86 | static Stmt q; |
| 87 | int srcid; |
| 88 | db_static_prepare(&q, "SELECT srcid FROM delta WHERE rid=:rid"); |
| 89 | db_bind_int(&q, ":rid", rid); |
| 90 | if( db_step(&q)==SQLITE_ROW ){ |
| 91 | srcid = db_column_int(&q, 0); |
| 92 | }else{ |
| 93 | srcid = 0; |
| 94 | } |
| 95 | db_reset(&q); |
| 96 | return srcid; |
| 97 | } |
| 98 | |
| 99 | /* |
| 100 | ** Check to see if content is available for artifact "rid". Return |
| 101 |
+2
-2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -770,11 +770,11 @@ | ||
| 770 | 770 | nMsg += send_unclustered(&xfer); |
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | /* Exchange messages with the server */ |
| 774 | 774 | nFileSend = xfer.nFileSent + xfer.nDeltaSent; |
| 775 | - printf("Sent: %10d bytes, %4d messages, %4d files (%d+%d)\n", | |
| 775 | + printf("Sent: %10d bytes, %5d messages, %5d files (%d+%d)\n", | |
| 776 | 776 | blob_size(&send), nMsg+xfer.nGimmeSent+xfer.nIGotSent, |
| 777 | 777 | nFileSend, xfer.nFileSent, xfer.nDeltaSent); |
| 778 | 778 | nMsg = 0; |
| 779 | 779 | xfer.nFileSent = 0; |
| 780 | 780 | xfer.nDeltaSent = 0; |
| @@ -921,11 +921,11 @@ | ||
| 921 | 921 | fossil_fatal("%b", &xfer.err); |
| 922 | 922 | } |
| 923 | 923 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 924 | 924 | blob_reset(&xfer.line); |
| 925 | 925 | } |
| 926 | - printf("\rReceived: %10d bytes, %4d messages, %4d files (%d+%d+%d)\n", | |
| 926 | + printf("\rReceived: %10d bytes, %5d messages, %5d files (%d+%d+%d)\n", | |
| 927 | 927 | blob_size(&recv), nMsg, |
| 928 | 928 | xfer.nFileRcvd + xfer.nDeltaRcvd + xfer.nDanglingFile, |
| 929 | 929 | xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); |
| 930 | 930 | |
| 931 | 931 | blob_reset(&recv); |
| 932 | 932 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -770,11 +770,11 @@ | |
| 770 | nMsg += send_unclustered(&xfer); |
| 771 | } |
| 772 | |
| 773 | /* Exchange messages with the server */ |
| 774 | nFileSend = xfer.nFileSent + xfer.nDeltaSent; |
| 775 | printf("Sent: %10d bytes, %4d messages, %4d files (%d+%d)\n", |
| 776 | blob_size(&send), nMsg+xfer.nGimmeSent+xfer.nIGotSent, |
| 777 | nFileSend, xfer.nFileSent, xfer.nDeltaSent); |
| 778 | nMsg = 0; |
| 779 | xfer.nFileSent = 0; |
| 780 | xfer.nDeltaSent = 0; |
| @@ -921,11 +921,11 @@ | |
| 921 | fossil_fatal("%b", &xfer.err); |
| 922 | } |
| 923 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 924 | blob_reset(&xfer.line); |
| 925 | } |
| 926 | printf("\rReceived: %10d bytes, %4d messages, %4d files (%d+%d+%d)\n", |
| 927 | blob_size(&recv), nMsg, |
| 928 | xfer.nFileRcvd + xfer.nDeltaRcvd + xfer.nDanglingFile, |
| 929 | xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); |
| 930 | |
| 931 | blob_reset(&recv); |
| 932 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -770,11 +770,11 @@ | |
| 770 | nMsg += send_unclustered(&xfer); |
| 771 | } |
| 772 | |
| 773 | /* Exchange messages with the server */ |
| 774 | nFileSend = xfer.nFileSent + xfer.nDeltaSent; |
| 775 | printf("Sent: %10d bytes, %5d messages, %5d files (%d+%d)\n", |
| 776 | blob_size(&send), nMsg+xfer.nGimmeSent+xfer.nIGotSent, |
| 777 | nFileSend, xfer.nFileSent, xfer.nDeltaSent); |
| 778 | nMsg = 0; |
| 779 | xfer.nFileSent = 0; |
| 780 | xfer.nDeltaSent = 0; |
| @@ -921,11 +921,11 @@ | |
| 921 | fossil_fatal("%b", &xfer.err); |
| 922 | } |
| 923 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 924 | blob_reset(&xfer.line); |
| 925 | } |
| 926 | printf("\rReceived: %10d bytes, %5d messages, %5d files (%d+%d+%d)\n", |
| 927 | blob_size(&recv), nMsg, |
| 928 | xfer.nFileRcvd + xfer.nDeltaRcvd + xfer.nDanglingFile, |
| 929 | xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); |
| 930 | |
| 931 | blob_reset(&recv); |
| 932 |