Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Changes necessary to get TH4 to compile again. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
15e8dd41a9af9de3b77c1954affa0329 |
User & Date: | drh 2013-07-22 12:28:49.581 |
Context
2013-07-22
| ||
12:50 | Merge the NGQP branch back into trunk. Currently 12 tests are failing in src4.test (all errors are artifacts of the test code). check-in: 4af30d63ec user: dan tags: trunk | |
12:28 | Changes necessary to get TH4 to compile again. check-in: 15e8dd41a9 user: drh tags: trunk | |
2013-07-18
| ||
00:58 | Fix a typo in the "key format" documentation. check-in: 4beefed2c9 user: drh tags: trunk | |
Changes
Changes to src/analyze.c.
︙ | ︙ | |||
550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 | */ regCnt = iMem; regPrev = iMem+1; aregCard = iMem+2; sqlite4VdbeAddOp2(v, OP_Integer, 0, regCnt); sqlite4VdbeAddOp2(v, OP_Null, 0, regPrev); sqlite4VdbeAddOp2(v, OP_Null, 0, regSample); for(i=0; i<nCol; i++){ sqlite4VdbeAddOp2(v, OP_Integer, 1, aregCard+i); } /* Start the analysis loop. This loop runs through all the entries in ** the index b-tree. */ endOfLoop = sqlite4VdbeMakeLabel(v); | > > | 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | */ regCnt = iMem; regPrev = iMem+1; aregCard = iMem+2; sqlite4VdbeAddOp2(v, OP_Integer, 0, regCnt); sqlite4VdbeAddOp2(v, OP_Null, 0, regPrev); #ifdef SQLITE4_ENABLE_STAT3 sqlite4VdbeAddOp2(v, OP_Null, 0, regSample); #endif for(i=0; i<nCol; i++){ sqlite4VdbeAddOp2(v, OP_Integer, 1, aregCard+i); } /* Start the analysis loop. This loop runs through all the entries in ** the index b-tree. */ endOfLoop = sqlite4VdbeMakeLabel(v); |
︙ | ︙ |
Changes to src/fts5func.c.
︙ | ︙ | |||
16 17 18 19 20 21 22 | ** found in: ** ** Stephen Robertson and Hugo Zaragoza: "The Probablistic Relevance ** Framework: BM25 and Beyond", 2009. */ #include "sqliteInt.h" | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | ** found in: ** ** Stephen Robertson and Hugo Zaragoza: "The Probablistic Relevance ** Framework: BM25 and Beyond", 2009. */ #include "sqliteInt.h" #include <math.h> // temporary: For log() */ static char fts5Tolower(char c){ if( c>='A' && c<='Z' ) c = c + ('a' - 'A'); return c; } static int fts5SimpleCreate( |
︙ | ︙ |
Changes to src/lsmInt.h.
︙ | ︙ | |||
869 870 871 872 873 874 875 876 877 878 879 880 881 882 | void lsmDbDatabaseRelease(lsm_db *); int lsmBeginReadTrans(lsm_db *); int lsmBeginWriteTrans(lsm_db *); int lsmBeginFlush(lsm_db *); int lsmDetectRoTrans(lsm_db *db, int *); int lsmBeginWork(lsm_db *); void lsmFinishWork(lsm_db *, int, int *); int lsmFinishRecovery(lsm_db *); void lsmFinishReadTrans(lsm_db *); int lsmFinishWriteTrans(lsm_db *, int); | > | 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 | void lsmDbDatabaseRelease(lsm_db *); int lsmBeginReadTrans(lsm_db *); int lsmBeginWriteTrans(lsm_db *); int lsmBeginFlush(lsm_db *); int lsmDetectRoTrans(lsm_db *db, int *); int lsmBeginRoTrans(lsm_db *db); int lsmBeginWork(lsm_db *); void lsmFinishWork(lsm_db *, int, int *); int lsmFinishRecovery(lsm_db *); void lsmFinishReadTrans(lsm_db *); int lsmFinishWriteTrans(lsm_db *, int); |
︙ | ︙ |
Changes to src/lsm_tree.c.
︙ | ︙ | |||
100 101 102 103 104 105 106 | u32 nHeight; /* Height of tree structure */ }; #ifndef NDEBUG /* ** assert() that a TreeKey.flags value is sane. Usage: ** | | | | | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | u32 nHeight; /* Height of tree structure */ }; #ifndef NDEBUG /* ** assert() that a TreeKey.flags value is sane. Usage: ** ** assert( lsmAssertFlagsOk(pTreeKey->flags) ); */ static int lsmAssertFlagsOk(u8 keyflags){ /* At least one flag must be set. Otherwise, what is this key doing? */ assert( keyflags!=0 ); /* The POINT_DELETE and INSERT flags cannot both be set. */ assert( (keyflags & LSM_POINT_DELETE)==0 || (keyflags & LSM_INSERT)==0 ); /* If both the START_DELETE and END_DELETE flags are set, then the INSERT ** flag must also be set. In other words - the three DELETE flags cannot ** all be set */ assert( (keyflags & LSM_END_DELETE)==0 || (keyflags & LSM_START_DELETE)==0 || (keyflags & LSM_POINT_DELETE)==0 ); return 1; } static int assert_delete_ranges_match(lsm_db *); static int treeCountEntries(lsm_db *db); #else # define lsmAssertFlagsOk(x) #endif /* ** Container for a key-value pair. Within the *-shm file, each key/value ** pair is stored in a single allocation (which may not actually be ** contiguous in memory). Layout is the TreeKey structure, followed by ** the nKey bytes of key blob, followed by the nValue bytes of value blob |
︙ | ︙ |
Changes to tool/mksqlite4c.tcl.
︙ | ︙ | |||
215 216 217 218 219 220 221 222 223 224 225 226 | sqliteInt.h global.c env.c ctime.c status.c date.c os.c fault.c mem.c mem0.c | > < | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | sqliteInt.h global.c env.c ctime.c status.c date.c math.c os.c fault.c mem.c mem0.c mem2.c mem3.c mem5.c mutex.c mutex_noop.c mutex_unix.c mutex_w32.c |
︙ | ︙ |