Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a problem in lsmtest causing one test to fail for multi-threaded LSM connections. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2bce64c8864b616f9ab0063f64d0ceb2 |
User & Date: | dan 2017-07-05 14:29:04.723 |
Context
2017-07-05
| ||
18:48 | Have fts3 virtual table cursors free internal resources when they reach EOF, instead of waiting until the xClose method is called. (check-in: b6b14ab6c8 user: dan tags: trunk) | |
14:29 | Fix a problem in lsmtest causing one test to fail for multi-threaded LSM connections. (check-in: 2bce64c886 user: dan tags: trunk) | |
2017-07-04
| ||
19:34 | Add the count-of-view optimization when compiled using SQLITE_COUNTOFVIEW_OPTIMIZATION. (check-in: d1ba200234 user: drh tags: trunk) | |
Changes
Changes to ext/lsm1/lsm-test/lsmtest9.c.
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | lsm_db *db = 0; TestDb *pDb; TestDb *pControl; Datasource *pData; int i; int rc = 0; int iDot = 0; int nRecOn3 = (p->nRec / 3); int iData = 0; /* Start the test case, open a database and allocate the datasource. */ rc = testControlDb(&pControl); pDb = testOpen(zSystem, 1, &rc); pData = testDatasourceNew(&p->defn); | > | > > > > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | lsm_db *db = 0; TestDb *pDb; TestDb *pControl; Datasource *pData; int i; int rc = 0; int iDot = 0; int bMultiThreaded = 0; /* True for MT LSM database */ int nRecOn3 = (p->nRec / 3); int iData = 0; /* Start the test case, open a database and allocate the datasource. */ rc = testControlDb(&pControl); pDb = testOpen(zSystem, 1, &rc); pData = testDatasourceNew(&p->defn); if( rc==0 ){ db = tdb_lsm(pDb); bMultiThreaded = tdb_lsm_multithread(pDb); } testWriteDatasourceRange(pControl, pData, iData, nRecOn3*3, &rc); testWriteDatasourceRange(pDb, pData, iData, nRecOn3*3, &rc); for(i=0; rc==0 && i<p->nRepeat; i++){ testDeleteDatasourceRange(pControl, pData, iData, nRecOn3*2, &rc); testDeleteDatasourceRange(pDb, pData, iData, nRecOn3*2, &rc); if( db ){ int nDone; #if 0 fprintf(stderr, "lsm_work() start...\n"); fflush(stderr); #endif do { nDone = 0; rc = lsm_work(db, 1, (1<<30), &nDone); }while( rc==0 && nDone>0 ); if( bMultiThreaded && rc==LSM_BUSY ) rc = LSM_OK; #if 0 fprintf(stderr, "lsm_work() done...\n"); fflush(stderr); #endif } if( i+1<p->nRepeat ){ iData += (nRecOn3*2); |
︙ | ︙ |
Changes to ext/lsm1/lsm-test/lsmtest_tdb.h.
︙ | ︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 | /* ** If the TestDb handle passed as an argument is a wrapper around an LSM ** database, return the LSM handle. Otherwise, if the argument is some other ** database system, return NULL. */ lsm_db *tdb_lsm(TestDb *pDb); /* ** Return a pointer to the lsm_env object used by all lsm database ** connections initialized as a copy of the object returned by ** lsm_default_env(). It may be modified (e.g. to override functions) ** if the caller can guarantee that it is not already in use. */ lsm_env *tdb_lsm_env(void); | > > > > > > | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | /* ** If the TestDb handle passed as an argument is a wrapper around an LSM ** database, return the LSM handle. Otherwise, if the argument is some other ** database system, return NULL. */ lsm_db *tdb_lsm(TestDb *pDb); /* ** Return true if the db passed as an argument is a multi-threaded LSM ** connection. */ int tdb_lsm_multithread(TestDb *pDb); /* ** Return a pointer to the lsm_env object used by all lsm database ** connections initialized as a copy of the object returned by ** lsm_default_env(). It may be modified (e.g. to override functions) ** if the caller can guarantee that it is not already in use. */ lsm_env *tdb_lsm_env(void); |
︙ | ︙ |
Changes to ext/lsm1/lsm-test/lsmtest_tdb3.c.
︙ | ︙ | |||
1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 | lsm_db *tdb_lsm(TestDb *pDb){ if( pDb->pMethods->xClose==test_lsm_close ){ return ((LsmDb *)pDb)->db; } return 0; } void tdb_lsm_enable_log(TestDb *pDb, int bEnable){ lsm_db *db = tdb_lsm(pDb); if( db ){ lsm_config_log(db, (bEnable ? xLog : 0), (void *)"client"); } } | > > > > > > > > | 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 | lsm_db *tdb_lsm(TestDb *pDb){ if( pDb->pMethods->xClose==test_lsm_close ){ return ((LsmDb *)pDb)->db; } return 0; } int tdb_lsm_multithread(TestDb *pDb){ int ret = 0; if( tdb_lsm(pDb) ){ ret = ((LsmDb*)pDb)->eMode!=LSMTEST_MODE_SINGLETHREAD; } return ret; } void tdb_lsm_enable_log(TestDb *pDb, int bEnable){ lsm_db *db = tdb_lsm(pDb); if( db ){ lsm_config_log(db, (bEnable ? xLog : 0), (void *)"client"); } } |
︙ | ︙ |