You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/04/02 07:06:01 UTC
[01/20] lucenenet git commit:
Lucene.Net.Tests.Index.TestIndexWriterWithThreads.TestCloseWithThreads(): Set
timeout back to its original value of 200ms. Apparently the optimizations
that have been done have fixed the slowness that was causing the test to
Repository: lucenenet
Updated Branches:
refs/heads/api-work b8d797eaa -> ec120c4ba
Lucene.Net.Tests.Index.TestIndexWriterWithThreads.TestCloseWithThreads(): Set timeout back to its original value of 200ms. Apparently the optimizations that have been done have fixed the slowness that was causing the test to fail with its original setting.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1944d9ec
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1944d9ec
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1944d9ec
Branch: refs/heads/api-work
Commit: 1944d9eca68c914de3d8c3121084d1ca5a68535f
Parents: b8d797e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 09:09:20 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 09:09:20 2017 +0700
----------------------------------------------------------------------
.../Index/TestIndexWriterWithThreads.cs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1944d9ec/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index 6fbf8e6..f7946f1 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -242,13 +242,11 @@ namespace Lucene.Net.Index
{
threads[i] = new IndexerThread(writer, false, NewField)
- // LUCENENET specific - ConcurrentMergeScheduler
- // seems to take too long for this test to index a single document
- // so, increasing the time from 200 to 300 ms
-
- // LUCENENET TODO: Find out what is taking so friggin long here -
- // probably boils down to using LINQ for something that needs to be fast
- { TimeToRunInMilliseconds = 300 };
+ // LUCENENET NOTE - ConcurrentMergeScheduler
+ // used to take too long for this test to index a single document
+ // so, increased the time from 200 to 300 ms.
+ // But it has now been restored to 200 ms like Lucene.
+ { TimeToRunInMilliseconds = 200 };
}
for (int i = 0; i < NUM_THREADS; i++)
[11/20] lucenenet git commit: Lucene.Net.Core.Store.IndexInput:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Store.IndexInput: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/de5e562a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/de5e562a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/de5e562a
Branch: refs/heads/api-work
Commit: de5e562a30e02e1d69df5e227ebae8bc79b76011
Parents: 6af91bd
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 10:52:29 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:34 2017 +0700
----------------------------------------------------------------------
.../Codecs/MultiLevelSkipListReader.cs | 7 ++-
.../Store/BufferedChecksumIndexInput.cs | 7 ++-
.../Store/ByteBufferIndexInput.cs | 61 ++++++++++----------
src/Lucene.Net.Core/Store/Directory.cs | 7 ++-
src/Lucene.Net.Core/Store/IndexInput.cs | 11 +++-
src/Lucene.Net.Core/Store/MMapDirectory.cs | 13 +++--
src/Lucene.Net.Core/Store/NIOFSDirectory.cs | 4 +-
src/Lucene.Net.Core/Store/RAMInputStream.cs | 2 +-
src/Lucene.Net.Core/Store/SimpleFSDirectory.cs | 4 +-
.../Index/MockIndexInput.cs | 2 +-
.../Store/MockIndexInputWrapper.cs | 33 ++++++-----
.../Store/SlowClosingMockIndexInputWrapper.cs | 25 ++++----
src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs | 7 ++-
src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 7 ++-
.../Index/TestLazyProxSkipping.cs | 7 ++-
.../Index/TestMultiLevelSkipList.cs | 7 ++-
.../Store/TestBufferedIndexInput.cs | 2 +-
17 files changed, 124 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs b/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs
index 657b72d..0399aaa 100644
--- a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs
+++ b/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs
@@ -338,9 +338,12 @@ namespace Lucene.Net.Codecs
input.ReadBytes(data, 0, length);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- data = null;
+ if (disposing)
+ {
+ data = null;
+ }
}
public override long GetFilePointer()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs b/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs
index ef91bc4..1099419 100644
--- a/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs
+++ b/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs
@@ -62,9 +62,12 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- main.Dispose();
+ if (disposing)
+ {
+ main.Dispose();
+ }
}
public override long GetFilePointer()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs b/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs
index d40b530..7b898ba 100644
--- a/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs
+++ b/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs
@@ -364,47 +364,50 @@ namespace Lucene.Net.Store
curBufIndex = 0;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- if (buffers == null)
+ try
{
- return;
- }
+ if (buffers == null)
+ {
+ return;
+ }
- // make local copy, then un-set early
- ByteBuffer[] bufs = buffers;
- UnsetBuffers();
- if (clones != null)
- {
- clones.Remove(this);
- }
+ // make local copy, then un-set early
+ ByteBuffer[] bufs = buffers;
+ UnsetBuffers();
+ if (clones != null)
+ {
+ clones.Remove(this);
+ }
- if (isClone)
- {
- return;
- }
+ if (isClone)
+ {
+ return;
+ }
- // for extra safety unset also all clones' buffers:
- if (clones != null)
- {
- foreach (ByteBufferIndexInput clone in clones.Keys)
+ // for extra safety unset also all clones' buffers:
+ if (clones != null)
{
- clone.UnsetBuffers();
+ foreach (ByteBufferIndexInput clone in clones.Keys)
+ {
+ clone.UnsetBuffers();
+ }
+ this.clones.Clear();
}
- this.clones.Clear();
- }
- foreach (ByteBuffer b in bufs)
+ foreach (ByteBuffer b in bufs)
+ {
+ FreeBuffer(b);
+ }
+ }
+ finally
{
- FreeBuffer(b);
+ UnsetBuffers();
}
}
- finally
- {
- UnsetBuffers();
- }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/Directory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/Directory.cs b/src/Lucene.Net.Core/Store/Directory.cs
index fce0e46..2e848c9 100644
--- a/src/Lucene.Net.Core/Store/Directory.cs
+++ b/src/Lucene.Net.Core/Store/Directory.cs
@@ -389,9 +389,12 @@ namespace Lucene.Net.Store
/// <summary>
/// Closes the stream to further operations.
/// </summary>
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- @base.Dispose();
+ if (disposing)
+ {
+ @base.Dispose();
+ }
}
public override long Length
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/IndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/IndexInput.cs b/src/Lucene.Net.Core/Store/IndexInput.cs
index 99cd039..fae97a5 100644
--- a/src/Lucene.Net.Core/Store/IndexInput.cs
+++ b/src/Lucene.Net.Core/Store/IndexInput.cs
@@ -57,7 +57,16 @@ namespace Lucene.Net.Store
/// <summary>
/// Closes the stream to further operations. </summary>
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Closes the stream to further operations. </summary>
+ protected abstract void Dispose(bool disposing);
/// <summary>
/// Returns the current position in this file, where the next read will
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/MMapDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/MMapDirectory.cs b/src/Lucene.Net.Core/Store/MMapDirectory.cs
index 9ebf25a..a0c920c 100644
--- a/src/Lucene.Net.Core/Store/MMapDirectory.cs
+++ b/src/Lucene.Net.Core/Store/MMapDirectory.cs
@@ -240,14 +240,17 @@ namespace Lucene.Net.Store
this.SetBuffers(outerInstance.Map(this, fc, 0, fc.Length));
}
- public override sealed void Dispose()
+ protected override /*sealed*/ void Dispose(bool disposing) // LUCENENET specific - not marked sealed in case subclass needs to dispose
{
- if (null != this.memoryMappedFile)
+ if (disposing)
{
- this.memoryMappedFile.Dispose();
- this.memoryMappedFile = null;
+ if (null != this.memoryMappedFile)
+ {
+ this.memoryMappedFile.Dispose();
+ this.memoryMappedFile = null;
+ }
+ base.Dispose();
}
- base.Dispose();
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs b/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
index faf27a9..6cc9aba 100644
--- a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
@@ -186,9 +186,9 @@ namespace Lucene.Net.Store
this.isClone = true;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (!isClone)
+ if (disposing && !isClone)
{
m_channel.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/RAMInputStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/RAMInputStream.cs b/src/Lucene.Net.Core/Store/RAMInputStream.cs
index 4a8a07e..623bd72 100644
--- a/src/Lucene.Net.Core/Store/RAMInputStream.cs
+++ b/src/Lucene.Net.Core/Store/RAMInputStream.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Store
currentBuffer = null;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
// nothing to do here
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs b/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
index e44e1b6..8bc927b 100644
--- a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
@@ -159,9 +159,9 @@ namespace Lucene.Net.Store
this.IsClone = true;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (!IsClone)
+ if (disposing && !IsClone)
{
m_file.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.TestFramework/Index/MockIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/MockIndexInput.cs b/src/Lucene.Net.TestFramework/Index/MockIndexInput.cs
index de745cb..88ab424 100644
--- a/src/Lucene.Net.TestFramework/Index/MockIndexInput.cs
+++ b/src/Lucene.Net.TestFramework/Index/MockIndexInput.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Index
Pointer += len;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
// ignore
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs
index 45ec2dd..03c9ea1 100644
--- a/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs
@@ -43,24 +43,27 @@ namespace Lucene.Net.Store
this.@delegate = @delegate;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- // turn on the following to look for leaks closing inputs,
- // after fixing TestTransactions
- // Dir.MaybeThrowDeterministicException();
- }
- finally
- {
- Closed = true;
- @delegate.Dispose();
- // Pending resolution on LUCENE-686 we may want to
- // remove the conditional check so we also track that
- // all clones get closed:
- if (!IsClone)
+ try
+ {
+ // turn on the following to look for leaks closing inputs,
+ // after fixing TestTransactions
+ // Dir.MaybeThrowDeterministicException();
+ }
+ finally
{
- Dir.RemoveIndexInput(this, Name);
+ Closed = true;
+ @delegate.Dispose();
+ // Pending resolution on LUCENE-686 we may want to
+ // remove the conditional check so we also track that
+ // all clones get closed:
+ if (!IsClone)
+ {
+ Dir.RemoveIndexInput(this, Name);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
index d59995d..72106a9 100644
--- a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
@@ -32,21 +32,24 @@ namespace Lucene.Net.Store
{
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- Thread.Sleep(50);
- }
+ try
+ {
+ Thread.Sleep(50);
+ }
#if !NETSTANDARD
- catch (ThreadInterruptedException ie)
- {
- throw new ThreadInterruptedException("Thread Interrupted Exception", ie);
- }
+ catch (ThreadInterruptedException ie)
+ {
+ throw new ThreadInterruptedException("Thread Interrupted Exception", ie);
+ }
#endif
- finally
- {
- base.Dispose();
+ finally
+ {
+ base.Dispose();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
index a137966..205704f 100644
--- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
+++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
@@ -155,9 +155,12 @@ namespace Lucene.Net.Facet
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- ii.Dispose();
+ if (disposing)
+ {
+ ii.Dispose();
+ }
}
public override bool Equals(object o)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
index 85379ce..c7b9619 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
@@ -205,9 +205,12 @@ namespace Lucene.Net.Index
get { return @delegate.Length; }
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- @delegate.Dispose();
+ if (disposing)
+ {
+ @delegate.Dispose();
+ }
}
public override object Clone()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
index 04cf6b5..2553cf1 100644
--- a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
+++ b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
@@ -228,9 +228,12 @@ namespace Lucene.Net.Index
this.Input.ReadBytes(b, offset, len);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- this.Input.Dispose();
+ if (disposing)
+ {
+ this.Input.Dispose();
+ }
}
public override long GetFilePointer()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
index b1de16d..11449d3 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
@@ -187,9 +187,12 @@ namespace Lucene.Net.Index
this.Input.ReadBytes(b, offset, len);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- this.Input.Dispose();
+ if (disposing)
+ {
+ this.Input.Dispose();
+ }
}
public override long GetFilePointer()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de5e562a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
index fad09a0..151c5df 100644
--- a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
+++ b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
@@ -252,7 +252,7 @@ namespace Lucene.Net.Store
this.Pos = pos;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
[07/20] lucenenet git commit: Lucene.Net.Core.Analysis.TokenStream:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Analysis.TokenStream: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c8c94d13
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c8c94d13
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c8c94d13
Branch: refs/heads/api-work
Commit: c8c94d1328f2959f48b0123fa2c0299bf9bde28a
Parents: b3627a7
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 10:05:15 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:32 2017 +0700
----------------------------------------------------------------------
.../Analysis/Miscellaneous/PatternAnalyzer.cs | 18 ++++++++++++------
.../PrefixAndSuffixAwareTokenFilter.cs | 7 +++++--
.../Miscellaneous/PrefixAwareTokenFilter.cs | 9 ++++++---
.../Analysis/Standard/ClassicTokenizer.cs | 9 ++++++---
.../Analysis/Standard/StandardTokenizer.cs | 9 ++++++---
.../Analysis/Standard/UAX29URLEmailTokenizer.cs | 9 ++++++---
.../Analysis/Wikipedia/WikipediaTokenizer.cs | 9 ++++++---
src/Lucene.Net.Core/Analysis/TokenFilter.cs | 9 ++++++---
src/Lucene.Net.Core/Analysis/TokenStream.cs | 9 ++++++++-
src/Lucene.Net.Core/Analysis/Tokenizer.cs | 15 +++++++++------
.../Analysis/MockGraphTokenFilter.cs | 9 ++++++---
.../Analysis/MockTokenizer.cs | 17 ++++++++++-------
.../Analysis/Core/TestBugInSomething.cs | 9 ++++++---
.../Highlight/HighlighterTest.cs | 9 ++++++---
src/Lucene.Net.Tests/Index/TestPayloads.cs | 7 +++++--
15 files changed, 103 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
index 4b5da76..251d30f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
@@ -432,10 +432,13 @@ namespace Lucene.Net.Analysis.Miscellaneous
this.offsetAtt.SetOffset(finalOffset, finalOffset);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- this.initialized = false;
+ if (disposing)
+ {
+ base.Dispose();
+ this.initialized = false;
+ }
}
public override void Reset()
@@ -566,10 +569,13 @@ namespace Lucene.Net.Analysis.Miscellaneous
return stopWords != null && stopWords.Contains(text);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- this.str = null;
+ if (disposing)
+ {
+ base.Dispose();
+ this.str = null;
+ }
}
public override void Reset()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
index 2479b33..2536cd0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
@@ -89,9 +89,12 @@
suffix.Reset();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- suffix.Dispose();
+ if (disposing)
+ {
+ suffix.Dispose();
+ }
}
public override void End()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
index cef54d0..cf61f29 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
@@ -174,10 +174,13 @@ namespace Lucene.Net.Analysis.Miscellaneous
suffix.End();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- prefix.Dispose();
- suffix.Dispose();
+ if (disposing)
+ {
+ prefix.Dispose();
+ suffix.Dispose();
+ }
}
public override void Reset()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
index 888615a..fd775db 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
@@ -196,10 +196,13 @@ namespace Lucene.Net.Analysis.Standard
posIncrAtt.PositionIncrement = posIncrAtt.PositionIncrement + skippedPositions;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- scanner.YyReset(m_input);
+ if (disposing)
+ {
+ base.Dispose();
+ scanner.YyReset(m_input);
+ }
}
public override void Reset()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
index c83e1e5..0c64290 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
@@ -250,10 +250,13 @@ namespace Lucene.Net.Analysis.Standard
posIncrAtt.PositionIncrement = posIncrAtt.PositionIncrement + skippedPositions;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- scanner.YyReset(m_input);
+ if (disposing)
+ {
+ base.Dispose();
+ scanner.YyReset(m_input);
+ }
}
public override void Reset()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
index 32a042c..0ca2477 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
@@ -216,10 +216,13 @@ namespace Lucene.Net.Analysis.Standard
posIncrAtt.PositionIncrement = posIncrAtt.PositionIncrement + skippedPositions;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- scanner.YyReset(m_input);
+ if (disposing)
+ {
+ base.Dispose();
+ scanner.YyReset(m_input);
+ }
}
public override void Reset()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
index e6f1c71..9b8e35e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
@@ -314,10 +314,13 @@ namespace Lucene.Net.Analysis.Wikipedia
offsetAtt.SetOffset(CorrectOffset(start), CorrectOffset(start + termAtt.Length));
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- scanner.YyReset(m_input);
+ if (disposing)
+ {
+ base.Dispose();
+ scanner.YyReset(m_input);
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Core/Analysis/TokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/TokenFilter.cs b/src/Lucene.Net.Core/Analysis/TokenFilter.cs
index 9a6c715..53044f1 100644
--- a/src/Lucene.Net.Core/Analysis/TokenFilter.cs
+++ b/src/Lucene.Net.Core/Analysis/TokenFilter.cs
@@ -67,15 +67,18 @@ namespace Lucene.Net.Analysis
/// <para/>
/// If you override this method, always call <c>base.Dispose()</c>, otherwise
/// some internal state will not be correctly reset (e.g., <see cref="Tokenizer"/> will
- /// throw <see cref="InvalidOperationException"/> on reuse).
+ /// throw <see cref="System.InvalidOperationException"/> on reuse).
/// <para/>
/// <b>NOTE:</b>
/// The default implementation chains the call to the input TokenStream, so
/// be sure to call <c>base.Dispose()</c> when overriding this method.
/// </summary>
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- m_input.Dispose();
+ if (disposing)
+ {
+ m_input.Dispose();
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Core/Analysis/TokenStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/TokenStream.cs b/src/Lucene.Net.Core/Analysis/TokenStream.cs
index f32092f..4bd469c 100644
--- a/src/Lucene.Net.Core/Analysis/TokenStream.cs
+++ b/src/Lucene.Net.Core/Analysis/TokenStream.cs
@@ -200,6 +200,13 @@ namespace Lucene.Net.Analysis
{
}
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
/// <summary>
/// Releases resources associated with this stream.
/// <para/>
@@ -207,7 +214,7 @@ namespace Lucene.Net.Analysis
/// some internal state will not be correctly reset (e.g., <see cref="Tokenizer"/> will
/// throw <see cref="InvalidOperationException"/> on reuse).
/// </summary>
- public virtual void Dispose()
+ protected virtual void Dispose(bool disposing)
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Core/Analysis/Tokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/Tokenizer.cs b/src/Lucene.Net.Core/Analysis/Tokenizer.cs
index 3176f01..03aecdd 100644
--- a/src/Lucene.Net.Core/Analysis/Tokenizer.cs
+++ b/src/Lucene.Net.Core/Analysis/Tokenizer.cs
@@ -76,13 +76,16 @@ namespace Lucene.Net.Analysis
/// The default implementation closes the input <see cref="TextReader"/>, so
/// be sure to call <c>base.Dispose()</c> when overriding this method.
/// </remarks>
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- m_input.Dispose();
- // LUCENE-2387: don't hold onto TextReader after close, so
- // GC can reclaim
- inputPending = ILLEGAL_STATE_READER;
- m_input = ILLEGAL_STATE_READER;
+ if (disposing)
+ {
+ m_input.Dispose();
+ // LUCENE-2387: don't hold onto TextReader after close, so
+ // GC can reclaim
+ inputPending = ILLEGAL_STATE_READER;
+ m_input = ILLEGAL_STATE_READER;
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
index f9d40fa..129f4b5 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
@@ -113,10 +113,13 @@ namespace Lucene.Net.Analysis
this.Random = new Random((int)Seed);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- this.Random = null;
+ if (disposing)
+ {
+ base.Dispose();
+ this.Random = null;
+ }
}
public override bool IncrementToken()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
index 2889557..64add2e 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
@@ -304,14 +304,17 @@ namespace Lucene.Net.Analysis
StreamState = State.RESET;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- // in some exceptional cases (e.g. TestIndexWriterExceptions) a test can prematurely close()
- // these tests should disable this check, by default we check the normal workflow.
- // TODO: investigate the CachingTokenFilter "double-close"... for now we ignore this
- Assert.True(!EnableChecks_Renamed || StreamState == State.END || StreamState == State.CLOSE, "close() called in wrong state: " + StreamState);
- StreamState = State.CLOSE;
+ if (disposing)
+ {
+ base.Dispose();
+ // in some exceptional cases (e.g. TestIndexWriterExceptions) a test can prematurely close()
+ // these tests should disable this check, by default we check the normal workflow.
+ // TODO: investigate the CachingTokenFilter "double-close"... for now we ignore this
+ Assert.True(!EnableChecks_Renamed || StreamState == State.END || StreamState == State.CLOSE, "close() called in wrong state: " + StreamState);
+ StreamState = State.CLOSE;
+ }
}
internal override bool SetReaderTestPoint()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
index 10fb996..af81d15 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
@@ -288,10 +288,13 @@ namespace Lucene.Net.Analysis.Core
Console.WriteLine(m_input.GetType().Name + ".end()");
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- Console.WriteLine(m_input.GetType().Name + ".close()");
+ if (disposing)
+ {
+ base.Dispose();
+ Console.WriteLine(m_input.GetType().Name + ".close()");
+ }
}
public override void Reset()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
index 3bc972e..5432921 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
@@ -2166,10 +2166,13 @@ namespace Lucene.Net.Search.Highlight
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- base.Dispose();
- this.realStream.Dispose();
+ if (disposing)
+ {
+ base.Dispose();
+ this.realStream.Dispose();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8c94d13/src/Lucene.Net.Tests/Index/TestPayloads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestPayloads.cs b/src/Lucene.Net.Tests/Index/TestPayloads.cs
index ba5038e..9ce5cff 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloads.cs
@@ -591,9 +591,12 @@ namespace Lucene.Net.Index
return true;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- Pool.Release(Payload);
+ if (disposing)
+ {
+ Pool.Release(Payload);
+ }
}
}
[17/20] lucenenet git commit: Lucene.Net.Codecs.TermsIndexReaderBase:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Codecs.TermsIndexReaderBase: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c2ec3e25
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c2ec3e25
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c2ec3e25
Branch: refs/heads/api-work
Commit: c2ec3e258e2a56ba34d1e1ee6d01660f7f478802
Parents: 8145821
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:35:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:36 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/FixedGapTermsIndexReader.cs | 9 ++++++---
src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs | 9 ++++++++-
.../BlockTerms/VariableGapTermsIndexReader.cs | 9 ++++++---
3 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2ec3e25/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
index 10d774a..92f6a95 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
@@ -460,11 +460,14 @@ namespace Lucene.Net.Codecs.BlockTerms
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (input != null && !indexLoaded)
+ if (disposing)
{
- input.Dispose();
+ if (input != null && !indexLoaded)
+ {
+ input.Dispose();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2ec3e25/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs b/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
index 6323e7e..d7b905f 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
@@ -40,7 +40,14 @@ namespace Lucene.Net.Codecs.BlockTerms
{
public abstract FieldIndexEnum GetFieldEnum(FieldInfo fieldInfo);
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected abstract void Dispose(bool disposing);
public abstract bool SupportsOrd { get; }
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2ec3e25/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
index fe56cc9..ca773c0 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
@@ -278,11 +278,14 @@ namespace Lucene.Net.Codecs.BlockTerms
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (input != null && !indexLoaded)
+ if (disposing)
{
- input.Dispose();
+ if (input != null && !indexLoaded)
+ {
+ input.Dispose();
+ }
}
}
[08/20] lucenenet git commit: Lucene.Net.Core.Codecs.FieldsConsumer:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Codecs.FieldsConsumer: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6af91bd7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6af91bd7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6af91bd7
Branch: refs/heads/api-work
Commit: 6af91bd74efec0dc75768a74f457f898b592aa6a
Parents: 8105155
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 10:25:52 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:33 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/BlockTermsWriter.cs | 53 +++++++-------
.../Bloom/BloomFilteringPostingsFormat.cs | 61 ++++++++--------
.../Memory/FSTOrdTermsWriter.cs | 77 ++++++++++----------
src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs | 59 ++++++++-------
.../Memory/MemoryPostingsFormat.cs | 22 +++---
.../SimpleText/SimpleTextFieldsWriter.cs | 27 ++++---
.../Codecs/BlockTreeTermsWriter.cs | 65 +++++++++--------
src/Lucene.Net.Core/Codecs/FieldsConsumer.cs | 11 ++-
.../Codecs/PerField/PerFieldPostingsFormat.cs | 9 ++-
.../Codecs/Asserting/AssertingPostingsFormat.cs | 9 +--
.../Codecs/Lucene3x/PreFlexRWFieldsWriter.cs | 7 +-
.../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 2 +-
12 files changed, 217 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs
index fdc9226..7c25d01 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs
@@ -130,38 +130,41 @@ namespace Lucene.Net.Codecs.BlockTerms
return new TermsWriter(this, fieldIndexWriter, field, postingsWriter);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (m_output != null)
+ if (disposing)
{
- try
+ if (m_output != null)
{
- long dirStart = m_output.GetFilePointer();
-
- m_output.WriteVInt32(fields.Count);
- foreach (FieldMetaData field in fields)
+ try
{
- m_output.WriteVInt32(field.FieldInfo.Number);
- m_output.WriteVInt64(field.NumTerms);
- m_output.WriteVInt64(field.TermsStartPointer);
- if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
- {
- m_output.WriteVInt64(field.SumTotalTermFreq);
- }
- m_output.WriteVInt64(field.SumDocFreq);
- m_output.WriteVInt32(field.DocCount);
- if (VERSION_CURRENT >= VERSION_META_ARRAY)
+ long dirStart = m_output.GetFilePointer();
+
+ m_output.WriteVInt32(fields.Count);
+ foreach (FieldMetaData field in fields)
{
- m_output.WriteVInt32(field.Int64sSize);
+ m_output.WriteVInt32(field.FieldInfo.Number);
+ m_output.WriteVInt64(field.NumTerms);
+ m_output.WriteVInt64(field.TermsStartPointer);
+ if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ {
+ m_output.WriteVInt64(field.SumTotalTermFreq);
+ }
+ m_output.WriteVInt64(field.SumDocFreq);
+ m_output.WriteVInt32(field.DocCount);
+ if (VERSION_CURRENT >= VERSION_META_ARRAY)
+ {
+ m_output.WriteVInt32(field.Int64sSize);
+ }
}
+ WriteTrailer(dirStart);
+ CodecUtil.WriteFooter(m_output);
+ }
+ finally
+ {
+ IOUtils.Close(m_output, postingsWriter, termsIndexWriter);
+ m_output = null;
}
- WriteTrailer(dirStart);
- CodecUtil.WriteFooter(m_output);
- }
- finally
- {
- IOUtils.Close(m_output, postingsWriter, termsIndexWriter);
- m_output = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
index 2f9b2c4..8ab4952 100644
--- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
@@ -449,41 +449,44 @@ namespace Lucene.Net.Codecs.Bloom
return _delegateFieldsConsumer.AddField(field);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- _delegateFieldsConsumer.Dispose();
- // Now we are done accumulating values for these fields
- var nonSaturatedBlooms = (from entry in _bloomFilters.EntrySet() let bloomFilter = entry.Value where !outerInstance._bloomFilterFactory.IsSaturated(bloomFilter, entry.Key) select entry).ToList();
-
- var bloomFileName = IndexFileNames.SegmentFileName(
- _state.SegmentInfo.Name, _state.SegmentSuffix, BLOOM_EXTENSION);
- IndexOutput bloomOutput = null;
-
- try
+ if (disposing)
{
- bloomOutput = _state.Directory.CreateOutput(bloomFileName, _state.Context);
- CodecUtil.WriteHeader(bloomOutput, /*BLOOM_CODEC_NAME*/ outerInstance.Name, VERSION_CURRENT);
- // remember the name of the postings format we will delegate to
- bloomOutput.WriteString(outerInstance._delegatePostingsFormat.Name);
+ _delegateFieldsConsumer.Dispose();
+ // Now we are done accumulating values for these fields
+ var nonSaturatedBlooms = (from entry in _bloomFilters.EntrySet() let bloomFilter = entry.Value where !outerInstance._bloomFilterFactory.IsSaturated(bloomFilter, entry.Key) select entry).ToList();
+
+ var bloomFileName = IndexFileNames.SegmentFileName(
+ _state.SegmentInfo.Name, _state.SegmentSuffix, BLOOM_EXTENSION);
+ IndexOutput bloomOutput = null;
- // First field in the output file is the number of fields+blooms saved
- bloomOutput.WriteInt32(nonSaturatedBlooms.Count);
- foreach (var entry in nonSaturatedBlooms)
+ try
{
- var fieldInfo = entry.Key;
- var bloomFilter = entry.Value;
- bloomOutput.WriteInt32(fieldInfo.Number);
- SaveAppropriatelySizedBloomFilter(bloomOutput, bloomFilter, fieldInfo);
+ bloomOutput = _state.Directory.CreateOutput(bloomFileName, _state.Context);
+ CodecUtil.WriteHeader(bloomOutput, /*BLOOM_CODEC_NAME*/ outerInstance.Name, VERSION_CURRENT);
+ // remember the name of the postings format we will delegate to
+ bloomOutput.WriteString(outerInstance._delegatePostingsFormat.Name);
+
+ // First field in the output file is the number of fields+blooms saved
+ bloomOutput.WriteInt32(nonSaturatedBlooms.Count);
+ foreach (var entry in nonSaturatedBlooms)
+ {
+ var fieldInfo = entry.Key;
+ var bloomFilter = entry.Value;
+ bloomOutput.WriteInt32(fieldInfo.Number);
+ SaveAppropriatelySizedBloomFilter(bloomOutput, bloomFilter, fieldInfo);
+ }
+
+ CodecUtil.WriteFooter(bloomOutput);
}
-
- CodecUtil.WriteFooter(bloomOutput);
- }
- finally
- {
- IOUtils.Close(bloomOutput);
+ finally
+ {
+ IOUtils.Close(bloomOutput);
+ }
+ //We are done with large bitsets so no need to keep them hanging around
+ _bloomFilters.Clear();
}
- //We are done with large bitsets so no need to keep them hanging around
- _bloomFilters.Clear();
}
private void SaveAppropriatelySizedBloomFilter(DataOutput bloomOutput,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
index 839929e..ecd90db 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
@@ -185,50 +185,53 @@ namespace Lucene.Net.Codecs.Memory
return new TermsWriter(this, field);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (blockOut == null) return;
-
- IOException ioe = null;
- try
+ if (disposing)
{
- var blockDirStart = blockOut.GetFilePointer();
+ if (blockOut == null) return;
- // write field summary
- blockOut.WriteVInt32(_fields.Count);
- foreach (var field in _fields)
+ IOException ioe = null;
+ try
{
- blockOut.WriteVInt32(field.FieldInfo.Number);
- blockOut.WriteVInt64(field.NumTerms);
- if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ var blockDirStart = blockOut.GetFilePointer();
+
+ // write field summary
+ blockOut.WriteVInt32(_fields.Count);
+ foreach (var field in _fields)
{
- blockOut.WriteVInt64(field.SumTotalTermFreq);
+ blockOut.WriteVInt32(field.FieldInfo.Number);
+ blockOut.WriteVInt64(field.NumTerms);
+ if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ {
+ blockOut.WriteVInt64(field.SumTotalTermFreq);
+ }
+ blockOut.WriteVInt64(field.SumDocFreq);
+ blockOut.WriteVInt32(field.DocCount);
+ blockOut.WriteVInt32(field.Int64sSize);
+ blockOut.WriteVInt64(field.StatsOut.GetFilePointer());
+ blockOut.WriteVInt64(field.MetaInt64sOut.GetFilePointer());
+ blockOut.WriteVInt64(field.MetaBytesOut.GetFilePointer());
+
+ field.SkipOut.WriteTo(blockOut);
+ field.StatsOut.WriteTo(blockOut);
+ field.MetaInt64sOut.WriteTo(blockOut);
+ field.MetaBytesOut.WriteTo(blockOut);
+ field.Dict.Save(indexOut);
}
- blockOut.WriteVInt64(field.SumDocFreq);
- blockOut.WriteVInt32(field.DocCount);
- blockOut.WriteVInt32(field.Int64sSize);
- blockOut.WriteVInt64(field.StatsOut.GetFilePointer());
- blockOut.WriteVInt64(field.MetaInt64sOut.GetFilePointer());
- blockOut.WriteVInt64(field.MetaBytesOut.GetFilePointer());
-
- field.SkipOut.WriteTo(blockOut);
- field.StatsOut.WriteTo(blockOut);
- field.MetaInt64sOut.WriteTo(blockOut);
- field.MetaBytesOut.WriteTo(blockOut);
- field.Dict.Save(indexOut);
+ WriteTrailer(blockOut, blockDirStart);
+ CodecUtil.WriteFooter(indexOut);
+ CodecUtil.WriteFooter(blockOut);
+ }
+ catch (IOException ioe2)
+ {
+ ioe = ioe2;
+ }
+ finally
+ {
+ IOUtils.CloseWhileHandlingException(ioe, blockOut, indexOut, postingsWriter);
+ blockOut = null;
}
- WriteTrailer(blockOut, blockDirStart);
- CodecUtil.WriteFooter(indexOut);
- CodecUtil.WriteFooter(blockOut);
- }
- catch (IOException ioe2)
- {
- ioe = ioe2;
- }
- finally
- {
- IOUtils.CloseWhileHandlingException(ioe, blockOut, indexOut, postingsWriter);
- blockOut = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
index 3f18e36..2f2b7d6 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
@@ -164,41 +164,44 @@ namespace Lucene.Net.Codecs.Memory
return new TermsWriter(this, field);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (_output == null) return;
-
- IOException ioe = null;
- try
+ if (disposing)
{
- // write field summary
- var dirStart = _output.GetFilePointer();
+ if (_output == null) return;
- _output.WriteVInt32(_fields.Count);
- foreach (var field in _fields)
+ IOException ioe = null;
+ try
{
- _output.WriteVInt32(field.FieldInfo.Number);
- _output.WriteVInt64(field.NumTerms);
- if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ // write field summary
+ var dirStart = _output.GetFilePointer();
+
+ _output.WriteVInt32(_fields.Count);
+ foreach (var field in _fields)
{
- _output.WriteVInt64(field.SumTotalTermFreq);
+ _output.WriteVInt32(field.FieldInfo.Number);
+ _output.WriteVInt64(field.NumTerms);
+ if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ {
+ _output.WriteVInt64(field.SumTotalTermFreq);
+ }
+ _output.WriteVInt64(field.SumDocFreq);
+ _output.WriteVInt32(field.DocCount);
+ _output.WriteVInt32(field.Int64sSize);
+ field.Dict.Save(_output);
}
- _output.WriteVInt64(field.SumDocFreq);
- _output.WriteVInt32(field.DocCount);
- _output.WriteVInt32(field.Int64sSize);
- field.Dict.Save(_output);
+ WriteTrailer(_output, dirStart);
+ CodecUtil.WriteFooter(_output);
+ }
+ catch (IOException ioe2)
+ {
+ ioe = ioe2;
+ }
+ finally
+ {
+ IOUtils.CloseWhileHandlingException(ioe, _output, _postingsWriter);
+ _output = null;
}
- WriteTrailer(_output, dirStart);
- CodecUtil.WriteFooter(_output);
- }
- catch (IOException ioe2)
- {
- ioe = ioe2;
- }
- finally
- {
- IOUtils.CloseWhileHandlingException(ioe, _output, _postingsWriter);
- _output = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
index d617030..9336c7b 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
@@ -359,20 +359,22 @@ namespace Lucene.Net.Codecs.Memory
return new TermsWriter(@out, field, outerInstance.doPackFST, outerInstance.acceptableOverheadRatio);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- // EOF marker:
- try
- {
- @out.WriteVInt32(0);
- CodecUtil.WriteFooter(@out);
- }
- finally
+ if (disposing)
{
- @out.Dispose();
+ // EOF marker:
+ try
+ {
+ @out.WriteVInt32(0);
+ CodecUtil.WriteFooter(@out);
+ }
+ finally
+ {
+ @out.Dispose();
+ }
}
}
-
}
private sealed class FSTDocsEnum : DocsEnum
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsWriter.cs
index e82e3a4..66a6027 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsWriter.cs
@@ -192,20 +192,23 @@ namespace Lucene.Net.Codecs.SimpleText
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (_output == null) return;
-
- try
- {
- Write(END);
- Newline();
- SimpleTextUtil.WriteChecksum(_output, _scratch);
- }
- finally
+ if (disposing)
{
- _output.Dispose();
- _output = null;
+ if (_output == null) return;
+
+ try
+ {
+ Write(END);
+ Newline();
+ SimpleTextUtil.WriteChecksum(_output, _scratch);
+ }
+ finally
+ {
+ _output.Dispose();
+ _output = null;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs b/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs
index ea0a46a..d026e76 100644
--- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs
@@ -1197,44 +1197,47 @@ namespace Lucene.Net.Codecs
internal readonly RAMOutputStream bytesWriter = new RAMOutputStream();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- System.IO.IOException ioe = null;
- try
+ if (disposing)
{
- long dirStart = @out.GetFilePointer();
- long indexDirStart = indexOut.GetFilePointer();
+ System.IO.IOException ioe = null;
+ try
+ {
+ long dirStart = @out.GetFilePointer();
+ long indexDirStart = indexOut.GetFilePointer();
- @out.WriteVInt32(fields.Count);
+ @out.WriteVInt32(fields.Count);
- foreach (FieldMetaData field in fields)
- {
- //System.out.println(" field " + field.fieldInfo.name + " " + field.numTerms + " terms");
- @out.WriteVInt32(field.FieldInfo.Number);
- @out.WriteVInt64(field.NumTerms);
- @out.WriteVInt32(field.RootCode.Length);
- @out.WriteBytes(field.RootCode.Bytes, field.RootCode.Offset, field.RootCode.Length);
- if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ foreach (FieldMetaData field in fields)
{
- @out.WriteVInt64(field.SumTotalTermFreq);
+ //System.out.println(" field " + field.fieldInfo.name + " " + field.numTerms + " terms");
+ @out.WriteVInt32(field.FieldInfo.Number);
+ @out.WriteVInt64(field.NumTerms);
+ @out.WriteVInt32(field.RootCode.Length);
+ @out.WriteBytes(field.RootCode.Bytes, field.RootCode.Offset, field.RootCode.Length);
+ if (field.FieldInfo.IndexOptions != IndexOptions.DOCS_ONLY)
+ {
+ @out.WriteVInt64(field.SumTotalTermFreq);
+ }
+ @out.WriteVInt64(field.SumDocFreq);
+ @out.WriteVInt32(field.DocCount);
+ @out.WriteVInt32(field.Int64sSize);
+ indexOut.WriteVInt64(field.IndexStartFP);
}
- @out.WriteVInt64(field.SumDocFreq);
- @out.WriteVInt32(field.DocCount);
- @out.WriteVInt32(field.Int64sSize);
- indexOut.WriteVInt64(field.IndexStartFP);
+ WriteTrailer(@out, dirStart);
+ CodecUtil.WriteFooter(@out);
+ WriteIndexTrailer(indexOut, indexDirStart);
+ CodecUtil.WriteFooter(indexOut);
+ }
+ catch (System.IO.IOException ioe2)
+ {
+ ioe = ioe2;
+ }
+ finally
+ {
+ IOUtils.CloseWhileHandlingException(ioe, @out, indexOut, postingsWriter);
}
- WriteTrailer(@out, dirStart);
- CodecUtil.WriteFooter(@out);
- WriteIndexTrailer(indexOut, indexDirStart);
- CodecUtil.WriteFooter(indexOut);
- }
- catch (System.IO.IOException ioe2)
- {
- ioe = ioe2;
- }
- finally
- {
- IOUtils.CloseWhileHandlingException(ioe, @out, indexOut, postingsWriter);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs b/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
index d338fce..ee6d7cd 100644
--- a/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
+++ b/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
@@ -60,7 +60,16 @@ namespace Lucene.Net.Codecs
/// <summary>
/// Called when we are done adding everything. </summary>
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Called when we are done adding everything. </summary>
+ protected abstract void Dispose(bool disposing);
/// <summary>
/// Called during merging to merge all <seealso cref="Fields"/> from
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs b/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
index e45056f..c214df8 100644
--- a/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
+++ b/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
@@ -157,10 +157,13 @@ namespace Lucene.Net.Codecs.PerField
return consumer.Consumer.AddField(field);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- // Close all subs
- IOUtils.Close(formats.Values);
+ if (disposing)
+ {
+ // Close all subs
+ IOUtils.Close(formats.Values);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
index d2b0a8c..fd3c9f7 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
@@ -126,15 +126,12 @@ namespace Lucene.Net.Codecs.Asserting
return new AssertingTermsConsumer(consumer, field);
}
- public override void Dispose()
- {
- Dispose(true);
- }
-
- protected void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
+ {
@in.Dispose();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs
index 053933a..ff80ffb 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs
@@ -96,9 +96,12 @@ namespace Lucene.Net.Codecs.Lucene3x
return new PreFlexTermsWriter(this, field);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- IOUtils.Close(TermsOut, FreqOut, ProxOut);
+ if (disposing)
+ {
+ IOUtils.Close(TermsOut, FreqOut, ProxOut);
+ }
}
private class PreFlexTermsWriter : TermsConsumer
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6af91bd7/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
index fbf5a25..9a8f03d 100644
--- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
@@ -317,7 +317,7 @@ namespace Lucene.Net.Codecs.RAMOnly
return TermsConsumer;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
// TODO: finalize stuff
}
[13/20] lucenenet git commit: Lucene.Net.Core.InfoStream: implemented
.NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.InfoStream: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/35430a9b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/35430a9b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/35430a9b
Branch: refs/heads/api-work
Commit: 35430a9b7408e56a5754cebbffe837d8ee6643f6
Parents: 99e1576
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:26:19 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:35 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Util/InfoStream.cs | 11 +++++++++--
src/Lucene.Net.Core/Util/PrintStreamInfoStream.cs | 4 ++--
src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs | 7 +++++--
.../Util/FailOnNonBulkMergesInfoStream.cs | 2 +-
src/Lucene.Net.TestFramework/Util/NullInfoStream.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs | 4 ++--
src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs | 2 +-
7 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.Core/Util/InfoStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/InfoStream.cs b/src/Lucene.Net.Core/Util/InfoStream.cs
index d9a6362..8d97037 100644
--- a/src/Lucene.Net.Core/Util/InfoStream.cs
+++ b/src/Lucene.Net.Core/Util/InfoStream.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Util
return false;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
}
@@ -87,7 +87,14 @@ namespace Lucene.Net.Util
}
}
- public virtual void Dispose()
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected virtual void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.Core/Util/PrintStreamInfoStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/PrintStreamInfoStream.cs b/src/Lucene.Net.Core/Util/PrintStreamInfoStream.cs
index ba473db..63d0f95 100644
--- a/src/Lucene.Net.Core/Util/PrintStreamInfoStream.cs
+++ b/src/Lucene.Net.Core/Util/PrintStreamInfoStream.cs
@@ -58,9 +58,9 @@ namespace Lucene.Net.Util
return true;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (!IsSystemStream)
+ if (disposing && !IsSystemStream)
{
m_stream.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index 03504c2..2eb3aa7 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -543,9 +543,12 @@ namespace Lucene.Net.Index
this.TestPoint = testPoint;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- @delegate.Dispose();
+ if (disposing)
+ {
+ @delegate.Dispose();
+ }
}
public override void Message(string component, string message)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.TestFramework/Util/FailOnNonBulkMergesInfoStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/FailOnNonBulkMergesInfoStream.cs b/src/Lucene.Net.TestFramework/Util/FailOnNonBulkMergesInfoStream.cs
index e6b3a4a..4deb2eb 100644
--- a/src/Lucene.Net.TestFramework/Util/FailOnNonBulkMergesInfoStream.cs
+++ b/src/Lucene.Net.TestFramework/Util/FailOnNonBulkMergesInfoStream.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Util
// TODO: we should probably be a wrapper so verbose still works...
public class FailOnNonBulkMergesInfoStream : InfoStream
{
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.TestFramework/Util/NullInfoStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/NullInfoStream.cs b/src/Lucene.Net.TestFramework/Util/NullInfoStream.cs
index baa8c21..42c0590 100644
--- a/src/Lucene.Net.TestFramework/Util/NullInfoStream.cs
+++ b/src/Lucene.Net.TestFramework/Util/NullInfoStream.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Util
return true; // to actually enable logging, we just ignore on message()
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index ed5587f..bad1448 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -1319,7 +1319,7 @@ namespace Lucene.Net.Index
return true;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
}
@@ -2515,7 +2515,7 @@ namespace Lucene.Net.Index
return true;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35430a9b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index fd8032e..42697a2 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -1237,7 +1237,7 @@ namespace Lucene.Net.Index
this.DidWarm = didWarm;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
[14/20] lucenenet git commit: Lucene.Net.Core.Store.IndexOutput:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Store.IndexOutput: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0f71b2b1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0f71b2b1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0f71b2b1
Branch: refs/heads/api-work
Commit: 0f71b2b1814c535afd3654b60e89416043760c8f
Parents: 2ea33f7
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:07:12 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:35 2017 +0700
----------------------------------------------------------------------
.../Store/BufferedIndexOutput.cs | 7 ++--
src/Lucene.Net.Core/Store/CompoundFileWriter.cs | 4 +--
src/Lucene.Net.Core/Store/FSDirectory.cs | 37 +++++++++++---------
src/Lucene.Net.Core/Store/IndexOutput.cs | 11 +++++-
src/Lucene.Net.Core/Store/RAMOutputStream.cs | 7 ++--
.../Store/RateLimitedIndexOutput.cs | 17 +++++----
.../Store/MockDirectoryWrapper.cs | 17 +++++----
.../Store/MockIndexOutputWrapper.cs | 31 ++++++++--------
.../Util/ThrottledIndexOutput.cs | 17 +++++----
src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs | 7 ++--
10 files changed, 94 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs b/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs
index 0acaf82..16fa6c8 100644
--- a/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs
+++ b/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs
@@ -148,9 +148,12 @@ namespace Lucene.Net.Store
/// <param name="len"> the number of bytes to write </param>
protected internal abstract void FlushBuffer(byte[] b, int offset, int len);
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- Flush();
+ if (disposing)
+ {
+ Flush();
+ }
}
public override long GetFilePointer()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/CompoundFileWriter.cs b/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
index f2166b8..c4a6827 100644
--- a/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
+++ b/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
@@ -386,9 +386,9 @@ namespace Lucene.Net.Store
@delegate.Flush();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (!closed)
+ if (disposing && !closed)
{
closed = true;
entry.Length = writtenBytes;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Core/Store/FSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/FSDirectory.cs b/src/Lucene.Net.Core/Store/FSDirectory.cs
index 41334b3..c3a7086 100644
--- a/src/Lucene.Net.Core/Store/FSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/FSDirectory.cs
@@ -483,25 +483,28 @@ namespace Lucene.Net.Store
//Debug.Assert(size == 0);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- parent.OnIndexOutputClosed(this);
- // only close the file if it has not been closed yet
- if (isOpen)
- {
- IOException priorE = null;
- try
- {
- base.Dispose();
- }
- catch (IOException ioe)
- {
- priorE = ioe;
- }
- finally
+ if (disposing)
+ {
+ parent.OnIndexOutputClosed(this);
+ // only close the file if it has not been closed yet
+ if (isOpen)
{
- isOpen = false;
- IOUtils.CloseWhileHandlingException(priorE, file);
+ IOException priorE = null;
+ try
+ {
+ base.Dispose();
+ }
+ catch (IOException ioe)
+ {
+ priorE = ioe;
+ }
+ finally
+ {
+ isOpen = false;
+ IOUtils.CloseWhileHandlingException(priorE, file);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Core/Store/IndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/IndexOutput.cs b/src/Lucene.Net.Core/Store/IndexOutput.cs
index 065f677..3c2adb2 100644
--- a/src/Lucene.Net.Core/Store/IndexOutput.cs
+++ b/src/Lucene.Net.Core/Store/IndexOutput.cs
@@ -39,7 +39,16 @@ namespace Lucene.Net.Store
/// <summary>
/// Closes this stream to further operations. </summary>
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Closes this stream to further operations. </summary>
+ protected abstract void Dispose(bool disposing);
/// <summary>
/// Returns the current position in this file, where the next write will
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Core/Store/RAMOutputStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/RAMOutputStream.cs b/src/Lucene.Net.Core/Store/RAMOutputStream.cs
index 19f6b89..4545392 100644
--- a/src/Lucene.Net.Core/Store/RAMOutputStream.cs
+++ b/src/Lucene.Net.Core/Store/RAMOutputStream.cs
@@ -120,9 +120,12 @@ namespace Lucene.Net.Store
crc.Reset();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- Flush();
+ if (disposing)
+ {
+ Flush();
+ }
}
[Obsolete("(4.1) this method will be removed in Lucene 5.0")]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs b/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
index 93014a6..367a57d 100644
--- a/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
+++ b/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
@@ -89,15 +89,18 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
- {
- base.Dispose();
- }
- finally
+ if (disposing)
{
- @delegate.Dispose();
+ try
+ {
+ base.Dispose();
+ }
+ finally
+ {
+ @delegate.Dispose();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 1c6eb46..8f49463 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -1426,15 +1426,18 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- base.Dispose();
- }
- finally
- {
- Io.Dispose();
+ try
+ {
+ base.Dispose();
+ }
+ finally
+ {
+ Io.Dispose();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
index 1c935f3..610095a 100644
--- a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
@@ -101,26 +101,29 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- Dir.MaybeThrowDeterministicException();
- }
- finally
- {
- @delegate.Dispose();
- if (Dir.TrackDiskUsage_Renamed)
+ try
+ {
+ Dir.MaybeThrowDeterministicException();
+ }
+ finally
{
- // Now compute actual disk usage & track the maxUsedSize
- // in the MockDirectoryWrapper:
- long size = Dir.RecomputedActualSizeInBytes;
- if (size > Dir.MaxUsedSize)
+ @delegate.Dispose();
+ if (Dir.TrackDiskUsage_Renamed)
{
- Dir.MaxUsedSize = size;
+ // Now compute actual disk usage & track the maxUsedSize
+ // in the MockDirectoryWrapper:
+ long size = Dir.RecomputedActualSizeInBytes;
+ if (size > Dir.MaxUsedSize)
+ {
+ Dir.MaxUsedSize = size;
+ }
}
+ Dir.RemoveIndexOutput(this, Name);
}
- Dir.RemoveIndexOutput(this, Name);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
index 6d71bac..e169e50 100644
--- a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
+++ b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
@@ -78,15 +78,18 @@ namespace Lucene.Net.Util
@delegate.Flush();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
- {
- Sleep(CloseDelayMillis + GetDelay(true));
- }
- finally
+ if (disposing)
{
- @delegate.Dispose();
+ try
+ {
+ Sleep(CloseDelayMillis + GetDelay(true));
+ }
+ finally
+ {
+ @delegate.Dispose();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f71b2b1/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
index 205704f..782d376 100644
--- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
+++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
@@ -230,9 +230,12 @@ namespace Lucene.Net.Facet
io.WriteBytes(b, offset, length);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- io.Dispose();
+ if (disposing)
+ {
+ io.Dispose();
+ }
}
public override void Flush()
{
[20/20] lucenenet git commit:
Lucene.Net.Tests.Store.TestFilterDirectory.TestOverrides(): Fixed test to
only scan for non-sealed members (Dispose() is sealed)
Posted by ni...@apache.org.
Lucene.Net.Tests.Store.TestFilterDirectory.TestOverrides(): Fixed test to only scan for non-sealed members (Dispose() is sealed)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ec120c4b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ec120c4b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ec120c4b
Branch: refs/heads/api-work
Commit: ec120c4ba36ef908ed483861d663c9c1cc9f3172
Parents: f57f938
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 14:05:30 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 14:05:30 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/Store/TestFilterDirectory.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec120c4b/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs b/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs
index 79d0d54..8172cfd 100644
--- a/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs
+++ b/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs
@@ -42,7 +42,9 @@ namespace Lucene.Net.Store
exclude.Add(typeof(Directory).GetMethod("OpenChecksumInput", new Type[] { typeof(string), typeof(IOContext) }).ToString());
foreach (MethodInfo m in typeof(FilterDirectory).GetMethods())
{
- if (m.DeclaringType == typeof(Directory))
+ // LUCNENET specific - Dispose() is final (we have to override the protected method).
+ // Since it is abstract, no need for a check here - the compiler takes care of that.
+ if (!m.IsFinal && m.DeclaringType == typeof(Directory))
{
Assert.IsTrue(exclude.Contains(m.ToString()), "method " + m.Name + " not overridden!");
}
[15/20] lucenenet git commit: Lucene.Net.Codecs.Sep.IntIndexInput:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Codecs.Sep.IntIndexInput: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/81458210
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/81458210
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/81458210
Branch: refs/heads/api-work
Commit: 8145821080bed491bb2b9888c6ebb7b53f04e305
Parents: 35430a9
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:31:52 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:36 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs | 7 +++++--
.../IntBlock/VariableIntBlockIndexInput.cs | 7 +++++--
src/Lucene.Net.Codecs/Sep/IntIndexInput.cs | 10 +++++++++-
.../Codecs/MockSep/MockSingleIntIndexInput.cs | 7 +++++--
4 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81458210/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs
index 3bc02b5..0d9ec7e 100644
--- a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs
+++ b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs
@@ -55,9 +55,12 @@ namespace Lucene.Net.Codecs.IntBlock
return new Reader(clone, buffer, GetBlockReader(clone, buffer));
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- input.Dispose();
+ if (disposing)
+ {
+ input.Dispose();
+ }
}
public override Int32IndexInput.Index GetIndex()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81458210/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
index a1864bc..3bae6fd 100644
--- a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
+++ b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
@@ -59,9 +59,12 @@ namespace Lucene.Net.Codecs.IntBlock
return new Reader(clone, buffer, GetBlockReader(clone, buffer));
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- input.Dispose();
+ if (disposing)
+ {
+ input.Dispose();
+ }
}
public override Int32IndexInput.Index GetIndex()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81458210/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs b/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
index 70ea8cf..9a3aabb 100644
--- a/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
+++ b/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
@@ -32,7 +32,15 @@ namespace Lucene.Net.Codecs.Sep
public abstract class Int32IndexInput : IDisposable
{
public abstract Reader GetReader();
- public abstract void Dispose();
+
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+ protected abstract void Dispose(bool disposing);
+
public abstract Index GetIndex();
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81458210/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
index 135ab27..33a63e0 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
@@ -45,9 +45,12 @@ namespace Lucene.Net.Codecs.MockSep
return new MockReader((IndexInput)@in.Clone());
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- @in.Dispose();
+ if (disposing)
+ {
+ @in.Dispose();
+ }
}
/**
[12/20] lucenenet git commit: Lucene.Net.Core.Store.Directory:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Store.Directory: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/99e15766
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/99e15766
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/99e15766
Branch: refs/heads/api-work
Commit: 99e1576606ef3c7ca132c5b8c8abee7602ee028d
Parents: 0f71b2b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:20:13 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:35 2017 +0700
----------------------------------------------------------------------
.../Store/CompoundFileDirectory.cs | 31 ++-
src/Lucene.Net.Core/Store/Directory.cs | 11 +-
src/Lucene.Net.Core/Store/FSDirectory.cs | 7 +-
.../Store/FileSwitchDirectory.cs | 4 +-
src/Lucene.Net.Core/Store/FilterDirectory.cs | 7 +-
.../Store/NRTCachingDirectory.cs | 23 +-
src/Lucene.Net.Core/Store/RAMDirectory.cs | 9 +-
.../Store/BaseDirectoryWrapper.cs | 13 +-
.../Store/MockDirectoryWrapper.cs | 277 ++++++++++---------
src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 7 +-
.../Store/TestBufferedIndexInput.cs | 7 +-
11 files changed, 216 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs b/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
index 9a07672..7b95e8d 100644
--- a/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
+++ b/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
@@ -292,24 +292,27 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
lock (this)
{
- if (!IsOpen)
+ if (disposing)
{
- // allow double close - usually to be consistent with other closeables
- return; // already closed
- }
- IsOpen = false;
- if (writer != null)
- {
- Debug.Assert(openForWrite);
- writer.Dispose();
- }
- else
- {
- IOUtils.Close(handle);
+ if (!IsOpen)
+ {
+ // allow double close - usually to be consistent with other closeables
+ return; // already closed
+ }
+ IsOpen = false;
+ if (writer != null)
+ {
+ Debug.Assert(openForWrite);
+ writer.Dispose();
+ }
+ else
+ {
+ IOUtils.Close(handle);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/Directory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/Directory.cs b/src/Lucene.Net.Core/Store/Directory.cs
index 2e848c9..6d0331f 100644
--- a/src/Lucene.Net.Core/Store/Directory.cs
+++ b/src/Lucene.Net.Core/Store/Directory.cs
@@ -129,7 +129,16 @@ namespace Lucene.Net.Store
/// <summary>
/// Disposes the store. </summary>
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Disposes the store. </summary>
+ protected abstract void Dispose(bool disposing);
/// <summary>
/// Set the <see cref="Store.LockFactory"/> that this <see cref="Directory"/> instance should
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/FSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/FSDirectory.cs b/src/Lucene.Net.Core/Store/FSDirectory.cs
index c3a7086..9c8c1ae 100644
--- a/src/Lucene.Net.Core/Store/FSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/FSDirectory.cs
@@ -400,9 +400,12 @@ namespace Lucene.Net.Store
/// <summary>
/// Closes the store to future operations. </summary>
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- IsOpen = false;
+ if (disposing)
+ {
+ IsOpen = false;
+ }
}
/// <summary> the underlying filesystem directory </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs b/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
index 3e40945..cceff73 100644
--- a/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
+++ b/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
@@ -70,9 +70,9 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (doClose)
+ if (disposing && doClose)
{
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/FilterDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/FilterDirectory.cs b/src/Lucene.Net.Core/Store/FilterDirectory.cs
index b0ff4b2..fd07bda 100644
--- a/src/Lucene.Net.Core/Store/FilterDirectory.cs
+++ b/src/Lucene.Net.Core/Store/FilterDirectory.cs
@@ -102,9 +102,12 @@ namespace Lucene.Net.Store
m_input.ClearLock(name);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- m_input.Dispose();
+ if (disposing)
+ {
+ m_input.Dispose();
+ }
}
public override void SetLockFactory(LockFactory lockFactory)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/NRTCachingDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/NRTCachingDirectory.cs b/src/Lucene.Net.Core/Store/NRTCachingDirectory.cs
index 8a603a3..ee9f5ba 100644
--- a/src/Lucene.Net.Core/Store/NRTCachingDirectory.cs
+++ b/src/Lucene.Net.Core/Store/NRTCachingDirectory.cs
@@ -331,19 +331,22 @@ namespace Lucene.Net.Store
/// Dispose this directory, which flushes any cached files
/// to the delegate and then disposes the delegate.
/// </summary>
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- // NOTE: technically we shouldn't have to do this, ie,
- // IndexWriter should have sync'd all files, but we do
- // it for defensive reasons... or in case the app is
- // doing something custom (creating outputs directly w/o
- // using IndexWriter):
- foreach (string fileName in cache.ListAll())
+ if (disposing)
{
- UnCache(fileName);
+ // NOTE: technically we shouldn't have to do this, ie,
+ // IndexWriter should have sync'd all files, but we do
+ // it for defensive reasons... or in case the app is
+ // doing something custom (creating outputs directly w/o
+ // using IndexWriter):
+ foreach (string fileName in cache.ListAll())
+ {
+ UnCache(fileName);
+ }
+ cache.Dispose();
+ @delegate.Dispose();
}
- cache.Dispose();
- @delegate.Dispose();
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Core/Store/RAMDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/RAMDirectory.cs b/src/Lucene.Net.Core/Store/RAMDirectory.cs
index fb787d0..ae8651c 100644
--- a/src/Lucene.Net.Core/Store/RAMDirectory.cs
+++ b/src/Lucene.Net.Core/Store/RAMDirectory.cs
@@ -224,10 +224,13 @@ namespace Lucene.Net.Store
/// <summary>
/// Closes the store to future operations, releasing associated memory. </summary>
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- IsOpen = false;
- m_fileMap.Clear();
+ if (disposing)
+ {
+ IsOpen = false;
+ m_fileMap.Clear();
+ }
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.TestFramework/Store/BaseDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/BaseDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/BaseDirectoryWrapper.cs
index b45435d..aa939ec 100644
--- a/src/Lucene.Net.TestFramework/Store/BaseDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/BaseDirectoryWrapper.cs
@@ -37,14 +37,17 @@ namespace Lucene.Net.Store
{
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- IsOpen = false;
- if (CheckIndexOnClose_Renamed && DirectoryReader.IndexExists(this))
+ if (disposing)
{
- TestUtil.CheckIndex(this, CrossCheckTermVectorsOnClose_Renamed);
+ IsOpen = false;
+ if (CheckIndexOnClose_Renamed && DirectoryReader.IndexExists(this))
+ {
+ TestUtil.CheckIndex(this, CrossCheckTermVectorsOnClose_Renamed);
+ }
+ base.Dispose(disposing);
}
- base.Dispose();
}
public virtual bool Open
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 8f49463..5858a26 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -902,191 +902,194 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
lock (this)
{
- // files that we tried to delete, but couldn't because readers were open.
- // all that matters is that we tried! (they will eventually go away)
- ISet<string> pendingDeletions = new HashSet<string>(OpenFilesDeleted);
- MaybeYield();
- if (OpenFiles == null)
- {
- OpenFiles = new Dictionary<string, int>();
- OpenFilesDeleted = new HashSet<string>();
- }
- if (OpenFiles.Count > 0)
+ if (disposing)
{
- // print the first one as its very verbose otherwise
- Exception cause = null;
- IEnumerator<Exception> stacktraces = OpenFileHandles.Values.GetEnumerator();
- if (stacktraces.MoveNext())
+ // files that we tried to delete, but couldn't because readers were open.
+ // all that matters is that we tried! (they will eventually go away)
+ ISet<string> pendingDeletions = new HashSet<string>(OpenFilesDeleted);
+ MaybeYield();
+ if (OpenFiles == null)
{
- cause = stacktraces.Current;
+ OpenFiles = new Dictionary<string, int>();
+ OpenFilesDeleted = new HashSet<string>();
}
-
- // RuntimeException instead ofSystem.IO.IOException because
- // super() does not throwSystem.IO.IOException currently:
- throw new Exception("MockDirectoryWrapper: cannot close: there are still open files: "
- + String.Join(" ,", OpenFiles.ToArray().Select(x => x.Key)), cause);
- }
- if (OpenLocks.Count > 0)
- {
- throw new Exception("MockDirectoryWrapper: cannot close: there are still open locks: "
- + String.Join(" ,", OpenLocks.ToArray()));
- }
-
- IsOpen = false;
- if (CheckIndexOnClose)
- {
- RandomIOExceptionRate_Renamed = 0.0;
- RandomIOExceptionRateOnOpen_Renamed = 0.0;
- if (DirectoryReader.IndexExists(this))
+ if (OpenFiles.Count > 0)
{
- if (LuceneTestCase.VERBOSE)
- {
- Console.WriteLine("\nNOTE: MockDirectoryWrapper: now crush");
- }
- Crash(); // corrupt any unsynced-files
- if (LuceneTestCase.VERBOSE)
+ // print the first one as its very verbose otherwise
+ Exception cause = null;
+ IEnumerator<Exception> stacktraces = OpenFileHandles.Values.GetEnumerator();
+ if (stacktraces.MoveNext())
{
- Console.WriteLine("\nNOTE: MockDirectoryWrapper: now run CheckIndex");
+ cause = stacktraces.Current;
}
- TestUtil.CheckIndex(this, CrossCheckTermVectorsOnClose);
- // TODO: factor this out / share w/ TestIW.assertNoUnreferencedFiles
- if (AssertNoUnreferencedFilesOnClose)
+ // RuntimeException instead ofSystem.IO.IOException because
+ // super() does not throwSystem.IO.IOException currently:
+ throw new Exception("MockDirectoryWrapper: cannot close: there are still open files: "
+ + string.Join(" ,", OpenFiles.ToArray().Select(x => x.Key)), cause);
+ }
+ if (OpenLocks.Count > 0)
+ {
+ throw new Exception("MockDirectoryWrapper: cannot close: there are still open locks: "
+ + string.Join(" ,", OpenLocks.ToArray()));
+ }
+
+ IsOpen = false;
+ if (CheckIndexOnClose)
+ {
+ RandomIOExceptionRate_Renamed = 0.0;
+ RandomIOExceptionRateOnOpen_Renamed = 0.0;
+ if (DirectoryReader.IndexExists(this))
{
- // now look for unreferenced files: discount ones that we tried to delete but could not
- HashSet<string> allFiles = new HashSet<string>(Arrays.AsList(ListAll()));
- allFiles.RemoveAll(pendingDeletions);
- string[] startFiles = allFiles.ToArray(/*new string[0]*/);
- IndexWriterConfig iwc = new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, null);
- iwc.SetIndexDeletionPolicy(NoDeletionPolicy.INSTANCE);
- (new IndexWriter(m_input, iwc)).Rollback();
- string[] endFiles = m_input.ListAll();
-
- ISet<string> startSet = new SortedSet<string>(Arrays.AsList(startFiles), StringComparer.Ordinal);
- ISet<string> endSet = new SortedSet<string>(Arrays.AsList(endFiles), StringComparer.Ordinal);
-
- if (pendingDeletions.Contains("segments.gen") && endSet.Contains("segments.gen"))
+ if (LuceneTestCase.VERBOSE)
{
- // this is possible if we hit an exception while writing segments.gen, we try to delete it
- // and it ends out in pendingDeletions (but IFD wont remove this).
- startSet.Add("segments.gen");
- if (LuceneTestCase.VERBOSE)
- {
- Console.WriteLine("MDW: Unreferenced check: Ignoring segments.gen that we could not delete.");
- }
+ Console.WriteLine("\nNOTE: MockDirectoryWrapper: now crush");
+ }
+ Crash(); // corrupt any unsynced-files
+ if (LuceneTestCase.VERBOSE)
+ {
+ Console.WriteLine("\nNOTE: MockDirectoryWrapper: now run CheckIndex");
}
+ TestUtil.CheckIndex(this, CrossCheckTermVectorsOnClose);
- // its possible we cannot delete the segments_N on windows if someone has it open and
- // maybe other files too, depending on timing. normally someone on windows wouldnt have
- // an issue (IFD would nuke this stuff eventually), but we pass NoDeletionPolicy...
- foreach (string file in pendingDeletions)
+ // TODO: factor this out / share w/ TestIW.assertNoUnreferencedFiles
+ if (AssertNoUnreferencedFilesOnClose)
{
- if (file.StartsWith("segments", StringComparison.Ordinal) && !file.Equals("segments.gen", StringComparison.Ordinal) && endSet.Contains(file, StringComparer.Ordinal))
+ // now look for unreferenced files: discount ones that we tried to delete but could not
+ HashSet<string> allFiles = new HashSet<string>(Arrays.AsList(ListAll()));
+ allFiles.RemoveAll(pendingDeletions);
+ string[] startFiles = allFiles.ToArray(/*new string[0]*/);
+ IndexWriterConfig iwc = new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, null);
+ iwc.SetIndexDeletionPolicy(NoDeletionPolicy.INSTANCE);
+ (new IndexWriter(m_input, iwc)).Rollback();
+ string[] endFiles = m_input.ListAll();
+
+ ISet<string> startSet = new SortedSet<string>(Arrays.AsList(startFiles), StringComparer.Ordinal);
+ ISet<string> endSet = new SortedSet<string>(Arrays.AsList(endFiles), StringComparer.Ordinal);
+
+ if (pendingDeletions.Contains("segments.gen") && endSet.Contains("segments.gen"))
{
- startSet.Add(file);
+ // this is possible if we hit an exception while writing segments.gen, we try to delete it
+ // and it ends out in pendingDeletions (but IFD wont remove this).
+ startSet.Add("segments.gen");
if (LuceneTestCase.VERBOSE)
{
- Console.WriteLine("MDW: Unreferenced check: Ignoring segments file: " + file + " that we could not delete.");
+ Console.WriteLine("MDW: Unreferenced check: Ignoring segments.gen that we could not delete.");
}
- SegmentInfos sis = new SegmentInfos();
- try
+ }
+
+ // its possible we cannot delete the segments_N on windows if someone has it open and
+ // maybe other files too, depending on timing. normally someone on windows wouldnt have
+ // an issue (IFD would nuke this stuff eventually), but we pass NoDeletionPolicy...
+ foreach (string file in pendingDeletions)
+ {
+ if (file.StartsWith("segments", StringComparison.Ordinal) && !file.Equals("segments.gen", StringComparison.Ordinal) && endSet.Contains(file, StringComparer.Ordinal))
{
- sis.Read(m_input, file);
- }
+ startSet.Add(file);
+ if (LuceneTestCase.VERBOSE)
+ {
+ Console.WriteLine("MDW: Unreferenced check: Ignoring segments file: " + file + " that we could not delete.");
+ }
+ SegmentInfos sis = new SegmentInfos();
+ try
+ {
+ sis.Read(m_input, file);
+ }
#pragma warning disable 168
- catch (System.IO.IOException ioe)
+ catch (System.IO.IOException ioe)
#pragma warning restore 168
- {
- // OK: likely some of the .si files were deleted
- }
+ {
+ // OK: likely some of the .si files were deleted
+ }
- try
- {
- ISet<string> ghosts = new HashSet<string>(sis.Files(m_input, false));
- foreach (string s in ghosts)
+ try
{
- if (endSet.Contains(s) && !startSet.Contains(s))
+ ISet<string> ghosts = new HashSet<string>(sis.Files(m_input, false));
+ foreach (string s in ghosts)
{
- Debug.Assert(pendingDeletions.Contains(s));
- if (LuceneTestCase.VERBOSE)
+ if (endSet.Contains(s) && !startSet.Contains(s))
{
- Console.WriteLine("MDW: Unreferenced check: Ignoring referenced file: " + s + " " + "from " + file + " that we could not delete.");
+ Debug.Assert(pendingDeletions.Contains(s));
+ if (LuceneTestCase.VERBOSE)
+ {
+ Console.WriteLine("MDW: Unreferenced check: Ignoring referenced file: " + s + " " + "from " + file + " that we could not delete.");
+ }
+ startSet.Add(s);
}
- startSet.Add(s);
}
}
- }
- catch (Exception t)
- {
- Console.Error.WriteLine("ERROR processing leftover segments file " + file + ":");
- Console.WriteLine(t.ToString());
- Console.Write(t.StackTrace);
+ catch (Exception t)
+ {
+ Console.Error.WriteLine("ERROR processing leftover segments file " + file + ":");
+ Console.WriteLine(t.ToString());
+ Console.Write(t.StackTrace);
+ }
}
}
- }
- startFiles = startSet.ToArray(/*new string[0]*/);
- endFiles = endSet.ToArray(/*new string[0]*/);
+ startFiles = startSet.ToArray(/*new string[0]*/);
+ endFiles = endSet.ToArray(/*new string[0]*/);
- if (!Arrays.Equals(startFiles, endFiles))
- {
- IList<string> removed = new List<string>();
- foreach (string fileName in startFiles)
+ if (!Arrays.Equals(startFiles, endFiles))
{
- if (!endSet.Contains(fileName))
+ IList<string> removed = new List<string>();
+ foreach (string fileName in startFiles)
{
- removed.Add(fileName);
+ if (!endSet.Contains(fileName))
+ {
+ removed.Add(fileName);
+ }
}
- }
- IList<string> added = new List<string>();
- foreach (string fileName in endFiles)
- {
- if (!startSet.Contains(fileName))
+ IList<string> added = new List<string>();
+ foreach (string fileName in endFiles)
{
- added.Add(fileName);
+ if (!startSet.Contains(fileName))
+ {
+ added.Add(fileName);
+ }
}
- }
- string extras;
- if (removed.Count != 0)
- {
- extras = "\n\nThese files were removed: " + removed;
- }
- else
- {
- extras = "";
- }
+ string extras;
+ if (removed.Count != 0)
+ {
+ extras = "\n\nThese files were removed: " + removed;
+ }
+ else
+ {
+ extras = "";
+ }
- if (added.Count != 0)
- {
- extras += "\n\nThese files were added (waaaaaaaaaat!): " + added;
- }
+ if (added.Count != 0)
+ {
+ extras += "\n\nThese files were added (waaaaaaaaaat!): " + added;
+ }
- if (pendingDeletions.Count != 0)
- {
- extras += "\n\nThese files we had previously tried to delete, but couldn't: " + pendingDeletions;
+ if (pendingDeletions.Count != 0)
+ {
+ extras += "\n\nThese files we had previously tried to delete, but couldn't: " + pendingDeletions;
+ }
+
+ Debug.Assert(false, "unreferenced files: before delete:\n " + Arrays.ToString(startFiles) + "\n after delete:\n " + Arrays.ToString(endFiles) + extras);
}
- Debug.Assert(false, "unreferenced files: before delete:\n " + Arrays.ToString(startFiles) + "\n after delete:\n " + Arrays.ToString(endFiles) + extras);
+ DirectoryReader ir1 = DirectoryReader.Open(this);
+ int numDocs1 = ir1.NumDocs;
+ ir1.Dispose();
+ (new IndexWriter(this, new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, null))).Dispose();
+ DirectoryReader ir2 = DirectoryReader.Open(this);
+ int numDocs2 = ir2.NumDocs;
+ ir2.Dispose();
+ Debug.Assert(numDocs1 == numDocs2, "numDocs changed after opening/closing IW: before=" + numDocs1 + " after=" + numDocs2);
}
-
- DirectoryReader ir1 = DirectoryReader.Open(this);
- int numDocs1 = ir1.NumDocs;
- ir1.Dispose();
- (new IndexWriter(this, new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, null))).Dispose();
- DirectoryReader ir2 = DirectoryReader.Open(this);
- int numDocs2 = ir2.NumDocs;
- ir2.Dispose();
- Debug.Assert(numDocs1 == numDocs2, "numDocs changed after opening/closing IW: before=" + numDocs1 + " after=" + numDocs2);
}
}
+ m_input.Dispose();
}
- m_input.Dispose();
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
index c7b9619..5f03962 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
@@ -163,9 +163,12 @@ namespace Lucene.Net.Index
FsDir.Sync(names);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- FsDir.Dispose();
+ if (disposing)
+ {
+ FsDir.Dispose();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99e15766/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
index 151c5df..4dc0c84 100644
--- a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
+++ b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
@@ -366,9 +366,12 @@ namespace Lucene.Net.Store
return Dir.CreateOutput(name, context);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- Dir.Dispose();
+ if (disposing)
+ {
+ Dir.Dispose();
+ }
}
public override void DeleteFile(string name)
[02/20] lucenenet git commit: Lucene.Net.Core.Util.Automaton: Using
OpenBitSet instead of BitArray because it is a closer match to the original
BitSet. BitArray has shown to be causing problems in other contexts.
Posted by ni...@apache.org.
Lucene.Net.Core.Util.Automaton: Using OpenBitSet instead of BitArray because it is a closer match to the original BitSet. BitArray has shown to be causing problems in other contexts.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3e8d52b2
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3e8d52b2
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3e8d52b2
Branch: refs/heads/api-work
Commit: 3e8d52b2a34267d7ddf13239a470cf140257aa8f
Parents: 1944d9e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 09:15:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 09:15:45 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Support/Number.cs | 20 ------------
src/Lucene.Net.Core/Util/Automaton/Automaton.cs | 6 ++--
.../Util/Automaton/BasicOperations.cs | 12 +++----
.../Util/Automaton/MinimizationOperations.cs | 33 ++++++++++----------
.../Util/Automaton/SpecialOperations.cs | 12 +++----
5 files changed, 32 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e8d52b2/src/Lucene.Net.Core/Support/Number.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Support/Number.cs b/src/Lucene.Net.Core/Support/Number.cs
index 223a0ca..9f572b8 100644
--- a/src/Lucene.Net.Core/Support/Number.cs
+++ b/src/Lucene.Net.Core/Support/Number.cs
@@ -202,26 +202,6 @@ namespace Lucene.Net.Support
}
/// <summary>
- /// Returns the index of the first bit that is set to true that occurs
- /// on or after the specified starting index. If no such bit exists
- /// then -1 is returned.
- /// </summary>
- /// <param name="bits">The BitArray object.</param>
- /// <param name="fromIndex">The index to start checking from (inclusive).</param>
- /// <returns>The index of the next set bit.</returns>
- public static int NextSetBit(System.Collections.BitArray bits, int fromIndex)
- {
- for (int i = fromIndex; i < bits.Length; i++)
- {
- if (bits[i] == true)
- {
- return i;
- }
- }
- return -1;
- }
-
- /// <summary>
/// Converts a System.String number to long.
/// </summary>
/// <param name="s"></param>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e8d52b2/src/Lucene.Net.Core/Util/Automaton/Automaton.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/Automaton/Automaton.cs b/src/Lucene.Net.Core/Util/Automaton/Automaton.cs
index dc32efb..5741337 100644
--- a/src/Lucene.Net.Core/Util/Automaton/Automaton.cs
+++ b/src/Lucene.Net.Core/Util/Automaton/Automaton.cs
@@ -531,10 +531,10 @@ namespace Lucene.Net.Util.Automaton
}
State[] live = GetLiveStates();
- BitArray liveSet = new BitArray(states.Length);
+ OpenBitSet liveSet = new OpenBitSet(states.Length);
foreach (State s in live)
{
- liveSet.SafeSet(s.number, true);
+ liveSet.Set(s.number);
}
foreach (State s in states)
@@ -544,7 +544,7 @@ namespace Lucene.Net.Util.Automaton
for (int i = 0; i < s.numTransitions; i++)
{
Transition t = s.TransitionsArray[i];
- if (liveSet.SafeGet(t.to.Number))
+ if (liveSet.Get(t.to.number))
{
s.TransitionsArray[upto++] = s.TransitionsArray[i];
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e8d52b2/src/Lucene.Net.Core/Util/Automaton/BasicOperations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/Automaton/BasicOperations.cs b/src/Lucene.Net.Core/Util/Automaton/BasicOperations.cs
index 567c450..a5f53f7 100644
--- a/src/Lucene.Net.Core/Util/Automaton/BasicOperations.cs
+++ b/src/Lucene.Net.Core/Util/Automaton/BasicOperations.cs
@@ -1079,8 +1079,8 @@ namespace Lucene.Net.Util.Automaton
State[] states = a.GetNumberedStates();
LinkedList<State> pp = new LinkedList<State>();
LinkedList<State> pp_other = new LinkedList<State>();
- BitArray bb = new BitArray(states.Length);
- BitArray bb_other = new BitArray(states.Length);
+ OpenBitSet bb = new OpenBitSet(states.Length);
+ OpenBitSet bb_other = new OpenBitSet(states.Length);
pp.AddLast(a.initial);
List<State> dest = new List<State>();
bool accept = a.initial.accept;
@@ -1089,7 +1089,7 @@ namespace Lucene.Net.Util.Automaton
c = Character.CodePointAt(s, i);
accept = false;
pp_other.Clear();
- bb_other.SetAll(false);
+ bb_other.Clear(0, bb_other.Length - 1);
foreach (State p in pp)
{
dest.Clear();
@@ -1100,9 +1100,9 @@ namespace Lucene.Net.Util.Automaton
{
accept = true;
}
- if (!bb_other.SafeGet(q.number))
+ if (!bb_other.Get(q.number))
{
- bb_other.SafeSet(q.number, true);
+ bb_other.Set(q.number);
pp_other.AddLast(q);
}
}
@@ -1110,7 +1110,7 @@ namespace Lucene.Net.Util.Automaton
LinkedList<State> tp = pp;
pp = pp_other;
pp_other = tp;
- BitArray tb = bb;
+ OpenBitSet tb = bb;
bb = bb_other;
bb_other = tb;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e8d52b2/src/Lucene.Net.Core/Util/Automaton/MinimizationOperations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/Automaton/MinimizationOperations.cs b/src/Lucene.Net.Core/Util/Automaton/MinimizationOperations.cs
index 579845f..4555f70 100644
--- a/src/Lucene.Net.Core/Util/Automaton/MinimizationOperations.cs
+++ b/src/Lucene.Net.Core/Util/Automaton/MinimizationOperations.cs
@@ -87,8 +87,9 @@ namespace Lucene.Net.Util.Automaton
StateList[,] active = new StateList[statesLen, sigmaLen];
StateListNode[,] active2 = new StateListNode[statesLen, sigmaLen];
LinkedList<Int32Pair> pending = new LinkedList<Int32Pair>();
- BitArray pending2 = new BitArray(sigmaLen * statesLen);
- BitArray split = new BitArray(statesLen), refine = new BitArray(statesLen), refine2 = new BitArray(statesLen);
+ OpenBitSet pending2 = new OpenBitSet(sigmaLen * statesLen);
+ OpenBitSet split = new OpenBitSet(statesLen),
+ refine = new OpenBitSet(statesLen), refine2 = new OpenBitSet(statesLen);
for (int q = 0; q < statesLen; q++)
{
splitblock[q] = new List<State>();
@@ -135,7 +136,7 @@ namespace Lucene.Net.Util.Automaton
{
int j = (active[0, x].Count <= active[1, x].Count) ? 0 : 1;
pending.AddLast(new Int32Pair(j, x));
- pending2.SafeSet(x * statesLen + j, true);
+ pending2.Set(x * statesLen + j);
}
// process pending until fixed point
int k = 2;
@@ -145,7 +146,7 @@ namespace Lucene.Net.Util.Automaton
pending.Remove(ip);
int p = ip.N1;
int x = ip.N2;
- pending2.SafeSet(x * statesLen + p, false);
+ pending2.Clear(x * statesLen + p);
// find states that need to be split off their blocks
for (StateListNode m = active[p, x].First; m != null; m = m.Next)
{
@@ -155,22 +156,22 @@ namespace Lucene.Net.Util.Automaton
foreach (State s in r)
{
int i = s.number;
- if (!split.SafeGet(i))
+ if (!split.Get(i))
{
- split.SafeSet(i, true);
+ split.Set(i);
int j = block[i];
splitblock[j].Add(s);
- if (!refine2.SafeGet(j))
+ if (!refine2.Get(j))
{
- refine2.SafeSet(j, true);
- refine.SafeSet(j, true);
+ refine2.Set(j);
+ refine.Set(j);
}
}
}
}
}
// refine blocks
- for (int j = Number.NextSetBit(refine, 0); j >= 0; j = Number.NextSetBit(refine, j + 1))
+ for (int j = refine.NextSetBit(0); j >= 0; j = refine.NextSetBit(j + 1))
{
List<State> sb = splitblock[j];
if (sb.Count < partition[j].Count)
@@ -196,27 +197,27 @@ namespace Lucene.Net.Util.Automaton
for (int c = 0; c < sigmaLen; c++)
{
int aj = active[j, c].Count, ak = active[k, c].Count, ofs = c * statesLen;
- if (!pending2.SafeGet(ofs + j) && 0 < aj && aj <= ak)
+ if (!pending2.Get(ofs + j) && 0 < aj && aj <= ak)
{
- pending2.SafeSet(ofs + j, true);
+ pending2.Set(ofs + j);
pending.AddLast(new Int32Pair(j, c));
}
else
{
- pending2.SafeSet(ofs + k, true);
+ pending2.Set(ofs + k);
pending.AddLast(new Int32Pair(k, c));
}
}
k++;
}
- refine2.SafeSet(j, false);
+ refine2.Clear(j);
foreach (State s in sb)
{
- split.SafeSet(s.number, false);
+ split.Clear(s.number);
}
sb.Clear();
}
- refine.SetAll(false);
+ refine.Clear(0, refine.Length - 1);
}
// make a new state for each equivalence class, set initial state
State[] newstates = new State[k];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e8d52b2/src/Lucene.Net.Core/Util/Automaton/SpecialOperations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/Automaton/SpecialOperations.cs b/src/Lucene.Net.Core/Util/Automaton/SpecialOperations.cs
index 7dfffe9..9de45e5 100644
--- a/src/Lucene.Net.Core/Util/Automaton/SpecialOperations.cs
+++ b/src/Lucene.Net.Core/Util/Automaton/SpecialOperations.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Util.Automaton
{
return true;
}
- return IsFinite(a.initial, new BitArray(a.GetNumberOfStates()), new BitArray(a.GetNumberOfStates()));
+ return IsFinite(a.initial, new OpenBitSet(a.GetNumberOfStates()), new OpenBitSet(a.GetNumberOfStates()));
}
/// <summary>
@@ -93,18 +93,18 @@ namespace Lucene.Net.Util.Automaton
/// </summary>
// TODO: not great that this is recursive... in theory a
// large automata could exceed java's stack
- private static bool IsFinite(State s, BitArray path, BitArray visited)
+ private static bool IsFinite(State s, OpenBitSet path, OpenBitSet visited)
{
- path.SafeSet(s.number, true);
+ path.Set(s.number);
foreach (Transition t in s.GetTransitions())
{
- if (path.SafeGet(t.to.number) || (!visited.SafeGet(t.to.number) && !IsFinite(t.to, path, visited)))
+ if (path.Get(t.to.number) || (!visited.Get(t.to.number) && !IsFinite(t.to, path, visited)))
{
return false;
}
}
- path.SafeSet(s.number, false);
- visited.SafeSet(s.number, true);
+ path.Clear(s.number);
+ visited.Set(s.number);
return true;
}
[03/20] lucenenet git commit:
Lucene.Net.Tests.Util.Automaton.TestMinimize: Updated debug notes
Posted by ni...@apache.org.
Lucene.Net.Tests.Util.Automaton.TestMinimize: Updated debug notes
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/4e548016
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/4e548016
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/4e548016
Branch: refs/heads/api-work
Commit: 4e54801645644f532997c37f7914688b402f8d21
Parents: 3e8d52b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 09:16:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 09:16:26 2017 +0700
----------------------------------------------------------------------
.../Util/Automaton/TestMinimize.cs | 37 ++------------------
1 file changed, 3 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4e548016/src/Lucene.Net.Tests/Util/Automaton/TestMinimize.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Util/Automaton/TestMinimize.cs b/src/Lucene.Net.Tests/Util/Automaton/TestMinimize.cs
index b58eb06..1328225 100644
--- a/src/Lucene.Net.Tests/Util/Automaton/TestMinimize.cs
+++ b/src/Lucene.Net.Tests/Util/Automaton/TestMinimize.cs
@@ -63,43 +63,12 @@ namespace Lucene.Net.Util.Automaton
// LUCENENET TODO:
//
- // DEBUG NOTE:
- //
- // Worked with the below test quite a bit to get it to match Lucene,
- // but no luck so far. However, I was able to determine that
- //
- // AutomatonTestUtil.MinimizeSimple(a);
- // Automaton b = (Automaton)a.Clone();
- // AutomatonTestUtil.MinimizeSimple(b);
- //
- // works and
- //
- // MinimizationOperations.Minimize(a);
- // Automaton b = (Automaton)a.Clone();
- // MinimizationOperations.Minimize(b);
- //
- // works. So, it looks like the Clone() method is working.
- // The only issue seems to be that the AutomatonTestUtil.MinimizeSimple()
- // operation is somehow different than the MinimizationOperations.Minimize()
- // operation. No more than one of them can be correct (but don't know which one, if either).
- //
- // I tried using the a.ToString() to compare what is happening against Java,
- // but the results are coming back in a slightly different order. It is a strange implementation
- // because SpecialOperations.Reverse() is called in AutomatonTestUtil.MinimizeSimple()
- // but the results are stored in a HashSet<T>, which by definition is not ordered.
- // So, it is not clear whether order is important or, if so, that it somehow depends
- // on Java's HashSet implementation to work. It also isn't very clear what
- // Automaton is supposed to do.
- //
- // I went over the AutomatonTestUtil line-by-line and although there were some things
- // that needed correcting, the result is still the same.
+ // The initialstate after MinimizeSimple is always 0
+ // in Lucene.NET. However, it doesn't seem to be
+ // causing any issues with other tests failing.
// HERE IS THE RESULT OF THE FOLLOWING TEST IN JAVA
- // One thing of note is that in .NET, the initial state
- // is always coming back as 0 but in Java it is > 0 after
- // the Minimize operation.
-
//Before MinimizeSimple: initial state: 0
//state 0 [accept]:
// S -> 1
[04/20] lucenenet git commit: Reviewed and removed some TODOs
Posted by ni...@apache.org.
Reviewed and removed some TODOs
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a8502e36
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a8502e36
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a8502e36
Branch: refs/heads/api-work
Commit: a8502e36f852ef67ca943fc17866dd4f3fd9dbfc
Parents: 4e54801
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 09:23:54 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 09:23:54 2017 +0700
----------------------------------------------------------------------
.../Codecs/Lucene42/Lucene42DocValuesProducer.cs | 2 +-
.../Search/ControlledRealTimeReopenThread.cs | 2 +-
.../Analysis/MockTokenizer.cs | 18 +++++++++---------
.../Codecs/Lucene40/Lucene40DocValuesWriter.cs | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a8502e36/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs
index 010adb0..4503588 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs
@@ -290,7 +290,7 @@ namespace Lucene.Net.Codecs.Lucene42
return new NumericDocValuesAnonymousInnerClassHelper3(min, mult, quotientReader);
default:
- throw new InvalidOperationException(); // LUCENENET TODO: This was AssertionError in Lucene - does this need a fix?
+ throw new InvalidOperationException();
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a8502e36/src/Lucene.Net.Core/Search/ControlledRealTimeReopenThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/ControlledRealTimeReopenThread.cs b/src/Lucene.Net.Core/Search/ControlledRealTimeReopenThread.cs
index ccdffa9..34f4f9a 100644
--- a/src/Lucene.Net.Core/Search/ControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Core/Search/ControlledRealTimeReopenThread.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Search
reopenCond.Reset();
}
- public void Dispose() // LUCENENET TODO: Implement disposable pattern
+ public void Dispose()
{
finish = true;
reopenCond.Set();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a8502e36/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
index e557eee..2889557 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
@@ -257,15 +257,15 @@ namespace Lucene.Net.Analysis
int ret = m_input.Read(c, 1, 1);
return ret <= 0 ? -1 : c[1];
}
- /* LUCENE TO-DO not sure if needed, CharBuffer not supported
- case 2:
- {
- // read(CharBuffer)
- char[] c = new char[1];
- CharBuffer cb = CharBuffer.Wrap(c);
- int ret = Input.Read(cb);
- return ret < 0 ? ret : c[0];
- }*/
+ // LUCENENET NOTE: CharBuffer not supported
+ //case 2:
+ // {
+ // // read(CharBuffer)
+ // char[] c = new char[1];
+ // CharBuffer cb = CharBuffer.Wrap(c);
+ // int ret = m_input.Read(cb);
+ // return ret < 0 ? ret : c[0];
+ // }
default:
// read()
return m_input.Read();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a8502e36/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs
index 51c4b36..18b157f 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.Codecs.Lucene40
// fits in a byte[], would be more than 4bpv, just write byte[]
AddBytesField(field, data, values);
}
- else if (minValue >= short.MinValue && maxValue <= short.MaxValue && PackedInt32s.BitsRequired(maxValue - minValue) > 8) // LUCENENET TODO: Shouldn't this be ushort.MinValue & MaxValue?
+ else if (minValue >= short.MinValue && maxValue <= short.MaxValue && PackedInt32s.BitsRequired(maxValue - minValue) > 8)
{
// fits in a short[], would be more than 8bpv, just write short[]
AddShortsField(field, data, values);
[10/20] lucenenet git commit: Lucene.Net.Core.Index.MergePolicy:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Index.MergePolicy: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2ea33f79
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2ea33f79
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2ea33f79
Branch: refs/heads/api-work
Commit: 2ea33f799b331b02d3a9f4b668af13e519a9bf30
Parents: de5e562
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 10:58:55 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:34 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/LogMergePolicy.cs | 2 +-
src/Lucene.Net.Core/Index/MergePolicy.cs | 12 +++++++++++-
src/Lucene.Net.Core/Index/NoMergePolicy.cs | 2 +-
src/Lucene.Net.Core/Index/TieredMergePolicy.cs | 2 +-
src/Lucene.Net.Core/Index/UpgradeIndexMergePolicy.cs | 7 +++++--
src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs | 7 +++++--
.../Index/MockRandomMergePolicy.cs | 2 +-
src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs | 2 +-
8 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Core/Index/LogMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/LogMergePolicy.cs b/src/Lucene.Net.Core/Index/LogMergePolicy.cs
index 28edd06..4c2b3ab 100644
--- a/src/Lucene.Net.Core/Index/LogMergePolicy.cs
+++ b/src/Lucene.Net.Core/Index/LogMergePolicy.cs
@@ -189,7 +189,7 @@ namespace Lucene.Net.Index
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Core/Index/MergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/MergePolicy.cs b/src/Lucene.Net.Core/Index/MergePolicy.cs
index c8731d4..72e2d68 100644
--- a/src/Lucene.Net.Core/Index/MergePolicy.cs
+++ b/src/Lucene.Net.Core/Index/MergePolicy.cs
@@ -691,7 +691,17 @@ namespace Lucene.Net.Index
/// <summary>
/// Release all resources for the policy.
/// </summary>
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Release all resources for the policy.
+ /// </summary>
+ protected abstract void Dispose(bool disposing);
/// <summary>
/// Returns true if a new segment (regardless of its origin) should use the
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Core/Index/NoMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/NoMergePolicy.cs b/src/Lucene.Net.Core/Index/NoMergePolicy.cs
index 9426106..beb702c 100644
--- a/src/Lucene.Net.Core/Index/NoMergePolicy.cs
+++ b/src/Lucene.Net.Core/Index/NoMergePolicy.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Index
this.useCompoundFile = useCompoundFile;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Core/Index/TieredMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TieredMergePolicy.cs b/src/Lucene.Net.Core/Index/TieredMergePolicy.cs
index 8a16f05..f41f6c6 100644
--- a/src/Lucene.Net.Core/Index/TieredMergePolicy.cs
+++ b/src/Lucene.Net.Core/Index/TieredMergePolicy.cs
@@ -742,7 +742,7 @@ namespace Lucene.Net.Index
return spec;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Core/Index/UpgradeIndexMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/UpgradeIndexMergePolicy.cs b/src/Lucene.Net.Core/Index/UpgradeIndexMergePolicy.cs
index 8ce1311..d536b5e 100644
--- a/src/Lucene.Net.Core/Index/UpgradeIndexMergePolicy.cs
+++ b/src/Lucene.Net.Core/Index/UpgradeIndexMergePolicy.cs
@@ -160,9 +160,12 @@ namespace Lucene.Net.Index
return m_base.UseCompoundFile(segments, newSegment);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- m_base.Dispose();
+ if (disposing)
+ {
+ m_base.Dispose();
+ }
}
public override string ToString()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
index 5249248..773e804 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
@@ -258,9 +258,12 @@ namespace Lucene.Net.Index.Sorter
return new SortingMergePolicy((MergePolicy)@in.Clone(), sort);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- @in.Dispose();
+ if (disposing)
+ {
+ @in.Dispose();
+ }
}
public override bool UseCompoundFile(SegmentInfos segments, SegmentCommitInfo newSegment)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.TestFramework/Index/MockRandomMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/MockRandomMergePolicy.cs b/src/Lucene.Net.TestFramework/Index/MockRandomMergePolicy.cs
index 820bd3e..b78fa5f 100644
--- a/src/Lucene.Net.TestFramework/Index/MockRandomMergePolicy.cs
+++ b/src/Lucene.Net.TestFramework/Index/MockRandomMergePolicy.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Index
return FindMerges((MergeTrigger)int.MinValue, segmentInfos);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ea33f79/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
index 5855138..0ae4569 100644
--- a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
+++ b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
@@ -282,7 +282,7 @@ namespace Lucene.Net.Index
this.UseCompoundFile_Renamed = useCompoundFile;
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
[16/20] lucenenet git commit: SWEEP: Fixed infinite recursion bugs
caused by calling base.Dispose() instead of base.Dispose(bool)
Posted by ni...@apache.org.
SWEEP: Fixed infinite recursion bugs caused by calling base.Dispose() instead of base.Dispose(bool)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b15f45d4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b15f45d4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b15f45d4
Branch: refs/heads/api-work
Commit: b15f45d457605a3db1bde289ac0fa6091c26d199
Parents: c2ec3e2
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:46:41 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:36 2017 +0700
----------------------------------------------------------------------
.../Analysis/Miscellaneous/PatternAnalyzer.cs | 4 ++--
.../Analysis/Standard/ClassicTokenizer.cs | 2 +-
.../Analysis/Standard/StandardTokenizer.cs | 2 +-
.../Analysis/Standard/UAX29URLEmailTokenizer.cs | 2 +-
.../Analysis/Wikipedia/WikipediaTokenizer.cs | 2 +-
src/Lucene.Net.Core/Analysis/CharFilter.cs | 7 +++++--
src/Lucene.Net.Core/Analysis/TokenFilter.cs | 4 ++--
src/Lucene.Net.Core/Analysis/TokenStream.cs | 2 +-
src/Lucene.Net.Core/Analysis/Tokenizer.cs | 4 ++--
src/Lucene.Net.Core/Index/IndexReader.cs | 2 +-
src/Lucene.Net.Core/Store/Directory.cs | 5 ++++-
src/Lucene.Net.Core/Store/FSDirectory.cs | 2 +-
src/Lucene.Net.Core/Store/MMapDirectory.cs | 2 +-
src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs | 2 +-
src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs | 2 +-
src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs | 2 +-
src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs | 2 +-
.../Store/SlowClosingMockIndexInputWrapper.cs | 2 +-
.../Analysis/Core/TestBugInSomething.cs | 2 +-
src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs | 2 +-
20 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
index 251d30f..69fa5fb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
@@ -434,9 +434,9 @@ namespace Lucene.Net.Analysis.Miscellaneous
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
this.initialized = false;
}
}
@@ -571,9 +571,9 @@ namespace Lucene.Net.Analysis.Miscellaneous
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
this.str = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
index fd775db..111e23f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
@@ -198,9 +198,9 @@ namespace Lucene.Net.Analysis.Standard
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
scanner.YyReset(m_input);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
index 0c64290..3fa7bb8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
@@ -252,9 +252,9 @@ namespace Lucene.Net.Analysis.Standard
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
scanner.YyReset(m_input);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
index 0ca2477..292b7bd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
@@ -218,9 +218,9 @@ namespace Lucene.Net.Analysis.Standard
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
scanner.YyReset(m_input);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
index 9b8e35e..46679ba 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
@@ -316,9 +316,9 @@ namespace Lucene.Net.Analysis.Wikipedia
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
scanner.YyReset(m_input);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Analysis/CharFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/CharFilter.cs b/src/Lucene.Net.Core/Analysis/CharFilter.cs
index 460fb79..e253a1f 100644
--- a/src/Lucene.Net.Core/Analysis/CharFilter.cs
+++ b/src/Lucene.Net.Core/Analysis/CharFilter.cs
@@ -57,11 +57,14 @@ namespace Lucene.Net.Analysis
/// <para/>
/// <b>NOTE:</b>
/// The default implementation closes the input <see cref="TextReader"/>, so
- /// be sure to call <c>base.Dispose()</c> when overriding this method.
+ /// be sure to call <c>base.Dispose(disposing)</c> when overriding this method.
/// </summary>
protected override void Dispose(bool disposing)
{
- m_input.Dispose();
+ if (disposing)
+ {
+ m_input.Dispose();
+ }
base.Dispose(disposing);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Analysis/TokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/TokenFilter.cs b/src/Lucene.Net.Core/Analysis/TokenFilter.cs
index 53044f1..bd7e0b2 100644
--- a/src/Lucene.Net.Core/Analysis/TokenFilter.cs
+++ b/src/Lucene.Net.Core/Analysis/TokenFilter.cs
@@ -65,13 +65,13 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Releases resources associated with this stream.
/// <para/>
- /// If you override this method, always call <c>base.Dispose()</c>, otherwise
+ /// If you override this method, always call <c>base.Dispose(disposing)</c>, otherwise
/// some internal state will not be correctly reset (e.g., <see cref="Tokenizer"/> will
/// throw <see cref="System.InvalidOperationException"/> on reuse).
/// <para/>
/// <b>NOTE:</b>
/// The default implementation chains the call to the input TokenStream, so
- /// be sure to call <c>base.Dispose()</c> when overriding this method.
+ /// be sure to call <c>base.Dispose(disposing)</c> when overriding this method.
/// </summary>
protected override void Dispose(bool disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Analysis/TokenStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/TokenStream.cs b/src/Lucene.Net.Core/Analysis/TokenStream.cs
index 4bd469c..7cec955 100644
--- a/src/Lucene.Net.Core/Analysis/TokenStream.cs
+++ b/src/Lucene.Net.Core/Analysis/TokenStream.cs
@@ -210,7 +210,7 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Releases resources associated with this stream.
/// <para/>
- /// If you override this method, always call <c>base.Dispose()</c>, otherwise
+ /// If you override this method, always call <c>base.Dispose(disposing)</c>, otherwise
/// some internal state will not be correctly reset (e.g., <see cref="Tokenizer"/> will
/// throw <see cref="InvalidOperationException"/> on reuse).
/// </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Analysis/Tokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/Tokenizer.cs b/src/Lucene.Net.Core/Analysis/Tokenizer.cs
index 03aecdd..0d2bd8c 100644
--- a/src/Lucene.Net.Core/Analysis/Tokenizer.cs
+++ b/src/Lucene.Net.Core/Analysis/Tokenizer.cs
@@ -67,14 +67,14 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Releases resources associated with this stream.
/// <para/>
- /// If you override this method, always call <c>base.Dispose()</c>, otherwise
+ /// If you override this method, always call <c>base.Dispose(disposing)</c>, otherwise
/// some internal state will not be correctly reset (e.g., <see cref="Tokenizer"/> will
/// throw <see cref="InvalidOperationException"/> on reuse).
/// </summary>
/// <remarks>
/// <b>NOTE:</b>
/// The default implementation closes the input <see cref="TextReader"/>, so
- /// be sure to call <c>base.Dispose()</c> when overriding this method.
+ /// be sure to call <c>base.Dispose(disposing)</c> when overriding this method.
/// </remarks>
protected override void Dispose(bool disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Index/IndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexReader.cs b/src/Lucene.Net.Core/Index/IndexReader.cs
index 420190f..c9ade02 100644
--- a/src/Lucene.Net.Core/Index/IndexReader.cs
+++ b/src/Lucene.Net.Core/Index/IndexReader.cs
@@ -552,7 +552,7 @@ namespace Lucene.Net.Index
/// Closes files associated with this index.
/// This method implements the disposable pattern.
/// It may be overridden to dispose any managed or unmanaged resources,
- /// but be sure to call <c>base.Dispose()</c> to close files associated with the
+ /// but be sure to call <c>base.Dispose(disposing)</c> to close files associated with the
/// underlying <see cref="IndexReader"/>.
/// </summary>
/// <param name="disposing"><c>true</c> indicates to dispose all managed
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Store/Directory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/Directory.cs b/src/Lucene.Net.Core/Store/Directory.cs
index 6d0331f..80827d8 100644
--- a/src/Lucene.Net.Core/Store/Directory.cs
+++ b/src/Lucene.Net.Core/Store/Directory.cs
@@ -280,7 +280,10 @@ namespace Lucene.Net.Store
public override void Dispose(bool disposing)
{
- @base.Dispose();
+ if (disposing)
+ {
+ @base.Dispose();
+ }
}
[Obsolete("Only for reading CFS files from 3.x indexes.")]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Store/FSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/FSDirectory.cs b/src/Lucene.Net.Core/Store/FSDirectory.cs
index 9c8c1ae..0330e4c 100644
--- a/src/Lucene.Net.Core/Store/FSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/FSDirectory.cs
@@ -497,7 +497,7 @@ namespace Lucene.Net.Store
IOException priorE = null;
try
{
- base.Dispose();
+ base.Dispose(disposing);
}
catch (IOException ioe)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Store/MMapDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/MMapDirectory.cs b/src/Lucene.Net.Core/Store/MMapDirectory.cs
index a0c920c..37296e6 100644
--- a/src/Lucene.Net.Core/Store/MMapDirectory.cs
+++ b/src/Lucene.Net.Core/Store/MMapDirectory.cs
@@ -249,8 +249,8 @@ namespace Lucene.Net.Store
this.memoryMappedFile.Dispose();
this.memoryMappedFile = null;
}
- base.Dispose();
}
+ base.Dispose(disposing);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs b/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
index 367a57d..c61ba6f 100644
--- a/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
+++ b/src/Lucene.Net.Core/Store/RateLimitedIndexOutput.cs
@@ -95,7 +95,7 @@ namespace Lucene.Net.Store
{
try
{
- base.Dispose();
+ base.Dispose(disposing);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
index 129f4b5..dc84f7a 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Analysis
{
if (disposing)
{
- base.Dispose();
+ base.Dispose(disposing);
this.Random = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
index 64add2e..5a17331 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
@@ -306,9 +306,9 @@ namespace Lucene.Net.Analysis
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
// in some exceptional cases (e.g. TestIndexWriterExceptions) a test can prematurely close()
// these tests should disable this check, by default we check the normal workflow.
// TODO: investigate the CachingTokenFilter "double-close"... for now we ignore this
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 5858a26..90dab4f 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -1435,7 +1435,7 @@ namespace Lucene.Net.Store
{
try
{
- base.Dispose();
+ base.Dispose(disposing);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
index 72106a9..5af71d0 100644
--- a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Store
#endif
finally
{
- base.Dispose();
+ base.Dispose(disposing);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
index af81d15..5bea6c3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
@@ -290,9 +290,9 @@ namespace Lucene.Net.Analysis.Core
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
Console.WriteLine(m_input.GetType().Name + ".close()");
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b15f45d4/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
index 5432921..c7be3a5 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
@@ -2168,9 +2168,9 @@ namespace Lucene.Net.Search.Highlight
protected override void Dispose(bool disposing)
{
+ base.Dispose(disposing);
if (disposing)
{
- base.Dispose();
this.realStream.Dispose();
}
}
[05/20] lucenenet git commit:
Lucene.Net.Codecs.BlockTerms.TermsIndexWriterBase: Implemented .NET dispose
pattern
Posted by ni...@apache.org.
Lucene.Net.Codecs.BlockTerms.TermsIndexWriterBase: Implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b3627a72
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b3627a72
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b3627a72
Branch: refs/heads/api-work
Commit: b3627a72d17f7498b2109acf232a222e6605a3de
Parents: 92c591b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 09:52:25 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:31 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/FixedGapTermsIndexWriter.cs | 77 ++++++++++----------
.../BlockTerms/TermsIndexWriterBase.cs | 9 ++-
.../BlockTerms/VariableGapTermsIndexWriter.cs | 55 +++++++-------
3 files changed, 77 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3627a72/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs
index 6c1ebf8..b27938e 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs
@@ -230,55 +230,58 @@ namespace Lucene.Net.Codecs.BlockTerms
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (m_output != null)
+ if (disposing)
{
- bool success = false;
- try
+ if (m_output != null)
{
- long dirStart = m_output.GetFilePointer();
- int fieldCount = fields.Count;
-
- int nonNullFieldCount = 0;
- for (int i = 0; i < fieldCount; i++)
+ bool success = false;
+ try
{
- SimpleFieldWriter field = fields[i];
- if (field.numIndexTerms > 0)
+ long dirStart = m_output.GetFilePointer();
+ int fieldCount = fields.Count;
+
+ int nonNullFieldCount = 0;
+ for (int i = 0; i < fieldCount; i++)
{
- nonNullFieldCount++;
+ SimpleFieldWriter field = fields[i];
+ if (field.numIndexTerms > 0)
+ {
+ nonNullFieldCount++;
+ }
}
- }
- m_output.WriteVInt32(nonNullFieldCount);
- for (int i = 0; i < fieldCount; i++)
- {
- SimpleFieldWriter field = fields[i];
- if (field.numIndexTerms > 0)
+ m_output.WriteVInt32(nonNullFieldCount);
+ for (int i = 0; i < fieldCount; i++)
{
- m_output.WriteVInt32(field.fieldInfo.Number);
- m_output.WriteVInt32(field.numIndexTerms);
- m_output.WriteVInt64(field.termsStart);
- m_output.WriteVInt64(field.indexStart);
- m_output.WriteVInt64(field.packedIndexStart);
- m_output.WriteVInt64(field.packedOffsetsStart);
+ SimpleFieldWriter field = fields[i];
+ if (field.numIndexTerms > 0)
+ {
+ m_output.WriteVInt32(field.fieldInfo.Number);
+ m_output.WriteVInt32(field.numIndexTerms);
+ m_output.WriteVInt64(field.termsStart);
+ m_output.WriteVInt64(field.indexStart);
+ m_output.WriteVInt64(field.packedIndexStart);
+ m_output.WriteVInt64(field.packedOffsetsStart);
+ }
}
+ WriteTrailer(dirStart);
+ CodecUtil.WriteFooter(m_output);
+ success = true;
}
- WriteTrailer(dirStart);
- CodecUtil.WriteFooter(m_output);
- success = true;
- }
- finally
- {
- if (success)
- {
- IOUtils.Close(m_output);
- }
- else
+ finally
{
- IOUtils.CloseWhileHandlingException(m_output);
+ if (success)
+ {
+ IOUtils.Close(m_output);
+ }
+ else
+ {
+ IOUtils.CloseWhileHandlingException(m_output);
+ }
+ m_output = null;
}
- m_output = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3627a72/src/Lucene.Net.Codecs/BlockTerms/TermsIndexWriterBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/TermsIndexWriterBase.cs b/src/Lucene.Net.Codecs/BlockTerms/TermsIndexWriterBase.cs
index 7613f23..5568252 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/TermsIndexWriterBase.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/TermsIndexWriterBase.cs
@@ -40,6 +40,13 @@ namespace Lucene.Net.Codecs.BlockTerms
public abstract FieldWriter AddField(FieldInfo fieldInfo, long termsFilePointer);
- public abstract void Dispose(); // LUCENENET TODO: Implement disposable pattern
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected abstract void Dispose(bool disposing);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3627a72/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs
index b87f8d7..9e05531 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs
@@ -318,42 +318,45 @@ namespace Lucene.Net.Codecs.BlockTerms
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- if (m_output != null)
+ if (disposing)
{
- try
+ if (m_output != null)
{
- long dirStart = m_output.GetFilePointer();
- int fieldCount = fields.Count;
-
- int nonNullFieldCount = 0;
- for (int i = 0; i < fieldCount; i++)
+ try
{
- FSTFieldWriter field = fields[i];
- if (field.fst != null)
+ long dirStart = m_output.GetFilePointer();
+ int fieldCount = fields.Count;
+
+ int nonNullFieldCount = 0;
+ for (int i = 0; i < fieldCount; i++)
{
- nonNullFieldCount++;
+ FSTFieldWriter field = fields[i];
+ if (field.fst != null)
+ {
+ nonNullFieldCount++;
+ }
}
- }
- m_output.WriteVInt32(nonNullFieldCount);
- for (int i = 0; i < fieldCount; i++)
- {
- FSTFieldWriter field = fields[i];
- if (field.fst != null)
+ m_output.WriteVInt32(nonNullFieldCount);
+ for (int i = 0; i < fieldCount; i++)
{
- m_output.WriteVInt32(field.fieldInfo.Number);
- m_output.WriteVInt64(field.indexStart);
+ FSTFieldWriter field = fields[i];
+ if (field.fst != null)
+ {
+ m_output.WriteVInt32(field.fieldInfo.Number);
+ m_output.WriteVInt64(field.indexStart);
+ }
}
+ WriteTrailer(dirStart);
+ CodecUtil.WriteFooter(m_output);
+ }
+ finally
+ {
+ m_output.Dispose();
+ m_output = null;
}
- WriteTrailer(dirStart);
- CodecUtil.WriteFooter(m_output);
- }
- finally
- {
- m_output.Dispose();
- m_output = null;
}
}
}
[06/20] lucenenet git commit: Lucene.Net.Codecs.Sep.IntIndexOutput:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Codecs.Sep.IntIndexOutput: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/92c591b5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/92c591b5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/92c591b5
Branch: refs/heads/api-work
Commit: 92c591b52ccdc1a0d6dde7e0eafe65b443c12601
Parents: a8502e3
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 09:43:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:31 2017 +0700
----------------------------------------------------------------------
.../IntBlock/FixedIntBlockIndexOutput.cs | 23 ++++++++-------
.../IntBlock/VariableIntBlockIndexOutput.cs | 31 +++++++++++---------
src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs | 9 +++++-
.../Codecs/MockSep/MockSingleIntIndexOutput.cs | 7 +++--
4 files changed, 43 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92c591b5/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs
index 76bde79..a0d7eb7 100644
--- a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs
+++ b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs
@@ -133,20 +133,23 @@ namespace Lucene.Net.Codecs.IntBlock
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- if (upto > 0)
+ try
{
- // NOTE: entries in the block after current upto are
- // invalid
- FlushBlock();
+ if (upto > 0)
+ {
+ // NOTE: entries in the block after current upto are
+ // invalid
+ FlushBlock();
+ }
+ }
+ finally
+ {
+ m_output.Dispose();
}
- }
- finally
- {
- m_output.Dispose();
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92c591b5/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs
index ce391e5..f26a3bc 100644
--- a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs
+++ b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs
@@ -140,24 +140,27 @@ namespace Lucene.Net.Codecs.IntBlock
Debug.Assert(upto >= 0);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- if (hitExcDuringWrite) return;
-
- // stuff 0s in until the "real" data is flushed:
- var stuffed = 0;
- while (upto > stuffed)
+ try
{
- upto -= Add(0) - 1;
- Debug.Assert(upto >= 0);
- stuffed += 1;
+ if (hitExcDuringWrite) return;
+
+ // stuff 0s in until the "real" data is flushed:
+ var stuffed = 0;
+ while (upto > stuffed)
+ {
+ upto -= Add(0) - 1;
+ Debug.Assert(upto >= 0);
+ stuffed += 1;
+ }
+ }
+ finally
+ {
+ m_output.Dispose();
}
- }
- finally
- {
- m_output.Dispose();
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92c591b5/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
index f182895..5d97def 100644
--- a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
+++ b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
@@ -64,6 +64,13 @@ namespace Lucene.Net.Codecs.Sep
/// </summary>
public abstract Index GetIndex();
- public abstract void Dispose(); // LUCENENET TODO: Implement disposable pattern
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected abstract void Dispose(bool disposing);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92c591b5/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs
index 8ee7c44..5154b53 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs
@@ -45,9 +45,12 @@ namespace Lucene.Net.Codecs.MockSep
return new MockSingleIntIndexOutputIndex(this);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- @out.Dispose();
+ if (disposing)
+ {
+ @out.Dispose();
+ }
}
public override string ToString()
[09/20] lucenenet git commit: Lucene.Net.Core.Codecs.FieldsProducer:
implemented .NET dispose pattern
Posted by ni...@apache.org.
Lucene.Net.Core.Codecs.FieldsProducer: implemented .NET dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/8105155d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/8105155d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/8105155d
Branch: refs/heads/api-work
Commit: 8105155d0d40ffbc71c5b5d17b2329c5b19a4c65
Parents: c8c94d1
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 10:16:04 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:33 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/BlockTermsReader.cs | 37 +++++++++++---------
.../Bloom/BloomFilteringPostingsFormat.cs | 7 ++--
.../Memory/DirectPostingsFormat.cs | 2 +-
.../Memory/FSTOrdTermsReader.cs | 17 +++++----
src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 17 +++++----
.../Memory/MemoryPostingsFormat.cs | 11 +++---
.../SimpleText/SimpleTextFieldsReader.cs | 7 ++--
.../Codecs/BlockTreeTermsReader.cs | 21 ++++++-----
src/Lucene.Net.Core/Codecs/FieldsProducer.cs | 9 ++++-
.../Codecs/Lucene3x/Lucene3xFields.cs | 7 ++--
.../Codecs/PerField/PerFieldPostingsFormat.cs | 7 ++--
.../Codecs/Asserting/AssertingPostingsFormat.cs | 9 ++---
.../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 2 +-
13 files changed, 92 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
index 8dd48d7..631349c 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
@@ -190,36 +190,39 @@ namespace Lucene.Net.Codecs.BlockTerms
input.Seek(dirOffset);
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
try
{
- if (indexReader != null)
+ try
+ {
+ if (indexReader != null)
+ {
+ indexReader.Dispose();
+ }
+ }
+ finally
{
- indexReader.Dispose();
+ // null so if an app hangs on to us (ie, we are not
+ // GCable, despite being closed) we still free most
+ // ram
+ indexReader = null;
+ if (input != null)
+ {
+ input.Dispose();
+ }
}
}
finally
{
- // null so if an app hangs on to us (ie, we are not
- // GCable, despite being closed) we still free most
- // ram
- indexReader = null;
- if (input != null)
+ if (postingsReader != null)
{
- input.Dispose();
+ postingsReader.Dispose();
}
}
}
- finally
- {
- if (postingsReader != null)
- {
- postingsReader.Dispose();
- }
- }
}
public override IEnumerator<string> GetEnumerator()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
index 204eb16..2f9b2c4 100644
--- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
@@ -185,9 +185,12 @@ namespace Lucene.Net.Codecs.Bloom
return _delegateFieldsProducer.GetEnumerator();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- _delegateFieldsProducer.Dispose();
+ if (disposing)
+ {
+ _delegateFieldsProducer.Dispose();
+ }
}
public override Terms GetTerms(string field)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
index 0cb8e26..95211d2 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
@@ -171,7 +171,7 @@ namespace Lucene.Net.Codecs.Memory
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
index 85754de..ccf7a59 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
@@ -180,15 +180,18 @@ namespace Lucene.Net.Codecs.Memory
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
- {
- IOUtils.Close(postingsReader);
- }
- finally
+ if (disposing)
{
- fields.Clear();
+ try
+ {
+ IOUtils.Close(postingsReader);
+ }
+ finally
+ {
+ fields.Clear();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
index 7d732da..5141776 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
@@ -176,15 +176,18 @@ namespace Lucene.Net.Codecs.Memory
get { return fields.Count; }
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
- {
- IOUtils.Close(postingsReader);
- }
- finally
+ if (disposing)
{
- fields.Clear();
+ try
+ {
+ IOUtils.Close(postingsReader);
+ }
+ finally
+ {
+ fields.Clear();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
index 55a7e6f..d617030 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
@@ -1089,12 +1089,15 @@ namespace Lucene.Net.Codecs.Memory
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- // Drop ref to FST:
- foreach (var field in _fields)
+ if (disposing)
{
- field.Value.fst = null;
+ // Drop ref to FST:
+ foreach (var field in _fields)
+ {
+ field.Value.fst = null;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
index 1650adb..5d57d4f 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
@@ -768,9 +768,12 @@ namespace Lucene.Net.Codecs.SimpleText
get { return -1; }
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- _input.Dispose();
+ if (disposing)
+ {
+ _input.Dispose();
+ }
}
public override long RamBytesUsed()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
index 98bd36c..fedc3b0 100644
--- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
@@ -263,17 +263,20 @@ namespace Lucene.Net.Codecs
// return "0x" + Integer.toHexString(v);
// }
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- try
+ if (disposing)
{
- IOUtils.Close(@in, postingsReader);
- }
- finally
- {
- // Clear so refs to terms index is GCable even if
- // app hangs onto us:
- fields.Clear();
+ try
+ {
+ IOUtils.Close(@in, postingsReader);
+ }
+ finally
+ {
+ // Clear so refs to terms index is GCable even if
+ // app hangs onto us:
+ fields.Clear();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Core/Codecs/FieldsProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/FieldsProducer.cs b/src/Lucene.Net.Core/Codecs/FieldsProducer.cs
index 540c124..d2b8f8a 100644
--- a/src/Lucene.Net.Core/Codecs/FieldsProducer.cs
+++ b/src/Lucene.Net.Core/Codecs/FieldsProducer.cs
@@ -38,7 +38,14 @@ namespace Lucene.Net.Codecs
{
}
- public abstract void Dispose();
+ // LUCENENET specific - implementing proper dispose pattern
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected abstract void Dispose(bool disposing);
/// <summary>
/// Returns approximate RAM bytes used </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
index 648c5b2..a7a52a5 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
@@ -194,9 +194,12 @@ namespace Lucene.Net.Codecs.Lucene3x
}
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- IOUtils.Close(Tis, TisNoIndex, /*cfsReader,*/ FreqStream, ProxStream); // LUCENENET NOTE: cfsReader not used
+ if (disposing)
+ {
+ IOUtils.Close(Tis, TisNoIndex, /*cfsReader,*/ FreqStream, ProxStream); // LUCENENET NOTE: cfsReader not used
+ }
}
private class PreTerms : Terms
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs b/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
index 3674bd6..e45056f 100644
--- a/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
+++ b/src/Lucene.Net.Core/Codecs/PerField/PerFieldPostingsFormat.cs
@@ -254,9 +254,12 @@ namespace Lucene.Net.Codecs.PerField
get { return fields.Count; }
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
- IOUtils.Close(formats.Values);
+ if (disposing)
+ {
+ IOUtils.Close(formats.Values);
+ }
}
public override long RamBytesUsed()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
index 840c5bc..d2b0a8c 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingPostingsFormat.cs
@@ -64,15 +64,12 @@ namespace Lucene.Net.Codecs.Asserting
this.@in = @in;
}
- public override void Dispose()
- {
- Dispose(true);
- }
-
- protected void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
+ {
@in.Dispose();
+ }
}
public override IEnumerator<string> GetEnumerator()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8105155d/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
index 712d18d..fbf5a25 100644
--- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Codecs.RAMOnly
return FieldToTerms.Keys.GetEnumerator();
}
- public override void Dispose()
+ protected override void Dispose(bool disposing)
{
}
[18/20] lucenenet git commit: SWEEP: Corrected accessibility of
Dispose(bool) for proper dispose pattern
Posted by ni...@apache.org.
SWEEP: Corrected accessibility of Dispose(bool) for proper dispose pattern
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/02b78dd4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/02b78dd4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/02b78dd4
Branch: refs/heads/api-work
Commit: 02b78dd44c30838a4aac273d3c0a2398188945ba
Parents: b15f45d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 11:55:02 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 11:58:37 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Store/CompoundFileDirectory.cs | 2 +-
src/Lucene.Net.Core/Store/Directory.cs | 5 +++--
src/Lucene.Net.Core/Store/Lock.cs | 3 ++-
src/Lucene.Net.Core/Store/MMapDirectory.cs | 7 +++++--
src/Lucene.Net.Core/Store/NIOFSDirectory.cs | 2 +-
src/Lucene.Net.Core/Store/NativeFSLockFactory.cs | 2 +-
src/Lucene.Net.Core/Store/NoLockFactory.cs | 2 +-
src/Lucene.Net.Core/Store/SimpleFSDirectory.cs | 2 +-
src/Lucene.Net.Core/Store/SimpleFSLockFactory.cs | 2 +-
src/Lucene.Net.Core/Store/SingleInstanceLockFactory.cs | 2 +-
src/Lucene.Net.Core/Store/VerifyingLockFactory.cs | 2 +-
src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs | 2 +-
src/Lucene.Net.TestFramework/Store/MockLockFactoryWrapper.cs | 2 +-
src/Lucene.Net.Tests/Store/TestLock.cs | 2 +-
src/Lucene.Net.Tests/Store/TestLockFactory.cs | 2 +-
15 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs b/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
index 7b95e8d..8527b28 100644
--- a/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
+++ b/src/Lucene.Net.Core/Store/CompoundFileDirectory.cs
@@ -448,7 +448,7 @@ namespace Lucene.Net.Store
this.entry = entry;
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/Directory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/Directory.cs b/src/Lucene.Net.Core/Store/Directory.cs
index 80827d8..17cb98b 100644
--- a/src/Lucene.Net.Core/Store/Directory.cs
+++ b/src/Lucene.Net.Core/Store/Directory.cs
@@ -278,7 +278,7 @@ namespace Lucene.Net.Store
return new SlicedIndexInput("SlicedIndexInput(" + sliceDescription + " in " + @base + ")", @base, offset, length);
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
@@ -329,11 +329,12 @@ namespace Lucene.Net.Store
[Obsolete("Only for reading CFS files from 3.x indexes.")]
public abstract IndexInput OpenFullSlice(); // can we remove this somehow?
- public abstract void Dispose(bool disposing);
+ protected abstract void Dispose(bool disposing);
public void Dispose()
{
Dispose(true);
+ GC.SuppressFinalize(this);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/Lock.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/Lock.cs b/src/Lucene.Net.Core/Store/Lock.cs
index c3c66f8..f09aee9 100644
--- a/src/Lucene.Net.Core/Store/Lock.cs
+++ b/src/Lucene.Net.Core/Store/Lock.cs
@@ -158,11 +158,12 @@ namespace Lucene.Net.Store
public void Dispose()
{
Dispose(true);
+ GC.SuppressFinalize(this);
}
/// <summary>
/// Releases exclusive access. </summary>
- public abstract void Dispose(bool disposing);
+ protected abstract void Dispose(bool disposing);
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/MMapDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/MMapDirectory.cs b/src/Lucene.Net.Core/Store/MMapDirectory.cs
index 37296e6..dcba346 100644
--- a/src/Lucene.Net.Core/Store/MMapDirectory.cs
+++ b/src/Lucene.Net.Core/Store/MMapDirectory.cs
@@ -219,9 +219,12 @@ namespace Lucene.Net.Store
return (IndexInput)full.Clone();
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
- full.Dispose();
+ if (disposing)
+ {
+ full.Dispose();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs b/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
index 6cc9aba..d1f268b 100644
--- a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/NIOFSDirectory.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Store
this.descriptor = descriptor;
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/NativeFSLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/NativeFSLockFactory.cs b/src/Lucene.Net.Core/Store/NativeFSLockFactory.cs
index d0aed22..47e6f15 100644
--- a/src/Lucene.Net.Core/Store/NativeFSLockFactory.cs
+++ b/src/Lucene.Net.Core/Store/NativeFSLockFactory.cs
@@ -183,7 +183,7 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/NoLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/NoLockFactory.cs b/src/Lucene.Net.Core/Store/NoLockFactory.cs
index 985d9a4..5159ddd 100644
--- a/src/Lucene.Net.Core/Store/NoLockFactory.cs
+++ b/src/Lucene.Net.Core/Store/NoLockFactory.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Store
return true;
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs b/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
index 8bc927b..ce76a84 100644
--- a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
+++ b/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Store
this.descriptor = descriptor;
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/SimpleFSLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/SimpleFSLockFactory.cs b/src/Lucene.Net.Core/Store/SimpleFSLockFactory.cs
index a457ed2..92588e4 100644
--- a/src/Lucene.Net.Core/Store/SimpleFSLockFactory.cs
+++ b/src/Lucene.Net.Core/Store/SimpleFSLockFactory.cs
@@ -159,7 +159,7 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/SingleInstanceLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/SingleInstanceLockFactory.cs b/src/Lucene.Net.Core/Store/SingleInstanceLockFactory.cs
index 2c7babb..a5ee42f 100644
--- a/src/Lucene.Net.Core/Store/SingleInstanceLockFactory.cs
+++ b/src/Lucene.Net.Core/Store/SingleInstanceLockFactory.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Core/Store/VerifyingLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/VerifyingLockFactory.cs b/src/Lucene.Net.Core/Store/VerifyingLockFactory.cs
index d6c835b..731283f 100644
--- a/src/Lucene.Net.Core/Store/VerifyingLockFactory.cs
+++ b/src/Lucene.Net.Core/Store/VerifyingLockFactory.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 90dab4f..cfcce58 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -1354,7 +1354,7 @@ namespace Lucene.Net.Store
private int disposed = 0;
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (0 == Interlocked.CompareExchange(ref this.disposed, 1, 0))
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.TestFramework/Store/MockLockFactoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockLockFactoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockLockFactoryWrapper.cs
index a1f35d3..4a8fd87 100644
--- a/src/Lucene.Net.TestFramework/Store/MockLockFactoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockLockFactoryWrapper.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Store
}
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Tests/Store/TestLock.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Store/TestLock.cs b/src/Lucene.Net.Tests/Store/TestLock.cs
index 6d91581..2941dbd 100644
--- a/src/Lucene.Net.Tests/Store/TestLock.cs
+++ b/src/Lucene.Net.Tests/Store/TestLock.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Store
return false;
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
// do nothing
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/02b78dd4/src/Lucene.Net.Tests/Store/TestLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Store/TestLockFactory.cs b/src/Lucene.Net.Tests/Store/TestLockFactory.cs
index 47991c9..8964277 100644
--- a/src/Lucene.Net.Tests/Store/TestLockFactory.cs
+++ b/src/Lucene.Net.Tests/Store/TestLockFactory.cs
@@ -485,7 +485,7 @@ namespace Lucene.Net.Store
return true;
}
- public override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
// do nothing
}
[19/20] lucenenet git commit: Lucene.Net.Core
(Search.ReferenceManager + Store.CompoundFileWriter): Changed
NullReferenceException to ArgumentNullException
Posted by ni...@apache.org.
Lucene.Net.Core (Search.ReferenceManager + Store.CompoundFileWriter): Changed NullReferenceException to ArgumentNullException
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f57f938e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f57f938e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f57f938e
Branch: refs/heads/api-work
Commit: f57f938e0f3b9ac53b4aedb2e30d2e6acd5dd461
Parents: 02b78dd
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 2 12:17:23 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 2 12:17:23 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Search/ReferenceManager.cs | 4 ++--
src/Lucene.Net.Core/Store/CompoundFileWriter.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f57f938e/src/Lucene.Net.Core/Search/ReferenceManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/ReferenceManager.cs b/src/Lucene.Net.Core/Search/ReferenceManager.cs
index bfe81de..a4d7df8 100644
--- a/src/Lucene.Net.Core/Search/ReferenceManager.cs
+++ b/src/Lucene.Net.Core/Search/ReferenceManager.cs
@@ -339,7 +339,7 @@ namespace Lucene.Net.Search
{
if (listener == null)
{
- throw new System.NullReferenceException("Listener cannot be null"); // LUCENENET TODO: ArgumentNullException ?
+ throw new System.ArgumentNullException("Listener cannot be null");
}
refreshListeners.Add(listener);
}
@@ -351,7 +351,7 @@ namespace Lucene.Net.Search
{
if (listener == null)
{
- throw new System.NullReferenceException("Listener cannot be null"); // LUCENENET TODO: ArgumentNullException ?
+ throw new System.ArgumentNullException("Listener cannot be null");
}
refreshListeners.Remove(listener);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f57f938e/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/CompoundFileWriter.cs b/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
index c4a6827..f58f7f2 100644
--- a/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
+++ b/src/Lucene.Net.Core/Store/CompoundFileWriter.cs
@@ -96,11 +96,11 @@ namespace Lucene.Net.Store
{
if (dir == null)
{
- throw new NullReferenceException("directory cannot be null"); // LUCENENET TODO: ArgumentNullException?
+ throw new ArgumentNullException("directory cannot be null");
}
if (name == null)
{
- throw new NullReferenceException("name cannot be null"); // LUCENENET TODO: ArgumentNullException?
+ throw new ArgumentNullException("name cannot be null");
}
directory = dir;
entryTableName = IndexFileNames.SegmentFileName(IndexFileNames.StripExtension(name), "", IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION);