You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by di...@apache.org on 2011/03/21 22:50:55 UTC
[Lucene.Net] svn commit: r1083978 - in /incubator/lucene.net/trunk/C#/src/Lucene.Net:
Index/ByteBlockPool.cs Index/DocumentsWriter.cs Index/IndexWriter.cs
Store/NativeFSLockFactory.cs
Author: digy
Date: Mon Mar 21 21:50:54 2011
New Revision: 1083978
URL: http://svn.apache.org/viewvc?rev=1083978&view=rev
Log:
[LUCENENET-399] Final make ups
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ByteBlockPool.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/DocumentsWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/NativeFSLockFactory.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ByteBlockPool.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/ByteBlockPool.cs?rev=1083978&r1=1083977&r2=1083978&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ByteBlockPool.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ByteBlockPool.cs Mon Mar 21 21:50:54 2011
@@ -48,7 +48,6 @@ namespace Lucene.Net.Index
public /*internal*/ abstract class Allocator
{
public /*internal*/ abstract void RecycleByteBlocks(byte[][] blocks, int start, int end);
- //abstract void recycleByteBlocks(List blocks); DIGY
public /*internal*/ abstract void RecycleByteBlocks(System.Collections.ArrayList blocks);
public /*internal*/ abstract byte[] GetByteBlock(bool trackAllocations);
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/DocumentsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/DocumentsWriter.cs?rev=1083978&r1=1083977&r2=1083978&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/DocumentsWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/DocumentsWriter.cs Mon Mar 21 21:50:54 2011
@@ -831,7 +831,6 @@ namespace Lucene.Net.Index
}
}
- //ICollection or IDictionary? DIGY
internal System.Collections.ICollection GetFlushedFiles()
{
return flushState.flushedFiles;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexWriter.cs?rev=1083978&r1=1083977&r2=1083978&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs Mon Mar 21 21:50:54 2011
@@ -6037,7 +6037,6 @@ namespace Lucene.Net.Index
mergedDocCount = merge.info.docCount = merger.Merge(merge.mergeDocStores);
System.Diagnostics.Debug.Assert(mergedDocCount == totDocCount);
- /////////////////////////////////////// start DIGY
if (merge.useCompoundFile)
{
@@ -6180,7 +6179,6 @@ namespace Lucene.Net.Index
System.Threading.Monitor.PulseAll(mergeScheduler);
}
- ///////////////////////////////////////////////////////// end DIGY
// Force a sync after commiting the merge. Once this
// sync completes then all index files referenced by the
// current segmentInfos are on stable storage so if the
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/NativeFSLockFactory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/NativeFSLockFactory.cs?rev=1083978&r1=1083977&r2=1083978&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/NativeFSLockFactory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/NativeFSLockFactory.cs Mon Mar 21 21:50:54 2011
@@ -386,30 +386,6 @@ namespace Lucene.Net.Store
if (!tmpBool)
throw new LockReleaseFailedException("failed to delete " + path);
}
- /* From Java 2.9.4 {{DIGY}}
- // LUCENE-2421: we don't care anymore if the file cannot be deleted
- // because it's held up by another process (e.g. AntiVirus). NativeFSLock
- // does not depend on the existence/absence of the lock file
- path.delete();
- } else {
- // if we don't hold the lock, and somebody still called release(), for
- // example as a result of calling IndexWriter.unlock(), we should attempt
- // to obtain the lock and release it. If the obtain fails, it means the
- // lock cannot be released, and we should throw a proper exception rather
- // than silently failing/not doing anything.
- boolean obtained = false;
- try {
- if (!(obtained = obtain())) {
- throw new LockReleaseFailedException(
- "Cannot forcefully unlock a NativeFSLock which is held by another indexer component: "
- + path);
- }
- } finally {
- if (obtained) {
- release();
- }
- }
- */
}
}