Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch embedded-btree Excluding Merge-Ins
This is equivalent to a diff from f19a93d9f9 to 50e87e23bb
2012-06-27
| ||
16:34 | Merge embedded-btree branch with trunk. check-in: 5eed33bc57 user: dan tags: trunk | |
16:10 | Remove a broken assert from lsm_sorted.c. Leaf check-in: 50e87e23bb user: dan tags: embedded-btree | |
16:02 | Testing finds no cases where separator runs are faster than embedded btrees. So discard the separator runs related code. check-in: afcbe561ff user: dan tags: embedded-btree | |
12:28 | Fixes to the amalgamation in order to enable a fossil4 build. check-in: 4539458ce3 user: drh tags: trunk | |
2012-06-26
| ||
20:39 | Merge trunk changes. check-in: 209c12ae0b user: dan tags: embedded-btree | |
20:17 | Updates to the design and storage documents. check-in: f19a93d9f9 user: drh tags: trunk | |
18:47 | Remove more traces of SQLITE_WSD. Everything is in pEnv now, with the except of the global state of the alternative memory allocators mem3 and mem5. check-in: 859a51036f user: drh tags: trunk | |
Changes to lsm-test/lsmtest_main.c.
︙ | ︙ | |||
181 182 183 184 185 186 187 | void *pVal, int nVal ){ ScanResult *p = (ScanResult *)pCtx; u8 *aKey = (u8 *)pKey; u8 *aVal = (u8 *)pVal; int i; | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | void *pVal, int nVal ){ ScanResult *p = (ScanResult *)pCtx; u8 *aKey = (u8 *)pKey; u8 *aVal = (u8 *)pVal; int i; if( test_scan_debug ) printf("%.20s\n", (char *)pKey); #if 0 /* Check tdb_fetch() matches */ int rc = 0; testFetch(p->pDb, pKey, nKey, pVal, nVal, &rc); assert( rc==0 ); #endif |
︙ | ︙ | |||
262 263 264 265 266 267 268 | res1.bReverse = bReverse; res2.pDb = pDb2; res2.nKey1 = nKey1; res2.pKey1 = pKey1; res2.nKey2 = nKey2; res2.pKey2 = pKey2; res2.bReverse = bReverse; tdb_scan(pDb1, pRes1, bReverse, pKey1, nKey1, pKey2, nKey2, scanCompareCb); | | | | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | res1.bReverse = bReverse; res2.pDb = pDb2; res2.nKey1 = nKey1; res2.pKey1 = pKey1; res2.nKey2 = nKey2; res2.pKey2 = pKey2; res2.bReverse = bReverse; tdb_scan(pDb1, pRes1, bReverse, pKey1, nKey1, pKey2, nKey2, scanCompareCb); if( test_scan_debug ) printf("\n\n\n"); tdb_scan(pDb2, pRes2, bReverse, pKey1, nKey1, pKey2, nKey2, scanCompareCb); if( test_scan_debug ) printf("\n\n\n"); if( res1.nRow!=res2.nRow || res1.cksum1!=res2.cksum1 || res1.cksum2!=res2.cksum2 ){ printf("expected: %d %X %X\n", res1.nRow, res1.cksum1, res1.cksum2); printf("got: %d %X %X\n", res2.nRow, res2.cksum1, res2.cksum2); |
︙ | ︙ | |||
463 464 465 466 467 468 469 470 471 472 473 474 475 476 | if( nArg==1 ){ zPattern = azArg[0]; } do_crash_test(zPattern, &rc); return rc; } int do_speed_tests(int nArg, char **azArg){ struct DbSystem { const char *zLibrary; const char *zColor; } aSys[] = { | > > > > > > > > > | 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 | if( nArg==1 ){ zPattern = azArg[0]; } do_crash_test(zPattern, &rc); return rc; } static lsm_db *configure_lsm_db(TestDb *pDb){ lsm_db *pLsm; pLsm = tdb_lsm(pDb); if( pLsm ){ tdb_lsm_config_str(pDb, "mmap=1 autowork=1 nmerge=4 worker_nmerge=4"); } return pLsm; } int do_speed_tests(int nArg, char **azArg){ struct DbSystem { const char *zLibrary; const char *zColor; } aSys[] = { |
︙ | ︙ | |||
590 591 592 593 594 595 596 | if( bSleep && nSleep ) sqlite3_sleep(nSleep); bSleep = 1; testCaseBegin(&rc, 0, "speed.insert.%s", aSys[j].zLibrary); rc = tdb_open(aSys[j].zLibrary, 0, 1, &pDb); if( rc ) return rc; | < < < < < < | < < < < < | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 | if( bSleep && nSleep ) sqlite3_sleep(nSleep); bSleep = 1; testCaseBegin(&rc, 0, "speed.insert.%s", aSys[j].zLibrary); rc = tdb_open(aSys[j].zLibrary, 0, 1, &pDb); if( rc ) return rc; pLsm = configure_lsm_db(pDb); testTimeInit(); for(i=0; i<nRow; i+=nStep){ int iStep; int nWrite1, nWrite2; testCaseProgress(i, nRow, testCaseNDot(), &iDot); if( pLsm ) lsm_info(pLsm, LSM_INFO_NWRITE, &nWrite1); |
︙ | ︙ | |||
642 643 644 645 646 647 648 649 650 651 652 653 654 655 | bSleep = 1; testCaseBegin(&rc, 0, "speed.select.%s", aSys[j].zLibrary); if( doWriteTest ){ rc = tdb_open(aSys[j].zLibrary, 0, 1, &pDb); if( rc ) return rc; for(i=0; i<nRow; i+=nSelStep){ int iStep; int iSel; testCaseProgress(i, nRow, testCaseNDot(), &iDot); for(iStep=0; iStep<nSelStep; iStep++){ u32 aKey[4]; /* 16-byte key */ | > | 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | bSleep = 1; testCaseBegin(&rc, 0, "speed.select.%s", aSys[j].zLibrary); if( doWriteTest ){ rc = tdb_open(aSys[j].zLibrary, 0, 1, &pDb); if( rc ) return rc; configure_lsm_db(pDb); for(i=0; i<nRow; i+=nSelStep){ int iStep; int iSel; testCaseProgress(i, nRow, testCaseNDot(), &iDot); for(iStep=0; iStep<nSelStep; iStep++){ u32 aKey[4]; /* 16-byte key */ |
︙ | ︙ | |||
672 673 674 675 676 677 678 | } aSelTime[(j*nRow+i)/nSelStep] = testTimeGet(); tdb_fetch(pDb, 0, 0, 0, 0); } }else{ int t; int iSel; | < | | 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 | } aSelTime[(j*nRow+i)/nSelStep] = testTimeGet(); tdb_fetch(pDb, 0, 0, 0, 0); } }else{ int t; int iSel; rc = tdb_open(aSys[j].zLibrary, 0, 0, &pDb); configure_lsm_db(pDb); testTimeInit(); for(iSel=0; rc==LSM_OK && iSel<nSelTest; iSel++){ void *pDummy; int nDummy; u32 iKey; u32 aKey[4]; /* 16-byte key */ |
︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 | fclose(pInput); pEnv->xClose(pOut); return rc; } static int do_insert(int nArg, char **azArg){ const char *zDb = "lsm"; TestDb *pDb = 0; int i; int rc; const int nRow = 1 * 1000 * 1000; DatasourceDefn defn = { TEST_DATASOURCE_RANDOM, 8, 15, 80, 150 }; Datasource *pData = 0; | > | | | | < < > > | > > | | | < | | > | 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 | fclose(pInput); pEnv->xClose(pOut); return rc; } static int do_insert(int nArg, char **azArg){ const char *zConfig = 0; const char *zDb = "lsm"; TestDb *pDb = 0; int i; int rc; const int nRow = 1 * 1000 * 1000; DatasourceDefn defn = { TEST_DATASOURCE_RANDOM, 8, 15, 80, 150 }; Datasource *pData = 0; if( nArg>2 ){ testPrintError("Usage: insert ?DATABASE? ?LSM-CONFIG?\n"); return 1; } if( nArg==1 ){ zDb = azArg[0]; } if( nArg==2 ){ zConfig = azArg[1]; } testMallocUninstall(tdb_lsm_env()); rc = tdb_open(zDb, 0, 1, &pDb); if( rc!=0 ){ testPrintError("Error opening db \"%s\": %d\n", zDb, rc); }else{ InsertWriteHook hook; memset(&hook, 0, sizeof(hook)); hook.pOut = fopen("writelog.txt", "w"); pData = testDatasourceNew(&defn); tdb_lsm_config_work_hook(pDb, do_insert_work_hook, 0); tdb_lsm_write_hook(pDb, do_insert_write_hook, (void *)&hook); if( zConfig ){ rc = test_lsm_config_str(tdb_lsm(pDb), zConfig); } if( rc==0 ){ for(i=0; i<nRow; i++){ void *pKey; int nKey; /* Database key to insert */ void *pVal; int nVal; /* Database value to insert */ testDatasourceEntry(pData, i, &pKey, &nKey, &pVal, &nVal); tdb_write(pDb, pKey, nKey, pVal, nVal); } } testDatasourceFree(pData); tdb_close(pDb); flushHook(&hook); fclose(hook.pOut); } |
︙ | ︙ |
Changes to lsm-test/lsmtest_tdb3.c.
︙ | ︙ | |||
716 717 718 719 720 721 722 | #ifdef LSM_MUTEX_PTHREADS static void *worker_main(void *pArg){ LsmWorker *p = (LsmWorker *)pArg; lsm_db *pWorker; /* Connection to access db through */ pthread_mutex_lock(&p->worker_mutex); | | < < < > > < < < > | 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 | #ifdef LSM_MUTEX_PTHREADS static void *worker_main(void *pArg){ LsmWorker *p = (LsmWorker *)pArg; lsm_db *pWorker; /* Connection to access db through */ pthread_mutex_lock(&p->worker_mutex); while( (pWorker = p->pWorker) ){ int nWrite = 0; int rc; /* Do some work. If an error occurs, exit. */ pthread_mutex_unlock(&p->worker_mutex); rc = lsm_work(pWorker, p->lsm_work_flags, p->lsm_work_npage, &nWrite); pthread_mutex_lock(&p->worker_mutex); if( rc!=LSM_OK ){ p->worker_rc = rc; break; } /* If the call to lsm_work() indicates that there is nothing more ** to do at this point, wait on the condition variable. The thread will ** wake up when it is signaled either because the client thread has ** flushed an in-memory tree into the db file or when the connection ** is being closed. */ if( nWrite==0 ){ if( p->pWorker && p->bDoWork==0 ){ pthread_cond_wait(&p->worker_cond, &p->worker_mutex); } p->bDoWork = 0; } } pthread_mutex_unlock(&p->worker_mutex); return 0; } /* ** Signal worker thread iWorker that there may be work to do. |
︙ | ︙ | |||
881 882 883 884 885 886 887 | if( rc==0 ){ pDb->aWorker = (LsmWorker *)testMalloc(sizeof(LsmWorker) * nWorker); memset(pDb->aWorker, 0, sizeof(LsmWorker) * nWorker); pDb->nWorker = nWorker; rc = mt_start_worker(pDb, 0, zFilename, LSM_WORK_CHECKPOINT, | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 | if( rc==0 ){ pDb->aWorker = (LsmWorker *)testMalloc(sizeof(LsmWorker) * nWorker); memset(pDb->aWorker, 0, sizeof(LsmWorker) * nWorker); pDb->nWorker = nWorker; rc = mt_start_worker(pDb, 0, zFilename, LSM_WORK_CHECKPOINT, nWorker==1 ? 512 : 0 ); } if( rc==0 && nWorker==2 ){ rc = mt_start_worker(pDb, 1, zFilename, 0, 512); } return rc; } int test_lsm_mt2(const char *zFilename, int bClear, TestDb **ppDb){ return test_lsm_mt(zFilename, 1, bClear, ppDb); } int test_lsm_mt3(const char *zFilename, int bClear, TestDb **ppDb){ return test_lsm_mt(zFilename, 2, bClear, ppDb); } int test_lsm_config_str( lsm_db *pDb, int bWorker, const char *zStr ){ struct CfgParam { const char *zParam; int bWorker; int eParam; } aParam[] = { { "write_buffer", 0, LSM_CONFIG_WRITE_BUFFER }, { "page_size", 0, LSM_CONFIG_PAGE_SIZE }, { "safety", 0, LSM_CONFIG_SAFETY }, { "autowork", 0, LSM_CONFIG_AUTOWORK }, { "log_size", 0, LSM_CONFIG_LOG_SIZE }, { "mmap", 0, LSM_CONFIG_MMAP }, { "use_log", 0, LSM_CONFIG_USE_LOG }, { "nmerge", 0, LSM_CONFIG_NMERGE }, { "worker_nmerge", 1, LSM_CONFIG_NMERGE }, { 0, 0 } }; char *z = zStr; while( z[0] && pDb ){ char *zStart; /* Skip whitespace */ while( *z==' ' ) z++; zStart = z; while( *z && *z!='=' ) z++; if( *z ){ int eParam; int i; int iVal; int rc; char zParam[32]; int nParam = z-zStart; if( nParam==0 || nParam>sizeof(zParam)-1 ) goto syntax_error; memcpy(zParam, zStart, nParam); zParam[nParam] = '\0'; rc = testArgSelect(aParam, "param", zParam, &i); if( rc!=0 ) return rc; eParam = aParam[i].eParam; z++; zStart = z; while( *z>='0' && *z<='9' ) z++; nParam = z-zStart; if( nParam==0 || nParam>sizeof(zParam)-1 ) goto syntax_error; memcpy(zParam, zStart, nParam); zParam[nParam] = '\0'; iVal = atoi(zParam); if( bWorker || aParam[i].bWorker==0 ){ lsm_config(pDb, eParam, &iVal); } }else if( z!=zStart ){ goto syntax_error; } } return 0; syntax_error: testPrintError("syntax error at: \"%s\"\n", z); return 1; } int tdb_lsm_config_str(TestDb *pDb, const char *zStr){ int rc = 0; if( tdb_lsm(pDb) ){ int i; LsmDb *pLsm = (LsmDb *)pDb; rc = test_lsm_config_str(pLsm->db, 0, zStr); for(i=0; rc==0 && i<pLsm->nWorker; i++){ rc = test_lsm_config_str(pLsm->aWorker[i].pWorker, 1, zStr); } } return rc; } #else static void mt_shutdown(LsmDb *pDb) { unused_parameter(pDb); } int test_lsm_mt(const char *zFilename, int bClear, TestDb **ppDb){ unused_parameter(zFilename); |
︙ | ︙ |
Changes to src/lsm.h.
︙ | ︙ | |||
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | ** LSM_CONFIG_MMAP ** A read/write integer parameter. True to use mmap() to access the ** database file. False otherwise. ** ** LSM_CONFIG_USE_LOG ** A read/write boolean parameter. True (the default) to use the log ** file normally. False otherwise. */ #define LSM_CONFIG_WRITE_BUFFER 1 #define LSM_CONFIG_PAGE_SIZE 2 #define LSM_CONFIG_SAFETY 3 #define LSM_CONFIG_BLOCK_SIZE 4 #define LSM_CONFIG_AUTOWORK 5 #define LSM_CONFIG_LOG_SIZE 6 #define LSM_CONFIG_MMAP 7 #define LSM_CONFIG_USE_LOG 8 #define LSM_SAFETY_OFF 0 #define LSM_SAFETY_NORMAL 1 #define LSM_SAFETY_FULL 2 /* | > > > > > | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | ** LSM_CONFIG_MMAP ** A read/write integer parameter. True to use mmap() to access the ** database file. False otherwise. ** ** LSM_CONFIG_USE_LOG ** A read/write boolean parameter. True (the default) to use the log ** file normally. False otherwise. ** ** LSM_CONFIG_NMERGE ** A read/write integer parameter. The minimum number of segments to ** merge together at a time. Default value 4. */ #define LSM_CONFIG_WRITE_BUFFER 1 #define LSM_CONFIG_PAGE_SIZE 2 #define LSM_CONFIG_SAFETY 3 #define LSM_CONFIG_BLOCK_SIZE 4 #define LSM_CONFIG_AUTOWORK 5 #define LSM_CONFIG_LOG_SIZE 6 #define LSM_CONFIG_MMAP 7 #define LSM_CONFIG_USE_LOG 8 #define LSM_CONFIG_NMERGE 9 #define LSM_SAFETY_OFF 0 #define LSM_SAFETY_NORMAL 1 #define LSM_SAFETY_FULL 2 /* |
︙ | ︙ |
Changes to src/lsmInt.h.
︙ | ︙ | |||
42 43 44 45 46 47 48 49 50 51 52 53 54 55 | */ #define LSM_PAGE_SIZE 4096 #define LSM_BLOCK_SIZE (2 * 1024 * 1024) #define LSM_TREE_BYTES (2 * 1024 * 1024) #define LSM_ECOLA 4 #define LSM_DEFAULT_LOG_SIZE (128*1024) /* Places where a NULL needs to be changed to a real lsm_env pointer ** are marked with NEED_ENV */ #define NEED_ENV ((lsm_env*)0) /* Initial values for log file checksums. These are only used if the ** database file does not contain a valid checkpoint. */ | > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | */ #define LSM_PAGE_SIZE 4096 #define LSM_BLOCK_SIZE (2 * 1024 * 1024) #define LSM_TREE_BYTES (2 * 1024 * 1024) #define LSM_ECOLA 4 #define LSM_DEFAULT_LOG_SIZE (128*1024) #define LSM_DEFAULT_NMERGE 4 /* Places where a NULL needs to be changed to a real lsm_env pointer ** are marked with NEED_ENV */ #define NEED_ENV ((lsm_env*)0) /* Initial values for log file checksums. These are only used if the ** database file does not contain a valid checkpoint. */ |
︙ | ︙ | |||
67 68 69 70 71 72 73 | typedef struct Mempool Mempool; typedef struct MetaPage MetaPage; typedef struct MultiCursor MultiCursor; typedef struct Page Page; typedef struct Segment Segment; typedef struct SegmentMerger SegmentMerger; typedef struct Snapshot Snapshot; | < | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | typedef struct Mempool Mempool; typedef struct MetaPage MetaPage; typedef struct MultiCursor MultiCursor; typedef struct Page Page; typedef struct Segment Segment; typedef struct SegmentMerger SegmentMerger; typedef struct Snapshot Snapshot; typedef struct TransMark TransMark; typedef struct Tree Tree; typedef struct TreeMark TreeMark; typedef struct TreeVersion TreeVersion; typedef struct TreeCursor TreeCursor; typedef struct Merge Merge; typedef struct MergeInput MergeInput; |
︙ | ︙ | |||
168 169 170 171 172 173 174 175 176 177 178 179 180 181 | /* Database handle configuration */ lsm_env *pEnv; /* runtime environment */ int (*xCmp)(void *, int, void *, int); /* Compare function */ int nTreeLimit; /* Maximum size of in-memory tree in bytes */ int bAutowork; /* True to do auto-work after writing */ int eSafety; /* LSM_SAFETY_OFF, NORMAL or FULL */ int nLogSz; /* Configured by LSM_CONFIG_LOG_SIZE */ int bUseLog; /* Configured by LSM_CONFIG_USE_LOG */ int nDfltPgsz; /* Configured by LSM_CONFIG_PAGE_SIZE */ int nDfltBlksz; /* Configured by LSM_CONFIG_BLOCK_SIZE */ /* Sub-system handles */ FileSystem *pFS; /* On-disk portion of database */ | > | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | /* Database handle configuration */ lsm_env *pEnv; /* runtime environment */ int (*xCmp)(void *, int, void *, int); /* Compare function */ int nTreeLimit; /* Maximum size of in-memory tree in bytes */ int bAutowork; /* True to do auto-work after writing */ int eSafety; /* LSM_SAFETY_OFF, NORMAL or FULL */ int nMerge; /* Configured by LSM_CONFIG_NMERGE */ int nLogSz; /* Configured by LSM_CONFIG_LOG_SIZE */ int bUseLog; /* Configured by LSM_CONFIG_USE_LOG */ int nDfltPgsz; /* Configured by LSM_CONFIG_PAGE_SIZE */ int nDfltBlksz; /* Configured by LSM_CONFIG_BLOCK_SIZE */ /* Sub-system handles */ FileSystem *pFS; /* On-disk portion of database */ |
︙ | ︙ | |||
198 199 200 201 202 203 204 | void *pLogCtx; /* Work done notification callback */ void (*xWork)(lsm_db *, void *); void *pWorkCtx; }; | | < < < < < | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | void *pLogCtx; /* Work done notification callback */ void (*xWork)(lsm_db *, void *); void *pWorkCtx; }; struct Segment { int iFirst; /* First page of this run */ int iLast; /* Last page of this run */ Pgno iRoot; /* Root page number (if any) */ int nSize; /* Size of this run in pages */ }; /* ** iSplitTopic/pSplitKey/nSplitKey: ** If nRight>0, this buffer contains a copy of the largest key that has ** already been written to the left-hand-side of the level. */ struct Level { Segment lhs; /* Left-hand (main) segment */ |
︙ | ︙ | |||
238 239 240 241 242 243 244 | ** ** It is assumed that code that uses an instance of this structure has ** access to the associated Level struct. ** ** bHierReadonly: ** True if the b-tree hierarchy is currently read-only. ** | | | < < | | | | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | ** ** It is assumed that code that uses an instance of this structure has ** access to the associated Level struct. ** ** bHierReadonly: ** True if the b-tree hierarchy is currently read-only. ** ** iOutputOff: ** The byte offset to write to next within the last page of the ** output segment. */ struct Merge { int nInput; /* Number of input runs being merged */ MergeInput *aInput; /* Array nInput entries in size */ int nSkip; /* Number of separators entries to skip */ int iOutputOff; /* Write offset on output page */ int bHierReadonly; /* True if b-tree heirarchies are read-only */ }; struct MergeInput { Pgno iPg; /* Page on which next input is stored */ int iCell; /* Cell containing next input to merge */ }; /* |
︙ | ︙ | |||
367 368 369 370 371 372 373 | int lsmFsPageSize(FileSystem *); void lsmFsSetPageSize(FileSystem *, int); int lsmFsFileid(lsm_db *pDb, void **ppId, int *pnId); /* Creating, populating, gobbling and deleting sorted runs. */ | < < | | | | | > | | 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | int lsmFsPageSize(FileSystem *); void lsmFsSetPageSize(FileSystem *, int); int lsmFsFileid(lsm_db *pDb, void **ppId, int *pnId); /* Creating, populating, gobbling and deleting sorted runs. */ void lsmFsGobble(Snapshot *, Segment *, Page *); int lsmFsSortedDelete(FileSystem *, Snapshot *, int, Segment *); int lsmFsSortedFinish(FileSystem *, Segment *); int lsmFsSortedAppend(FileSystem *, Snapshot *, Segment *, Page **); int lsmFsPhantomMaterialize(FileSystem *, Snapshot *, Segment *); /* Functions to retrieve the lsm_env pointer from a FileSystem or Page object */ lsm_env *lsmFsEnv(FileSystem *); lsm_env *lsmPageEnv(Page *); FileSystem *lsmPageFS(Page *); int lsmFsSectorSize(FileSystem *); void lsmSortedSplitkey(lsm_db *, Level *, int *); int lsmFsSetupAppendList(lsm_db *db); /* Reading sorted run content. */ int lsmFsDbPageGet(FileSystem *, Pgno, Page **); int lsmFsDbPageNext(Segment *, Page *, int eDir, Page **); int lsmFsPageWrite(Page *); u8 *lsmFsPageData(Page *, int *); int lsmFsPageRelease(Page *); int lsmFsPagePersist(Page *); void lsmFsPageRef(Page *); Pgno lsmFsPageNumber(Page *); |
︙ | ︙ | |||
435 436 437 438 439 440 441 442 443 444 445 446 447 448 | /* ** Functions from file "lsm_sorted.c". */ int lsmInfoPageDump(lsm_db *, Pgno, int, char **); int lsmSortedFlushTree(lsm_db *, int *); void lsmSortedCleanup(lsm_db *); int lsmSortedAutoWork(lsm_db *, int nUnit); void lsmSortedFreeLevel(lsm_env *pEnv, Level *); int lsmSortedFlushDb(lsm_db *); int lsmSortedAdvanceAll(lsm_db *pDb); int lsmSortedLoadMerge(lsm_db *, Level *, u32 *, int *); | > > | 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | /* ** Functions from file "lsm_sorted.c". */ int lsmInfoPageDump(lsm_db *, Pgno, int, char **); int lsmSortedFlushTree(lsm_db *, int *); void lsmSortedCleanup(lsm_db *); int lsmSortedAutoWork(lsm_db *, int nUnit); void lsmSortedRemap(lsm_db *pDb); void lsmSortedFreeLevel(lsm_env *pEnv, Level *); int lsmSortedFlushDb(lsm_db *); int lsmSortedAdvanceAll(lsm_db *pDb); int lsmSortedLoadMerge(lsm_db *, Level *, u32 *, int *); |
︙ | ︙ | |||
466 467 468 469 470 471 472 | int lsmMCursorType(MultiCursor *, int *); lsm_db *lsmMCursorDb(MultiCursor *); int lsmSaveCursors(lsm_db *pDb); int lsmRestoreCursors(lsm_db *pDb); void lsmSortedDumpStructure(lsm_db *pDb, Snapshot *, int, int, const char *); | < | 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | int lsmMCursorType(MultiCursor *, int *); lsm_db *lsmMCursorDb(MultiCursor *); int lsmSaveCursors(lsm_db *pDb); int lsmRestoreCursors(lsm_db *pDb); void lsmSortedDumpStructure(lsm_db *pDb, Snapshot *, int, int, const char *); void lsmFsDumpBlocklists(lsm_db *); void lsmPutU32(u8 *, u32); u32 lsmGetU32(u8 *); /* |
︙ | ︙ |
Changes to src/lsm_ckpt.c.
︙ | ︙ | |||
62 63 64 65 66 67 68 | ** The checksum: ** ** 1. Checksum value 1. ** 2. Checksum value 2. ** ** In the above, a segment record is: ** | | | | | < < | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | ** The checksum: ** ** 1. Checksum value 1. ** 2. Checksum value 2. ** ** In the above, a segment record is: ** ** 1. First page of array, ** 2. Last page of array, ** 3. Root page of array (or 0), ** 4. Size of array in pages, */ /* ** OVERSIZED CHECKPOINT BLOBS: ** ** There are two slots allocated for checkpoints at the start of each ** database file. Each are 4096 bytes in size, so may accommodate |
︙ | ︙ | |||
219 220 221 222 223 224 225 | Segment *pSeg, CkptBuffer *p, int *piOut, int *pRc ){ int iOut = *piOut; | | | | < | < < < < < < < | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | Segment *pSeg, CkptBuffer *p, int *piOut, int *pRc ){ int iOut = *piOut; ckptSetValue(p, iOut++, pSeg->iFirst, pRc); ckptSetValue(p, iOut++, pSeg->iLast, pRc); ckptSetValue(p, iOut++, pSeg->iRoot, pRc); ckptSetValue(p, iOut++, pSeg->nSize, pRc); *piOut = iOut; } static void ckptExportLevel( Level *pLevel, CkptBuffer *p, |
︙ | ︙ | |||
383 384 385 386 387 388 389 | static void ckptNewSegment( u32 *aIn, int *piIn, Segment *pSegment /* Populate this structure */ ){ int iIn = *piIn; | | | < < < | | | | < < < | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | static void ckptNewSegment( u32 *aIn, int *piIn, Segment *pSegment /* Populate this structure */ ){ int iIn = *piIn; assert( pSegment->iFirst==0 && pSegment->iLast==0 ); assert( pSegment->nSize==0 && pSegment->iRoot==0 ); pSegment->iFirst = aIn[iIn++]; pSegment->iLast = aIn[iIn++]; pSegment->iRoot = aIn[iIn++]; pSegment->nSize = aIn[iIn++]; *piIn = iIn; } static int ckptSetupMerge(lsm_db *pDb, u32 *aInt, int *piIn, Level *pLevel){ Merge *pMerge; /* Allocated Merge object */ int nInput; /* Number of input segments in merge */ |
︙ | ︙ | |||
416 417 418 419 420 421 422 | pMerge = (Merge *)lsmMallocZero(pDb->pEnv, nByte); if( !pMerge ) return LSM_NOMEM_BKPT; pLevel->pMerge = pMerge; /* Populate the Merge object. */ pMerge->aInput = (MergeInput *)&pMerge[1]; pMerge->nInput = nInput; | | | < | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | pMerge = (Merge *)lsmMallocZero(pDb->pEnv, nByte); if( !pMerge ) return LSM_NOMEM_BKPT; pLevel->pMerge = pMerge; /* Populate the Merge object. */ pMerge->aInput = (MergeInput *)&pMerge[1]; pMerge->nInput = nInput; pMerge->iOutputOff = -1; pMerge->bHierReadonly = 1; pMerge->nSkip = (int)aInt[iIn++]; for(i=0; i<nInput; i++){ pMerge->aInput[i].iPg = (Pgno)aInt[iIn++]; pMerge->aInput[i].iCell = (int)aInt[iIn++]; } /* Set *piIn and return LSM_OK. */ *piIn = iIn; |
︙ | ︙ | |||
494 495 496 497 498 499 500 | return rc; } static int ckptImport(lsm_db *pDb, void *pCkpt, int nInt, int *pRc){ int ret = 0; if( *pRc==LSM_OK ){ Snapshot *pSnap = pDb->pWorker; | < | 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | return rc; } static int ckptImport(lsm_db *pDb, void *pCkpt, int nInt, int *pRc){ int ret = 0; if( *pRc==LSM_OK ){ Snapshot *pSnap = pDb->pWorker; u32 cksum[2] = {0, 0}; u32 *aInt = (u32 *)pCkpt; lsmChecksumBytes((u8 *)aInt, sizeof(u32)*(nInt-2), 0, cksum); if( LSM_LITTLE_ENDIAN ){ int i; for(i=0; i<nInt; i++) aInt[i] = BYTESWAP32(aInt[i]); |
︙ | ︙ | |||
523 524 525 526 527 528 529 | nLevel = (int)aInt[CKPT_HDR_NLEVEL]; lsmSnapshotSetNBlock(pSnap, (int)aInt[CKPT_HDR_NBLOCK]); lsmDbSetPagesize(pDb,(int)aInt[CKPT_HDR_PGSZ],(int)aInt[CKPT_HDR_BLKSZ]); /* Import log offset */ ckptImportLog(aInt, &iIn, lsmDatabaseLog(pDb)); | | | 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 | nLevel = (int)aInt[CKPT_HDR_NLEVEL]; lsmSnapshotSetNBlock(pSnap, (int)aInt[CKPT_HDR_NBLOCK]); lsmDbSetPagesize(pDb,(int)aInt[CKPT_HDR_PGSZ],(int)aInt[CKPT_HDR_BLKSZ]); /* Import log offset */ ckptImportLog(aInt, &iIn, lsmDatabaseLog(pDb)); /* Import all levels stored in the checkpoint. */ *pRc = ckptLoadLevels(pDb, aInt, &iIn, nLevel, &pTopLevel); lsmDbSnapshotSetLevel(pSnap, pTopLevel); /* Import the freelist delta */ aDelta = lsmFreelistDeltaPtr(pDb); for(i=0; i<LSM_FREELIST_DELTA_SIZE; i++){ aDelta[i] = aInt[iIn++]; |
︙ | ︙ | |||
681 682 683 684 685 686 687 | int lsmCheckpointLevels( lsm_db *pDb, /* Database handle */ int *pnHdrLevel, /* OUT: Levels to write to db header */ void **paVal, /* OUT: Pointer to LEVELS blob */ int *pnVal /* OUT: Size of LEVELS blob in bytes */ ){ int rc = LSM_OK; /* Return code */ | | | 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 | int lsmCheckpointLevels( lsm_db *pDb, /* Database handle */ int *pnHdrLevel, /* OUT: Levels to write to db header */ void **paVal, /* OUT: Pointer to LEVELS blob */ int *pnVal /* OUT: Size of LEVELS blob in bytes */ ){ int rc = LSM_OK; /* Return code */ const int SEGMENT_SIZE = 4; /* Size of a checkpoint segment record */ Level *p; /* Used to iterate through levels */ int nFree; /* Free integers remaining in db header */ int nHdr = 0; /* Number of levels stored in db header */ int nLevels = 0; /* Number of levels stored in LEVELS */ /* Number of free integers - 1024 less those used by the checkpoint header, ** less the 4 used for the log-pointer, less the 3 used for the |
︙ | ︙ |
Changes to src/lsm_file.c.
︙ | ︙ | |||
86 87 88 89 90 91 92 | */ #include "lsmInt.h" #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | */ #include "lsmInt.h" #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> /* ** File-system object. Each database connection allocates a single instance ** of the following structure. It is used for all access to the database and ** log files. ** ** pLruFirst, pLruLast: |
︙ | ︙ | |||
148 149 150 151 152 153 154 | struct FileSystem { lsm_db *pDb; /* Database handle that owns this object */ lsm_env *pEnv; /* Environment pointer */ char *zDb; /* Database file name */ int nMetasize; /* Size of meta pages in bytes */ int nPagesize; /* Database page-size in bytes */ int nBlocksize; /* Database block-size in bytes */ | < | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | struct FileSystem { lsm_db *pDb; /* Database handle that owns this object */ lsm_env *pEnv; /* Environment pointer */ char *zDb; /* Database file name */ int nMetasize; /* Size of meta pages in bytes */ int nPagesize; /* Database page-size in bytes */ int nBlocksize; /* Database block-size in bytes */ /* r/w file descriptors for both files. */ lsm_file *fdDb; /* Database file */ lsm_file *fdLog; /* Log file */ /* mmap() mode things */ int bUseMmap; /* True to use mmap() to access db file */ |
︙ | ︙ | |||
178 179 180 181 182 183 184 185 186 187 188 189 190 191 | }; /* ** Database page handle. */ struct Page { u8 *aData; /* Buffer containing page data */ int iPg; /* Page number */ int nRef; /* Number of outstanding references */ int flags; /* Combination of PAGE_XXX flags */ Page *pHashNext; /* Next page in hash table slot */ Page *pLruNext; /* Next page in LRU list */ Page *pLruPrev; /* Previous page in LRU list */ FileSystem *pFS; /* File system that owns this page */ | > | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | }; /* ** Database page handle. */ struct Page { u8 *aData; /* Buffer containing page data */ int nData; /* Bytes of usable data at aData[] */ int iPg; /* Page number */ int nRef; /* Number of outstanding references */ int flags; /* Combination of PAGE_XXX flags */ Page *pHashNext; /* Next page in hash table slot */ Page *pLruNext; /* Next page in LRU list */ Page *pLruPrev; /* Previous page in LRU list */ FileSystem *pFS; /* File system that owns this page */ |
︙ | ︙ | |||
211 212 213 214 215 216 217 | /* ** Number of pgsz byte pages omitted from the start of block 1. The start ** of block 1 contains two 4096 byte meta pages (8192 bytes in total). */ #define BLOCK1_HDR_SIZE(pgsz) LSM_MAX(1, 8192/(pgsz)) | < < < < < | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | /* ** Number of pgsz byte pages omitted from the start of block 1. The start ** of block 1 contains two 4096 byte meta pages (8192 bytes in total). */ #define BLOCK1_HDR_SIZE(pgsz) LSM_MAX(1, 8192/(pgsz)) /* ** Wrappers around the VFS methods of the lsm_env object: ** ** lsmEnvOpen() ** lsmEnvRead() ** lsmEnvWrite() |
︙ | ︙ | |||
413 414 415 416 417 418 419 | */ void lsmFsClose(FileSystem *pFS){ if( pFS ){ Page *pPg; lsm_env *pEnv = pFS->pEnv; assert( pFS->nOut==0 ); | < | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 | */ void lsmFsClose(FileSystem *pFS){ if( pFS ){ Page *pPg; lsm_env *pEnv = pFS->pEnv; assert( pFS->nOut==0 ); pPg = pFS->pLruFirst; while( pPg ){ Page *pNext = pPg->pLruNext; if( pPg->flags & PAGE_FREE ) lsmFree(pEnv, pPg->aData); lsmFree(pEnv, pPg); pPg = pNext; } |
︙ | ︙ | |||
596 597 598 599 600 601 602 603 604 605 606 607 608 609 | pPg->pLruPrev->pLruNext = pPg; }else{ pFS->pLruFirst = pPg; } pFS->pLruLast = pPg; } static void fsPageRemoveFromHash(FileSystem *pFS, Page *pPg){ int iHash; Page **pp; iHash = fsHashKey(pFS->nHash, pPg->iPg); for(pp=&pFS->apHash[iHash]; *pp!=pPg; pp=&(*pp)->pHashNext); *pp = pPg->pHashNext; | > > > | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 | pPg->pLruPrev->pLruNext = pPg; }else{ pFS->pLruFirst = pPg; } pFS->pLruLast = pPg; } /* ** Remove page pPg from the hash table. */ static void fsPageRemoveFromHash(FileSystem *pFS, Page *pPg){ int iHash; Page **pp; iHash = fsHashKey(pFS->nHash, pPg->iPg); for(pp=&pFS->apHash[iHash]; *pp!=pPg; pp=&(*pp)->pHashNext); *pp = pPg->pHashNext; |
︙ | ︙ | |||
668 669 670 671 672 673 674 675 676 677 678 679 680 681 | int rc; rc = lsmEnvRemap(pFS->pEnv, pFS->fdDb, iSz, &pFS->pMap, &pFS->nMap); if( rc==LSM_OK ){ u8 *aData = (u8 *)pFS->pMap; for(pFix=pFS->pLruFirst; pFix; pFix=pFix->pLruNext){ pFix->aData = &aData[pFS->nPagesize * (i64)(pFix->iPg-1)]; } } *pRc = rc; } } /* ** Return a handle for a database page. | > > | 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 | int rc; rc = lsmEnvRemap(pFS->pEnv, pFS->fdDb, iSz, &pFS->pMap, &pFS->nMap); if( rc==LSM_OK ){ u8 *aData = (u8 *)pFS->pMap; for(pFix=pFS->pLruFirst; pFix; pFix=pFix->pLruNext){ pFix->aData = &aData[pFS->nPagesize * (i64)(pFix->iPg-1)]; } lsmSortedRemap(pFS->pDb); } *pRc = rc; } } /* ** Return a handle for a database page. |
︙ | ︙ | |||
738 739 740 741 742 743 744 745 746 747 748 749 750 751 | } /* If the xRead() call was successful (or not attempted), link the ** page into the page-cache hash-table. Otherwise, if it failed, ** free the buffer. */ if( rc==LSM_OK ){ p->pHashNext = pFS->apHash[iHash]; pFS->apHash[iHash] = p; }else{ fsPageBufferFree(p); p = 0; } } }else if( p->nRef==0 && pFS->bUseMmap==0 ){ | > | 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 | } /* If the xRead() call was successful (or not attempted), link the ** page into the page-cache hash-table. Otherwise, if it failed, ** free the buffer. */ if( rc==LSM_OK ){ p->pHashNext = pFS->apHash[iHash]; p->nData = pFS->nPagesize - (p->flags & PAGE_SHORT); pFS->apHash[iHash] = p; }else{ fsPageBufferFree(p); p = 0; } } }else if( p->nRef==0 && pFS->bUseMmap==0 ){ |
︙ | ︙ | |||
775 776 777 778 779 780 781 | *piNext = fsPageToBlock(pFS, lsmGetU32(&pLast->aData[pFS->nPagesize-4])); lsmFsPageRelease(pLast); } return rc; } static int fsRunEndsBetween( | | | | | < < | < < | | 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 | *piNext = fsPageToBlock(pFS, lsmGetU32(&pLast->aData[pFS->nPagesize-4])); lsmFsPageRelease(pLast); } return rc; } static int fsRunEndsBetween( Segment *pRun, Segment *pIgnore, int iFirst, int iLast ){ return (pRun!=pIgnore && ( (pRun->iFirst>=iFirst && pRun->iFirst<=iLast) || (pRun->iLast>=iFirst && pRun->iLast<=iLast) )); } static int fsLevelEndsBetween( Level *pLevel, Segment *pIgnore, int iFirst, int iLast ){ int i; if( fsRunEndsBetween(&pLevel->lhs, pIgnore, iFirst, iLast) ){ return 1; } for(i=0; i<pLevel->nRight; i++){ if( fsRunEndsBetween(&pLevel->aRhs[i], pIgnore, iFirst, iLast) ){ return 1; } } return 0; } static int fsFreeBlock( FileSystem *pFS, Snapshot *pSnapshot, Segment *pIgnore, /* Ignore this run when searching */ int iBlk ){ int rc = LSM_OK; /* Return code */ int iFirst; /* First page on block iBlk */ int iLast; /* Last page on block iBlk */ int i; /* Used to iterate through append points */ Level *pLevel; /* Used to iterate through levels */ |
︙ | ︙ | |||
856 857 858 859 860 861 862 | /* ** Delete or otherwise recycle the blocks currently occupied by run pDel. */ int lsmFsSortedDelete( FileSystem *pFS, Snapshot *pSnapshot, | | | | 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 | /* ** Delete or otherwise recycle the blocks currently occupied by run pDel. */ int lsmFsSortedDelete( FileSystem *pFS, Snapshot *pSnapshot, int bZero, /* True to zero the Segment structure */ Segment *pDel ){ if( pDel->iFirst ){ int rc = LSM_OK; int iBlk; int iLastBlk; |
︙ | ︙ | |||
880 881 882 883 884 885 886 | }else if( bZero==0 && pDel->iLast!=fsLastPageOnBlock(pFS, iLastBlk) ){ break; } rc = fsFreeBlock(pFS, pSnapshot, pDel, iBlk); iBlk = iNext; } | | | | 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 | }else if( bZero==0 && pDel->iLast!=fsLastPageOnBlock(pFS, iLastBlk) ){ break; } rc = fsFreeBlock(pFS, pSnapshot, pDel, iBlk); iBlk = iNext; } if( bZero ) memset(pDel, 0, sizeof(Segment)); } return LSM_OK; } /* ** The pager reference passed as the only argument must refer to a sorted ** file page (not a log or meta page). This call indicates that the argument ** page is now the first page in its sorted file - all previous pages may ** be considered free. */ void lsmFsGobble( Snapshot *pSnapshot, Segment *pRun, Page *pPg ){ FileSystem *pFS = pPg->pFS; if( pPg->iPg!=pRun->iFirst ){ int rc = LSM_OK; int iBlk = fsPageToBlock(pFS, pRun->iFirst); |
︙ | ︙ | |||
942 943 944 945 946 947 948 | ** If the previous/next page does exist and is successfully loaded, *ppNext ** is set to point to it and LSM_OK is returned. Otherwise, if an error ** occurs, *ppNext is set to NULL and and lsm error code returned. ** ** Page references returned by this function should be released by the ** caller using lsmFsPageRelease(). */ | | | 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 | ** If the previous/next page does exist and is successfully loaded, *ppNext ** is set to point to it and LSM_OK is returned. Otherwise, if an error ** occurs, *ppNext is set to NULL and and lsm error code returned. ** ** Page references returned by this function should be released by the ** caller using lsmFsPageRelease(). */ int lsmFsDbPageNext(Segment *pRun, Page *pPg, int eDir, Page **ppNext){ FileSystem *pFS = pPg->pFS; int iPg = pPg->iPg; assert( eDir==1 || eDir==-1 ); if( eDir<0 ){ if( pRun && iPg==pRun->iFirst ){ |
︙ | ︙ | |||
1055 1056 1057 1058 1059 1060 1061 | assert( db->pWorker ); for(pLvl=lsmDbSnapshotLevel(db->pWorker); rc==LSM_OK && pLvl; pLvl=pLvl->pNext ){ if( pLvl->nRight==0 ){ | | < | < | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | < < | 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 | assert( db->pWorker ); for(pLvl=lsmDbSnapshotLevel(db->pWorker); rc==LSM_OK && pLvl; pLvl=pLvl->pNext ){ if( pLvl->nRight==0 ){ addAppendPoint(db, pLvl->lhs.iLast, &rc); }else{ int i; for(i=0; i<pLvl->nRight; i++){ addAppendPoint(db, pLvl->aRhs[i].iLast, &rc); } } } for(pLvl=lsmDbSnapshotLevel(db->pWorker); pLvl; pLvl=pLvl->pNext){ int i; subAppendPoint(db, pLvl->lhs.iFirst); for(i=0; i<pLvl->nRight; i++){ subAppendPoint(db, pLvl->aRhs[i].iFirst); } } return rc; } /* ** Append a page to file iFile. Return a reference to it. lsmFsPageWrite() ** has already been called on the returned reference. */ int lsmFsSortedAppend( FileSystem *pFS, Snapshot *pSnapshot, Segment *p, Page **ppOut ){ int rc = LSM_OK; Page *pPg = 0; *ppOut = 0; int iApp = 0; int iNext = 0; int iPrev = p->iLast; if( iPrev==0 ){ iApp = findAppendPoint(pFS, 0); }else if( fsIsLast(pFS, iPrev) ){ Page *pLast = 0; rc = fsPageGet(pFS, iPrev, 0, &pLast); if( rc!=LSM_OK ) return rc; iApp = lsmGetU32(&pLast->aData[pFS->nPagesize-4]); lsmFsPageRelease(pLast); }else{ iApp = iPrev + 1; } /* If this is the first page allocated, or if the page allocated is the ** last in the block, allocate a new block here. */ if( iApp==0 || fsIsLast(pFS, iApp) ){ int iNew; /* New block number */ lsmBlockAllocate(pFS->pDb, &iNew); if( iApp==0 ){ iApp = fsFirstPageOnBlock(pFS, iNew); }else{ iNext = fsFirstPageOnBlock(pFS, iNew); } } /* Grab the new page. */ pPg = 0; rc = fsPageGet(pFS, iApp, 1, &pPg); assert( rc==LSM_OK || pPg==0 ); /* If this is the first or last page of a block, fill in the pointer ** value at the end of the new page. */ if( rc==LSM_OK ){ p->nSize++; p->iLast = iApp; if( p->iFirst==0 ) p->iFirst = iApp; pPg->flags |= PAGE_DIRTY; if( fsIsLast(pFS, iApp) ){ lsmPutU32(&pPg->aData[pFS->nPagesize-4], iNext); }else if( fsIsFirst(pFS, iApp) ){ lsmPutU32(&pPg->aData[pFS->nPagesize-4], iPrev); } } *ppOut = pPg; return rc; } /* ** Mark the sorted run passed as the second argument as finished. */ int lsmFsSortedFinish(FileSystem *pFS, Segment *p){ int rc = LSM_OK; if( p ){ const int nPagePerBlock = (pFS->nBlocksize / pFS->nPagesize); /* Check if the last page of this run happens to be the last of a block. ** If it is, then an extra block has already been allocated for this run. ** Shift this extra block back to the free-block list. ** ** Otherwise, add the first free page in the last block used by the run ** to the lAppend list. */ |
︙ | ︙ | |||
1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 | /* ** Return a copy of the environment pointer used by the file-system object ** to which this page belongs. */ lsm_env *lsmPageEnv(Page *pPg) { return pPg->pFS->pEnv; } /* ** Return the sector-size as reported by the log file handle. */ int lsmFsSectorSize(FileSystem *pFS){ return lsmEnvSectorSize(pFS->pEnv, pFS->fdLog); } | > > > > | 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 | /* ** Return a copy of the environment pointer used by the file-system object ** to which this page belongs. */ lsm_env *lsmPageEnv(Page *pPg) { return pPg->pFS->pEnv; } FileSystem *lsmPageFS(Page *pPg){ return pPg->pFS; } /* ** Return the sector-size as reported by the log file handle. */ int lsmFsSectorSize(FileSystem *pFS){ return lsmEnvSectorSize(pFS->pEnv, pFS->fdLog); } |
︙ | ︙ | |||
1517 1518 1519 1520 1521 1522 1523 | *piParam = pFS->bUseMmap; return LSM_OK; } /* ** Helper function for lsmInfoArrayStructure(). */ | | | | < < | < | 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 | *piParam = pFS->bUseMmap; return LSM_OK; } /* ** Helper function for lsmInfoArrayStructure(). */ static Segment *startsWith(Segment *pRun, Pgno iFirst){ return (iFirst==pRun->iFirst) ? pRun : 0; } /* ** This function implements the lsm_info(LSM_INFO_ARRAY_STRUCTURE) request. ** If successful, *pzOut is set to point to a nul-terminated string ** containing the array structure and LSM_OK is returned. The caller should ** eventually free the string using lsmFree(). ** ** If an error occurs, *pzOut is set to NULL and an LSM error code returned. */ int lsmInfoArrayStructure(lsm_db *pDb, Pgno iFirst, char **pzOut){ int rc = LSM_OK; Snapshot *pWorker; /* Worker snapshot */ Snapshot *pRelease = 0; /* Snapshot to release */ Segment *pArray = 0; /* Array to report on */ Level *pLvl; /* Used to iterate through db levels */ *pzOut = 0; if( iFirst==0 ) return LSM_ERROR; /* Obtain the worker snapshot */ pWorker = pDb->pWorker; if( !pWorker ){ pRelease = pWorker = lsmDbSnapshotWorker(pDb); } /* Search for the array that starts on page iFirst */ for(pLvl=lsmDbSnapshotLevel(pWorker); pLvl && pArray==0; pLvl=pLvl->pNext){ if( 0==(pArray = startsWith(&pLvl->lhs, iFirst)) ){ int i; for(i=0; i<pLvl->nRight; i++){ if( (pArray = startsWith(&pLvl->aRhs[i], iFirst)) ) break; } } } if( pArray==0 ){ /* Could not find the requested array. This is an error. */ *pzOut = 0; |
︙ | ︙ | |||
1587 1588 1589 1590 1591 1592 1593 | *pzOut = str.z; } lsmDbSnapshotRelease(pDb->pEnv, pRelease); return rc; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 | *pzOut = str.z; } lsmDbSnapshotRelease(pDb->pEnv, pRelease); return rc; } #ifdef LSM_EXPENSIVE_DEBUG /* ** Helper function for lsmFsIntegrityCheck() */ static void checkBlocks( FileSystem *pFS, Segment *pSeg, int bExtra, u8 *aUsed ){ if( pSeg ){ int i; for(i=0; i<2; i++){ Segment *p = (i ? pSeg->pRun : pSeg->pSep); if( p && p->nSize>0 ){ const int nPagePerBlock = (pFS->nBlocksize / pFS->nPagesize); int iBlk; int iLastBlk; iBlk = fsPageToBlock(pFS, p->iFirst); |
︙ | ︙ |
Changes to src/lsm_main.c.
︙ | ︙ | |||
78 79 80 81 82 83 84 85 86 87 88 89 90 91 | pDb->nTreeLimit = LSM_TREE_BYTES; pDb->bAutowork = 1; pDb->eSafety = LSM_SAFETY_NORMAL; pDb->xCmp = xCmp; pDb->nLogSz = LSM_DEFAULT_LOG_SIZE; pDb->nDfltPgsz = LSM_PAGE_SIZE; pDb->nDfltBlksz = LSM_BLOCK_SIZE; pDb->bUseLog = 1; return LSM_OK; } lsm_env *lsm_get_env(lsm_db *pDb){ assert( pDb->pEnv ); | > | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | pDb->nTreeLimit = LSM_TREE_BYTES; pDb->bAutowork = 1; pDb->eSafety = LSM_SAFETY_NORMAL; pDb->xCmp = xCmp; pDb->nLogSz = LSM_DEFAULT_LOG_SIZE; pDb->nDfltPgsz = LSM_PAGE_SIZE; pDb->nDfltBlksz = LSM_BLOCK_SIZE; pDb->nMerge = LSM_DEFAULT_NMERGE; pDb->bUseLog = 1; return LSM_OK; } lsm_env *lsm_get_env(lsm_db *pDb){ assert( pDb->pEnv ); |
︙ | ︙ | |||
393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | int *piVal = va_arg(ap, int *); if( pDb->nTransOpen==0 && (*piVal==0 || *piVal==1) ){ pDb->bUseLog = *piVal; } *piVal = pDb->bUseLog; break; } default: rc = LSM_MISUSE; break; } va_end(ap); return rc; } void lsmAppendSegmentList(LsmString *pStr, char *zPre, Segment *pSeg){ lsmStringAppendf(pStr, "%s{%d %d %d %d %d %d}", zPre, | > > > > > > > | | | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 | int *piVal = va_arg(ap, int *); if( pDb->nTransOpen==0 && (*piVal==0 || *piVal==1) ){ pDb->bUseLog = *piVal; } *piVal = pDb->bUseLog; break; } case LSM_CONFIG_NMERGE: { int *piVal = va_arg(ap, int *); if( *piVal>1 ) pDb->nMerge = *piVal; *piVal = pDb->nMerge; break; } default: rc = LSM_MISUSE; break; } va_end(ap); return rc; } void lsmAppendSegmentList(LsmString *pStr, char *zPre, Segment *pSeg){ lsmStringAppendf(pStr, "%s{%d %d %d %d %d %d}", zPre, 0, 0, 0, pSeg->iFirst, pSeg->iLast, pSeg->nSize ); } int lsmStructList( lsm_db *pDb, /* Database handle */ char **pzOut /* OUT: Nul-terminated string (tcl list) */ ){ |
︙ | ︙ |
Changes to src/lsm_shared.c.
︙ | ︙ | |||
750 751 752 753 754 755 756 | lsmMutexEnter(pDb->pEnv, p->pClientMutex); assertSnapshotListOk(p); pOld = p->pClient; pNew->pSnapshotNext = pOld; p->pClient = pNew; assertSnapshotListOk(p); if( pDb->pClient ){ | < | | | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 | lsmMutexEnter(pDb->pEnv, p->pClientMutex); assertSnapshotListOk(p); pOld = p->pClient; pNew->pSnapshotNext = pOld; p->pClient = pNew; assertSnapshotListOk(p); if( pDb->pClient ){ pDb->pClient = pNew; pNew->nRef++; } lsmMutexLeave(pDb->pEnv, p->pClientMutex); lsmDbSnapshotRelease(pDb->pEnv, pOld); p->bDirty = 0; /* Upgrade the user connection to the new client snapshot */ |
︙ | ︙ |
Changes to src/lsm_sorted.c.
1 2 3 4 5 6 7 8 9 10 11 12 | /* ** 2011-08-14 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** | < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* ** 2011-08-14 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** PAGE FORMAT: ** ** The maximum page size is 65536 bytes. ** ** Since all records are equal to or larger than 2 bytes in size, and ** some space within the page is consumed by the page footer, there must ** be less than 2^15 records on each page. |
︙ | ︙ | |||
148 149 150 151 152 153 154 | ** ** * To iterate and/or seek within a single Segment (the combination of a ** main run and an optional sorted run). ** ** * To iterate through the separators array of a segment. */ struct SegmentPtr { | | < | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | ** ** * To iterate and/or seek within a single Segment (the combination of a ** main run and an optional sorted run). ** ** * To iterate through the separators array of a segment. */ struct SegmentPtr { Segment *pSeg; /* Segment to access */ /* Current page. See segmentPtrLoadPage(). */ Page *pPg; /* Current page */ u16 flags; /* Copy of page flags field */ int nCell; /* Number of cells on pPg */ int iPtr; /* Base cascade pointer */ |
︙ | ︙ | |||
197 198 199 200 201 202 203 204 205 206 207 208 209 210 | int bIgnoreSeparators; /* True to ignore SORTED_SEPARATOR records */ int bIgnoreSystem; /* True to ignore records for topic!=0 */ int iCurrentPtr; /* Current entry in aPtr[] */ int nPtr; /* Size of aPtr[] array */ SegmentPtr *aPtr; /* Array of segment pointers */ Level *pLevel; /* Pointer to Level object (if nPtr>1) */ }; /* ** A cursor used for merged searches or iterations through up to one ** Tree structure and any number of sorted files. ** ** lsmMCursorNew() ** lsmMCursorSeek() | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | int bIgnoreSeparators; /* True to ignore SORTED_SEPARATOR records */ int bIgnoreSystem; /* True to ignore records for topic!=0 */ int iCurrentPtr; /* Current entry in aPtr[] */ int nPtr; /* Size of aPtr[] array */ SegmentPtr *aPtr; /* Array of segment pointers */ Level *pLevel; /* Pointer to Level object (if nPtr>1) */ }; /* ** Used to iterate through the keys stored in a b-tree hierarchy from start ** to finish. Only First() and Next() operations are required. ** ** btreeCursorNew() ** btreeCursorFirst() ** btreeCursorNext() ** btreeCursorFree() ** btreeCursorPosition() ** btreeCursorRestore() */ typedef struct BtreePg BtreePg; typedef struct BtreeCursor BtreeCursor; struct BtreePg { Page *pPage; int iCell; }; struct BtreeCursor { Segment *pSeg; /* Iterate through this segments btree */ FileSystem *pFS; /* File system to read pages from */ int nDepth; /* Allocated size of aPg[] */ int iPg; /* Current entry in aPg[]. -1 -> EOF. */ BtreePg *aPg; /* Pages from root to current location */ /* Cache of current entry. pKey==0 for EOF. */ void *pKey; int nKey; int eType; Pgno iPtr; /* Storage for key, if not local */ Blob blob; }; /* ** A cursor used for merged searches or iterations through up to one ** Tree structure and any number of sorted files. ** ** lsmMCursorNew() ** lsmMCursorSeek() |
︙ | ︙ | |||
220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | lsm_db *pDb; /* Connection that owns this cursor */ MultiCursor *pNext; /* Next cursor owned by connection pDb */ int flags; /* Mask of CURSOR_XXX flags */ int (*xCmp)(void *, int, void *, int); /* Compare function */ int eType; /* Cache of current key type */ Blob key; /* Cache of current key (or NULL) */ TreeCursor *pTreeCsr; /* Single tree cursor */ int nSegCsr; /* Size of aSegCsr[] array */ LevelCursor *aSegCsr; /* Array of cursors open on sorted files */ int nTree; int *aTree; int *pnHdrLevel; void *pSystemVal; Snapshot *pSnap; }; /* ** CURSOR_IGNORE_DELETE ** If set, this cursor will not visit SORTED_DELETE keys. ** ** CURSOR_NEW_SYSTEM ** If set, then after all user data from the in-memory tree and any other | > > > > > > > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | lsm_db *pDb; /* Connection that owns this cursor */ MultiCursor *pNext; /* Next cursor owned by connection pDb */ int flags; /* Mask of CURSOR_XXX flags */ int (*xCmp)(void *, int, void *, int); /* Compare function */ int eType; /* Cache of current key type */ Blob key; /* Cache of current key (or NULL) */ Blob val; /* Cache of current value */ TreeCursor *pTreeCsr; /* Single tree cursor */ int nSegCsr; /* Size of aSegCsr[] array */ LevelCursor *aSegCsr; /* Array of cursors open on sorted files */ int nTree; int *aTree; BtreeCursor *pBtCsr; int *pnHdrLevel; void *pSystemVal; Snapshot *pSnap; }; #define CURSOR_DATA_TREE 0 #define CURSOR_DATA_SYSTEM 1 #define CURSOR_DATA_SEGMENT 2 /* ** CURSOR_IGNORE_DELETE ** If set, this cursor will not visit SORTED_DELETE keys. ** ** CURSOR_NEW_SYSTEM ** If set, then after all user data from the in-memory tree and any other |
︙ | ︙ | |||
269 270 271 272 273 274 275 276 277 278 279 280 | #define CURSOR_AT_FREELIST 0x00000004 #define CURSOR_AT_LEVELS 0x00000008 #define CURSOR_IGNORE_SYSTEM 0x00000010 #define CURSOR_NEXT_OK 0x00000020 #define CURSOR_PREV_OK 0x00000040 typedef struct MergeWorker MergeWorker; struct MergeWorker { lsm_db *pDb; /* Database handle */ Level *pLevel; /* Worker snapshot Level being merged */ MultiCursor *pCsr; /* Cursor to read new segment contents from */ int bFlush; /* True if this is an in-memory tree flush */ | > > > > > > > < | | | | < < < > > > > > > > > > | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | #define CURSOR_AT_FREELIST 0x00000004 #define CURSOR_AT_LEVELS 0x00000008 #define CURSOR_IGNORE_SYSTEM 0x00000010 #define CURSOR_NEXT_OK 0x00000020 #define CURSOR_PREV_OK 0x00000040 typedef struct MergeWorker MergeWorker; typedef struct Hierarchy Hierarchy; struct Hierarchy { Page **apHier; int nHier; }; struct MergeWorker { lsm_db *pDb; /* Database handle */ Level *pLevel; /* Worker snapshot Level being merged */ MultiCursor *pCsr; /* Cursor to read new segment contents from */ int bFlush; /* True if this is an in-memory tree flush */ Hierarchy hier; /* B-tree hierarchy under construction */ Page *pPage; /* Current output page */ int nWork; /* Number of calls to mergeWorkerNextPage() */ }; #ifdef LSM_DEBUG_EXPENSIVE static int assertPointersOk(lsm_db *, Segment *, Segment *, int); static int assertBtreeOk(lsm_db *, Segment *); #endif struct FilePage { u8 *aData; int nData; }; static u8 *fsPageData(Page *pPg, int *pnData){ *pnData = ((struct FilePage *)(pPg))->nData; return ((struct FilePage *)(pPg))->aData; } static u8 *fsPageDataPtr(Page *pPg){ return ((struct FilePage *)(pPg))->aData; } /* ** Write nVal as a 16-bit unsigned big-endian integer into buffer aOut. */ void lsmPutU16(u8 *aOut, u16 nVal){ aOut[0] = (u8)((nVal>>8) & 0xFF); aOut[1] = (u8)(nVal & 0xFF); |
︙ | ︙ | |||
344 345 346 347 348 349 350 | static void sortedBlobFree(Blob *pBlob){ assert( pBlob->pEnv || pBlob->pData==0 ); if( pBlob->pData ) lsmFree(pBlob->pEnv, pBlob->pData); memset(pBlob, 0, sizeof(Blob)); } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 | static void sortedBlobFree(Blob *pBlob){ assert( pBlob->pEnv || pBlob->pData==0 ); if( pBlob->pData ) lsmFree(pBlob->pEnv, pBlob->pData); memset(pBlob, 0, sizeof(Blob)); } static int sortedReadData( Page *pPg, int iOff, int nByte, void **ppData, Blob *pBlob ){ int rc = LSM_OK; int iEnd; int nData; int nCell; u8 *aData; aData = fsPageData(pPg, &nData); nCell = lsmGetU16(&aData[SEGMENT_NRECORD_OFFSET(nData)]); iEnd = SEGMENT_EOF(nData, nCell); assert( iEnd>0 && iEnd<nData ); if( iOff+nByte<=iEnd ){ *ppData = (void *)&aData[iOff]; }else{ |
︙ | ︙ | |||
488 489 490 491 492 493 494 | rc = lsmFsDbPageNext(0, pPg, 1, &pNext); if( rc==LSM_OK && pNext==0 ){ rc = LSM_CORRUPT_BKPT; } if( rc ) break; lsmFsPageRelease(pPg); pPg = pNext; | | | > > | > > > | | > > | > > > | > > > > > > > | > > > | | > > | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | rc = lsmFsDbPageNext(0, pPg, 1, &pNext); if( rc==LSM_OK && pNext==0 ){ rc = LSM_CORRUPT_BKPT; } if( rc ) break; lsmFsPageRelease(pPg); pPg = pNext; aData = fsPageData(pPg, &nData); flags = lsmGetU16(&aData[SEGMENT_FLAGS_OFFSET(nData)]); }while( flags&SEGMENT_BTREE_FLAG ); iEnd = SEGMENT_EOF(nData, lsmGetU16(&aData[nData-2])); assert( iEnd>0 && iEnd<nData ); } lsmFsPageRelease(pPg); } return rc; } static int pageGetNRec(u8 *aData, int nData){ return (int)lsmGetU16(&aData[SEGMENT_NRECORD_OFFSET(nData)]); } static int pageGetPtr(u8 *aData, int nData){ return (int)lsmGetU32(&aData[SEGMENT_POINTER_OFFSET(nData)]); } static int pageGetFlags(u8 *aData, int nData){ return (int)lsmGetU16(&aData[SEGMENT_FLAGS_OFFSET(nData)]); } static u8 *pageGetCell(u8 *aData, int nData, int iCell){ return &aData[lsmGetU16(&aData[SEGMENT_CELLPTR_OFFSET(nData, iCell)])]; } /* ** Return the decoded (possibly relative) pointer value stored in cell ** iCell from page aData/nData. */ static int pageGetRecordPtr(u8 *aData, int nData, int iCell){ int iRet; /* Return value */ u8 *aCell; /* Pointer to cell iCell */ assert( iCell<pageGetNRec(aData, nData) && iCell>=0 ); aCell = pageGetCell(aData, nData, iCell); lsmVarintGet32(&aCell[1], &iRet); return iRet; } static u8 *pageGetKey( Page *pPg, /* Page to read from */ int iCell, /* Index of cell on page to read */ int *piTopic, /* OUT: Topic associated with this key */ int *pnKey, /* OUT: Size of key in bytes */ Blob *pBlob /* If required, use this for dynamic memory */ ){ u8 *pKey; int nDummy; int eType; u8 *aData; int nData; aData = fsPageData(pPg, &nData); assert( !(pageGetFlags(aData, nData) & SEGMENT_BTREE_FLAG) ); assert( iCell<pageGetNRec(aData, nData) ); pKey = pageGetCell(aData, nData, iCell); eType = *pKey++; pKey += lsmVarintGet32(pKey, &nDummy); pKey += lsmVarintGet32(pKey, pnKey); if( rtIsWrite(eType) ){ pKey += lsmVarintGet32(pKey, &nDummy); |
︙ | ︙ | |||
561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 | if( (void *)aKey!=pBlob->pData ){ rc = sortedBlobSet(pEnv, pBlob, aKey, nKey); } return rc; } static int segmentPtrLoadCell( SegmentPtr *pPtr, /* Load page into this SegmentPtr object */ int iNew /* Cell number of new cell */ ){ int rc = LSM_OK; if( pPtr->pPg ){ u8 *aData; /* Pointer to page data buffer */ int iOff; /* Offset in aData[] to read from */ int nPgsz; /* Size of page (aData[]) in bytes */ assert( iNew<pPtr->nCell ); pPtr->iCell = iNew; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > < < < < < < < < < < < < < | < | 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | if( (void *)aKey!=pBlob->pData ){ rc = sortedBlobSet(pEnv, pBlob, aKey, nKey); } return rc; } static int pageGetBtreeKey( Page *pPg, int iKey, int *piPtr, int *piTopic, void **ppKey, int *pnKey, Blob *pBlob ){ u8 *aData; int nData; u8 *aCell; int eType; aData = fsPageData(pPg, &nData); assert( SEGMENT_BTREE_FLAG & pageGetFlags(aData, nData) ); aCell = pageGetCell(aData, nData, iKey); eType = *aCell++; aCell += lsmVarintGet32(aCell, piPtr); if( eType==0 ){ int rc; Pgno iRef; /* Page number of referenced page */ Page *pRef; aCell += lsmVarintGet32(aCell, &iRef); rc = lsmFsDbPageGet(lsmPageFS(pPg), iRef, &pRef); if( rc!=LSM_OK ) return rc; pageGetKeyCopy(lsmPageEnv(pPg), pRef, 0, &eType, pBlob); lsmFsPageRelease(pRef); *ppKey = pBlob->pData; *pnKey = pBlob->nData; }else{ aCell += lsmVarintGet32(aCell, pnKey); *ppKey = aCell; } if( piTopic ) *piTopic = rtTopic(eType); return LSM_OK; } static int btreeCursorLoadKey(BtreeCursor *pCsr){ int rc = LSM_OK; if( pCsr->iPg<0 ){ pCsr->pKey = 0; pCsr->nKey = 0; pCsr->eType = 0; }else{ int dummy; rc = pageGetBtreeKey( pCsr->aPg[pCsr->iPg].pPage, pCsr->aPg[pCsr->iPg].iCell, &dummy, &pCsr->eType, &pCsr->pKey, &pCsr->nKey, &pCsr->blob ); pCsr->eType |= SORTED_SEPARATOR; } return rc; } static int btreeCursorPtr(u8 *aData, int nData, int iCell){ int nCell; nCell = pageGetNRec(aData, nData); if( iCell>=nCell ){ return pageGetPtr(aData, nData); } return pageGetRecordPtr(aData, nData, iCell); } static int btreeCursorNext(BtreeCursor *pCsr){ int rc = LSM_OK; BtreePg *pPg = &pCsr->aPg[pCsr->iPg]; int nCell; u8 *aData; int nData; assert( pCsr->iPg>=0 ); assert( pCsr->iPg==pCsr->nDepth-1 ); aData = fsPageData(pPg->pPage, &nData); nCell = pageGetNRec(aData, nData); assert( pPg->iCell<=nCell ); pPg->iCell++; if( pPg->iCell==nCell ){ Pgno iLoad; /* Up to parent. */ lsmFsPageRelease(pPg->pPage); pPg->pPage = 0; pCsr->iPg--; while( pCsr->iPg>=0 ){ pPg = &pCsr->aPg[pCsr->iPg]; aData = fsPageData(pPg->pPage, &nData); if( pPg->iCell<pageGetNRec(aData, nData) ) break; lsmFsPageRelease(pPg->pPage); pCsr->iPg--; } /* Read the key */ rc = btreeCursorLoadKey(pCsr); /* Unless the cursor is at EOF, descend to cell -1 (yes, negative one) of ** the left-most most descendent. */ if( pCsr->iPg>=0 ){ pCsr->aPg[pCsr->iPg].iCell++; iLoad = btreeCursorPtr(aData, nData, pPg->iCell); do { Page *pLoad; pCsr->iPg++; rc = lsmFsDbPageGet(pCsr->pFS, iLoad, &pLoad); pCsr->aPg[pCsr->iPg].pPage = pLoad; pCsr->aPg[pCsr->iPg].iCell = 0; if( rc==LSM_OK ){ if( pCsr->iPg==(pCsr->nDepth-1) ) break; aData = fsPageData(pLoad, &nData); iLoad = btreeCursorPtr(aData, nData, 0); } }while( rc==LSM_OK && pCsr->iPg<(pCsr->nDepth-1) ); pCsr->aPg[pCsr->iPg].iCell = -1; } }else{ rc = btreeCursorLoadKey(pCsr); } if( rc==LSM_OK && pCsr->iPg>=0 ){ aData = fsPageData(pCsr->aPg[pCsr->iPg].pPage, &nData); pCsr->iPtr = btreeCursorPtr(aData, nData, pCsr->aPg[pCsr->iPg].iCell+1); } return rc; } static void btreeCursorFree(BtreeCursor *pCsr){ if( pCsr ){ int i; lsm_env *pEnv = lsmFsEnv(pCsr->pFS); for(i=0; i<=pCsr->iPg; i++){ lsmFsPageRelease(pCsr->aPg[i].pPage); } sortedBlobFree(&pCsr->blob); lsmFree(pEnv, pCsr->aPg); lsmFree(pEnv, pCsr); } } static int btreeCursorFirst(BtreeCursor *pCsr){ int rc; Page *pPg = 0; FileSystem *pFS = pCsr->pFS; int iPg = pCsr->pSeg->iRoot; do { rc = lsmFsDbPageGet(pFS, iPg, &pPg); assert( (rc==LSM_OK)==(pPg!=0) ); if( rc==LSM_OK ){ u8 *aData; int nData; int flags; aData = fsPageData(pPg, &nData); flags = pageGetFlags(aData, nData); if( (flags & SEGMENT_BTREE_FLAG)==0 ) break; if( (pCsr->nDepth % 8)==0 ){ int nNew = pCsr->nDepth + 8; pCsr->aPg = (BtreePg *)lsmReallocOrFreeRc( lsmFsEnv(pFS), pCsr->aPg, sizeof(BtreePg) * nNew, &rc ); if( rc==LSM_OK ){ memset(&pCsr->aPg[pCsr->nDepth], 0, sizeof(BtreePg) * 8); } } if( rc==LSM_OK ){ assert( pCsr->aPg[pCsr->nDepth].iCell==0 ); pCsr->aPg[pCsr->nDepth].pPage = pPg; pCsr->nDepth++; iPg = pageGetRecordPtr(aData, nData, 0); } } }while( rc==LSM_OK ); lsmFsPageRelease(pPg); pCsr->iPg = pCsr->nDepth-1; if( rc==LSM_OK && pCsr->nDepth ){ pCsr->aPg[pCsr->iPg].iCell = -1; rc = btreeCursorNext(pCsr); } return rc; } static void btreeCursorPosition(BtreeCursor *pCsr, MergeInput *p){ if( pCsr->iPg>=0 ){ p->iPg = lsmFsPageNumber(pCsr->aPg[pCsr->iPg].pPage); p->iCell = ((pCsr->aPg[pCsr->iPg].iCell + 1) << 8) + pCsr->nDepth; }else{ p->iPg = 0; p->iCell = 0; } } static int sortedKeyCompare( int (*xCmp)(void *, int, void *, int), int iLhsTopic, void *pLhsKey, int nLhsKey, int iRhsTopic, void *pRhsKey, int nRhsKey ){ int res = iLhsTopic - iRhsTopic; if( res==0 ){ res = xCmp(pLhsKey, nLhsKey, pRhsKey, nRhsKey); } return res; } static int btreeCursorRestore( BtreeCursor *pCsr, int (*xCmp)(void *, int, void *, int), MergeInput *p ){ int rc = LSM_OK; if( p->iPg ){ lsm_env *pEnv = lsmFsEnv(pCsr->pFS); int iCell; /* Current cell number on leaf page */ Pgno iLeaf; /* Page number of current leaf page */ int nDepth; /* Depth of b-tree structure */ /* Decode the MergeInput structure */ iLeaf = p->iPg; nDepth = (p->iCell & 0x00FF); iCell = (p->iCell >> 8) - 1; /* Allocate the BtreeCursor.aPg[] array */ assert( pCsr->aPg==0 ); pCsr->aPg = (BtreePg *)lsmMallocZeroRc(pEnv, sizeof(BtreePg) * nDepth, &rc); /* Populate the last entry of the aPg[] array */ if( rc==LSM_OK ){ pCsr->iPg = nDepth-1; pCsr->nDepth = nDepth; pCsr->aPg[pCsr->iPg].iCell = iCell; rc = lsmFsDbPageGet(pCsr->pFS, iLeaf, &pCsr->aPg[nDepth-1].pPage); } /* Populate any other aPg[] array entries */ if( rc==LSM_OK && nDepth>1 ){ Blob blob = {0,0,0}; void *pSeek; int nSeek; int iTopicSeek; int dummy; int iPg = 0; int iLoad = pCsr->pSeg->iRoot; rc = pageGetBtreeKey(pCsr->aPg[nDepth-1].pPage, 0, &dummy, &iTopicSeek, &pSeek, &nSeek, &pCsr->blob ); do { Page *pPg; rc = lsmFsDbPageGet(pCsr->pFS, iLoad, &pPg); assert( rc==LSM_OK || pPg==0 ); if( rc==LSM_OK ){ u8 *aData; /* Buffer containing page data */ int nData; /* Size of aData[] in bytes */ int iMin; int iMax; int iCell; aData = fsPageData(pPg, &nData); assert( (pageGetFlags(aData, nData) & SEGMENT_BTREE_FLAG) ); iLoad = pageGetPtr(aData, nData); iCell = pageGetNRec(aData, nData); iMax = iCell-1; iMin = 0; while( iMax>=iMin ){ int iTry = (iMin+iMax)/2; void *pKey; int nKey; /* Key for cell iTry */ int iTopic; /* Topic for key pKeyT/nKeyT */ int iPtr; /* Pointer for cell iTry */ int res; /* (pSeek - pKeyT) */ rc = pageGetBtreeKey(pPg, iTry, &iPtr, &iTopic, &pKey, &nKey,&blob); if( rc!=LSM_OK ) break; res = sortedKeyCompare( xCmp, iTopicSeek, pSeek, nSeek, iTopic, pKey, nKey ); assert( res!=0 ); if( res<0 ){ iLoad = iPtr; iCell = iTry; iMax = iTry-1; }else{ iMin = iTry+1; } } pCsr->aPg[iPg].pPage = pPg; pCsr->aPg[iPg].iCell = iCell; iPg++; assert( iPg!=nDepth-1 || iLoad==iLeaf ); } }while( rc==LSM_OK && iPg<(nDepth-1) ); sortedBlobFree(&blob); } /* Load the current key and pointer */ if( rc==LSM_OK ){ BtreePg *pBtreePg; u8 *aData; int nData; pBtreePg = &pCsr->aPg[pCsr->iPg]; aData = fsPageData(pBtreePg->pPage, &nData); pCsr->iPtr = btreeCursorPtr(aData, nData, pBtreePg->iCell+1); if( pBtreePg->iCell<0 ){ int dummy; int i; for(i=pCsr->iPg-1; i>=0; i--){ if( pCsr->aPg[i].iCell>0 ) break; } assert( i>=0 ); rc = pageGetBtreeKey( pCsr->aPg[i].pPage, pCsr->aPg[i].iCell-1, &dummy, &pCsr->eType, &pCsr->pKey, &pCsr->nKey, &pCsr->blob ); pCsr->eType |= SORTED_SEPARATOR; }else{ rc = btreeCursorLoadKey(pCsr); } } } return rc; } static int btreeCursorNew( lsm_db *pDb, Segment *pSeg, BtreeCursor **ppCsr ){ int rc = LSM_OK; BtreeCursor *pCsr; assert( pSeg->iRoot ); pCsr = lsmMallocZeroRc(pDb->pEnv, sizeof(BtreeCursor), &rc); if( pCsr ){ pCsr->pFS = pDb->pFS; pCsr->pSeg = pSeg; pCsr->iPg = -1; } *ppCsr = pCsr; return rc; } static void segmentPtrSetPage(SegmentPtr *pPtr, Page *pNext){ lsmFsPageRelease(pPtr->pPg); if( pNext ){ int nData; u8 *aData = fsPageData(pNext, &nData); pPtr->nCell = pageGetNRec(aData, nData); pPtr->flags = pageGetFlags(aData, nData); pPtr->iPtr = pageGetPtr(aData, nData); } pPtr->pPg = pNext; } /* ** Load a new page into the SegmentPtr object pPtr. */ static int segmentPtrLoadPage( FileSystem *pFS, SegmentPtr *pPtr, /* Load page into this SegmentPtr object */ int iNew /* Page number of new page */ ){ Page *pPg = 0; /* The new page */ int rc; /* Return Code */ rc = lsmFsDbPageGet(pFS, iNew, &pPg); assert( rc==LSM_OK || pPg==0 ); segmentPtrSetPage(pPtr, pPg); return rc; } static int segmentPtrReadData( SegmentPtr *pPtr, int iOff, int nByte, void **ppData, Blob *pBlob ){ return sortedReadData(pPtr->pPg, iOff, nByte, ppData, pBlob); } static int segmentPtrNextPage( SegmentPtr *pPtr, /* Load page into this SegmentPtr object */ int eDir /* +1 for next(), -1 for prev() */ ){ Page *pNext; /* New page to load */ int rc; /* Return code */ assert( eDir==1 || eDir==-1 ); assert( pPtr->pPg ); assert( pPtr->pSeg || eDir>0 ); rc = lsmFsDbPageNext(pPtr->pSeg, pPtr->pPg, eDir, &pNext); assert( rc==LSM_OK || pNext==0 ); segmentPtrSetPage(pPtr, pNext); return rc; } static int segmentPtrLoadCell( SegmentPtr *pPtr, /* Load page into this SegmentPtr object */ int iNew /* Cell number of new cell */ ){ int rc = LSM_OK; if( pPtr->pPg ){ u8 *aData; /* Pointer to page data buffer */ int iOff; /* Offset in aData[] to read from */ int nPgsz; /* Size of page (aData[]) in bytes */ assert( iNew<pPtr->nCell ); pPtr->iCell = iNew; aData = fsPageData(pPtr->pPg, &nPgsz); iOff = lsmGetU16(&aData[SEGMENT_CELLPTR_OFFSET(nPgsz, pPtr->iCell)]); pPtr->eType = aData[iOff]; iOff++; iOff += lsmVarintGet32(&aData[iOff], &pPtr->iPgPtr); iOff += lsmVarintGet32(&aData[iOff], &pPtr->nKey); if( rtIsWrite(pPtr->eType) ){ iOff += lsmVarintGet32(&aData[iOff], &pPtr->nVal); } rc = segmentPtrReadData( pPtr, iOff, pPtr->nKey, &pPtr->pKey, &pPtr->blob1 ); if( rc==LSM_OK && rtIsWrite(pPtr->eType) ){ rc = segmentPtrReadData( pPtr, iOff+pPtr->nKey, pPtr->nVal, &pPtr->pVal, &pPtr->blob2 ); }else{ pPtr->nVal = 0; pPtr->pVal = 0; } } return rc; } void lsmSortedSplitkey(lsm_db *pDb, Level *pLevel, int *pRc){ lsm_env *pEnv = pDb->pEnv; /* Environment handle */ int rc = *pRc; int i; Merge *pMerge = pLevel->pMerge; for(i=0; rc==LSM_OK && i<pLevel->nRight; i++){ Page *pPg = 0; int iTopic; Blob blob = {0, 0, 0, 0}; assert( pLevel->aRhs[i].iFirst!=0 ); rc = lsmFsDbPageGet(pDb->pFS, pMerge->aInput[i].iPg, &pPg); if( rc==LSM_OK ){ rc = pageGetKeyCopy(pEnv, pPg, pMerge->aInput[i].iCell, &iTopic, &blob); } if( rc==LSM_OK ){ int res = -1; if( pLevel->pSplitKey ){ |
︙ | ︙ | |||
680 681 682 683 684 685 686 | int i; pCsr->aPtr[0].pSeg = &pLevel->lhs; pCsr->nPtr = nPtr; for(i=0; i<pLevel->nRight; i++){ pCsr->aPtr[i+1].pSeg = &pLevel->aRhs[i]; } | < < < | | | 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 | int i; pCsr->aPtr[0].pSeg = &pLevel->lhs; pCsr->nPtr = nPtr; for(i=0; i<pLevel->nRight; i++){ pCsr->aPtr[i+1].pSeg = &pLevel->aRhs[i]; } } return rc; } static int levelCursorInitRun( lsm_db *pDb, Segment *pSeg, int (*xCmp)(void *, int, void *, int), LevelCursor *pCsr /* Cursor structure to initialize */ ){ int rc = LSM_OK; memset(pCsr, 0, sizeof(LevelCursor)); pCsr->pFS = pDb->pFS; pCsr->bIgnoreSeparators = 1; pCsr->xCmp = xCmp; pCsr->nPtr = 1; pCsr->aPtr = (SegmentPtr*)lsmMallocZeroRc(pDb->pEnv, sizeof(SegmentPtr)*pCsr->nPtr, &rc ); if( rc==LSM_OK ){ pCsr->aPtr[0].pSeg = pSeg; } return rc; } static void segmentPtrReset(SegmentPtr *pPtr){ lsmFsPageRelease(pPtr->pPg); |
︙ | ︙ | |||
787 788 789 790 791 792 793 | FileSystem *pFS, SegmentPtr *pPtr, int bLast, int *pRc ){ if( *pRc==LSM_OK ){ Page *pNew = 0; | | | 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 | FileSystem *pFS, SegmentPtr *pPtr, int bLast, int *pRc ){ if( *pRc==LSM_OK ){ Page *pNew = 0; Pgno iPg = (bLast ? pPtr->pSeg->iLast : pPtr->pSeg->iFirst); *pRc = lsmFsDbPageGet(pFS, iPg, &pNew); segmentPtrSetPage(pPtr, pNew); } } /* ** Try to move the segment pointer passed as the second argument so that it |
︙ | ︙ | |||
811 812 813 814 815 816 817 | int bLast, /* True for last, false for first */ int *pRc /* IN/OUT error code */ ){ if( *pRc==LSM_OK ){ int rc = LSM_OK; segmentPtrEndPage(pCsr->pFS, pPtr, bLast, &rc); | | > > > | 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 | int bLast, /* True for last, false for first */ int *pRc /* IN/OUT error code */ ){ if( *pRc==LSM_OK ){ int rc = LSM_OK; segmentPtrEndPage(pCsr->pFS, pPtr, bLast, &rc); while( rc==LSM_OK && pPtr->pPg && (pPtr->nCell==0 || (pPtr->flags & SEGMENT_BTREE_FLAG)) ){ rc = segmentPtrNextPage(pPtr, (bLast ? -1 : 1)); } if( rc==LSM_OK && pPtr->pPg ){ rc = segmentPtrLoadCell(pPtr, bLast ? (pPtr->nCell-1) : 0); } if( rc==LSM_OK && pPtr->pPg && ( |
︙ | ︙ | |||
892 893 894 895 896 897 898 | for(eDir=-1; eDir<=1; eDir+=2){ Page *pTest = pPtr->pPg; lsmFsPageRef(pTest); while( pTest ){ Page *pNext; | | | | 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 | for(eDir=-1; eDir<=1; eDir+=2){ Page *pTest = pPtr->pPg; lsmFsPageRef(pTest); while( pTest ){ Page *pNext; int rc = lsmFsDbPageNext(pPtr->pSeg, pTest, eDir, &pNext); lsmFsPageRelease(pTest); pTest = pNext; assert( rc==LSM_OK ); if( pTest ){ int nData; u8 *aData = fsPageData(pTest, &nData); int nCell = pageGetNRec(aData, nData); int flags = pageGetFlags(aData, nData); if( nCell && 0==(flags&SEGMENT_BTREE_FLAG) ){ int nPgKey; int iPgTopic; u8 *pPgKey; int res; |
︙ | ︙ | |||
975 976 977 978 979 980 981 | ** page. */ res = iLastTopic - iTopic; if( res==0 ) res = pCsr->xCmp(pLastKey, nLastKey, pKey, nKey); if( res>=0 ) break; /* Advance to the next page that contains at least one key. */ do { | | | | | | 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 | ** page. */ res = iLastTopic - iTopic; if( res==0 ) res = pCsr->xCmp(pLastKey, nLastKey, pKey, nKey); if( res>=0 ) break; /* Advance to the next page that contains at least one key. */ do { rc = lsmFsDbPageNext(pPtr->pSeg, pPtr->pPg, 1, &pNext); if( pNext==0 ) break; assert( rc==LSM_OK ); segmentPtrSetPage(pPtr, pNext); }while( (pPtr->nCell==0 || (pPtr->flags & SEGMENT_BTREE_FLAG)) ); if( pNext==0 ) break; /* This should probably be an LSM_CORRUPT error. */ assert( rc!=LSM_OK || (pPtr->flags & PGFTR_SKIP_THIS_FLAG) ); } iPtrOut = pPtr->iPtr; /* Assert that this page is the right page of this segment for the key ** that we are searching for. Do this by loading page (iPg-1) and testing ** that pKey/nKey is greater than all keys on that page, and then by ** loading (iPg+1) and testing that pKey/nKey is smaller than all ** the keys it houses. */ #if 1 assert( assertKeyLocation(pCsr, pPtr, pKey, nKey) ); #endif assert( pPtr->nCell>0 || pPtr->pSeg->nSize==1 || lsmFsPageNumber(pPtr->pPg)==pPtr->pSeg->iLast ); if( pPtr->nCell==0 ){ segmentPtrReset(pPtr); }else{ iMin = 0; iMax = pPtr->nCell-1; |
︙ | ︙ | |||
1110 1111 1112 1113 1114 1115 1116 | ); if( res ) iBest = i; } pCsr->iCurrentPtr = iBest; } | | | | > < | < > | | < < < < < < | < < < < < < < < < | < < < < < < < > < < < < < < < < < < > > | | | | > > | | | < | | | > > | 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 | ); if( res ) iBest = i; } pCsr->iCurrentPtr = iBest; } static int seekInBtree( LevelCursor *pCsr, Segment *pSeg, void *pKey, int nKey, /* Key to seek to */ Page **ppPg /* OUT: Leaf (sorted-run) page reference */ ){ int rc; int iPg; Page *pPg = 0; Blob blob = {0, 0, 0}; int iTopic = 0; /* TODO: Fix me */ iPg = pSeg->iRoot; do { rc = lsmFsDbPageGet(pCsr->pFS, iPg, &pPg); assert( rc==LSM_OK || pPg==0 ); if( rc==LSM_OK ){ u8 *aData; /* Buffer containing page data */ int nData; /* Size of aData[] in bytes */ int iMin; int iMax; int nRec; int flags; aData = fsPageData(pPg, &nData); flags = pageGetFlags(aData, nData); if( (flags & SEGMENT_BTREE_FLAG)==0 ) break; iPg = pageGetPtr(aData, nData); nRec = pageGetNRec(aData, nData); iMin = 0; iMax = nRec-1; while( iMax>=iMin ){ int iTry = (iMin+iMax)/2; void *pKeyT; int nKeyT; /* Key for cell iTry */ int iTopicT; /* Topic for key pKeyT/nKeyT */ int iPtr; /* Pointer associated with cell iTry */ int res; /* (pKey - pKeyT) */ rc = pageGetBtreeKey(pPg, iTry, &iPtr, &iTopicT, &pKeyT, &nKeyT, &blob); if( rc!=LSM_OK ) break; res = iTopic - iTopicT; if( res==0 ) res = pCsr->xCmp(pKey, nKey, pKeyT, nKeyT); if( res<0 ){ iPg = iPtr; iMax = iTry-1; }else{ iMin = iTry+1; } } lsmFsPageRelease(pPg); pPg = 0; } }while( rc==LSM_OK ); sortedBlobFree(&blob); assert( (rc==LSM_OK)==(pPg!=0) ); *ppPg = pPg; return rc; } static int seekInSegment( LevelCursor *pCsr, SegmentPtr *pPtr, void *pKey, int nKey, int iPg, /* Page to search */ int eSeek, /* Search bias - see above */ int *piPtr /* OUT: FC pointer */ ){ int iPtr = iPg; int rc = LSM_OK; if( pPtr->pSeg->iRoot ){ Page *pPg; assert( pPtr->pSeg->iRoot!=0 ); rc = seekInBtree(pCsr, pPtr->pSeg, pKey, nKey, &pPg); if( rc==LSM_OK ) segmentPtrSetPage(pPtr, pPg); }else{ if( iPtr==0 ){ iPtr = pPtr->pSeg->iFirst; } if( rc==LSM_OK ){ rc = segmentPtrLoadPage(pCsr->pFS, pPtr, iPtr); } } if( rc==LSM_OK ){ rc = segmentPtrSeek(pCsr, pPtr, pKey, nKey, eSeek, piPtr); } return rc; } /* |
︙ | ︙ | |||
1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 | lsmTreeCursorDestroy(pCsr->pTreeCsr); /* Close the sorted file cursors */ for(i=0; i<pCsr->nSegCsr; i++){ segmentCursorClose(pEnv, &pCsr->aSegCsr[i]); } /* Free allocations */ lsmFree(pEnv, pCsr->aSegCsr); lsmFree(pEnv, pCsr->aTree); lsmFree(pEnv, pCsr->pSystemVal); /* Zero fields */ pCsr->nSegCsr = 0; pCsr->aSegCsr = 0; pCsr->nTree = 0; pCsr->aTree = 0; pCsr->pSystemVal = 0; pCsr->pSnap = 0; pCsr->pTreeCsr = 0; } void lsmMCursorClose(MultiCursor *pCsr){ if( pCsr ){ lsm_db *pDb = pCsr->pDb; MultiCursor **pp; /* Iterator variable */ /* The cursor may or may not be currently part of the linked list ** starting at lsm_db.pCsr. If it is, extract it. */ for(pp=&pDb->pCsr; *pp; pp=&((*pp)->pNext)){ if( *pp==pCsr ){ *pp = pCsr->pNext; break; } } /* Free the allocation used to cache the current key, if any. */ sortedBlobFree(&pCsr->key); /* Free the component cursors */ mcursorFreeComponents(pCsr); /* Free the cursor structure itself */ lsmFree(pDb->pEnv, pCsr); } } #define MULTICURSOR_ADDLEVEL_ALL 1 #define MULTICURSOR_ADDLEVEL_RHS 2 #define MULTICURSOR_ADDLEVEL_LHS_SEP 3 | > > > > > < < < < < < < > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | < < < < | | | | > > > > > | 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 | lsmTreeCursorDestroy(pCsr->pTreeCsr); /* Close the sorted file cursors */ for(i=0; i<pCsr->nSegCsr; i++){ segmentCursorClose(pEnv, &pCsr->aSegCsr[i]); } /* And the b-tree cursor, if any */ btreeCursorFree(pCsr->pBtCsr); /* Free allocations */ lsmFree(pEnv, pCsr->aSegCsr); lsmFree(pEnv, pCsr->aTree); lsmFree(pEnv, pCsr->pSystemVal); /* Zero fields */ pCsr->nSegCsr = 0; pCsr->aSegCsr = 0; pCsr->nTree = 0; pCsr->aTree = 0; pCsr->pSystemVal = 0; pCsr->pSnap = 0; pCsr->pTreeCsr = 0; pCsr->pBtCsr = 0; } void lsmMCursorClose(MultiCursor *pCsr){ if( pCsr ){ lsm_db *pDb = pCsr->pDb; MultiCursor **pp; /* Iterator variable */ /* The cursor may or may not be currently part of the linked list ** starting at lsm_db.pCsr. If it is, extract it. */ for(pp=&pDb->pCsr; *pp; pp=&((*pp)->pNext)){ if( *pp==pCsr ){ *pp = pCsr->pNext; break; } } /* Free the allocation used to cache the current key, if any. */ sortedBlobFree(&pCsr->key); sortedBlobFree(&pCsr->val); /* Free the component cursors */ mcursorFreeComponents(pCsr); /* Free the cursor structure itself */ lsmFree(pDb->pEnv, pCsr); } } #define MULTICURSOR_ADDLEVEL_ALL 1 #define MULTICURSOR_ADDLEVEL_RHS 2 #define MULTICURSOR_ADDLEVEL_LHS_SEP 3 /* ** Add segments belonging to level pLevel to the multi-cursor pCsr. The ** third argument must be one of the following: ** ** MULTICURSOR_ADDLEVEL_ALL ** Add all segments in the level to the cursor. ** ** MULTICURSOR_ADDLEVEL_RHS ** Add only the rhs segments in the level to the cursor. ** ** MULTICURSOR_ADDLEVEL_LHS_SEP ** Add only the lhs segment. And iterate through its separators array, ** not the main run array. ** ** RHS and SEP are only used by cursors created to use as data sources when ** creating new segments (either when flushing the in-memory tree to disk or ** when merging existing runs). */ int multiCursorAddLevel( MultiCursor *pCsr, /* Multi-cursor to add segment to */ Level *pLevel, /* Level to add to multi-cursor merge */ int eMode /* A MULTICURSOR_ADDLEVEL_*** constant */ ){ int rc = LSM_OK; assert( eMode==MULTICURSOR_ADDLEVEL_ALL || eMode==MULTICURSOR_ADDLEVEL_RHS || eMode==MULTICURSOR_ADDLEVEL_LHS_SEP ); if( eMode==MULTICURSOR_ADDLEVEL_LHS_SEP ){ assert( pLevel->lhs.iRoot ); assert( pCsr->pBtCsr==0 ); rc = btreeCursorNew(pCsr->pDb, &pLevel->lhs, &pCsr->pBtCsr); assert( (rc==LSM_OK)==(pCsr->pBtCsr!=0) ); }else{ int i; int nAdd = (eMode==MULTICURSOR_ADDLEVEL_RHS ? pLevel->nRight : 1); for(i=0; i<nAdd; i++){ LevelCursor *pNew; lsm_db *pDb = pCsr->pDb; /* Grow the pCsr->aSegCsr array if required */ if( 0==(pCsr->nSegCsr % 16) ){ int nByte; LevelCursor *aNew; nByte = sizeof(LevelCursor) * (pCsr->nSegCsr+16); aNew = (LevelCursor *)lsmRealloc(pDb->pEnv, pCsr->aSegCsr, nByte); if( aNew==0 ) return LSM_NOMEM_BKPT; memset(&aNew[pCsr->nSegCsr], 0, sizeof(LevelCursor)*16); pCsr->aSegCsr = aNew; } pNew = &pCsr->aSegCsr[pCsr->nSegCsr]; switch( eMode ){ case MULTICURSOR_ADDLEVEL_ALL: rc = levelCursorInit(pDb, pLevel, pCsr->xCmp, pNew); break; case MULTICURSOR_ADDLEVEL_RHS: rc = levelCursorInitRun(pDb, &pLevel->aRhs[i], pCsr->xCmp, pNew); break; } if( pCsr->flags & CURSOR_IGNORE_SYSTEM ){ pNew->bIgnoreSystem = 1; } if( rc==LSM_OK ) pCsr->nSegCsr++; } } return rc; } static int multiCursorNew( lsm_db *pDb, /* Database handle */ Snapshot *pSnap, /* Snapshot to use for this cursor */ int useTree, /* If true, search the in-memory tree */ int bUserOnly, /* If true, ignore all system data */ MultiCursor **ppCsr /* OUT: Allocated cursor */ ){ int rc = LSM_OK; /* Return Code */ MultiCursor *pCsr = *ppCsr; /* Allocated multi-cursor */ if( pCsr==0 ){ pCsr = (MultiCursor *)lsmMallocZeroRc(pDb->pEnv, sizeof(MultiCursor), &rc); if( pCsr ){ pCsr->pNext = pDb->pCsr; pDb->pCsr = pCsr; } } if( rc==LSM_OK ){ if( useTree ){ assert( pDb->pTV ); rc = lsmTreeCursorNew(pDb, &pCsr->pTreeCsr); } |
︙ | ︙ | |||
1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 | if( rc!=LSM_OK ){ lsmMCursorClose(pCsr); pCsr = 0; } *ppCsr = pCsr; return rc; } static void multiCursorReadSeparators(MultiCursor *pCsr){ if( pCsr->nSegCsr>0 ){ pCsr->aSegCsr[pCsr->nSegCsr-1].bIgnoreSeparators = 0; } } | > > > > > > > > > > > > > > > > > | 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 | if( rc!=LSM_OK ){ lsmMCursorClose(pCsr); pCsr = 0; } *ppCsr = pCsr; return rc; } void lsmSortedRemap(lsm_db *pDb){ MultiCursor *pCsr; for(pCsr=pDb->pCsr; pCsr; pCsr=pCsr->pNext){ int i; if( pCsr->pBtCsr ){ btreeCursorLoadKey(pCsr->pBtCsr); } for(i=0; i<pCsr->nSegCsr; i++){ int iPtr; LevelCursor *p = &pCsr->aSegCsr[i]; for(iPtr=0; iPtr<p->nPtr; iPtr++){ segmentPtrLoadCell(&p->aPtr[iPtr], p->aPtr[iPtr].iCell); } } } } static void multiCursorReadSeparators(MultiCursor *pCsr){ if( pCsr->nSegCsr>0 ){ pCsr->aSegCsr[pCsr->nSegCsr-1].bIgnoreSeparators = 0; } } |
︙ | ︙ | |||
1616 1617 1618 1619 1620 1621 1622 | lsm_db *pDb, /* Database handle */ MultiCursor **ppCsr /* OUT: Allocated cursor */ ){ MultiCursor *pCsr = 0; int rc; rc = multiCursorAllocate(pDb, 0, &pCsr); | < < < < < < < < | 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 | lsm_db *pDb, /* Database handle */ MultiCursor **ppCsr /* OUT: Allocated cursor */ ){ MultiCursor *pCsr = 0; int rc; rc = multiCursorAllocate(pDb, 0, &pCsr); assert( (rc==LSM_OK)==(pCsr!=0) ); *ppCsr = pCsr; return rc; } static void multiCursorGetKey( MultiCursor *pCsr, int iKey, int *peType, /* OUT: Key type (SORTED_WRITE etc.) */ void **ppKey, /* OUT: Pointer to buffer containing key */ int *pnKey /* OUT: Size of *ppKey in bytes */ ){ |
︙ | ︙ | |||
1668 1669 1670 1671 1672 1673 1674 | nKey = 6; eType = SORTED_SYSTEM_WRITE; } break; default: { int iSeg = iKey - CURSOR_DATA_SEGMENT; | > > > > | | 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 | nKey = 6; eType = SORTED_SYSTEM_WRITE; } break; default: { int iSeg = iKey - CURSOR_DATA_SEGMENT; if( iSeg==pCsr->nSegCsr && pCsr->pBtCsr ){ pKey = pCsr->pBtCsr->pKey; nKey = pCsr->pBtCsr->nKey; eType = pCsr->pBtCsr->eType; }if( iSeg<pCsr->nSegCsr && segmentCursorValid(&pCsr->aSegCsr[iSeg]) ){ segmentCursorKey(&pCsr->aSegCsr[iSeg], &pKey, &nKey); segmentCursorType(&pCsr->aSegCsr[iSeg], &eType); } break; } } |
︙ | ︙ | |||
1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 | && segmentCursorValid(&pCsr->aSegCsr[iVal-CURSOR_DATA_SEGMENT]) ){ segmentCursorValue(&pCsr->aSegCsr[iVal-CURSOR_DATA_SEGMENT], ppVal, pnVal); }else{ *ppVal = 0; *pnVal = 0; } return rc; } int lsmSortedLoadSystem(lsm_db *pDb){ MultiCursor *pCsr = 0; /* Cursor used to retreive free-list */ int rc; /* Return Code */ | > | 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 | && segmentCursorValid(&pCsr->aSegCsr[iVal-CURSOR_DATA_SEGMENT]) ){ segmentCursorValue(&pCsr->aSegCsr[iVal-CURSOR_DATA_SEGMENT], ppVal, pnVal); }else{ *ppVal = 0; *pnVal = 0; } assert( rc==LSM_OK || (*ppVal==0 && *pnVal==0) ); return rc; } int lsmSortedLoadSystem(lsm_db *pDb){ MultiCursor *pCsr = 0; /* Cursor used to retreive free-list */ int rc; /* Return Code */ |
︙ | ︙ | |||
1814 1815 1816 1817 1818 1819 1820 1821 | pCsr->aTree[iOut] = iRes; } static int multiCursorAllocTree(MultiCursor *pCsr){ int rc = LSM_OK; if( pCsr->aTree==0 ){ int nByte; /* Bytes of space to allocate */ pCsr->nTree = 2; | > > > | | 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 | pCsr->aTree[iOut] = iRes; } static int multiCursorAllocTree(MultiCursor *pCsr){ int rc = LSM_OK; if( pCsr->aTree==0 ){ int nByte; /* Bytes of space to allocate */ int bBtree; /* True if b-tree cursor is present */ bBtree = (pCsr->pBtCsr!=0); pCsr->nTree = 2; while( pCsr->nTree<(CURSOR_DATA_SEGMENT+pCsr->nSegCsr+bBtree) ){ pCsr->nTree = pCsr->nTree*2; } nByte = sizeof(int)*pCsr->nTree*2; pCsr->aTree = (int *)lsmMallocZeroRc(pCsr->pDb->pEnv, nByte, &rc); } return rc; |
︙ | ︙ | |||
1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 | if( pCsr->flags & CURSOR_NEW_SYSTEM ){ assert( bLast==0 ); pCsr->flags |= CURSOR_AT_FREELIST; } for(i=0; rc==LSM_OK && i<pCsr->nSegCsr; i++){ rc = segmentCursorEnd(&pCsr->aSegCsr[i], bLast); } if( rc==LSM_OK ){ rc = multiCursorAllocTree(pCsr); } if( rc==LSM_OK ){ for(i=pCsr->nTree-1; i>0; i--){ | > > > > > | 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 | if( pCsr->flags & CURSOR_NEW_SYSTEM ){ assert( bLast==0 ); pCsr->flags |= CURSOR_AT_FREELIST; } for(i=0; rc==LSM_OK && i<pCsr->nSegCsr; i++){ rc = segmentCursorEnd(&pCsr->aSegCsr[i], bLast); } if( rc==LSM_OK && pCsr->pBtCsr ){ assert( bLast==0 ); rc = btreeCursorFirst(pCsr->pBtCsr); } if( rc==LSM_OK ){ rc = multiCursorAllocTree(pCsr); } if( rc==LSM_OK ){ for(i=pCsr->nTree-1; i>0; i--){ |
︙ | ︙ | |||
2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 | if( pCsr->flags & CURSOR_AT_FREELIST ){ pCsr->flags &= ~CURSOR_AT_FREELIST; pCsr->flags |= CURSOR_AT_LEVELS; }else{ pCsr->flags &= ~CURSOR_AT_LEVELS; } }else{ LevelCursor *pLevel = &pCsr->aSegCsr[iKey-CURSOR_DATA_SEGMENT]; rc = segmentCursorAdvance(pLevel, bReverse); } if( rc==LSM_OK ){ int i; for(i=(iKey+pCsr->nTree)/2; i>0; i=i/2){ | > > > | 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 | if( pCsr->flags & CURSOR_AT_FREELIST ){ pCsr->flags &= ~CURSOR_AT_FREELIST; pCsr->flags |= CURSOR_AT_LEVELS; }else{ pCsr->flags &= ~CURSOR_AT_LEVELS; } }else if( iKey==(CURSOR_DATA_SEGMENT+pCsr->nSegCsr) ){ assert( bReverse==0 && pCsr->pBtCsr ); rc = btreeCursorNext(pCsr->pBtCsr); }else{ LevelCursor *pLevel = &pCsr->aSegCsr[iKey-CURSOR_DATA_SEGMENT]; rc = segmentCursorAdvance(pLevel, bReverse); } if( rc==LSM_OK ){ int i; for(i=(iKey+pCsr->nTree)/2; i>0; i=i/2){ |
︙ | ︙ | |||
2147 2148 2149 2150 2151 2152 2153 2154 2155 | } *pnKey = nKey; } return LSM_OK; } int lsmMCursorValue(MultiCursor *pCsr, void **ppVal, int *pnVal){ assert( pCsr->aTree ); assert( rtIsDelete(pCsr->eType)==0 || !(pCsr->flags & CURSOR_IGNORE_DELETE) ); | > > > > > | > > > > > > > > > > > > | 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 | } *pnKey = nKey; } return LSM_OK; } int lsmMCursorValue(MultiCursor *pCsr, void **ppVal, int *pnVal){ void *pVal; int nVal; int rc; assert( pCsr->aTree ); assert( rtIsDelete(pCsr->eType)==0 || !(pCsr->flags & CURSOR_IGNORE_DELETE) ); rc = multiCursorGetVal(pCsr, pCsr->aTree[1], &pVal, &nVal); if( pVal && rc==LSM_OK ){ rc = sortedBlobSet(pCsr->pDb->pEnv, &pCsr->val, pVal, nVal); pVal = pCsr->val.pData; } if( rc!=LSM_OK ){ pVal = 0; nVal = 0; } *ppVal = pVal; *pnVal = nVal; return rc; } int lsmMCursorType(MultiCursor *pCsr, int *peType){ assert( pCsr->aTree ); multiCursorGetKey(pCsr, pCsr->aTree[1], peType, 0, 0); return LSM_OK; } |
︙ | ︙ | |||
2199 2200 2201 2202 2203 2204 2205 | ** This function copies all such b-tree pages to new locations, so that ** they can be modified as required. ** ** The complication is that not all database pages are the same size - due ** to the way the file.c module works some (the first and last in each block) ** are 4 bytes smaller than the others. */ | | > > > | < | > < | | | | | 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 | ** This function copies all such b-tree pages to new locations, so that ** they can be modified as required. ** ** The complication is that not all database pages are the same size - due ** to the way the file.c module works some (the first and last in each block) ** are 4 bytes smaller than the others. */ static int mergeWorkerMoveHierarchy( MergeWorker *pMW, /* Merge worker */ int bSep /* True for separators run */ ){ Segment *pSeg; /* Segment being written */ lsm_db *pDb = pMW->pDb; /* Database handle */ int rc = LSM_OK; /* Return code */ int i; int iRight = 0; Page **apHier = pMW->hier.apHier; int nHier = pMW->hier.nHier; assert( nHier>0 && pMW->pLevel->pMerge->bHierReadonly ); pSeg = &pMW->pLevel->lhs; for(i=0; rc==LSM_OK && i<nHier; i++){ Page *pNew = 0; rc = lsmFsSortedAppend(pDb->pFS, pDb->pWorker, pSeg, &pNew); assert( rc==LSM_OK ); if( rc==LSM_OK ){ u8 *a1; int n1; u8 *a2; int n2; a1 = fsPageData(pNew, &n1); a2 = fsPageData(apHier[i], &n2); assert( n1==n2 || n1+4==n2 || n2+4==n1 ); if( n1>=n2 ){ /* If n1 (size of the new page) is equal to or greater than n2 (the ** size of the old page), then copy the data into the new page. If ** n1==n2, this could be done with a single memcpy(). However, ** since sometimes n1>n2, the page content and footer must be copied |
︙ | ︙ | |||
2252 2253 2254 2255 2256 2257 2258 | lsmFsPageRelease(pNew); } } } #ifdef LSM_DEBUG if( rc==LSM_OK ){ | | > > > | > | | | | 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 | lsmFsPageRelease(pNew); } } } #ifdef LSM_DEBUG if( rc==LSM_OK ){ for(i=0; i<nHier; i++) assert( lsmFsPageWritable(apHier[i]) ); } #endif if( rc==LSM_OK ){ pMW->pLevel->pMerge->bHierReadonly = 0; } return rc; } /* ** Allocate and populate the MergeWorker.apHier[] array. */ static int mergeWorkerLoadHierarchy(MergeWorker *pMW){ int rc = LSM_OK; Segment *pSeg; Hierarchy *p; pSeg = &pMW->pLevel->lhs; p = &pMW->hier; if( p->apHier==0 && pSeg->iRoot!=0 ){ int bHierReadonly = pMW->pLevel->pMerge->bHierReadonly; FileSystem *pFS = pMW->pDb->pFS; lsm_env *pEnv = pMW->pDb->pEnv; Page **apHier = 0; int nHier = 0; int iPg = pSeg->iRoot; do { Page *pPg = 0; u8 *aData; int nData; int flags; rc = lsmFsDbPageGet(pFS, iPg, &pPg); if( rc!=LSM_OK ) break; aData = fsPageData(pPg, &nData); flags = pageGetFlags(aData, nData); if( flags&SEGMENT_BTREE_FLAG ){ Page **apNew = (Page **)lsmRealloc( pEnv, apHier, sizeof(Page *)*(nHier+1) ); if( apNew==0 ){ rc = LSM_NOMEM_BKPT; |
︙ | ︙ | |||
2310 2311 2312 2313 2314 2315 2316 | }else{ lsmFsPageRelease(pPg); break; } }while( 1 ); if( rc==LSM_OK ){ | | | | 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 | }else{ lsmFsPageRelease(pPg); break; } }while( 1 ); if( rc==LSM_OK ){ p->nHier = nHier; p->apHier = apHier; }else{ int i; for(i=0; i<nHier; i++){ lsmFsPageRelease(apHier[i]); } lsmFree(pEnv, apHier); } |
︙ | ︙ | |||
2356 2357 2358 2359 2360 2361 2362 | ** The reason for having the page footer pointer point to the right-child ** (instead of the left) is that doing things this way makes the ** segWriterMoveHierarchy() operation less complicated (since the pointers ** that need to be updated are all stored as fixed-size integers within the ** page footer, not varints in page records). ** ** Records may not span b-tree pages. If this function is called to add a | | | > > > > > > < > > > | | | | | | | | | | | | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | < < | | | | | | | | | 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 | ** The reason for having the page footer pointer point to the right-child ** (instead of the left) is that doing things this way makes the ** segWriterMoveHierarchy() operation less complicated (since the pointers ** that need to be updated are all stored as fixed-size integers within the ** page footer, not varints in page records). ** ** Records may not span b-tree pages. If this function is called to add a ** record larger than (page-size / 4) bytes, then a pointer to the indexed ** array page that contains the main record is added to the b-tree instead. ** In this case the record format is: ** ** + 0x00 byte (1 byte) ** + Absolute pointer value (varint), ** + Absolute page number of page containing key (varint). ** ** See function seekInBtree() for the code that traverses b-tree pages. */ static int mergeWorkerPushHierarchy( MergeWorker *pMW, /* Merge worker object */ int bSep, /* True for separators, false otherwise */ Pgno iKeyPg, /* Page that will contain pKey/nKey */ int iTopic, /* Topic value for this key */ void *pKey, /* Pointer to key buffer */ int nKey /* Size of pKey buffer in bytes */ ){ lsm_db *pDb = pMW->pDb; /* Database handle */ int rc; /* Return Code */ int iLevel; /* Level of b-tree hierachy to write to */ int nData; /* Size of aData[] in bytes */ u8 *aData; /* Page data for level iLevel */ int iOff; /* Offset on b-tree page to write record to */ int nRec; /* Initial number of records on b-tree page */ Pgno iPtr; /* Pointer value to accompany pKey/nKey */ int bIndirect; /* True to use an indirect record */ Hierarchy *p; Segment *pSeg; /* If there exists a b-tree hierarchy and it is not loaded into ** memory, load it now. */ pSeg = &pMW->pLevel->lhs; p = &pMW->hier; rc = mergeWorkerLoadHierarchy(pMW); /* Obtain the absolute pointer value to store along with the key in the ** page body. This pointer points to a page that contains keys that are ** smaller than pKey/nKey. */ if( p->nHier ){ aData = fsPageData(p->apHier[0], &nData); iPtr = lsmGetU32(&aData[SEGMENT_POINTER_OFFSET(nData)]); }else{ iPtr = pSeg->iFirst; } if( p->nHier && pMW->pLevel->pMerge->bHierReadonly ){ rc = mergeWorkerMoveHierarchy(pMW, bSep); if( rc!=LSM_OK ) goto push_hierarchy_out; } /* Determine if the indirect format should be used. */ bIndirect = (nKey*4 > lsmFsPageSize(pMW->pDb->pFS)); /* The MergeWorker.apHier[] array contains the right-most leaf of the b-tree ** hierarchy, the root node, and all nodes that lie on the path between. ** apHier[0] is the right-most leaf and apHier[pMW->nHier-1] is the current ** root page. ** ** This loop searches for a node with enough space to store the key on, ** starting with the leaf and iterating up towards the root. When the loop ** exits, the key may be written to apHier[iLevel]. */ for(iLevel=0; iLevel<=p->nHier; iLevel++){ int nByte; /* Number of free bytes required */ int iRight; /* Right hand pointer from aData[]/nData */ if( iLevel==p->nHier ){ /* Extend the array and allocate a new root page. */ Page **aNew; aNew = (Page **)lsmRealloc( pMW->pDb->pEnv, p->apHier, sizeof(Page *)*(p->nHier+1) ); if( !aNew ){ rc = LSM_NOMEM_BKPT; goto push_hierarchy_out; } p->apHier = aNew; }else{ int nFree; /* If the key will fit on this page, break out of the loop. */ assert( lsmFsPageWritable(p->apHier[iLevel]) ); aData = fsPageData(p->apHier[iLevel], &nData); iRight = lsmGetU32(&aData[SEGMENT_POINTER_OFFSET(nData)]); if( bIndirect ){ nByte = 2 + 1 + lsmVarintLen32(iRight) + lsmVarintLen32(iKeyPg); }else{ nByte = 2 + 1 + lsmVarintLen32(iRight) + lsmVarintLen32(nKey) + nKey; } nRec = pageGetNRec(aData, nData); nFree = SEGMENT_EOF(nData, nRec) - mergeWorkerPageOffset(aData, nData); if( nByte<=nFree ) break; /* Otherwise, it is full. Release it. */ iPtr = lsmFsPageNumber(p->apHier[iLevel]); rc = lsmFsPageRelease(p->apHier[iLevel]); } /* Allocate a new page for apHier[iLevel]. */ p->apHier[iLevel] = 0; if( rc==LSM_OK ){ rc = lsmFsSortedAppend( pDb->pFS, pDb->pWorker, pSeg, &p->apHier[iLevel] ); } if( rc!=LSM_OK ) goto push_hierarchy_out; aData = fsPageData(p->apHier[iLevel], &nData); memset(aData, 0, nData); lsmPutU16(&aData[SEGMENT_FLAGS_OFFSET(nData)], SEGMENT_BTREE_FLAG); lsmPutU16(&aData[SEGMENT_NRECORD_OFFSET(nData)], 0); if( iLevel>0 ){ iRight = lsmFsPageNumber(p->apHier[iLevel-1]); lsmPutU32(&aData[SEGMENT_POINTER_OFFSET(nData)], iRight); } if( iLevel==p->nHier ){ p->nHier++; break; } } /* Write the key into page apHier[iLevel]. */ aData = fsPageData(p->apHier[iLevel], &nData); iOff = mergeWorkerPageOffset(aData, nData); nRec = pageGetNRec(aData, nData); lsmPutU16(&aData[SEGMENT_CELLPTR_OFFSET(nData, nRec)], iOff); lsmPutU16(&aData[SEGMENT_NRECORD_OFFSET(nData)], nRec+1); if( bIndirect ){ aData[iOff++] = 0x00; iOff += lsmVarintPut32(&aData[iOff], iPtr); iOff += lsmVarintPut32(&aData[iOff], iKeyPg); }else{ aData[iOff++] = (u8)(iTopic | SORTED_SEPARATOR); iOff += lsmVarintPut32(&aData[iOff], iPtr); iOff += lsmVarintPut32(&aData[iOff], nKey); memcpy(&aData[iOff], pKey, nKey); } if( iLevel>0 ){ int iRight = lsmFsPageNumber(p->apHier[iLevel-1]); lsmPutU32(&aData[SEGMENT_POINTER_OFFSET(nData)], iRight); } /* Write the right-hand pointer of the right-most leaf page of the ** b-tree heirarchy. */ aData = fsPageData(p->apHier[0], &nData); lsmPutU32(&aData[SEGMENT_POINTER_OFFSET(nData)], iKeyPg); /* Ensure that the SortedRun.iRoot field is correct. */ pSeg->iRoot = lsmFsPageNumber(p->apHier[p->nHier-1]); push_hierarchy_out: return rc; } static int keyszToSkip(FileSystem *pFS, int nKey){ int nPgsz; /* Nominal database page size */ nPgsz = lsmFsPageSize(pFS); return LSM_MIN(((nKey * 4) / nPgsz), 3); } /* ** Advance to the next page of an output run being populated by merge-worker ** pMW. The footer of the new page is initialized to indicate that it contains ** zero records. The flags field is cleared. The page footer pointer field ** is set to iFPtr. ** ** If successful, LSM_OK is returned. Otherwise, an error code. */ static int mergeWorkerNextPage( MergeWorker *pMW, /* Merge worker object to append page to */ int iFPtr /* Pointer value for footer of new page */ ){ int rc = LSM_OK; /* Return code */ Page *pNext = 0; /* New page appended to run */ lsm_db *pDb = pMW->pDb; /* Database handle */ Segment *pSeg; /* Run to append to */ pSeg = &pMW->pLevel->lhs; rc = lsmFsSortedAppend(pDb->pFS, pDb->pWorker, pSeg, &pNext); assert( rc!=LSM_OK || pSeg->iFirst>0 ); if( rc==LSM_OK ){ u8 *aData; /* Data buffer belonging to page pNext */ int nData; /* Size of aData[] in bytes */ lsmFsPageRelease(pMW->pPage); pMW->pPage = pNext; pMW->pLevel->pMerge->iOutputOff = 0; aData = fsPageData(pNext, &nData); lsmPutU16(&aData[SEGMENT_NRECORD_OFFSET(nData)], 0); lsmPutU16(&aData[SEGMENT_FLAGS_OFFSET(nData)], 0); lsmPutU32(&aData[SEGMENT_POINTER_OFFSET(nData)], iFPtr); pMW->nWork++; } return rc; } /* ** Write a blob of data into an output segment being populated by a |
︙ | ︙ | |||
2653 2654 2655 2656 2657 2658 2659 | Merge *pMerge = pMW->pLevel->pMerge; int nCopy; /* Number of bytes to copy */ u8 *aData; /* Pointer to buffer of current output page */ int nData; /* Size of aData[] in bytes */ int nRec; /* Number of records on current output page */ int iOff; /* Offset in aData[] to write to */ | | | | | | < | | | | < | | | | 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 | Merge *pMerge = pMW->pLevel->pMerge; int nCopy; /* Number of bytes to copy */ u8 *aData; /* Pointer to buffer of current output page */ int nData; /* Size of aData[] in bytes */ int nRec; /* Number of records on current output page */ int iOff; /* Offset in aData[] to write to */ assert( lsmFsPageWritable(pMW->pPage) ); aData = fsPageData(pMW->pPage, &nData); nRec = pageGetNRec(aData, nData); iOff = pMerge->iOutputOff; nCopy = LSM_MIN(nRem, SEGMENT_EOF(nData, nRec) - iOff); memcpy(&aData[iOff], &aWrite[nWrite-nRem], nCopy); nRem -= nCopy; if( nRem>0 ){ rc = mergeWorkerNextPage(pMW, iFPtr); }else{ pMerge->iOutputOff = iOff + nCopy; } } return rc; } static int mergeWorkerWrite( MergeWorker *pMW, /* Merge worker object to write into */ int eType, /* One of SORTED_SEPARATOR, WRITE or DELETE */ void *pKey, int nKey, /* Key value */ MultiCursor *pCsr, /* Read value (if any) from here */ int iPtr, /* Absolute value of page pointer, or 0 */ int *piPtrOut /* OUT: Pointer to write to separators */ ){ int rc = LSM_OK; /* Return code */ Merge *pMerge; /* Persistent part of level merge state */ int nHdr; /* Space required for this record header */ Page *pPg; /* Page to write to */ u8 *aData; /* Data buffer for page pWriter->pPage */ int nData; /* Size of buffer aData[] in bytes */ int nRec; /* Number of records on page pPg */ int iFPtr; /* Value of pointer in footer of pPg */ int iRPtr; /* Value of pointer written into record */ int iOff; /* Current write offset within page pPg */ Segment *pSeg; /* Segment being written */ int flags = 0; /* If != 0, flags value for page footer */ void *pVal; int nVal; pMerge = pMW->pLevel->pMerge; pSeg = &pMW->pLevel->lhs; pPg = pMW->pPage; aData = fsPageData(pPg, &nData); nRec = pageGetNRec(aData, nData); iFPtr = pageGetPtr(aData, nData); /* If iPtr is 0, set it to the same value as the absolute pointer ** stored as part of the previous record. */ if( iPtr==0 ){ iPtr = iFPtr; |
︙ | ︙ | |||
2732 2733 2734 2735 2736 2737 2738 | ** The header space is: ** ** 1) record type - 1 byte. ** 2) Page-pointer-offset - 1 varint ** 3) Key size - 1 varint ** 4) Value size - 1 varint (SORTED_WRITE only) */ | > > | | | | | | | | | | | | < > | < | | | | < | | | | | | | | < > > | | > > | > | 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 | ** The header space is: ** ** 1) record type - 1 byte. ** 2) Page-pointer-offset - 1 varint ** 3) Key size - 1 varint ** 4) Value size - 1 varint (SORTED_WRITE only) */ rc = lsmMCursorValue(pCsr, &pVal, &nVal); if( rc==LSM_OK ){ nHdr = 1 + lsmVarintLen32(iRPtr) + lsmVarintLen32(nKey); if( rtIsWrite(eType) ) nHdr += lsmVarintLen32(nVal); /* If the entire header will not fit on page pPg, or if page pPg is ** marked read-only, advance to the next page of the output run. */ iOff = pMerge->iOutputOff; if( iOff<0 || iOff+nHdr > SEGMENT_EOF(nData, nRec+1) ){ iFPtr = iFPtr + (nRec ? pageGetRecordPtr(aData, nData, nRec-1) : 0); iRPtr = iPtr - iFPtr; iOff = 0; nRec = 0; rc = mergeWorkerNextPage(pMW, iFPtr); pPg = pMW->pPage; } } /* If this record header will be the first on the page, and the page is ** not the very first in the entire run, special actions may need to be ** taken: ** ** * If currently writing the main run, *piPtrOut should be set to ** the current page number. The caller will add a key to the separators ** array that points to the current page. ** ** * If currently writing the separators array, push a copy of the key ** into the b-tree hierarchy. */ if( rc==LSM_OK && nRec==0 && pSeg->iFirst!=pSeg->iLast ){ assert( pMerge->nSkip>=0 ); if( pMerge->nSkip==0 ){ Pgno iPg = lsmFsPageNumber(pPg); rc = mergeWorkerPushHierarchy(pMW, 0, iPg, rtTopic(eType), pKey, nKey); } if( pMerge->nSkip ){ pMerge->nSkip--; flags = PGFTR_SKIP_THIS_FLAG; }else{ *piPtrOut = lsmFsPageNumber(pPg); pMerge->nSkip = keyszToSkip(pMW->pDb->pFS, nKey); } if( pMerge->nSkip ) flags |= PGFTR_SKIP_NEXT_FLAG; } /* Update the output segment */ if( rc==LSM_OK ){ aData = fsPageData(pPg, &nData); /* Update the page footer. */ lsmPutU16(&aData[SEGMENT_NRECORD_OFFSET(nData)], nRec+1); lsmPutU16(&aData[SEGMENT_CELLPTR_OFFSET(nData, nRec)], iOff); if( flags ) lsmPutU16(&aData[SEGMENT_FLAGS_OFFSET(nData)], flags); /* Write the entry header into the current page. */ aData[iOff++] = eType; /* 1 */ iOff += lsmVarintPut32(&aData[iOff], iRPtr); /* 2 */ iOff += lsmVarintPut32(&aData[iOff], nKey); /* 3 */ if( rtIsWrite(eType) ) iOff += lsmVarintPut32(&aData[iOff], nVal); /* 4 */ pMerge->iOutputOff = iOff; /* Write the key and data into the segment. */ assert( iFPtr==pageGetPtr(aData, nData) ); rc = mergeWorkerData(pMW, 0, iFPtr+iRPtr, pKey, nKey); if( rc==LSM_OK && rtIsWrite(eType) ){ if( rtTopic(eType)==0 ) rc = lsmMCursorValue(pCsr, &pVal, &nVal); if( rc==LSM_OK ){ rc = mergeWorkerData(pMW, 0, iFPtr+iRPtr, pVal, nVal); } } } return rc; } |
︙ | ︙ | |||
2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 | MultiCursor *pCsr = pMW->pCsr; /* Unless the merge has finished, save the cursor position in the ** Merge.aInput[] array. See function mergeWorkerInit() for the ** code to restore a cursor position based on aInput[]. */ if( pCsr ){ Merge *pMerge = pMW->pLevel->pMerge; /* pMerge->nInput==0 indicates that this is a FlushTree() operation. */ assert( pMerge->nInput==0 || pMW->pLevel->nRight>0 ); | > | | > > > > | | > | > > > | | | > > | > | | < < < | > > | > > > > > | | | | | < | | | > > > > | | < < < > > > > > > > > > | | < < < < < < < < < < < < < < < < < < < < < < < | < | | > > | | > > > | > | < | | 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 | MultiCursor *pCsr = pMW->pCsr; /* Unless the merge has finished, save the cursor position in the ** Merge.aInput[] array. See function mergeWorkerInit() for the ** code to restore a cursor position based on aInput[]. */ if( pCsr ){ Merge *pMerge = pMW->pLevel->pMerge; int bBtree = (pCsr->pBtCsr!=0); /* pMerge->nInput==0 indicates that this is a FlushTree() operation. */ assert( pMerge->nInput==0 || pMW->pLevel->nRight>0 ); assert( pMerge->nInput==0 || pMerge->nInput==(pCsr->nSegCsr+bBtree) ); for(i=0; i<(pMerge->nInput-bBtree); i++){ SegmentPtr *pPtr = &pCsr->aSegCsr[i].aPtr[0]; if( pPtr->pPg ){ pMerge->aInput[i].iPg = lsmFsPageNumber(pPtr->pPg); pMerge->aInput[i].iCell = pPtr->iCell; }else{ pMerge->aInput[i].iPg = 0; pMerge->aInput[i].iCell = 0; } } if( bBtree && pMerge->nInput ){ assert( i==pCsr->nSegCsr ); btreeCursorPosition(pCsr->pBtCsr, &pMerge->aInput[i]); } } lsmMCursorClose(pCsr); lsmFsPageRelease(pMW->pPage); lsmFsPageRelease(pMW->pPage); for(i=0; i<2; i++){ Hierarchy *p = &pMW->hier; int iPg; for(iPg=0; iPg<p->nHier; iPg++){ lsmFsPageRelease(p->apHier[iPg]); } lsmFree(pMW->pDb->pEnv, p->apHier); p->apHier = 0; p->nHier = 0; } pMW->pCsr = 0; pMW->pPage = 0; pMW->pPage = 0; } static int mergeWorkerFirstPage(MergeWorker *pMW){ int rc; /* Return code */ Page *pPg = 0; /* First page of run pSeg */ int iFPtr; /* Pointer value read from footer of pPg */ MultiCursor *pCsr = pMW->pCsr; assert( pMW->pPage==0 ); if( pCsr->pBtCsr ){ rc = LSM_OK; iFPtr = pMW->pLevel->pNext->lhs.iFirst; }else{ Segment *pSeg; pSeg = pMW->pCsr->aSegCsr[pMW->pCsr->nSegCsr-1].aPtr[0].pSeg; rc = lsmFsDbPageGet(pMW->pDb->pFS, pSeg->iFirst, &pPg); if( rc==LSM_OK ){ u8 *aData; /* Buffer for page pPg */ int nData; /* Size of aData[] in bytes */ aData = fsPageData(pPg, &nData); iFPtr = pageGetPtr(aData, nData); lsmFsPageRelease(pPg); } } if( rc==LSM_OK ){ rc = mergeWorkerNextPage(pMW, iFPtr); } return rc; } static int mergeWorkerStep(MergeWorker *pMW){ lsm_db *pDb = pMW->pDb; /* Database handle */ MultiCursor *pCsr; /* Cursor to read input data from */ int rc = LSM_OK; /* Return code */ int eType; /* SORTED_SEPARATOR, WRITE or DELETE */ void *pKey; int nKey; /* Key */ Segment *pSeg; /* Output segment */ int iPtr = 0; pCsr = pMW->pCsr; pSeg = &pMW->pLevel->lhs; /* Pull the next record out of the source cursor. */ lsmMCursorKey(pCsr, &pKey, &nKey); eType = pCsr->eType; /* Figure out if the output record may have a different pointer value ** than the previous. This is the case if the current key is identical to ** a key that appears in the lowest level run being merged. If so, set ** iPtr to the absolute pointer value. If not, leave iPtr set to zero, ** indicating that the output pointer value should be a copy of the pointer ** value written with the previous key. */ if( pCsr->pBtCsr ){ BtreeCursor *pBtCsr = pCsr->pBtCsr; if( pBtCsr->pKey ){ int res = rtTopic(pBtCsr->eType) - rtTopic(eType); if( res==0 ) res = pDb->xCmp(pBtCsr->pKey, pBtCsr->nKey, pKey, nKey); if( 0==res ) iPtr = pBtCsr->iPtr; assert( res>=0 ); } }else if( pCsr->nSegCsr ){ LevelCursor *pPtrs = &pCsr->aSegCsr[pCsr->nSegCsr-1]; if( segmentCursorValid(pPtrs) && 0==pDb->xCmp(pPtrs->aPtr[0].pKey, pPtrs->aPtr[0].nKey, pKey, nKey) ){ iPtr = pPtrs->aPtr[0].iPtr+pPtrs->aPtr[0].iPgPtr; } } /* If this is a separator key and we know that the output pointer has not ** changed, there is no point in writing an output record. Otherwise, ** proceed. */ if( rtIsSeparator(eType)==0 || iPtr!=0 ){ int iSPtr = 0; /* Separators require a pointer here */ if( pMW->pPage==0 ){ rc = mergeWorkerFirstPage(pMW); } /* Write the record into the main run. */ if( rc==LSM_OK ){ rc = mergeWorkerWrite(pMW, eType, pKey, nKey, pCsr, iPtr, &iSPtr); } } /* Advance the cursor to the next input record (assuming one exists). */ assert( lsmMCursorValid(pMW->pCsr) ); if( rc==LSM_OK ) rc = lsmMCursorNext(pMW->pCsr); /* If the cursor is at EOF, the merge is finished. Release all page ** references currently held by the merge worker and inform the ** FileSystem object that no further pages will be appended to either ** the main or separators array. */ if( rc==LSM_OK && !lsmMCursorValid(pMW->pCsr) ){ if( pSeg->iFirst ){ rc = lsmFsSortedFinish(pDb->pFS, pSeg); } #ifdef LSM_DEBUG_EXPENSIVE if( rc==LSM_OK ){ rc = assertBtreeOk(pDb, pSeg); if( pMW->pCsr->pBtCsr ){ Segment *pNext = &pMW->pLevel->pNext->lhs; rc = assertPointersOk(pDb, pSeg, pNext, 0); } } #endif mergeWorkerShutdown(pMW); } return rc; } static int mergeWorkerDone(MergeWorker *pMW){ return pMW->pCsr==0 || !lsmMCursorValid(pMW->pCsr); |
︙ | ︙ | |||
3012 3013 3014 3015 3016 3017 3018 | lsm_db *pDb, /* Connection handle */ int *pnHdrLevel /* OUT: Number of levels not stored in LSM */ ){ int rc = LSM_OK; /* Return Code */ MultiCursor *pCsr = 0; Level *pNext = 0; /* The current top level */ Level *pNew; /* The new level itself */ | | | < < < < < < | < | | 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 | lsm_db *pDb, /* Connection handle */ int *pnHdrLevel /* OUT: Number of levels not stored in LSM */ ){ int rc = LSM_OK; /* Return Code */ MultiCursor *pCsr = 0; Level *pNext = 0; /* The current top level */ Level *pNew; /* The new level itself */ Segment *pDel = 0; /* Delete separators from this segment */ int iLeftPtr = 0; /* Allocate the new level structure to write to. */ pNext = lsmDbSnapshotLevel(pDb->pWorker); pNew = (Level *)lsmMallocZeroRc(pDb->pEnv, sizeof(Level), &rc); /* Create a cursor to gather the data required by the new segment. The new ** segment contains everything in the tree and pointers to the next segment ** in the database (if any). */ if( rc==LSM_OK ){ pNew->pNext = pNext; lsmDbSnapshotSetLevel(pDb->pWorker, pNew); rc = multiCursorNew(pDb, pDb->pWorker, (pDb->pTV!=0), 0, &pCsr); if( rc==LSM_OK ){ if( pNext ){ assert( pNext->pMerge==0 || pNext->nRight>0 ); if( pNext->pMerge==0 ){ if( pNext->lhs.iRoot ){ rc = multiCursorAddLevel(pCsr, pNext, MULTICURSOR_ADDLEVEL_LHS_SEP); if( rc==LSM_OK ){ pDel = &pNext->lhs; } } iLeftPtr = pNext->lhs.iFirst; } }else{ /* The new level will be the only level in the LSM. There is no reason ** to write out delete keys in this case. */ multiCursorIgnoreDelete(pCsr); } } |
︙ | ︙ | |||
3077 3078 3079 3080 3081 3082 3083 | pNew->pMerge = &merge; mergeworker.pDb = pDb; mergeworker.pLevel = pNew; mergeworker.pCsr = pCsr; /* Mark the separators array for the new level as a "phantom". */ mergeworker.bFlush = 1; | < | < | < < < < | | 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 | pNew->pMerge = &merge; mergeworker.pDb = pDb; mergeworker.pLevel = pNew; mergeworker.pCsr = pCsr; /* Mark the separators array for the new level as a "phantom". */ mergeworker.bFlush = 1; /* Allocate the first page of the output segment. */ rc = mergeWorkerNextPage(&mergeworker, iLeftPtr); /* Do the work to create the new merged segment on disk */ if( rc==LSM_OK ) rc = lsmMCursorFirst(pCsr); while( rc==LSM_OK && mergeWorkerDone(&mergeworker)==0 ){ rc = mergeWorkerStep(&mergeworker); } mergeWorkerShutdown(&mergeworker); pNew->pMerge = 0; } lsmFreelistDeltaEnd(pDb); /* Link the new level into the top of the tree. */ if( rc==LSM_OK ){ if( pDel ){ pDel->iRoot = 0; } }else{ lsmDbSnapshotSetLevel(pDb->pWorker, pNext); sortedFreeLevel(pDb->pEnv, pNew); } if( rc==LSM_OK ){ |
︙ | ︙ | |||
3156 3157 3158 3159 3160 3161 3162 | lsmSortedNewToplevel(pDb, pnHdrLevel); } #if 0 lsmSortedDumpStructure(pDb, pDb->pWorker, 0, 0, "tree flush"); #endif | < < | 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 | lsmSortedNewToplevel(pDb, pnHdrLevel); } #if 0 lsmSortedDumpStructure(pDb, pDb->pWorker, 0, 0, "tree flush"); #endif assert( rc!=LSM_OK || lsmFsIntegrityCheck(pDb) ); lsmFinishFlush(pDb, rc==LSM_OK); return rc; } /* |
︙ | ︙ | |||
3216 3217 3218 3219 3220 3221 3222 | pTopLevel = lsmDbSnapshotLevel(pDb->pWorker); pNew->pNext = p; for(pp=&pTopLevel; *pp!=pLevel; pp=&((*pp)->pNext)); *pp = pNew; lsmDbSnapshotSetLevel(pDb->pWorker, pTopLevel); /* Determine whether or not the next separators will be linked in */ | | | | | | | | | | | | 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 | pTopLevel = lsmDbSnapshotLevel(pDb->pWorker); pNew->pNext = p; for(pp=&pTopLevel; *pp!=pLevel; pp=&((*pp)->pNext)); *pp = pNew; lsmDbSnapshotSetLevel(pDb->pWorker, pTopLevel); /* Determine whether or not the next separators will be linked in */ if( pNext && pNext->pMerge==0 && pNext->lhs.iRoot ){ bUseNext = 1; } } /* Allocate the merge object */ nByte = sizeof(Merge) + sizeof(MergeInput) * (nMerge + bUseNext); pMerge = (Merge *)lsmMallocZeroRc(pDb->pEnv, nByte, &rc); if( pMerge ){ pMerge->aInput = (MergeInput *)&pMerge[1]; pMerge->nInput = nMerge + bUseNext; pNew->pMerge = pMerge; } *ppNew = pNew; return rc; } static int mergeWorkerLoadOutputPage(MergeWorker *pMW){ int rc = LSM_OK; /* Return code */ Segment *pSeg; /* Run to load page from */ Level *pLevel; pLevel = pMW->pLevel; pSeg = &pLevel->lhs; if( pSeg->iLast ){ Page *pPg; rc = lsmFsDbPageGet(pMW->pDb->pFS, pSeg->iLast, &pPg); while( rc==LSM_OK ){ Page *pNext; u8 *aData; int nData; aData = fsPageData(pPg, &nData); if( (pageGetFlags(aData, nData) & SEGMENT_BTREE_FLAG)==0 ) break; rc = lsmFsDbPageNext(pSeg, pPg, -1, &pNext); lsmFsPageRelease(pPg); pPg = pNext; } if( rc==LSM_OK ){ pMW->pPage = pPg; if( pLevel->pMerge->iOutputOff>=0 ) rc = lsmFsPageWrite(pPg); } } return rc; } static int mergeWorkerInit( lsm_db *pDb, /* Db connection to do merge work */ |
︙ | ︙ | |||
3304 3305 3306 3307 3308 3309 3310 | Level *pNext = pLevel->pNext; rc = multiCursorAddLevel(pCsr, pNext, MULTICURSOR_ADDLEVEL_LHS_SEP); } multiCursorReadSeparators(pCsr); }else{ multiCursorIgnoreDelete(pCsr); } | | | | < | > > > > > < | | 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 | Level *pNext = pLevel->pNext; rc = multiCursorAddLevel(pCsr, pNext, MULTICURSOR_ADDLEVEL_LHS_SEP); } multiCursorReadSeparators(pCsr); }else{ multiCursorIgnoreDelete(pCsr); } assert( rc!=LSM_OK || pMerge->nInput==(pCsr->nSegCsr+(pCsr->pBtCsr!=0)) ); pMW->pCsr = pCsr; /* Load the current output page into memory. */ if( rc==LSM_OK ) rc = mergeWorkerLoadOutputPage(pMW); /* Position the cursor. */ if( rc==LSM_OK ){ if( pMW->pPage==0 ){ /* The output array is still empty. So position the cursor at the very ** start of the input. */ rc = multiCursorEnd(pCsr, 0); }else{ /* The output array is non-empty. Position the cursor based on the ** page/cell data saved in the Merge.aInput[] array. */ int i; for(i=0; rc==LSM_OK && i<pCsr->nSegCsr; i++){ MergeInput *pInput = &pMerge->aInput[i]; if( pInput->iPg ){ SegmentPtr *pPtr; assert( pCsr->aSegCsr[i].nPtr==1 ); assert( pCsr->aSegCsr[i].aPtr[0].pPg==0 ); pPtr = &pCsr->aSegCsr[i].aPtr[0]; rc = segmentPtrLoadPage(pDb->pFS, pPtr, pInput->iPg); if( rc==LSM_OK && pPtr->nCell>0 ){ rc = segmentPtrLoadCell(pPtr, pInput->iCell); } } } if( rc==LSM_OK && pCsr->pBtCsr ){ assert( i==pCsr->nSegCsr ); rc = btreeCursorRestore(pCsr->pBtCsr, pCsr->xCmp, &pMerge->aInput[i]); } if( rc==LSM_OK ){ rc = multiCursorSetupTree(pCsr, 0); } } pCsr->flags |= CURSOR_NEXT_OK; } return rc; } int sortedWork(lsm_db *pDb, int nWork, int bOptimize, int *pnWrite){ int rc = LSM_OK; /* Return Code */ int nRemaining = nWork; /* Units of work to do before returning */ Snapshot *pWorker = pDb->pWorker; assert( lsmFsIntegrityCheck(pDb) ); assert( pWorker ); if( lsmDbSnapshotLevel(pWorker)==0 ) return LSM_OK; lsmDatabaseDirty(pDb); while( nRemaining>0 ){ Level *pLevel; Level *pTopLevel = lsmDbSnapshotLevel(pWorker); /* Find the longest contiguous run of levels not currently undergoing a ** merge with the same age in the structure. Or the level being merged ** with the largest number of right-hand segments. Work on it. */ Level *pBest = 0; int nBest = pDb->nMerge; Level *pThis = 0; int nThis = 0; for(pLevel = pTopLevel; pLevel; pLevel=pLevel->pNext){ if( pLevel->nRight==0 && pThis && pLevel->iAge==pThis->iAge ){ nThis++; |
︙ | ︙ | |||
3440 3441 3442 3443 3444 3445 3446 | ** into the lhs of the level. */ if( rc==LSM_OK ){ if( mergeWorkerDone(&mergeworker)==0 ){ int iGobble = mergeworker.pCsr->aTree[1] - CURSOR_DATA_SEGMENT; if( iGobble<pLevel->nRight ){ SegmentPtr *pGobble = &mergeworker.pCsr->aSegCsr[iGobble].aPtr[0]; | | > > | | < | | | < | < | 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 | ** into the lhs of the level. */ if( rc==LSM_OK ){ if( mergeWorkerDone(&mergeworker)==0 ){ int iGobble = mergeworker.pCsr->aTree[1] - CURSOR_DATA_SEGMENT; if( iGobble<pLevel->nRight ){ SegmentPtr *pGobble = &mergeworker.pCsr->aSegCsr[iGobble].aPtr[0]; if( (pGobble->flags & PGFTR_SKIP_THIS_FLAG)==0 && pGobble->pSeg->iRoot==0 ){ lsmFsGobble(pWorker, pGobble->pSeg, pGobble->pPg); } } }else if( pLevel->lhs.iFirst==0 ){ /* If the new level is completely empty, remove it from the ** database snapshot. This can only happen if all input keys were ** annihilated. Since keys are only annihilated if the new level ** is the last in the linked list (contains the most ancient of ** database content), this guarantees that pLevel->pNext==0. */ Level *pTop; /* Top level of worker snapshot */ Level **pp; /* Read/write iterator for Level.pNext list */ assert( pLevel->pNext==0 ); /* Remove the level from the worker snapshot. */ pTop = lsmDbSnapshotLevel(pWorker); for(pp=&pTop; *pp!=pLevel; pp=&((*pp)->pNext)); *pp = pLevel->pNext; lsmDbSnapshotSetLevel(pWorker, pTop); /* Free the Level structure. */ lsmFsSortedDelete(pDb->pFS, pWorker, 1, &pLevel->lhs); sortedFreeLevel(pDb->pEnv, pLevel); }else{ int i; /* Free the separators of the next level, if required. */ if( pLevel->pMerge->nInput > pLevel->nRight ){ assert( pLevel->pNext->lhs.iRoot ); pLevel->pNext->lhs.iRoot = 0; } /* Free the right-hand-side of pLevel */ for(i=0; i<pLevel->nRight; i++){ lsmFsSortedDelete(pDb->pFS, pWorker, 1, &pLevel->aRhs[i]); } lsmFree(pDb->pEnv, pLevel->aRhs); pLevel->nRight = 0; pLevel->aRhs = 0; /* Free the Merge object */ lsmFree(pDb->pEnv, pLevel->pMerge); |
︙ | ︙ | |||
3508 3509 3510 3511 3512 3513 3514 | } } if( pnWrite ){ *pnWrite = (nWork - nRemaining); } | < < | 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 | } } if( pnWrite ){ *pnWrite = (nWork - nRemaining); } assert( rc!=LSM_OK || lsmFsIntegrityCheck(pDb) ); return rc; } typedef struct Metric Metric; struct Metric { double fAvgHeight; |
︙ | ︙ | |||
3642 3643 3644 3645 3646 3647 3648 | } /* ** Return a string representation of the segment passed as the only argument. ** Space for the returned string is allocated using lsmMalloc(), and should ** be freed by the caller using lsmFree(). */ | | | | | | | 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 | } /* ** Return a string representation of the segment passed as the only argument. ** Space for the returned string is allocated using lsmMalloc(), and should ** be freed by the caller using lsmFree(). */ static char *segToString(lsm_env *pEnv, Segment *pSeg, int nMin){ int nSize = pSeg->nSize; Pgno iRoot = pSeg->iRoot; Pgno iFirst = pSeg->iFirst; Pgno iLast = pSeg->iLast; char *z; char *z1; char *z2; int nPad; z1 = lsmMallocPrintf(pEnv, "%d.%d", iFirst, iLast); |
︙ | ︙ | |||
3679 3680 3681 3682 3683 3684 3685 | } static int fileToString( lsm_env *pEnv, /* For xMalloc() */ char *aBuf, int nBuf, int nMin, | | | | | | 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 | } static int fileToString( lsm_env *pEnv, /* For xMalloc() */ char *aBuf, int nBuf, int nMin, Segment *pSeg ){ int i = 0; char *zSeg; zSeg = segToString(pEnv, pSeg, nMin); i += sqlite4_snprintf(&aBuf[i], nBuf-i, "%s", zSeg); lsmFree(pEnv, zSeg); return i; } void sortedDumpPage(lsm_db *pDb, Segment *pRun, Page *pPg, int bVals){ Blob blob = {0, 0, 0}; /* Blob used for keys */ LsmString s; int i; int nRec; int iPtr; int flags; u8 *aData; int nData; aData = fsPageData(pPg, &nData); nRec = pageGetNRec(aData, nData); iPtr = pageGetPtr(aData, nData); flags = pageGetFlags(aData, nData); lsmStringInit(&s, pDb->pEnv); lsmStringAppendf(&s,"nCell=%d iPtr=%d flags=%d {", nRec, iPtr, flags); |
︙ | ︙ | |||
3780 3781 3782 3783 3784 3785 3786 | u8 *aKey; int nKey = 0; /* Key */ u8 *aVal; int nVal = 0; /* Value */ int eType; int iPgPtr; Page *pRef = 0; /* Pointer to page iRef */ u8 *aCell; | | | 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 | u8 *aKey; int nKey = 0; /* Key */ u8 *aVal; int nVal = 0; /* Value */ int eType; int iPgPtr; Page *pRef = 0; /* Pointer to page iRef */ u8 *aCell; aData = fsPageData(pPg, &nData); aCell = pageGetCell(aData, nData, iCell); eType = *aCell++; aCell += lsmVarintGet32(aCell, &iPgPtr); if( eType==0 ){ int dummy; |
︙ | ︙ | |||
3848 3849 3850 3851 3852 3853 3854 | LsmString str; int nRec; int iPtr; int flags; int iCell; u8 *aData; int nData; /* Page data and size thereof */ | | | 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 | LsmString str; int nRec; int iPtr; int flags; int iCell; u8 *aData; int nData; /* Page data and size thereof */ aData = fsPageData(pPg, &nData); nRec = pageGetNRec(aData, nData); iPtr = pageGetPtr(aData, nData); flags = pageGetFlags(aData, nData); lsmStringInit(&str, pDb->pEnv); lsmStringAppendf(&str, "Page : %d\n", iPg); lsmStringAppendf(&str, "nRec : %d\n", nRec); |
︙ | ︙ | |||
3905 3906 3907 3908 3909 3910 3911 | lsmFsPageRelease(pPg); } lsmDbSnapshotRelease(pDb->pEnv, pRelease); return rc; } | | | | 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 | lsmFsPageRelease(pPg); } lsmDbSnapshotRelease(pDb->pEnv, pRelease); return rc; } void sortedDumpSegment(lsm_db *pDb, Segment *pRun, int bVals){ assert( pDb->xLog ); if( pRun && pRun->iFirst ){ char *zSeg; Page *pPg; zSeg = segToString(pDb->pEnv, pRun, 0); lsmLogMessage(pDb, LSM_OK, "Segment: %s", zSeg); lsmFree(pDb->pEnv, zSeg); |
︙ | ︙ | |||
3957 3958 3959 3960 3961 3962 3963 | lsmLogMessage(pDb, LSM_OK, "Database structure (%s)", zWhy); for(pLevel=pTopLevel; pLevel; pLevel=pLevel->pNext){ char zLeft[1024]; char zRight[1024]; int i = 0; | | | < | | < < < | < < | 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 | lsmLogMessage(pDb, LSM_OK, "Database structure (%s)", zWhy); for(pLevel=pTopLevel; pLevel; pLevel=pLevel->pNext){ char zLeft[1024]; char zRight[1024]; int i = 0; Segment *aLeft[24]; Segment *aRight[24]; int nLeft = 0; int nRight = 0; Segment *pSeg = &pLevel->lhs; aLeft[nLeft++] = pSeg; for(i=0; i<pLevel->nRight; i++){ aRight[nRight++] = &pLevel->aRhs[i]; } for(i=0; i<nLeft || i<nRight; i++){ int iPad = 0; char zLevel[32]; zLeft[0] = '\0'; zRight[0] = '\0'; |
︙ | ︙ | |||
4007 4008 4009 4010 4011 4012 4013 | zLevel, iPad, "", zLeft, zRight ); } iLevel++; } | < < < < < < < < < < < < < < | < < | < < | 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 | zLevel, iPad, "", zLeft, zRight ); } iLevel++; } if( bKeys ){ for(pLevel=pTopLevel; pLevel; pLevel=pLevel->pNext){ int i; sortedDumpSegment(pDb, &pLevel->lhs, bVals); for(i=0; i<pLevel->nRight; i++){ sortedDumpSegment(pDb, &pLevel->aRhs[i], bVals); } } } } if( pSnap==0 ){ lsmDbSnapshotRelease(pDb->pEnv, pDump); |
︙ | ︙ | |||
4059 4060 4061 4062 4063 4064 4065 | int rc = LSM_OK; Level *p; assert( pDb->pWorker ); for(p=lsmDbSnapshotLevel(pDb->pWorker); p && rc==LSM_OK; p=p->pNext){ Merge *pMerge = p->pMerge; if( pMerge ){ | | < < < < < < | < < < < < < < < < < < < < < < < < | < < < | < < < | < < | < < < < < | < < < < < < < | < < | < < < < < < < < < < < < < < < < < < < < < < < < < | | | | < | | | 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 | int rc = LSM_OK; Level *p; assert( pDb->pWorker ); for(p=lsmDbSnapshotLevel(pDb->pWorker); p && rc==LSM_OK; p=p->pNext){ Merge *pMerge = p->pMerge; if( pMerge ){ pMerge->iOutputOff = -1; pMerge->bHierReadonly = 1; } } return LSM_OK; } void lsmSortedSaveTreeCursors(lsm_db *pDb){ MultiCursor *pCsr; for(pCsr=pDb->pCsr; pCsr; pCsr=pCsr->pNext){ lsmTreeCursorSave(pCsr->pTreeCsr); } } #ifdef LSM_DEBUG_EXPENSIVE /* ** This function is only included in the build if LSM_DEBUG_EXPENSIVE is ** defined. Its only purpose is to evaluate various assert() statements to ** verify that the database is well formed in certain respects. ** ** More specifically, it checks that the array pOne contains the required ** pointers to pTwo. Array pTwo must be a main array. pOne may be either a ** separators array or another main array. If pOne does not contain the ** correct set of pointers, an assert() statement fails. */ static int assertPointersOk( lsm_db *pDb, /* Database handle */ Segment *pOne, /* Segment containing pointers */ Segment *pTwo, /* Segment containing pointer targets */ int bRhs /* True if pTwo may have been Gobble()d */ ){ int rc = LSM_OK; /* Error code */ SegmentPtr ptr1; /* Iterates through pOne */ SegmentPtr ptr2; /* Iterates through pTwo */ Pgno iPrev; assert( pOne && pTwo ); memset(&ptr1, 0, sizeof(ptr1)); memset(&ptr2, 0, sizeof(ptr1)); ptr1.pSeg = pOne; ptr2.pSeg = pTwo; segmentPtrEndPage(pDb->pFS, &ptr1, 0, &rc); segmentPtrEndPage(pDb->pFS, &ptr2, 0, &rc); /* Check that the footer pointer of the first page of pOne points to ** the first page of pTwo. */ iPrev = pTwo->iFirst; if( ptr1.iPtr!=iPrev && !bRhs ){ |
︙ | ︙ | |||
4199 4200 4201 4202 4203 4204 4205 | do{ rc = segmentPtrNextPage(&ptr2, 1); assert( rc==LSM_OK ); }while( rc==LSM_OK && ptr2.pPg && ptr2.nCell==0 ); if( rc!=LSM_OK || ptr2.pPg==0 ) break; iThis = lsmFsPageNumber(ptr2.pPg); | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < | < | < < < < < < < < | < < < | < < < | < < < < < | < < < < | < < < < < < < < < < < < < < < < < < > | > > > > > > > > | > | < < < > | | < > | | > > > > > | > > > > > > > > > > > > > > > | > | | > > | > > | > | | 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 | do{ rc = segmentPtrNextPage(&ptr2, 1); assert( rc==LSM_OK ); }while( rc==LSM_OK && ptr2.pPg && ptr2.nCell==0 ); if( rc!=LSM_OK || ptr2.pPg==0 ) break; iThis = lsmFsPageNumber(ptr2.pPg); if( (ptr2.flags & (PGFTR_SKIP_THIS_FLAG|SEGMENT_BTREE_FLAG))==0 ){ /* Load the first cell in the array pTwo page. */ rc = segmentPtrLoadCell(&ptr2, 0); /* Iterate forwards through pOne, searching for a key that matches the ** key ptr2.pKey/nKey. This key should have a pointer to the page that ** ptr2 currently points to. */ while( rc==LSM_OK ){ int res = rtTopic(ptr1.eType) - rtTopic(ptr2.eType); if( res==0 ){ res = pDb->xCmp(ptr1.pKey, ptr1.nKey, ptr2.pKey, ptr2.nKey); } if( res<0 ){ assert( bRhs || ptr1.iPtr+ptr1.iPgPtr==iPrev ); }else if( res>0 ){ assert( 0 ); }else{ assert( ptr1.iPtr+ptr1.iPgPtr==iThis ); iPrev = iThis; break; } rc = segmentPtrAdvance(0, &ptr1, 0); if( ptr1.pPg==0 ){ assert( 0 ); } } } } segmentPtrReset(&ptr1); segmentPtrReset(&ptr2); return LSM_OK; } /* ** This function is only included in the build if LSM_DEBUG_EXPENSIVE is ** defined. Its only purpose is to evaluate various assert() statements to ** verify that the database is well formed in certain respects. ** ** More specifically, it checks that the b-tree embedded in array pRun ** contains the correct keys. If not, an assert() fails. */ static int assertBtreeOk( lsm_db *pDb, Segment *pSeg ){ int rc = LSM_OK; /* Return code */ if( pSeg->iRoot ){ Blob blob = {0, 0, 0}; /* Buffer used to cache overflow keys */ FileSystem *pFS = pDb->pFS; /* File system to read from */ Page *pPg = 0; /* Main run page */ BtreeCursor *pCsr = 0; /* Btree cursor */ rc = btreeCursorNew(pDb, pSeg, &pCsr); if( rc==LSM_OK ){ rc = btreeCursorFirst(pCsr); } if( rc==LSM_OK ){ rc = lsmFsDbPageGet(pFS, pSeg->iFirst, &pPg); } while( rc==LSM_OK ){ Page *pNext; u8 *aData; int nData; int flags; rc = lsmFsDbPageNext(pSeg, pPg, 1, &pNext); lsmFsPageRelease(pPg); pPg = pNext; if( pPg==0 ) break; aData = fsPageData(pPg, &nData); flags = pageGetFlags(aData, nData); if( rc==LSM_OK && 0==((SEGMENT_BTREE_FLAG|PGFTR_SKIP_THIS_FLAG) & flags) && 0!=pageGetNRec(aData, nData) ){ u8 *pKey; int nKey; int iTopic; pKey = pageGetKey(pPg, 0, &iTopic, &nKey, &blob); assert( nKey==pCsr->nKey && 0==memcmp(pKey, pCsr->pKey, nKey) ); assert( lsmFsPageNumber(pPg)==pCsr->iPtr ); rc = btreeCursorNext(pCsr); } } assert( rc!=LSM_OK || pCsr->pKey==0 ); if( pPg ) lsmFsPageRelease(pPg); btreeCursorFree(pCsr); sortedBlobFree(&blob); } return rc; } #endif /* ifdef LSM_DEBUG_EXPENSIVE */ |