beagled/Lucene.Net/upstream-changes/21_fsdirectory_lock-cumulative.patch

   1 From: Debajyoti Bera <dbera.web@gmail.com>
   2
   3 While migrating to Lucene.Net-1.9, it was patched numerous times to keep in sync
   4 with the beagle specific changes to Lucene.Net. Each incremental was checked in separately.
   5 This patch should be applied after all of them to fix some errors in the previous
   6 patches.
   7
   8 Index: Store/FSDirectory.cs
   9 ===================================================================
  10 RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Store/FSDirectory.cs,v
  11 retrieving revision 1.19.2.18
  12 diff -u -3 -p -r1.19.2.18 FSDirectory.cs
  13 --- Store/FSDirectory.cs        30 Sep 2006 02:52:27 -0000      1.19.2.18
  14 +++ Store/FSDirectory.cs        30 Sep 2006 02:56:11 -0000
  15 @@ -121,8 +121,6 @@ namespace Lucene.Net.Store
  16                     //System.IO.StreamWriter w = new System.IO.StreamWriter (new Mono.Unix.UnixStream (fd, true));
  17                     //w.WriteLine (System.Diagnostics.Process.GetCurrentProcess ().Id);
  18                     //w.Close ();
  19 -                    System.IO.FileStream createdFile = lockFile.Create();
  20 -                    createdFile.Close();
  21                      return true;
  22                  }
  23                  catch (Exception e)
  24 Index: Store/Lock.cs
  25 ===================================================================
  26 RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Store/Lock.cs,v
  27 retrieving revision 1.6.4.12
  28 diff -u -3 -p -r1.6.4.12 Lock.cs
  29 --- Store/Lock.cs       30 Sep 2006 02:52:27 -0000      1.6.4.12
  30 +++ Store/Lock.cs       30 Sep 2006 02:56:11 -0000
  31 @@ -58,14 +58,14 @@ namespace Lucene.Net.Store
  32                 /// <throws>  IOException if lock wait times out or obtain() throws an IOException </throws>
  33                 public virtual bool Obtain(long lockWaitTimeout)
  34                 {
  35 -                       int maxSleepCount = (int) (lockWaitTimeout / LOCK_POLL_INTERVAL);
  36                         int sleepCount = 0;
  37 -                       maxSleepCount = System.Math.Max (maxSleepCount, 1);
  38 -                       FSDirectory.Log ("Lock.Obtain timeout={0} maxsleepcount={1}", lockWaitTimeout, maxSleepCount);
  39                         bool locked = Obtain();
  40 +                       int maxSleepCount = (int) (lockWaitTimeout / LOCK_POLL_INTERVAL);
  41 +                       maxSleepCount = System.Math.Min (maxSleepCount, 1);
  42
  43                         while (!locked)
  44                         {
  45 +                               FSDirectory.Log ("Lock.Obtain timeout: sleepcount = {0} (timeout={1},maxsleepcount={2})", sleepCount, lockWaitTimeout, maxSleepCount);
  46                                 if (sleepCount++ == maxSleepCount)
  47                                 {
  48                                         // Try and be a little more verbose on failure
  49 Index: Analysis/Standard/StandardTokenizerTokenManager.cs
  50 ===================================================================
  51 RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs,v
  52 retrieving revision 1.7.4.10
  53 diff -u -3 -p -r1.7.4.10 StandardTokenizerTokenManager.cs
  54 --- Analysis/Standard/StandardTokenizerTokenManager.cs  30 Sep 2006 02:57:25 -0000      1.7.4.10
  55 +++ Analysis/Standard/StandardTokenizerTokenManager.cs  30 Sep 2006 02:59:27 -0000
  56 @@ -30,6 +30,7 @@ namespace Lucene.Net.Analysis.Standard
  57
  58                 private void  InitBlock()
  59                 {
  60 +               }
  61                 private int JjMoveStringLiteralDfa0_0()
  62                 {
  63                         return JjMoveNfa_0(0, 0);