/ Check-in [aa0b96c3]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Bug fix: named local variable lockStyle as lockingStyle in SQLITE_ENABLE_LOCKING_STYLE block in allocateUnixFile (CVS 3473)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: aa0b96c3dfa1d8008cd944281c227604b2ee16d1
User & Date: aswift 2006-10-11 17:19:46
Context
2006-10-12
23:15
Convert fts2 to store data in a way which allows for much faster updates. Groups of documents form segments which are encoded in a btree layered over a table of blocks, with various tricks to make merges fast. This performs 20x-25x faster than fts1 when loading the Enron corpus, and is only slightly slower for queries. (CVS 3474) check-in: 85272b2f user: shess tags: trunk
2006-10-11
17:19
Bug fix: named local variable lockStyle as lockingStyle in SQLITE_ENABLE_LOCKING_STYLE block in allocateUnixFile (CVS 3473) check-in: aa0b96c3 user: aswift tags: trunk
2006-10-10
23:22
Fix leaky symbols. With this change, fts1 and fts2 can both be statically linked. (CVS 3472) check-in: 5e8bbb85 user: shess tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  2441   2441    */
  2442   2442   static int allocateUnixFile(
  2443   2443     int h,                  /* Open file descriptor of file being opened */
  2444   2444     OsFile **pId,           /* Write completed initialization here */
  2445   2445     const char *zFilename,  /* Name of the file being opened */
  2446   2446     int delFlag             /* Delete-on-or-before-close flag */
  2447   2447   ){
  2448         -  sqlite3LockingStyle lockStyle;
         2448  +  sqlite3LockingStyle lockingStyle;
  2449   2449     unixFile *pNew;
  2450   2450     unixFile f;
  2451   2451     int rc;
  2452   2452   
  2453   2453     lockingStyle = sqlite3DetectLockingStyle(zFilename, f.h);
  2454   2454     if ( lockingStyle == posixLockingStyle ) {
  2455   2455       sqlite3OsEnterMutex();
................................................................................
  2481   2481       releaseLockInfo(f.pLock);
  2482   2482       releaseOpenCnt(f.pOpen);
  2483   2483       sqlite3OsLeaveMutex();
  2484   2484       *pId = 0;
  2485   2485       return SQLITE_NOMEM;
  2486   2486     }else{
  2487   2487       *pNew = f;
  2488         -    switch(lockStyle) {
         2488  +    switch(lockingStyle) {
  2489   2489         case afpLockingStyle:
  2490   2490           /* afp locking uses the file path so it needs to be included in
  2491   2491           ** the afpLockingContext */
  2492   2492           pNew->pMethod = &sqlite3AFPLockingUnixIoMethod;
  2493   2493           pNew->lockingContext = 
  2494   2494             sqlite3ThreadSafeMalloc(sizeof(afpLockingContext));
  2495   2495           ((afpLockingContext *)pNew->lockingContext)->filePath =