Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Update the sessions branch to the official 3.7.17 release code. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | sessions |
Files: | files | file ages | folders |
SHA1: |
fc88f7311ba888015634b89b59098902 |
User & Date: | drh 2013-05-20 13:01:19.466 |
Context
2013-06-26
| ||
13:31 | Bring the sessions branch up-to-date with all the latest trunk changes. (check-in: 086a127236 user: drh tags: sessions) | |
2013-05-20
| ||
13:01 | Update the sessions branch to the official 3.7.17 release code. (check-in: fc88f7311b user: drh tags: sessions) | |
00:56 | Version 3.7.17 (check-in: 118a3b3569 user: drh tags: trunk, release, version-3.7.17) | |
2013-05-17
| ||
10:58 | Update the sessions branch to the latest 3.7.17 beta. (check-in: af8057ef5d user: drh tags: sessions) | |
Changes
Changes to ext/misc/closure.c.
︙ | ︙ | |||
291 292 293 294 295 296 297 | p = p->pUp; } if( p && pPrev==0 ){ p = closureAvlFirst(p->pAfter); } return p; } | | | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 | p = p->pUp; } if( p && pPrev==0 ){ p = closureAvlFirst(p->pAfter); } return p; } /* Insert a new node pNew. Return NULL on success. If the key is not ** unique, then do not perform the insert but instead leave pNew unchanged ** and return a pointer to an existing node with the same key. */ static closure_avl *closureAvlInsert( closure_avl **ppHead, /* Head of the tree */ closure_avl *pNew /* New node to be inserted */ |
︙ | ︙ |
Changes to mptest/crash01.test.
︙ | ︙ | |||
16 17 18 19 20 21 22 | INSERT INTO t1 SELECT a+32, randomblob(1500) FROM t1; SELECT count(*) FROM t1; --match 64 SELECT avg(length(b)) FROM t1; --match 1500.0 --sleep 2 UPDATE t1 SET b='x'||a||'y'; | | | | | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | INSERT INTO t1 SELECT a+32, randomblob(1500) FROM t1; SELECT count(*) FROM t1; --match 64 SELECT avg(length(b)) FROM t1; --match 1500.0 --sleep 2 UPDATE t1 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t1; --match 247 SELECT a FROM t1 WHERE b='x17y'; --match 17 CREATE INDEX t1b ON t1(b); SELECT a FROM t1 WHERE b='x17y'; --match 17 SELECT a FROM t1 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; --match 29 28 27 26 25 --end --wait 1 --task 2 CREATE TABLE t2(a INTEGER PRIMARY KEY, b); INSERT INTO t2 SELECT a, b FROM t1; UPDATE t1 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t2; --match 247 SELECT a FROM t2 WHERE b='x17y'; --match 17 CREATE INDEX t2b ON t2(b); SELECT a FROM t2 WHERE b='x17y'; --match 17 SELECT a FROM t2 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; --match 29 28 27 26 25 --end --task 3 CREATE TABLE t3(a INTEGER PRIMARY KEY, b); INSERT INTO t3 SELECT a, b FROM t1; UPDATE t1 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t3; --match 247 SELECT a FROM t3 WHERE b='x17y'; --match 17 CREATE INDEX t3b ON t3(b); SELECT a FROM t3 WHERE b='x17y'; --match 17 SELECT a FROM t3 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; --match 29 28 27 26 25 --end --task 4 CREATE TABLE t4(a INTEGER PRIMARY KEY, b); INSERT INTO t4 SELECT a, b FROM t1; UPDATE t1 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t4; --match 247 SELECT a FROM t4 WHERE b='x17y'; --match 17 CREATE INDEX t4b ON t4(b); SELECT a FROM t4 WHERE b='x17y'; --match 17 SELECT a FROM t4 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; --match 29 28 27 26 25 --end --task 5 CREATE TABLE t5(a INTEGER PRIMARY KEY, b); INSERT INTO t5 SELECT a, b FROM t1; UPDATE t1 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t5; --match 247 SELECT a FROM t5 WHERE b='x17y'; --match 17 CREATE INDEX t5b ON t5(b); SELECT a FROM t5 WHERE b='x17y'; --match 17 SELECT a FROM t5 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; |
︙ | ︙ |
Changes to mptest/multiwrite01.test.
︙ | ︙ | |||
18 19 20 21 22 23 24 | INSERT INTO t1 SELECT a+32, randomblob(1500) FROM t1; SELECT count(*) FROM t1; --match 64 SELECT avg(length(b)) FROM t1; --match 1500.0 --sleep 2 UPDATE t1 SET b='x'||a||'y'; | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | INSERT INTO t1 SELECT a+32, randomblob(1500) FROM t1; SELECT count(*) FROM t1; --match 64 SELECT avg(length(b)) FROM t1; --match 1500.0 --sleep 2 UPDATE t1 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t1; --match 247 SELECT a FROM t1 WHERE b='x17y'; --match 17 CREATE INDEX t1b ON t1(b); SELECT a FROM t1 WHERE b='x17y'; --match 17 SELECT a FROM t1 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; |
︙ | ︙ | |||
50 51 52 53 54 55 56 | INSERT INTO t2 SELECT a+32, randomblob(1500) FROM t2; SELECT count(*) FROM t2; --match 64 SELECT avg(length(b)) FROM t2; --match 1500.0 --sleep 2 UPDATE t2 SET b='x'||a||'y'; | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | INSERT INTO t2 SELECT a+32, randomblob(1500) FROM t2; SELECT count(*) FROM t2; --match 64 SELECT avg(length(b)) FROM t2; --match 1500.0 --sleep 2 UPDATE t2 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t2; --match 247 SELECT a FROM t2 WHERE b='x17y'; --match 17 CREATE INDEX t2b ON t2(b); SELECT a FROM t2 WHERE b='x17y'; --match 17 SELECT a FROM t2 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; |
︙ | ︙ | |||
81 82 83 84 85 86 87 | INSERT INTO t3 SELECT a+32, randomblob(1500) FROM t3; SELECT count(*) FROM t3; --match 64 SELECT avg(length(b)) FROM t3; --match 1500.0 --sleep 2 UPDATE t3 SET b='x'||a||'y'; | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | INSERT INTO t3 SELECT a+32, randomblob(1500) FROM t3; SELECT count(*) FROM t3; --match 64 SELECT avg(length(b)) FROM t3; --match 1500.0 --sleep 2 UPDATE t3 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t3; --match 247 SELECT a FROM t3 WHERE b='x17y'; --match 17 CREATE INDEX t3b ON t3(b); SELECT a FROM t3 WHERE b='x17y'; --match 17 SELECT a FROM t3 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; |
︙ | ︙ | |||
112 113 114 115 116 117 118 | INSERT INTO t4 SELECT a+32, randomblob(1500) FROM t4; SELECT count(*) FROM t4; --match 64 SELECT avg(length(b)) FROM t4; --match 1500.0 --sleep 2 UPDATE t4 SET b='x'||a||'y'; | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | INSERT INTO t4 SELECT a+32, randomblob(1500) FROM t4; SELECT count(*) FROM t4; --match 64 SELECT avg(length(b)) FROM t4; --match 1500.0 --sleep 2 UPDATE t4 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t4; --match 247 SELECT a FROM t4 WHERE b='x17y'; --match 17 CREATE INDEX t4b ON t4(b); SELECT a FROM t4 WHERE b='x17y'; --match 17 SELECT a FROM t4 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; |
︙ | ︙ | |||
143 144 145 146 147 148 149 | INSERT INTO t5 SELECT a+32, randomblob(1500) FROM t5; SELECT count(*) FROM t5; --match 64 SELECT avg(length(b)) FROM t5; --match 1500.0 --sleep 2 UPDATE t5 SET b='x'||a||'y'; | | | | | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | INSERT INTO t5 SELECT a+32, randomblob(1500) FROM t5; SELECT count(*) FROM t5; --match 64 SELECT avg(length(b)) FROM t5; --match 1500.0 --sleep 2 UPDATE t5 SET b='x'||a||'y'; SELECT sum(length(b)) FROM t5; --match 247 SELECT a FROM t5 WHERE b='x17y'; --match 17 CREATE INDEX t5b ON t5(b); SELECT a FROM t5 WHERE b='x17y'; --match 17 SELECT a FROM t5 WHERE b GLOB 'x2?y' ORDER BY b DESC LIMIT 5; --match 29 28 27 26 25 --end --wait all SELECT count(*), sum(length(b)) FROM t1; --match 64 247 SELECT count(*), sum(length(b)) FROM t2; --match 64 247 SELECT count(*), sum(length(b)) FROM t3; --match 64 247 SELECT count(*), sum(length(b)) FROM t4; --match 64 247 SELECT count(*), sum(length(b)) FROM t5; --match 64 247 --task 1 SELECT t1.a FROM t1, t2 WHERE t2.b GLOB 'x3?y' AND t1.b=('x'||(t2.a+3)||'y') ORDER BY t1.a LIMIT 4 --match 33 34 35 36 |
︙ | ︙ |
Changes to src/os_unix.c.
︙ | ︙ | |||
5149 5150 5151 5152 5153 5154 5155 | assert( zFilename!=0 || (ctrlFlags & UNIXFILE_NOLOCK)!=0 ); OSTRACE(("OPEN %-3d %s\n", h, zFilename)); pNew->h = h; pNew->pVfs = pVfs; pNew->zPath = zFilename; pNew->ctrlFlags = (u8)ctrlFlags; | | | 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 | assert( zFilename!=0 || (ctrlFlags & UNIXFILE_NOLOCK)!=0 ); OSTRACE(("OPEN %-3d %s\n", h, zFilename)); pNew->h = h; pNew->pVfs = pVfs; pNew->zPath = zFilename; pNew->ctrlFlags = (u8)ctrlFlags; pNew->mmapSizeMax = sqlite3GlobalConfig.szMmap; if( sqlite3_uri_boolean(((ctrlFlags & UNIXFILE_URI) ? zFilename : 0), "psow", SQLITE_POWERSAFE_OVERWRITE) ){ pNew->ctrlFlags |= UNIXFILE_PSOW; } if( strcmp(pVfs->zName,"unix-excl")==0 ){ pNew->ctrlFlags |= UNIXFILE_EXCL; } |
︙ | ︙ |
Changes to src/os_win.c.
︙ | ︙ | |||
4242 4243 4244 4245 4246 4247 4248 | pFile->lastErrno = NO_ERROR; pFile->zPath = zName; #if SQLITE_MAX_MMAP_SIZE>0 pFile->hMap = NULL; pFile->pMapRegion = 0; pFile->mmapSize = 0; pFile->mmapSizeActual = 0; | | | 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 | pFile->lastErrno = NO_ERROR; pFile->zPath = zName; #if SQLITE_MAX_MMAP_SIZE>0 pFile->hMap = NULL; pFile->pMapRegion = 0; pFile->mmapSize = 0; pFile->mmapSizeActual = 0; pFile->mmapSizeMax = sqlite3GlobalConfig.szMmap; #endif OpenCounter(+1); return rc; } /* |
︙ | ︙ |
Changes to src/test_syscall.c.
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 | ** Return true if the named system call exists. Or false otherwise. ** ** test_syscall list ** Return a list of all system calls. The list is constructed using ** the xNextSystemCall() VFS method. */ #include "sqlite3.h" #include "tcl.h" #include <stdlib.h> #include <string.h> #include <assert.h> | > < | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | ** Return true if the named system call exists. Or false otherwise. ** ** test_syscall list ** Return a list of all system calls. The list is constructed using ** the xNextSystemCall() VFS method. */ #include "sqliteInt.h" #include "sqlite3.h" #include "tcl.h" #include <stdlib.h> #include <string.h> #include <assert.h> #if SQLITE_OS_UNIX /* From main.c */ extern const char *sqlite3ErrName(int); #include <sys/mman.h> #include <sys/types.h> |
︙ | ︙ |
Changes to src/vdbetrace.c.
︙ | ︙ | |||
138 139 140 141 142 143 144 | sqlite3VdbeMemSetStr(&utf8, pVar->z, pVar->n, enc, SQLITE_STATIC); sqlite3VdbeChangeEncoding(&utf8, SQLITE_UTF8); pVar = &utf8; } #endif nOut = pVar->n; #ifdef SQLITE_TRACE_SIZE_LIMIT | | | | | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | sqlite3VdbeMemSetStr(&utf8, pVar->z, pVar->n, enc, SQLITE_STATIC); sqlite3VdbeChangeEncoding(&utf8, SQLITE_UTF8); pVar = &utf8; } #endif nOut = pVar->n; #ifdef SQLITE_TRACE_SIZE_LIMIT if( nOut>SQLITE_TRACE_SIZE_LIMIT ){ nOut = SQLITE_TRACE_SIZE_LIMIT; while( nOut<pVar->n && (pVar->z[nOut]&0xc0)==0x80 ){ nOut++; } } #endif sqlite3XPrintf(&out, "'%.*q'", nOut, pVar->z); #ifdef SQLITE_TRACE_SIZE_LIMIT if( nOut<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-nOut); #endif #ifndef SQLITE_OMIT_UTF16 if( enc!=SQLITE_UTF8 ) sqlite3VdbeMemRelease(&utf8); #endif }else if( pVar->flags & MEM_Zero ){ sqlite3XPrintf(&out, "zeroblob(%d)", pVar->u.nZero); }else{ int nOut; /* Number of bytes of the blob to include in output */ assert( pVar->flags & MEM_Blob ); sqlite3StrAccumAppend(&out, "x'", 2); nOut = pVar->n; #ifdef SQLITE_TRACE_SIZE_LIMIT if( nOut>SQLITE_TRACE_SIZE_LIMIT ) nOut = SQLITE_TRACE_SIZE_LIMIT; #endif for(i=0; i<nOut; i++){ sqlite3XPrintf(&out, "%02x", pVar->z[i]&0xff); } sqlite3StrAccumAppend(&out, "'", 1); #ifdef SQLITE_TRACE_SIZE_LIMIT if( nOut<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-nOut); #endif } } } return sqlite3StrAccumFinish(&out); } |
︙ | ︙ |
Changes to test/mmap1.test.
︙ | ︙ | |||
149 150 151 152 153 154 155 156 157 158 159 160 161 162 | do_execsql_test 2.4 { PRAGMA wal_checkpoint; } {0 24 24} db2 close } reset_db db func rblob rblob do_execsql_test 3.1 { PRAGMA auto_vacuum = 1; CREATE TABLE t1(a, b, UNIQUE(a, b)); INSERT INTO t1 VALUES(rblob(500), rblob(500)); INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; -- 2 | > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | do_execsql_test 2.4 { PRAGMA wal_checkpoint; } {0 24 24} db2 close } reset_db execsql { PRAGMA mmap_size = 67108864; } db func rblob rblob do_execsql_test 3.1 { PRAGMA auto_vacuum = 1; CREATE TABLE t1(a, b, UNIQUE(a, b)); INSERT INTO t1 VALUES(rblob(500), rblob(500)); INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; -- 2 |
︙ | ︙ | |||
177 178 179 180 181 182 183 184 185 186 187 188 189 190 | } {8} #------------------------------------------------------------------------- # Ensure that existing cursors using xFetch() pages see changes made # to rows using the incrblob API. # reset_db set aaa [string repeat a 400] set bbb [string repeat b 400] set ccc [string repeat c 400] set ddd [string repeat d 400] set eee [string repeat e 400] do_execsql_test 4.1 { | > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | } {8} #------------------------------------------------------------------------- # Ensure that existing cursors using xFetch() pages see changes made # to rows using the incrblob API. # reset_db execsql { PRAGMA mmap_size = 67108864; } set aaa [string repeat a 400] set bbb [string repeat b 400] set ccc [string repeat c 400] set ddd [string repeat d 400] set eee [string repeat e 400] do_execsql_test 4.1 { |
︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 | #------------------------------------------------------------------------- # Ensure that existing cursors holding xFetch() references are not # confused if those pages are moved to make way for the root page of a # new table or index. # reset_db do_execsql_test 5.1 { PRAGMA auto_vacuum = 2; PRAGMA page_size = 1024; CREATE TABLE t1(x); INSERT INTO t1 VALUES($aaa); INSERT INTO t1 VALUES($bbb); INSERT INTO t1 VALUES($ccc); | > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 | #------------------------------------------------------------------------- # Ensure that existing cursors holding xFetch() references are not # confused if those pages are moved to make way for the root page of a # new table or index. # reset_db execsql { PRAGMA mmap_size = 67108864; } do_execsql_test 5.1 { PRAGMA auto_vacuum = 2; PRAGMA page_size = 1024; CREATE TABLE t1(x); INSERT INTO t1 VALUES($aaa); INSERT INTO t1 VALUES($bbb); INSERT INTO t1 VALUES($ccc); |
︙ | ︙ |
Changes to test/mmap2.test.
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 | foreach syscall {mmap mremap} { test_syscall uninstall if {[catch {test_syscall install $syscall}]} continue for {set i 1} {$i < 20} {incr i} { reset_db test_syscall fault $i 1 test_syscall errno $syscall ENOMEM set ::log "" do_execsql_test 1.$syscall.$i.1 { CREATE TABLE t1(a, b, UNIQUE(a, b)); | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | foreach syscall {mmap mremap} { test_syscall uninstall if {[catch {test_syscall install $syscall}]} continue for {set i 1} {$i < 20} {incr i} { reset_db execsql { PRAGMA mmap_size = 8000000 } test_syscall fault $i 1 test_syscall errno $syscall ENOMEM set ::log "" do_execsql_test 1.$syscall.$i.1 { CREATE TABLE t1(a, b, UNIQUE(a, b)); |
︙ | ︙ |