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/06/22 05:25:02 UTC
[01/38] lucenenet git commit: Lucene.Net.Document.Field: Added
Obsolete attribute to extension methods that use Obsolete enumerations,
since they will be removed in 6.0.
Repository: lucenenet
Updated Branches:
refs/heads/master 666de32b0 -> 468199e3f
Lucene.Net.Document.Field: Added Obsolete attribute to extension methods that use Obsolete enumerations, since they will be removed in 6.0.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/26630034
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/26630034
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/26630034
Branch: refs/heads/master
Commit: 26630034706dd713fe773ddc847b51ecf0e1d33c
Parents: 666de32
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Tue Jun 13 03:11:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Tue Jun 13 03:11:45 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Document/Field.cs | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/26630034/src/Lucene.Net/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/Field.cs b/src/Lucene.Net/Document/Field.cs
index 54fe113..8d85c80 100644
--- a/src/Lucene.Net/Document/Field.cs
+++ b/src/Lucene.Net/Document/Field.cs
@@ -1040,7 +1040,7 @@ namespace Lucene.Net.Documents
}
}
-#pragma warning disable 612, 618
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static bool IsIndexed(this Field.Index index)
{
switch (index)
@@ -1059,6 +1059,7 @@ namespace Lucene.Net.Documents
}
}
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static bool IsAnalyzed(this Field.Index index)
{
switch (index)
@@ -1077,6 +1078,7 @@ namespace Lucene.Net.Documents
}
}
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static bool OmitNorms(this Field.Index index)
{
switch (index)
@@ -1095,6 +1097,7 @@ namespace Lucene.Net.Documents
}
}
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static bool IsStored(this Field.TermVector tv)
{
switch (tv)
@@ -1113,6 +1116,7 @@ namespace Lucene.Net.Documents
}
}
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static bool WithPositions(this Field.TermVector tv)
{
switch (tv)
@@ -1131,6 +1135,7 @@ namespace Lucene.Net.Documents
}
}
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static bool WithOffsets(this Field.TermVector tv)
{
switch (tv)
@@ -1149,12 +1154,14 @@ namespace Lucene.Net.Documents
}
}
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static Field.Index ToIndex(bool indexed, bool analyed)
{
return ToIndex(indexed, analyed, false);
}
- public static Field.Index ToIndex(bool indexed, bool analyzed, bool omitNorms)
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
+ public static Field.Index ToIndex(bool indexed, bool analyzed, bool omitNorms)
{
// If it is not indexed nothing else matters
if (!indexed)
@@ -1183,6 +1190,7 @@ namespace Lucene.Net.Documents
/// <summary>
/// Get the best representation of a TermVector given the flags.
/// </summary>
+ [Obsolete("This is here only to ease transition from the pre-4.0 APIs.")]
public static Field.TermVector ToTermVector(bool stored, bool withOffsets, bool withPositions)
{
// If it is not stored, nothing else matters.
@@ -1206,6 +1214,5 @@ namespace Lucene.Net.Documents
}
return Field.TermVector.YES;
}
-#pragma warning restore 612, 618
}
}
\ No newline at end of file
[21/38] lucenenet git commit: API: Lucene.Net.Util.IOUtils: Renamed
Close() > Dispose(),
CloseWhileHandlingException() > DisposeWhileHandlingException()
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs
index 8e019f2..c18fc59 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs
@@ -247,7 +247,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!closed)
{
- IOUtils.Close(fieldsStream, indexStream, storeCFSReader);
+ IOUtils.Dispose(fieldsStream, indexStream, storeCFSReader);
closed = true;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
index 7fbdf32..75f5c18 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
@@ -206,7 +206,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (disposing)
{
- IOUtils.Close(tvx, tvd, tvf, storeCFSReader);
+ IOUtils.Dispose(tvx, tvd, tvf, storeCFSReader);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/TermInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/TermInfosReader.cs b/src/Lucene.Net/Codecs/Lucene3x/TermInfosReader.cs
index 90360e8..81f2e43 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/TermInfosReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/TermInfosReader.cs
@@ -182,7 +182,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public void Dispose()
{
- IOUtils.Close(origEnum, threadResources);
+ IOUtils.Dispose(origEnum, threadResources);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/BitVector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/BitVector.cs b/src/Lucene.Net/Codecs/Lucene40/BitVector.cs
index eb1605a..a33b95b 100644
--- a/src/Lucene.Net/Codecs/Lucene40/BitVector.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/BitVector.cs
@@ -285,7 +285,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
finally
{
- IOUtils.Close(output);
+ IOUtils.Dispose(output);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40DocValuesReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40DocValuesReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40DocValuesReader.cs
index bca9a0c..11988b1 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40DocValuesReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40DocValuesReader.cs
@@ -126,11 +126,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(input);
+ IOUtils.Dispose(input);
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
numericInstances[field.Number] = instance;
@@ -476,11 +476,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(input);
+ IOUtils.Dispose(input);
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
@@ -530,11 +530,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
}
@@ -588,11 +588,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
}
@@ -646,11 +646,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
}
@@ -726,11 +726,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
sortedInstances[field.Number] = instance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40FieldInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40FieldInfosReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40FieldInfosReader.cs
index 3f14e3f..ac18c98 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40FieldInfosReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40FieldInfosReader.cs
@@ -130,7 +130,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs
index 12fb35d..0757d9a 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(freqIn, proxIn);
+ IOUtils.DisposeWhileHandlingException(freqIn, proxIn);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoReader.cs
index 07b728f..00bb659 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoReader.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoWriter.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoWriter.cs
index ef8807f..8b4b00f 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoWriter.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40SegmentInfoWriter.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
si.Dir.DeleteFile(fileName);
}
else
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs
index 2ce0261..218a262 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs
@@ -141,7 +141,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (!closed)
{
- IOUtils.Close(fieldsStream, indexStream);
+ IOUtils.Dispose(fieldsStream, indexStream);
closed = true;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
index 77eeced..44b680c 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
try
{
- IOUtils.Close(fieldsStream, indexStream);
+ IOUtils.Dispose(fieldsStream, indexStream);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs
index 0d44dec..1e5da3a 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs
@@ -234,7 +234,7 @@ namespace Lucene.Net.Codecs.Lucene40
protected override void Dispose(bool disposing)
{
if (disposing)
- IOUtils.Close(tvx, tvd, tvf);
+ IOUtils.Dispose(tvx, tvd, tvf);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsWriter.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsWriter.cs
index 5a8063e..9ff8537 100644
--- a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsWriter.cs
+++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsWriter.cs
@@ -511,7 +511,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
// make an effort to close all streams we can but remember and re-throw
// the first exception encountered in this process
- IOUtils.Close(tvx, tvd, tvf);
+ IOUtils.Dispose(tvx, tvd, tvf);
tvx = tvd = tvf = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsFormat.cs b/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsFormat.cs
index 043b6e7..f1c9f13 100644
--- a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsFormat.cs
+++ b/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsFormat.cs
@@ -417,7 +417,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(postingsWriter);
+ IOUtils.DisposeWhileHandlingException(postingsWriter);
}
}
}
@@ -436,7 +436,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(postingsReader);
+ IOUtils.DisposeWhileHandlingException(postingsReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsReader.cs b/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsReader.cs
index b31126d..66bf4db 100644
--- a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsReader.cs
@@ -77,7 +77,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docIn, posIn, payIn);
+ IOUtils.DisposeWhileHandlingException(docIn, posIn, payIn);
}
}
}
@@ -133,7 +133,7 @@ namespace Lucene.Net.Codecs.Lucene41
protected override void Dispose(bool disposing)
{
if (disposing)
- IOUtils.Close(docIn, posIn, payIn);
+ IOUtils.Dispose(docIn, posIn, payIn);
}
public override void DecodeTerm(long[] longs, DataInput @in, FieldInfo fieldInfo, BlockTermState termState, bool absolute)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsWriter.cs b/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsWriter.cs
index 5494d64..e2c44e6 100644
--- a/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsWriter.cs
+++ b/src/Lucene.Net/Codecs/Lucene41/Lucene41PostingsWriter.cs
@@ -174,7 +174,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docOut, posOut, payOut);
+ IOUtils.DisposeWhileHandlingException(docOut, posOut, payOut);
}
}
@@ -679,11 +679,11 @@ namespace Lucene.Net.Codecs.Lucene41
{
if (success)
{
- IOUtils.Close(docOut, posOut, payOut);
+ IOUtils.Dispose(docOut, posOut, payOut);
}
else
{
- IOUtils.CloseWhileHandlingException(docOut, posOut, payOut);
+ IOUtils.DisposeWhileHandlingException(docOut, posOut, payOut);
}
docOut = posOut = payOut = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs b/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs
index dc52a9e..fab7de3 100644
--- a/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs
+++ b/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs
@@ -124,11 +124,11 @@ namespace Lucene.Net.Codecs.Lucene42
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
@@ -149,7 +149,7 @@ namespace Lucene.Net.Codecs.Lucene42
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this.data);
+ IOUtils.DisposeWhileHandlingException(this.data);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene42/Lucene42FieldInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene42/Lucene42FieldInfosReader.cs b/src/Lucene.Net/Codecs/Lucene42/Lucene42FieldInfosReader.cs
index 7c5bff8..36abd25 100644
--- a/src/Lucene.Net/Codecs/Lucene42/Lucene42FieldInfosReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene42/Lucene42FieldInfosReader.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Codecs.Lucene42
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene42/Lucene42NormsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene42/Lucene42NormsConsumer.cs b/src/Lucene.Net/Codecs/Lucene42/Lucene42NormsConsumer.cs
index 3351309..7d0b4b0 100644
--- a/src/Lucene.Net/Codecs/Lucene42/Lucene42NormsConsumer.cs
+++ b/src/Lucene.Net/Codecs/Lucene42/Lucene42NormsConsumer.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Codecs.Lucene42
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
}
}
}
@@ -219,11 +219,11 @@ namespace Lucene.Net.Codecs.Lucene42
{
if (success)
{
- IOUtils.Close(data, meta);
+ IOUtils.Dispose(data, meta);
}
else
{
- IOUtils.CloseWhileHandlingException(data, meta);
+ IOUtils.DisposeWhileHandlingException(data, meta);
}
meta = data = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
index 9907b28..085f813 100644
--- a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
+++ b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
@@ -103,7 +103,7 @@ namespace Lucene.Net.Codecs.Lucene45
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
}
}
}
@@ -520,11 +520,11 @@ namespace Lucene.Net.Codecs.Lucene45
{
if (success)
{
- IOUtils.Close(data, meta);
+ IOUtils.Dispose(data, meta);
}
else
{
- IOUtils.CloseWhileHandlingException(data, meta);
+ IOUtils.DisposeWhileHandlingException(data, meta);
}
meta = data = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
index 300b1cf..8e1c953 100644
--- a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
+++ b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
@@ -103,11 +103,11 @@ namespace Lucene.Net.Codecs.Lucene45
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
@@ -128,7 +128,7 @@ namespace Lucene.Net.Codecs.Lucene45
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this.data);
+ IOUtils.DisposeWhileHandlingException(this.data);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosReader.cs b/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosReader.cs
index e46df2d..75c1666 100644
--- a/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosReader.cs
@@ -122,7 +122,7 @@ namespace Lucene.Net.Codecs.Lucene46
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosWriter.cs b/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosWriter.cs
index eafa70d..1600241 100644
--- a/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosWriter.cs
+++ b/src/Lucene.Net/Codecs/Lucene46/Lucene46FieldInfosWriter.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Codecs.Lucene46
}
else
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoReader.cs b/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoReader.cs
index 19a856a..5fd7bf8 100644
--- a/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoReader.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Codecs.Lucene46
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoWriter.cs b/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoWriter.cs
index a39be6d..aaa3869 100644
--- a/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoWriter.cs
+++ b/src/Lucene.Net/Codecs/Lucene46/Lucene46SegmentInfoWriter.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Codecs.Lucene46
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
si.Dir.DeleteFile(fileName);
}
else
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/PerField/PerFieldDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/PerField/PerFieldDocValuesFormat.cs b/src/Lucene.Net/Codecs/PerField/PerFieldDocValuesFormat.cs
index 45a0517..5b9cc74 100644
--- a/src/Lucene.Net/Codecs/PerField/PerFieldDocValuesFormat.cs
+++ b/src/Lucene.Net/Codecs/PerField/PerFieldDocValuesFormat.cs
@@ -214,7 +214,7 @@ namespace Lucene.Net.Codecs.PerField
if (disposing)
{
// Close all subs
- IOUtils.Close(formats.Values);
+ IOUtils.Dispose(formats.Values);
}
}
}
@@ -280,7 +280,7 @@ namespace Lucene.Net.Codecs.PerField
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(formats.Values);
+ IOUtils.DisposeWhileHandlingException(formats.Values);
}
}
}
@@ -362,7 +362,7 @@ namespace Lucene.Net.Codecs.PerField
{
if (disposing)
{
- IOUtils.Close(formats.Values);
+ IOUtils.Dispose(formats.Values);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/PerField/PerFieldPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/PerField/PerFieldPostingsFormat.cs b/src/Lucene.Net/Codecs/PerField/PerFieldPostingsFormat.cs
index 66a0734..0b0be1a 100644
--- a/src/Lucene.Net/Codecs/PerField/PerFieldPostingsFormat.cs
+++ b/src/Lucene.Net/Codecs/PerField/PerFieldPostingsFormat.cs
@@ -165,7 +165,7 @@ namespace Lucene.Net.Codecs.PerField
if (disposing)
{
// Close all subs
- IOUtils.Close(formats.Values);
+ IOUtils.Dispose(formats.Values);
}
}
}
@@ -234,7 +234,7 @@ namespace Lucene.Net.Codecs.PerField
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(formats.Values);
+ IOUtils.DisposeWhileHandlingException(formats.Values);
}
}
}
@@ -264,7 +264,7 @@ namespace Lucene.Net.Codecs.PerField
{
if (disposing)
{
- IOUtils.Close(formats.Values);
+ IOUtils.Dispose(formats.Values);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/DocInverterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocInverterPerField.cs b/src/Lucene.Net/Index/DocInverterPerField.cs
index 8b6b8d4..9724363 100644
--- a/src/Lucene.Net/Index/DocInverterPerField.cs
+++ b/src/Lucene.Net/Index/DocInverterPerField.cs
@@ -224,7 +224,7 @@ namespace Lucene.Net.Index
{
if (!succeededInProcessingField)
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/DocValuesProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocValuesProcessor.cs b/src/Lucene.Net/Index/DocValuesProcessor.cs
index 3f6da3a..6de3f99 100644
--- a/src/Lucene.Net/Index/DocValuesProcessor.cs
+++ b/src/Lucene.Net/Index/DocValuesProcessor.cs
@@ -110,11 +110,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(dvConsumer);
+ IOUtils.Dispose(dvConsumer);
}
else
{
- IOUtils.CloseWhileHandlingException(dvConsumer);
+ IOUtils.DisposeWhileHandlingException(dvConsumer);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/FreqProxTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FreqProxTermsWriter.cs b/src/Lucene.Net/Index/FreqProxTermsWriter.cs
index 22f0ee7..f857c61 100644
--- a/src/Lucene.Net/Index/FreqProxTermsWriter.cs
+++ b/src/Lucene.Net/Index/FreqProxTermsWriter.cs
@@ -108,11 +108,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(consumer);
+ IOUtils.Dispose(consumer);
}
else
{
- IOUtils.CloseWhileHandlingException(consumer);
+ IOUtils.DisposeWhileHandlingException(consumer);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs
index 5ad4af8..66bb35c 100644
--- a/src/Lucene.Net/Index/IndexWriter.cs
+++ b/src/Lucene.Net/Index/IndexWriter.cs
@@ -427,7 +427,7 @@ namespace Lucene.Net.Index
{
if (!success2)
{
- IOUtils.CloseWhileHandlingException(r);
+ IOUtils.DisposeWhileHandlingException(r);
}
}
return r;
@@ -945,7 +945,7 @@ namespace Lucene.Net.Index
{
infoStream.Message("IW", "init: hit exception on init; releasing write lock");
}
- IOUtils.CloseWhileHandlingException(writeLock);
+ IOUtils.DisposeWhileHandlingException(writeLock);
writeLock = null;
}
}
@@ -1237,7 +1237,7 @@ namespace Lucene.Net.Index
finally
{
// shutdown policy, scheduler and all threads (this call is not interruptible):
- IOUtils.CloseWhileHandlingException(mergePolicy, mergeScheduler);
+ IOUtils.DisposeWhileHandlingException(mergePolicy, mergeScheduler);
}
}
@@ -2593,7 +2593,7 @@ namespace Lucene.Net.Index
deleter.Refresh();
deleter.Dispose();
- IOUtils.Close(writeLock); // release write lock
+ IOUtils.Dispose(writeLock); // release write lock
writeLock = null;
Debug.Assert(docWriter.perThreadPool.NumDeactivatedThreadStates() == docWriter.perThreadPool.MaxThreadStates, "" + docWriter.perThreadPool.NumDeactivatedThreadStates() + " " + docWriter.perThreadPool.MaxThreadStates);
@@ -2612,7 +2612,7 @@ namespace Lucene.Net.Index
// Must not hold IW's lock while closing
// mergePolicy/Scheduler: this can lead to deadlock,
// e.g. TestIW.testThreadInterruptDeadlock
- IOUtils.CloseWhileHandlingException(mergePolicy, mergeScheduler);
+ IOUtils.DisposeWhileHandlingException(mergePolicy, mergeScheduler);
}
lock (this)
{
@@ -2634,7 +2634,7 @@ namespace Lucene.Net.Index
}
// close all the closeables we can (but important is readerPool and writeLock to prevent leaks)
- IOUtils.CloseWhileHandlingException(readerPool, deleter, writeLock);
+ IOUtils.DisposeWhileHandlingException(readerPool, deleter, writeLock);
writeLock = null;
}
closed = true;
@@ -2962,7 +2962,7 @@ namespace Lucene.Net.Index
/// <summary>
/// Acquires write locks on all the directories; be sure
- /// to match with a call to <see cref="IOUtils.Close(IEnumerable{IDisposable})"/> in a
+ /// to match with a call to <see cref="IOUtils.Dispose(IEnumerable{IDisposable})"/> in a
/// finally clause.
/// </summary>
private IEnumerable<Lock> AcquireWriteLocks(params Directory[] dirs)
@@ -2983,7 +2983,7 @@ namespace Lucene.Net.Index
if (!success)
{
// Release all previously acquired locks:
- IOUtils.CloseWhileHandlingException(locks);
+ IOUtils.DisposeWhileHandlingException(locks);
}
}
}
@@ -3151,11 +3151,11 @@ namespace Lucene.Net.Index
{
if (successTop)
{
- IOUtils.Close(locks);
+ IOUtils.Dispose(locks);
}
else
{
- IOUtils.CloseWhileHandlingException(locks);
+ IOUtils.DisposeWhileHandlingException(locks);
}
}
}
@@ -5775,7 +5775,7 @@ namespace Lucene.Net.Index
bool success = false;
try
{
- IOUtils.CloseWhileHandlingException(prior, cfsDir);
+ IOUtils.DisposeWhileHandlingException(prior, cfsDir);
success = true;
}
finally
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/NormsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NormsConsumer.cs b/src/Lucene.Net/Index/NormsConsumer.cs
index 444cd6c..a8e6b78 100644
--- a/src/Lucene.Net/Index/NormsConsumer.cs
+++ b/src/Lucene.Net/Index/NormsConsumer.cs
@@ -78,11 +78,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(normsConsumer);
+ IOUtils.Dispose(normsConsumer);
}
else
{
- IOUtils.CloseWhileHandlingException(normsConsumer);
+ IOUtils.DisposeWhileHandlingException(normsConsumer);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs b/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
index 5d14564..af28bf3 100644
--- a/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
@@ -224,7 +224,7 @@ namespace Lucene.Net.Index
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(@out);
+ IOUtils.DisposeWhileHandlingException(@out);
try
{
dir.DeleteFile(fileName);
@@ -238,7 +238,7 @@ namespace Lucene.Net.Index
}
else
{
- IOUtils.Close(@out);
+ IOUtils.Dispose(@out);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/ReadersAndUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ReadersAndUpdates.cs b/src/Lucene.Net/Index/ReadersAndUpdates.cs
index c17a4c0..06d823c 100644
--- a/src/Lucene.Net/Index/ReadersAndUpdates.cs
+++ b/src/Lucene.Net/Index/ReadersAndUpdates.cs
@@ -555,7 +555,7 @@ namespace Lucene.Net.Index
}
else
{
- IOUtils.CloseWhileHandlingException(fieldsConsumer);
+ IOUtils.DisposeWhileHandlingException(fieldsConsumer);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/SegmentCoreReaders.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentCoreReaders.cs b/src/Lucene.Net/Index/SegmentCoreReaders.cs
index c37aea7..17c3ea8 100644
--- a/src/Lucene.Net/Index/SegmentCoreReaders.cs
+++ b/src/Lucene.Net/Index/SegmentCoreReaders.cs
@@ -250,7 +250,7 @@ namespace Lucene.Net.Index
Exception th = null;
try
{
- IOUtils.Close(termVectorsLocal, fieldsReaderLocal, normsLocal, fields, termVectorsReaderOrig, fieldsReaderOrig, cfsReader, normsProducer);
+ IOUtils.Dispose(termVectorsLocal, fieldsReaderLocal, normsLocal, fields, termVectorsReaderOrig, fieldsReaderOrig, cfsReader, normsProducer);
}
catch (Exception throwable)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/SegmentInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentInfos.cs b/src/Lucene.Net/Index/SegmentInfos.cs
index f330d11..7d6f403 100644
--- a/src/Lucene.Net/Index/SegmentInfos.cs
+++ b/src/Lucene.Net/Index/SegmentInfos.cs
@@ -447,7 +447,7 @@ namespace Lucene.Net.Index
// Clear any segment infos we had loaded so we
// have a clean slate on retry:
this.Clear();
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
else
{
@@ -584,7 +584,7 @@ namespace Lucene.Net.Index
{
// We hit an exception above; try to close the file
// but suppress any exception:
- IOUtils.CloseWhileHandlingException(segnOutput);
+ IOUtils.DisposeWhileHandlingException(segnOutput);
foreach (string fileName in upgradedSIFiles)
{
@@ -634,7 +634,7 @@ namespace Lucene.Net.Index
{
if (@in != null)
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
return false;
@@ -678,7 +678,7 @@ namespace Lucene.Net.Index
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
try
{
si.Dir.DeleteFile(fileName);
@@ -1118,7 +1118,7 @@ namespace Lucene.Net.Index
{
// Suppress so we keep throwing the original exception
// in our caller
- IOUtils.CloseWhileHandlingException(pendingSegnOutput);
+ IOUtils.DisposeWhileHandlingException(pendingSegnOutput);
pendingSegnOutput = null;
// Must carefully compute fileName from "generation"
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/SegmentMerger.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentMerger.cs b/src/Lucene.Net/Index/SegmentMerger.cs
index 57e1fa7..77ce627 100644
--- a/src/Lucene.Net/Index/SegmentMerger.cs
+++ b/src/Lucene.Net/Index/SegmentMerger.cs
@@ -264,11 +264,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(consumer);
+ IOUtils.Dispose(consumer);
}
else
{
- IOUtils.CloseWhileHandlingException(consumer);
+ IOUtils.DisposeWhileHandlingException(consumer);
}
}
}
@@ -304,11 +304,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(consumer);
+ IOUtils.Dispose(consumer);
}
else
{
- IOUtils.CloseWhileHandlingException(consumer);
+ IOUtils.DisposeWhileHandlingException(consumer);
}
}
}
@@ -471,11 +471,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(consumer);
+ IOUtils.Dispose(consumer);
}
else
{
- IOUtils.CloseWhileHandlingException(consumer);
+ IOUtils.DisposeWhileHandlingException(consumer);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/SegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentReader.cs b/src/Lucene.Net/Index/SegmentReader.cs
index 4af36b5..d17923b 100644
--- a/src/Lucene.Net/Index/SegmentReader.cs
+++ b/src/Lucene.Net/Index/SegmentReader.cs
@@ -311,7 +311,7 @@ namespace Lucene.Net.Index
dvProducersByField.Clear();
try
{
- IOUtils.Close(docValuesLocal, docsWithFieldLocal);
+ IOUtils.Dispose(docValuesLocal, docsWithFieldLocal);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/StandardDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/StandardDirectoryReader.cs b/src/Lucene.Net/Index/StandardDirectoryReader.cs
index 2484c68..0d78142 100644
--- a/src/Lucene.Net/Index/StandardDirectoryReader.cs
+++ b/src/Lucene.Net/Index/StandardDirectoryReader.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Index
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(prior, readers);
+ IOUtils.DisposeWhileHandlingException(prior, readers);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/StoredFieldsProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/StoredFieldsProcessor.cs b/src/Lucene.Net/Index/StoredFieldsProcessor.cs
index bd16042..53ad45e 100644
--- a/src/Lucene.Net/Index/StoredFieldsProcessor.cs
+++ b/src/Lucene.Net/Index/StoredFieldsProcessor.cs
@@ -88,11 +88,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(fieldsWriter);
+ IOUtils.Dispose(fieldsWriter);
}
else
{
- IOUtils.CloseWhileHandlingException(fieldsWriter);
+ IOUtils.DisposeWhileHandlingException(fieldsWriter);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Index/TermVectorsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/TermVectorsConsumer.cs b/src/Lucene.Net/Index/TermVectorsConsumer.cs
index f1c8019..4179cca 100644
--- a/src/Lucene.Net/Index/TermVectorsConsumer.cs
+++ b/src/Lucene.Net/Index/TermVectorsConsumer.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Index
}
finally
{
- IOUtils.Close(writer);
+ IOUtils.Dispose(writer);
writer = null;
lastDocID = 0;
hasVectors = false;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Search/SearcherLifetimeManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/SearcherLifetimeManager.cs b/src/Lucene.Net/Search/SearcherLifetimeManager.cs
index 0090339..8b7b3d4 100644
--- a/src/Lucene.Net/Search/SearcherLifetimeManager.cs
+++ b/src/Lucene.Net/Search/SearcherLifetimeManager.cs
@@ -336,7 +336,7 @@ namespace Lucene.Net.Search
_searchers.TryRemove(tracker.Version, out _);
}
- IOUtils.Close(toClose);
+ IOUtils.Dispose(toClose);
// Make some effort to catch mis-use:
if (_searchers.Count != 0)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/CompoundFileDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/CompoundFileDirectory.cs b/src/Lucene.Net/Store/CompoundFileDirectory.cs
index 58cca90..53682b2 100644
--- a/src/Lucene.Net/Store/CompoundFileDirectory.cs
+++ b/src/Lucene.Net/Store/CompoundFileDirectory.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Store
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(handle);
+ IOUtils.DisposeWhileHandlingException(handle);
}
}
this.IsOpen = true;
@@ -204,7 +204,7 @@ namespace Lucene.Net.Store
}
finally
{
- IOUtils.CloseWhileHandlingException(priorE, stream, entriesStream);
+ IOUtils.DisposeWhileHandlingException(priorE, stream, entriesStream);
}
// this is needed until Java 7's real try-with-resources:
throw new InvalidOperationException("impossible to get here");
@@ -311,7 +311,7 @@ namespace Lucene.Net.Store
}
else
{
- IOUtils.Close(handle);
+ IOUtils.Dispose(handle);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/CompoundFileWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/CompoundFileWriter.cs b/src/Lucene.Net/Store/CompoundFileWriter.cs
index 380c009..245f4d3 100644
--- a/src/Lucene.Net/Store/CompoundFileWriter.cs
+++ b/src/Lucene.Net/Store/CompoundFileWriter.cs
@@ -124,7 +124,7 @@ namespace Lucene.Net.Store
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(dataOut);
+ IOUtils.DisposeWhileHandlingException(dataOut);
}
}
}
@@ -186,7 +186,7 @@ namespace Lucene.Net.Store
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, dataOut);
+ IOUtils.DisposeWhileHandlingException(priorException, dataOut);
}
try
{
@@ -199,7 +199,7 @@ namespace Lucene.Net.Store
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, entryTableOut);
+ IOUtils.DisposeWhileHandlingException(priorException, entryTableOut);
}
}
@@ -239,13 +239,13 @@ namespace Lucene.Net.Store
{
if (success)
{
- IOUtils.Close(@is);
+ IOUtils.Dispose(@is);
// copy successful - delete file
fileEntry.Dir.DeleteFile(fileEntry.File);
}
else
{
- IOUtils.CloseWhileHandlingException(@is);
+ IOUtils.DisposeWhileHandlingException(@is);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/Directory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/Directory.cs b/src/Lucene.Net/Store/Directory.cs
index 7565b8a..7ca06b3 100644
--- a/src/Lucene.Net/Store/Directory.cs
+++ b/src/Lucene.Net/Store/Directory.cs
@@ -213,7 +213,7 @@ namespace Lucene.Net.Store
bool success = false;
try
{
- IOUtils.CloseWhileHandlingException(priorException, os, @is);
+ IOUtils.DisposeWhileHandlingException(priorException, os, @is);
success = true;
}
finally
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/FSDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/FSDirectory.cs b/src/Lucene.Net/Store/FSDirectory.cs
index d1cbda1..36cac51 100644
--- a/src/Lucene.Net/Store/FSDirectory.cs
+++ b/src/Lucene.Net/Store/FSDirectory.cs
@@ -507,7 +507,7 @@ namespace Lucene.Net.Store
finally
{
isOpen = false;
- IOUtils.CloseWhileHandlingException(priorE, file);
+ IOUtils.DisposeWhileHandlingException(priorE, file);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/LockVerifyServer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/LockVerifyServer.cs b/src/Lucene.Net/Store/LockVerifyServer.cs
index f65d243..6a22f8f 100644
--- a/src/Lucene.Net/Store/LockVerifyServer.cs
+++ b/src/Lucene.Net/Store/LockVerifyServer.cs
@@ -184,7 +184,7 @@ namespace Lucene.Net.Store
}
finally
{
- IOUtils.CloseWhileHandlingException(cs);
+ IOUtils.DisposeWhileHandlingException(cs);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/NRTCachingDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/NRTCachingDirectory.cs b/src/Lucene.Net/Store/NRTCachingDirectory.cs
index ee9f5ba..f6463b5 100644
--- a/src/Lucene.Net/Store/NRTCachingDirectory.cs
+++ b/src/Lucene.Net/Store/NRTCachingDirectory.cs
@@ -399,7 +399,7 @@ namespace Lucene.Net.Store
}
finally
{
- IOUtils.Close(@in, @out);
+ IOUtils.Dispose(@in, @out);
}
// Lock order: uncacheLock -> this
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Store/NativeFSLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/NativeFSLockFactory.cs b/src/Lucene.Net/Store/NativeFSLockFactory.cs
index 47e6f15..3459747 100644
--- a/src/Lucene.Net/Store/NativeFSLockFactory.cs
+++ b/src/Lucene.Net/Store/NativeFSLockFactory.cs
@@ -174,7 +174,7 @@ namespace Lucene.Net.Store
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(channel);
+ IOUtils.DisposeWhileHandlingException(channel);
channel = null;
}
}
@@ -198,7 +198,7 @@ namespace Lucene.Net.Store
}
finally
{
- IOUtils.CloseWhileHandlingException(channel);
+ IOUtils.DisposeWhileHandlingException(channel);
channel = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Util/Fst/FST.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/Fst/FST.cs b/src/Lucene.Net/Util/Fst/FST.cs
index e85af58..8982395 100644
--- a/src/Lucene.Net/Util/Fst/FST.cs
+++ b/src/Lucene.Net/Util/Fst/FST.cs
@@ -589,11 +589,11 @@ namespace Lucene.Net.Util.Fst
{
if (success)
{
- IOUtils.Close(bs);
+ IOUtils.Dispose(bs);
}
else
{
- IOUtils.CloseWhileHandlingException(bs);
+ IOUtils.DisposeWhileHandlingException(bs);
}
}
}
@@ -2195,11 +2195,11 @@ namespace Lucene.Net.Util.Fst
{
if (success)
{
- IOUtils.Close(bs);
+ IOUtils.Dispose(bs);
}
else
{
- IOUtils.CloseWhileHandlingException(bs);
+ IOUtils.DisposeWhileHandlingException(bs);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Util/IOUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/IOUtils.cs b/src/Lucene.Net/Util/IOUtils.cs
index 87049da..76aa7a4 100644
--- a/src/Lucene.Net/Util/IOUtils.cs
+++ b/src/Lucene.Net/Util/IOUtils.cs
@@ -72,14 +72,104 @@ namespace Lucene.Net.Util
/// }
/// finally
/// {
- /// CloseWhileHandlingException(priorE, resource1, resource2, resource3);
+ /// IOUtils.CloseWhileHandlingException(priorE, resource1, resource2, resource3);
/// }
/// </code>
/// </para>
/// </summary>
/// <param name="priorException"> <c>null</c> or an exception that will be rethrown after method completion. </param>
/// <param name="objects"> Objects to call <see cref="IDisposable.Dispose()"/> on. </param>
- public static void CloseWhileHandlingException(Exception priorException, params IDisposable[] objects) // LUCENENET TODO: API rename DisposeWhileHandlingException()
+ [Obsolete("Use DisposeWhileHandlingException(Exception, params IDisposable[]) instead.")]
+ public static void CloseWhileHandlingException(Exception priorException, params IDisposable[] objects)
+ {
+ DisposeWhileHandlingException(priorException, objects);
+ }
+
+ /// <summary>
+ /// Disposes all given <see cref="IDisposable"/>s, suppressing all thrown exceptions. </summary>
+ /// <seealso cref="DisposeWhileHandlingException(Exception, IDisposable[])"/>
+ [Obsolete("Use DisposeWhileHandlingException(Exception, IEnumerable<IDisposable>) instead.")]
+ public static void CloseWhileHandlingException(Exception priorException, IEnumerable<IDisposable> objects)
+ {
+ DisposeWhileHandlingException(priorException, objects);
+ }
+
+ /// <summary>
+ /// Disposes all given <see cref="IDisposable"/>s. Some of the
+ /// <see cref="IDisposable"/>s may be <c>null</c>; they are
+ /// ignored. After everything is closed, the method either
+ /// throws the first exception it hit while closing, or
+ /// completes normally if there were no exceptions.
+ /// </summary>
+ /// <param name="objects">
+ /// Objects to call <see cref="IDisposable.Dispose()"/> on </param>
+ [Obsolete("Use Dispose(params IDisposable[]) instead.")]
+ public static void Close(params IDisposable[] objects)
+ {
+ Dispose(objects);
+ }
+
+ /// <summary>
+ /// Disposes all given <see cref="IDisposable"/>s. </summary>
+ /// <seealso cref="Dispose(IDisposable[])"/>
+ [Obsolete("Use Dispose(IEnumerable<IDisposable>) instead.")]
+ public static void Close(IEnumerable<IDisposable> objects)
+ {
+ Dispose(objects);
+ }
+
+ /// <summary>
+ /// Disposes all given <see cref="IDisposable"/>s, suppressing all thrown exceptions.
+ /// Some of the <see cref="IDisposable"/>s may be <c>null</c>, they are ignored.
+ /// </summary>
+ /// <param name="objects">
+ /// Objects to call <see cref="IDisposable.Dispose()"/> on </param>
+ [Obsolete("Use DisposeWhileHandlingException(params IDisposable[]) instead.")]
+ public static void CloseWhileHandlingException(params IDisposable[] objects)
+ {
+ DisposeWhileHandlingException(objects);
+ }
+
+ /// <summary>
+ /// Disposes all given <see cref="IDisposable"/>s, suppressing all thrown exceptions. </summary>
+ /// <seealso cref="DisposeWhileHandlingException(IEnumerable{IDisposable})"/>
+ /// <seealso cref="DisposeWhileHandlingException(IDisposable[])"/>
+ [Obsolete("Use DisposeWhileHandlingException(IEnumerable<IDisposable>) instead.")]
+ public static void CloseWhileHandlingException(IEnumerable<IDisposable> objects)
+ {
+ DisposeWhileHandlingException(objects);
+ }
+
+
+ // LUCENENET specific - added overloads starting with Dispose... instead of Close...
+
+ /// <summary>
+ /// <para>Disposes all given <c>IDisposable</c>s, suppressing all thrown exceptions. Some of the <c>IDisposable</c>s
+ /// may be <c>null</c>, they are ignored. After everything is disposed, method either throws <paramref name="priorException"/>,
+ /// if one is supplied, or the first of suppressed exceptions, or completes normally.</para>
+ /// <para>Sample usage:
+ /// <code>
+ /// IDisposable resource1 = null, resource2 = null, resource3 = null;
+ /// ExpectedException priorE = null;
+ /// try
+ /// {
+ /// resource1 = ...; resource2 = ...; resource3 = ...; // Acquisition may throw ExpectedException
+ /// ..do..stuff.. // May throw ExpectedException
+ /// }
+ /// catch (ExpectedException e)
+ /// {
+ /// priorE = e;
+ /// }
+ /// finally
+ /// {
+ /// IOUtils.DisposeWhileHandlingException(priorE, resource1, resource2, resource3);
+ /// }
+ /// </code>
+ /// </para>
+ /// </summary>
+ /// <param name="priorException"> <c>null</c> or an exception that will be rethrown after method completion. </param>
+ /// <param name="objects"> Objects to call <see cref="IDisposable.Dispose()"/> on. </param>
+ public static void DisposeWhileHandlingException(Exception priorException, params IDisposable[] objects)
{
Exception th = null;
@@ -114,8 +204,8 @@ namespace Lucene.Net.Util
/// <summary>
/// Disposes all given <see cref="IDisposable"/>s, suppressing all thrown exceptions. </summary>
- /// <seealso cref="CloseWhileHandlingException(Exception, IDisposable[])"/>
- public static void CloseWhileHandlingException(Exception priorException, IEnumerable<IDisposable> objects) // LUCENENET TODO: API rename DisposeWhileHandlingException()
+ /// <seealso cref="DisposeWhileHandlingException(Exception, IDisposable[])"/>
+ public static void DisposeWhileHandlingException(Exception priorException, IEnumerable<IDisposable> objects)
{
Exception th = null;
@@ -157,7 +247,7 @@ namespace Lucene.Net.Util
/// </summary>
/// <param name="objects">
/// Objects to call <see cref="IDisposable.Dispose()"/> on </param>
- public static void Close(params IDisposable[] objects) // LUCENENET TODO: API rename Dispose()
+ public static void Dispose(params IDisposable[] objects)
{
Exception th = null;
@@ -185,8 +275,8 @@ namespace Lucene.Net.Util
/// <summary>
/// Disposes all given <see cref="IDisposable"/>s. </summary>
- /// <seealso cref="Close(IDisposable[])"/>
- public static void Close(IEnumerable<IDisposable> objects) // LUCENENET TODO: API rename Dispose()
+ /// <seealso cref="Dispose(IDisposable[])"/>
+ public static void Dispose(IEnumerable<IDisposable> objects)
{
Exception th = null;
@@ -218,7 +308,7 @@ namespace Lucene.Net.Util
/// </summary>
/// <param name="objects">
/// Objects to call <see cref="IDisposable.Dispose()"/> on </param>
- public static void CloseWhileHandlingException(params IDisposable[] objects) // LUCENENET TODO: API rename DisposeWhileHandlingException()
+ public static void DisposeWhileHandlingException(params IDisposable[] objects)
{
foreach (var o in objects)
{
@@ -238,8 +328,8 @@ namespace Lucene.Net.Util
/// <summary>
/// Disposes all given <see cref="IDisposable"/>s, suppressing all thrown exceptions. </summary>
- /// <seealso cref="CloseWhileHandlingException(IDisposable[])"/>
- public static void CloseWhileHandlingException(IEnumerable<IDisposable> objects) // LUCENENET TODO: API rename DisposeWhileHandlingException()
+ /// <seealso cref="DisposeWhileHandlingException(IDisposable[])"/>
+ public static void DisposeWhileHandlingException(IEnumerable<IDisposable> objects)
{
foreach (IDisposable @object in objects)
{
@@ -318,7 +408,7 @@ namespace Lucene.Net.Util
{
if (!success)
{
- IOUtils.Close(stream);
+ IOUtils.Dispose(stream);
}
}
}
@@ -350,7 +440,7 @@ namespace Lucene.Net.Util
{
if (!success)
{
- IOUtils.Close(stream);
+ IOUtils.Dispose(stream);
}
}
}
@@ -397,7 +487,7 @@ namespace Lucene.Net.Util
}
finally
{
- Close(fis, fos);
+ Dispose(fis, fos);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Util/OfflineSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs
index bce5f2e..91dc2c0 100644
--- a/src/Lucene.Net/Util/OfflineSorter.cs
+++ b/src/Lucene.Net/Util/OfflineSorter.cs
@@ -296,11 +296,11 @@ namespace Lucene.Net.Util
{
if (success)
{
- IOUtils.Close(inputStream);
+ IOUtils.Dispose(inputStream);
}
else
{
- IOUtils.CloseWhileHandlingException(inputStream);
+ IOUtils.DisposeWhileHandlingException(inputStream);
}
}
@@ -442,11 +442,11 @@ namespace Lucene.Net.Util
// happening in closing streams.
try
{
- IOUtils.Close(streams);
+ IOUtils.Dispose(streams);
}
finally
{
- IOUtils.Close(@out);
+ IOUtils.Dispose(@out);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Util/QueryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/QueryBuilder.cs b/src/Lucene.Net/Util/QueryBuilder.cs
index 286b4e2..8abe1cb 100644
--- a/src/Lucene.Net/Util/QueryBuilder.cs
+++ b/src/Lucene.Net/Util/QueryBuilder.cs
@@ -258,7 +258,7 @@ namespace Lucene.Net.Util
}
finally
{
- IOUtils.CloseWhileHandlingException(source);
+ IOUtils.DisposeWhileHandlingException(source);
}
// rewind the buffer stream
[36/38] lucenenet git commit: BUG:
Lucene.Net.Search.ConstantScoreQuery.ConstantWeight: Fixed initialization
issue with commented code in GetValueForNormalization() (that diverged from
Lucene)
Posted by ni...@apache.org.
BUG: Lucene.Net.Search.ConstantScoreQuery.ConstantWeight: Fixed initialization issue with commented code in GetValueForNormalization() (that diverged from Lucene)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/484f2683
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/484f2683
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/484f2683
Branch: refs/heads/master
Commit: 484f2683468fc018580449f20c1307b4964f95d0
Parents: 06e1a90
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jun 22 00:54:25 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:54:25 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/ConstantScoreQuery.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/484f2683/src/Lucene.Net/Search/ConstantScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/ConstantScoreQuery.cs b/src/Lucene.Net/Search/ConstantScoreQuery.cs
index 254d267..88a36b8 100644
--- a/src/Lucene.Net/Search/ConstantScoreQuery.cs
+++ b/src/Lucene.Net/Search/ConstantScoreQuery.cs
@@ -162,10 +162,10 @@ namespace Lucene.Net.Search
public override float GetValueForNormalization()
{
// we calculate sumOfSquaredWeights of the inner weight, but ignore it (just to initialize everything)
- /*if (InnerWeight != null) // LUCENENET TODO: BUG This code was in the original
+ if (innerWeight != null)
{
- return innerWeight.GetValueForNormalization();
- }*/
+ innerWeight.GetValueForNormalization();
+ }
queryWeight = outerInstance.Boost;
return queryWeight * queryWeight;
}
[29/38] lucenenet git commit: Lucene.Net.Search.BooleanQuery: Added
documentation to show usage of collection initializer
Posted by ni...@apache.org.
Lucene.Net.Search.BooleanQuery: Added documentation to show usage of collection initializer
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/56d6d6d0
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/56d6d6d0
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/56d6d6d0
Branch: refs/heads/master
Commit: 56d6d6d04586f6caa3f072733944ee56cbf27eea
Parents: f674dc6
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 23:52:07 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:02 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/BooleanQuery.cs | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/56d6d6d0/src/Lucene.Net/Search/BooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/BooleanQuery.cs b/src/Lucene.Net/Search/BooleanQuery.cs
index b144393..bbf0699 100644
--- a/src/Lucene.Net/Search/BooleanQuery.cs
+++ b/src/Lucene.Net/Search/BooleanQuery.cs
@@ -39,6 +39,29 @@ namespace Lucene.Net.Search
/// A <see cref="Query"/> that matches documents matching boolean combinations of other
/// queries, e.g. <see cref="TermQuery"/>s, <see cref="PhraseQuery"/>s or other
/// <see cref="BooleanQuery"/>s.
+ /// <para/>
+ /// Collection initializer note: To create and populate a <see cref="BooleanQuery"/>
+ /// in a single statement, you can use the following example as a guide:
+ ///
+ /// <code>
+ /// var booleanQuery = new BooleanQuery() {
+ /// { new WildcardQuery(new Term("field2", "foobar")), Occur.SHOULD },
+ /// { new MultiPhraseQuery() {
+ /// new Term("field", "microsoft"),
+ /// new Term("field", "office")
+ /// }, Occur.SHOULD }
+ /// };
+ ///
+ /// // or
+ ///
+ /// var booleanQuery = new BooleanQuery() {
+ /// new BooleanClause(new WildcardQuery(new Term("field2", "foobar")), Occur.SHOULD),
+ /// new BooleanClause(new MultiPhraseQuery() {
+ /// new Term("field", "microsoft"),
+ /// new Term("field", "office")
+ /// }, Occur.SHOULD)
+ /// };
+ /// </code>
/// </summary>
#if FEATURE_SERIALIZABLE
[Serializable]
[06/38] lucenenet git commit: API:
Lucene.Net.Search.Similarities.LMSimilarity.ICollectionModel: Renamed Name >
GetName() (consistency)
Posted by ni...@apache.org.
API: Lucene.Net.Search.Similarities.LMSimilarity.ICollectionModel: Renamed Name > GetName() (consistency)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cf7e7494
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cf7e7494
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cf7e7494
Branch: refs/heads/master
Commit: cf7e7494b1478c9c2f5eb45cf1f001d54401b33c
Parents: f77728b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:12:00 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:12:00 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/Similarities/LMSimilarity.cs | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf7e7494/src/Lucene.Net/Search/Similarities/LMSimilarity.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/Similarities/LMSimilarity.cs b/src/Lucene.Net/Search/Similarities/LMSimilarity.cs
index 721d576..3be8cec 100644
--- a/src/Lucene.Net/Search/Similarities/LMSimilarity.cs
+++ b/src/Lucene.Net/Search/Similarities/LMSimilarity.cs
@@ -90,11 +90,11 @@ namespace Lucene.Net.Search.Similarities
/// Returns the name of the LM method. If a custom collection model strategy is
/// used, its name is included as well. </summary>
/// <seealso cref="GetName()"/>
- /// <seealso cref="ICollectionModel.Name"/>
+ /// <seealso cref="ICollectionModel.GetName()"/>
/// <seealso cref="DefaultCollectionModel"/>
public override string ToString()
{
- string coll = m_collectionModel.Name;
+ string coll = m_collectionModel.GetName();
if (coll != null)
{
return string.Format("LM {0} - {1}", GetName(), coll);
@@ -153,7 +153,7 @@ namespace Lucene.Net.Search.Similarities
/// <summary>
/// The name of the collection model strategy. </summary>
- string Name { get; } // LUCENENET TODO: API Change to GetName() ? (consistency)
+ string GetName();
}
/// <summary>
@@ -176,12 +176,9 @@ namespace Lucene.Net.Search.Similarities
return (stats.TotalTermFreq + 1F) / (stats.NumberOfFieldTokens + 1F);
}
- public virtual string Name
+ public virtual string GetName()
{
- get
- {
- return null;
- }
+ return null;
}
}
}
[14/38] lucenenet git commit: Lucene.Net.Util.RamUsageEstimator:
Removed TODO about restoring IsEmpty property (class is internal anyway,
so there is no way to use it)
Posted by ni...@apache.org.
Lucene.Net.Util.RamUsageEstimator: Removed TODO about restoring IsEmpty property (class is internal anyway, so there is no way to use it)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e837081e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e837081e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e837081e
Branch: refs/heads/master
Commit: e837081ea35a473b73a9e9995922d06d86741a98
Parents: 43e0ea4
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 14:11:31 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 14:11:31 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/RamUsageEstimator.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e837081e/src/Lucene.Net/Util/RamUsageEstimator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/RamUsageEstimator.cs b/src/Lucene.Net/Util/RamUsageEstimator.cs
index f00dcce..b4a37a8 100644
--- a/src/Lucene.Net/Util/RamUsageEstimator.cs
+++ b/src/Lucene.Net/Util/RamUsageEstimator.cs
@@ -923,9 +923,7 @@ namespace Lucene.Net.Util
get { return Assigned; }
}
- // LUCENENET TODO: API - bring back this IsEmpty property (doesn't work the same as !Any())
-
- //public bool Empty // LUCENENET NOTE: in .NET we can just use !Any() on IEnumerable<T>
+ //public bool IsEmpty // LUCENENET NOTE: in .NET we can just use !Any() on IEnumerable<T>
//{
// get
// {
[34/38] lucenenet git commit: Lucene.Net.Queries.CustomScoreQuery:
Updated documentation comment
Posted by ni...@apache.org.
Lucene.Net.Queries.CustomScoreQuery: Updated documentation comment
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b1668ebf
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b1668ebf
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b1668ebf
Branch: refs/heads/master
Commit: b1668ebf3aecec24057dbb4f990e810bbb3efbaa
Parents: a632950
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 23:56:57 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:04 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/CustomScoreQuery.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b1668ebf/src/Lucene.Net.Queries/CustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CustomScoreQuery.cs b/src/Lucene.Net.Queries/CustomScoreQuery.cs
index d7bcaba..c0422dc 100644
--- a/src/Lucene.Net.Queries/CustomScoreQuery.cs
+++ b/src/Lucene.Net.Queries/CustomScoreQuery.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Queries
/// <item><description>(optional) the score of its <see cref="FunctionQuery"/> (or queries).</description></item>
/// </list>
/// Subclasses can modify the computation by overriding <see cref="GetCustomScoreProvider"/>.
- ///
+ /// <para/>
/// @lucene.experimental
/// </summary>
public class CustomScoreQuery : Query
[16/38] lucenenet git commit: API:
Lucene.Net.Search.BitsFilteredDocIdSet: Changed constructor to throw
ArgumentNullException instead of NullReferenceException
Posted by ni...@apache.org.
API: Lucene.Net.Search.BitsFilteredDocIdSet: Changed constructor to throw ArgumentNullException instead of NullReferenceException
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/20de9874
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/20de9874
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/20de9874
Branch: refs/heads/master
Commit: 20de98744bedf137e513732b25271574f5c16534
Parents: 6f24c03
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 14:19:27 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 14:19:27 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/BitsFilteredDocIdSet.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/20de9874/src/Lucene.Net/Search/BitsFilteredDocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/BitsFilteredDocIdSet.cs b/src/Lucene.Net/Search/BitsFilteredDocIdSet.cs
index 5de931c..9fedb4f 100644
--- a/src/Lucene.Net/Search/BitsFilteredDocIdSet.cs
+++ b/src/Lucene.Net/Search/BitsFilteredDocIdSet.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
{
if (acceptDocs == null)
{
- throw new System.NullReferenceException("acceptDocs is null"); // LUCENENET TODO: API throw ArgumentNullException ?
+ throw new ArgumentNullException("acceptDocs is null");
}
this.acceptDocs = acceptDocs;
}
[25/38] lucenenet git commit: Lucene.Net.Index.Terms: Removed TODOs
about making the SumTotalTermFreq and SumDocFreq properties into methods
(minor issue)
Posted by ni...@apache.org.
Lucene.Net.Index.Terms: Removed TODOs about making the SumTotalTermFreq and SumDocFreq properties into methods (minor issue)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/de55c63d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/de55c63d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/de55c63d
Branch: refs/heads/master
Commit: de55c63dd9e14cea5750041a55e53f5d631238ee
Parents: cf3a71c
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 20:15:10 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jun 21 23:59:57 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Index/Terms.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/de55c63d/src/Lucene.Net/Index/Terms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/Terms.cs b/src/Lucene.Net/Index/Terms.cs
index 69e2ca0..288d09c 100644
--- a/src/Lucene.Net/Index/Terms.cs
+++ b/src/Lucene.Net/Index/Terms.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Index
/// measures, this measure does not take deleted documents
/// into account.
/// </summary>
- public abstract long SumTotalTermFreq { get; } // LUCENENET TODO: API Make GetSumTotalTermFreq() (conversion)
+ public abstract long SumTotalTermFreq { get; }
/// <summary>
/// Returns the sum of <see cref="TermsEnum.DocFreq"/> for
@@ -140,7 +140,7 @@ namespace Lucene.Net.Index
/// measures, this measure does not take deleted documents
/// into account.
/// </summary>
- public abstract long SumDocFreq { get; } // LUCENENET TODO: API Make GetSumDocFreq() (conversion)
+ public abstract long SumDocFreq { get; }
/// <summary>
/// Returns the number of documents that have at least one
[08/38] lucenenet git commit: API: Lucene.Net.Util.OfflineSorter:
Changed setter of BufferSize to private (was not settable in Lucene)
Posted by ni...@apache.org.
API: Lucene.Net.Util.OfflineSorter: Changed setter of BufferSize to private (was not settable in Lucene)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c29ca08b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c29ca08b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c29ca08b
Branch: refs/heads/master
Commit: c29ca08b308cf7caa433447308fdf8d5780d8708
Parents: d683f0f
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:21:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:21:45 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/OfflineSorter.cs | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c29ca08b/src/Lucene.Net/Util/OfflineSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs
index db34023..bce5f2e 100644
--- a/src/Lucene.Net/Util/OfflineSorter.cs
+++ b/src/Lucene.Net/Util/OfflineSorter.cs
@@ -141,11 +141,6 @@ namespace Lucene.Net.Util
/// </summary>
public class SortInfo
{
- internal virtual void InitializeInstanceFields()
- {
- BufferSize = outerInstance.ramBufferSize.bytes;
- }
-
private readonly OfflineSorter outerInstance;
/// <summary>
@@ -171,7 +166,7 @@ namespace Lucene.Net.Util
public long ReadTime { get; set; }
/// <summary>
/// Read buffer size (in bytes) </summary>
- public long BufferSize { get; set; } // LUCENENET TODO: API - make setter private
+ public long BufferSize { get; private set; }
/// <summary>
/// Create a new <see cref="SortInfo"/> (with empty statistics) for debugging. </summary>
@@ -179,7 +174,7 @@ namespace Lucene.Net.Util
{
this.outerInstance = outerInstance;
- InitializeInstanceFields();
+ BufferSize = outerInstance.ramBufferSize.bytes;
}
/// <summary>
[11/38] lucenenet git commit: API:
Lucene.Net.Util.PrintStreamInfoStream: Marked obsolete and created
TextWriterInfoStream class to replace it, which is more sensible in .NET.
Posted by ni...@apache.org.
API: Lucene.Net.Util.PrintStreamInfoStream: Marked obsolete and created TextWriterInfoStream class to replace it, which is more sensible in .NET.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a6b5a87f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a6b5a87f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a6b5a87f
Branch: refs/heads/master
Commit: a6b5a87fe15f5a7013f0f9b8cc176984686af4e9
Parents: f4dfbb8
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:52:53 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:52:53 2017 +0700
----------------------------------------------------------------------
.../ThreadedIndexingAndSearchingTestCase.cs | 4 ++--
.../Search/ShardSearchingTestBase.cs | 4 ++--
.../Util/TestRuleSetupAndRestoreClassEnv.cs | 2 +-
.../Index/TestDocInverterPerFieldErrorInfo.cs | 6 ++---
.../TestIndexWriterOutOfFileDescriptors.cs | 4 ++--
src/Lucene.Net/Index/IndexWriterConfig.cs | 6 ++---
src/Lucene.Net/Util/PrintStreamInfoStream.cs | 25 ++++++++++++++++----
7 files changed, 34 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index f386508..31b91a1 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using PhraseQuery = Lucene.Net.Search.PhraseQuery;
- using PrintStreamInfoStream = Lucene.Net.Util.PrintStreamInfoStream;
+ using TextWriterInfoStream = Lucene.Net.Util.TextWriterInfoStream;
using Query = Lucene.Net.Search.Query;
using ScoreDoc = Lucene.Net.Search.ScoreDoc;
using Sort = Lucene.Net.Search.Sort;
@@ -821,7 +821,7 @@ namespace Lucene.Net.Index
}
}
- private class PrintStreamInfoStreamAnonymousInnerClassHelper : PrintStreamInfoStream
+ private class PrintStreamInfoStreamAnonymousInnerClassHelper : TextWriterInfoStream
{
private readonly ThreadedIndexingAndSearchingTestCase outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
index dbcfc46..e70ec1a 100644
--- a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Search
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using OpenMode = Lucene.Net.Index.OpenMode;
- using PrintStreamInfoStream = Lucene.Net.Util.PrintStreamInfoStream;
+ using TextWriterInfoStream = Lucene.Net.Util.TextWriterInfoStream;
using Term = Lucene.Net.Index.Term;
using TermContext = Lucene.Net.Index.TermContext;
using TestUtil = Lucene.Net.Util.TestUtil;
@@ -548,7 +548,7 @@ namespace Lucene.Net.Search
iwc.SetOpenMode(OpenMode.CREATE);
if (VERBOSE)
{
- iwc.SetInfoStream(new PrintStreamInfoStream(Console.Out));
+ iwc.SetInfoStream(new TextWriterInfoStream(Console.Out));
}
Writer = new IndexWriter(Dir, iwc);
Mgr = new SearcherManager(Writer, true, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
index 2c392ec..2766e4b 100644
--- a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
@@ -284,7 +284,7 @@ namespace Lucene.Net.Util
}
}
- internal class ThreadNameFixingPrintStreamInfoStream : PrintStreamInfoStream
+ internal class ThreadNameFixingPrintStreamInfoStream : TextWriterInfoStream
{
public ThreadNameFixingPrintStreamInfoStream(TextWriter @out)
: base(@out)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs b/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs
index 64ed379..a01074d 100644
--- a/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.Index
using FieldType = FieldType;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using MockTokenizer = Lucene.Net.Analysis.MockTokenizer;
- using PrintStreamInfoStream = Lucene.Net.Util.PrintStreamInfoStream;
+ using TextWriterInfoStream = Lucene.Net.Util.TextWriterInfoStream;
using TextField = TextField;
using TokenFilter = Lucene.Net.Analysis.TokenFilter;
using Tokenizer = Lucene.Net.Analysis.Tokenizer;
@@ -93,7 +93,7 @@ namespace Lucene.Net.Index
IndexWriterConfig c = new IndexWriterConfig(TEST_VERSION_CURRENT, new ThrowingAnalyzer());
ByteArrayOutputStream infoBytes = new ByteArrayOutputStream();
StreamWriter infoPrintStream = new StreamWriter(infoBytes, Encoding.UTF8);
- PrintStreamInfoStream printStreamInfoStream = new PrintStreamInfoStream(infoPrintStream);
+ TextWriterInfoStream printStreamInfoStream = new TextWriterInfoStream(infoPrintStream);
c.SetInfoStream(printStreamInfoStream);
writer = new IndexWriter(dir, c);
Document doc = new Document();
@@ -122,7 +122,7 @@ namespace Lucene.Net.Index
IndexWriterConfig c = new IndexWriterConfig(TEST_VERSION_CURRENT, new ThrowingAnalyzer());
ByteArrayOutputStream infoBytes = new ByteArrayOutputStream();
StreamWriter infoPrintStream = new StreamWriter(infoBytes, Encoding.UTF8);
- PrintStreamInfoStream printStreamInfoStream = new PrintStreamInfoStream(infoPrintStream);
+ TextWriterInfoStream printStreamInfoStream = new TextWriterInfoStream(infoPrintStream);
c.SetInfoStream(printStreamInfoStream);
writer = new IndexWriter(dir, c);
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
index 517019e..3f33b35 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.Index
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using MockDirectoryWrapper = Lucene.Net.Store.MockDirectoryWrapper;
- using PrintStreamInfoStream = Lucene.Net.Util.PrintStreamInfoStream;
+ using TextWriterInfoStream = Lucene.Net.Util.TextWriterInfoStream;
using TestUtil = Lucene.Net.Util.TestUtil;
[TestFixture]
@@ -69,7 +69,7 @@ namespace Lucene.Net.Index
{
// Do this ourselves instead of relying on LTC so
// we see incrementing messageID:
- iwc.SetInfoStream(new PrintStreamInfoStream(Console.Out));
+ iwc.SetInfoStream(new TextWriterInfoStream(Console.Out));
}
var ms = iwc.MergeScheduler;
if (ms is IConcurrentMergeScheduler)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net/Index/IndexWriterConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriterConfig.cs b/src/Lucene.Net/Index/IndexWriterConfig.cs
index b2ed2b8..300dca3 100644
--- a/src/Lucene.Net/Index/IndexWriterConfig.cs
+++ b/src/Lucene.Net/Index/IndexWriterConfig.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Index
using IndexingChain = Lucene.Net.Index.DocumentsWriterPerThread.IndexingChain;
using IndexReaderWarmer = Lucene.Net.Index.IndexWriter.IndexReaderWarmer;
using InfoStream = Lucene.Net.Util.InfoStream;
- using PrintStreamInfoStream = Lucene.Net.Util.PrintStreamInfoStream;
+ using TextWriterInfoStream = Lucene.Net.Util.TextWriterInfoStream;
using Similarity = Lucene.Net.Search.Similarities.Similarity;
/// <summary>
@@ -664,7 +664,7 @@ namespace Lucene.Net.Index
}
/// <summary>
- /// Convenience method that uses <see cref="PrintStreamInfoStream"/> to write to the passed in <see cref="TextWriter"/>.
+ /// Convenience method that uses <see cref="TextWriterInfoStream"/> to write to the passed in <see cref="TextWriter"/>.
/// Must not be <c>null</c>.
/// </summary>
public IndexWriterConfig SetInfoStream(TextWriter printStream)
@@ -673,7 +673,7 @@ namespace Lucene.Net.Index
{
throw new System.ArgumentException("printStream must not be null");
}
- return SetInfoStream(new PrintStreamInfoStream(printStream));
+ return SetInfoStream(new TextWriterInfoStream(printStream));
}
// LUCENENET NOTE: These were only here for casting purposes, but since we are
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6b5a87f/src/Lucene.Net/Util/PrintStreamInfoStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/PrintStreamInfoStream.cs b/src/Lucene.Net/Util/PrintStreamInfoStream.cs
index 455e273..ebbb8d3 100644
--- a/src/Lucene.Net/Util/PrintStreamInfoStream.cs
+++ b/src/Lucene.Net/Util/PrintStreamInfoStream.cs
@@ -23,12 +23,29 @@ namespace Lucene.Net.Util
*/
/// <summary>
- /// InfoStream implementation over a <see cref="TextWriter"/>
+ /// LUCENENET specific stub to assist with migration to <see cref="TextWriterInfoStream"/>.
+ /// </summary>
+ [Obsolete("Use TextWriterInfoStream in .NET. This class is provided only to assist with the transition.")]
+ public class PrintStreamInfoStream : TextWriterInfoStream
+ {
+ public PrintStreamInfoStream(TextWriter stream)
+ : base(stream)
+ { }
+
+ public PrintStreamInfoStream(TextWriter stream, int messageID)
+ : base(stream, messageID)
+ { }
+ }
+
+ /// <summary>
+ /// <see cref="InfoStream"/> implementation over a <see cref="TextWriter"/>
/// such as <see cref="Console.Out"/>.
/// <para/>
+ /// NOTE: This is analogous to PrintStreamInfoStream in Lucene.
+ /// <para/>
/// @lucene.internal
/// </summary>
- public class PrintStreamInfoStream : InfoStream // LUCENENET TODO: API - Rename to TextWriterInfoStream
+ public class TextWriterInfoStream : InfoStream
{
// Used for printing messages
private static readonly AtomicInt32 MESSAGE_ID = new AtomicInt32();
@@ -37,12 +54,12 @@ namespace Lucene.Net.Util
protected readonly TextWriter m_stream;
- public PrintStreamInfoStream(TextWriter stream)
+ public TextWriterInfoStream(TextWriter stream)
: this(stream, MESSAGE_ID.GetAndIncrement())
{
}
- public PrintStreamInfoStream(TextWriter stream, int messageID)
+ public TextWriterInfoStream(TextWriter stream, int messageID)
{
this.m_stream = stream;
this.m_messageID = messageID;
[10/38] lucenenet git commit: API: Lucene.Net.Util (PagedBytes +
PagedBytes.PagedBytesDataInput + PagedBytes.PagedBytesDataOutput): Changed
Pointer > GetPointer(), Position > GetPosition()
Posted by ni...@apache.org.
API: Lucene.Net.Util (PagedBytes + PagedBytes.PagedBytesDataInput + PagedBytes.PagedBytesDataOutput): Changed Pointer > GetPointer(), Position > GetPosition()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f4dfbb86
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f4dfbb86
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f4dfbb86
Branch: refs/heads/master
Commit: f4dfbb86754637fe4ebee069c983de7c94ee3ecd
Parents: 8a19d27
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:42:28 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:42:28 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/FixedGapTermsIndexReader.cs | 2 +-
.../Codecs/Lucene3x/TermInfosReaderIndex.cs | 2 +-
src/Lucene.Net/Util/PagedBytes.cs | 37 ++++++++------------
3 files changed, 16 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f4dfbb86/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 1265661..1891d3b 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
@@ -327,7 +327,7 @@ namespace Lucene.Net.Codecs.BlockTerms
int numIndexTerms)
{
this.termsStart = termsStart;
- termBytesStart = outerInstance.outerInstance.termBytes.Pointer;
+ termBytesStart = outerInstance.outerInstance.termBytes.GetPointer();
IndexInput clone = (IndexInput)outerInstance.outerInstance.input.Clone();
clone.Seek(indexStart);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f4dfbb86/src/Lucene.Net/Codecs/Lucene3x/TermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/TermInfosReaderIndex.cs b/src/Lucene.Net/Codecs/Lucene3x/TermInfosReaderIndex.cs
index eb8c2c5..8715d6e 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/TermInfosReaderIndex.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/TermInfosReaderIndex.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Codecs.Lucene3x
fieldCounter++;
}
TermInfo termInfo = indexEnum.TermInfo();
- indexToTerms.Set(i, dataOutput.Position);
+ indexToTerms.Set(i, dataOutput.GetPosition());
dataOutput.WriteVInt32(fieldCounter);
dataOutput.WriteString(term.Text());
dataOutput.WriteVInt32(termInfo.DocFreq);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f4dfbb86/src/Lucene.Net/Util/PagedBytes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/PagedBytes.cs b/src/Lucene.Net/Util/PagedBytes.cs
index 4a6e4bd..ad5fea3 100644
--- a/src/Lucene.Net/Util/PagedBytes.cs
+++ b/src/Lucene.Net/Util/PagedBytes.cs
@@ -262,18 +262,15 @@ namespace Lucene.Net.Util
return new PagedBytes.Reader(this);
}
- public long Pointer // LUCENENET TODO: API - Change to GetPointer() (makes conversion)
+ public long GetPointer()
{
- get
+ if (currentBlock == null)
{
- if (currentBlock == null)
- {
- return 0;
- }
- else
- {
- return (blocks.Count * ((long)blockSize)) + upto;
- }
+ return 0;
+ }
+ else
+ {
+ return (blocks.Count * ((long)blockSize)) + upto;
}
}
@@ -311,7 +308,7 @@ namespace Lucene.Net.Util
upto = 0;
}
- long pointer = Pointer;
+ long pointer = GetPointer();
if (bytes.Length < 128)
{
@@ -345,22 +342,19 @@ namespace Lucene.Net.Util
public override object Clone()
{
PagedBytesDataInput clone = outerInstance.GetDataInput();
- clone.SetPosition(Position);
+ clone.SetPosition(GetPosition());
return clone;
}
/// <summary>
/// Returns the current byte position. </summary>
- public long Position // LUCENENET TODO: API - Change to GetPosition() (makes conversion)
+ public long GetPosition()
{
- get
- {
- return (long)currentBlockIndex * outerInstance.blockSize + currentBlockUpto;
- }
+ return (long)currentBlockIndex * outerInstance.blockSize + currentBlockUpto;
}
/// <summary>
- /// Seek to a position previously obtained from <see cref="Position"/>.
+ /// Seek to a position previously obtained from <see cref="GetPosition()"/>.
/// </summary>
/// <param name="position"></param>
public void SetPosition(long position)
@@ -480,12 +474,9 @@ namespace Lucene.Net.Util
/// <summary>
/// Return the current byte position. </summary>
- public long Position // LUCENENET TODO: API - Change to GetPosition() (makes conversion)
+ public long GetPosition()
{
- get
- {
- return outerInstance.Pointer;
- }
+ return outerInstance.GetPointer();
}
}
[13/38] lucenenet git commit: API:
Lucene.Net.Util.RamUsageEstimator.IdentityHashSet: Changed
accessibility from public to internal (as it was in Lucene)
Posted by ni...@apache.org.
API: Lucene.Net.Util.RamUsageEstimator.IdentityHashSet<KType>: Changed accessibility from public to internal (as it was in Lucene)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/43e0ea49
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/43e0ea49
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/43e0ea49
Branch: refs/heads/master
Commit: 43e0ea49cbbc05f2b0061e6067546cdaba1ad9e0
Parents: 5ebf735
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:59:02 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:59:02 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/RamUsageEstimator.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/43e0ea49/src/Lucene.Net/Util/RamUsageEstimator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/RamUsageEstimator.cs b/src/Lucene.Net/Util/RamUsageEstimator.cs
index 6dc5a14..f00dcce 100644
--- a/src/Lucene.Net/Util/RamUsageEstimator.cs
+++ b/src/Lucene.Net/Util/RamUsageEstimator.cs
@@ -697,7 +697,7 @@ namespace Lucene.Net.Util
/// <para/>
/// TODO: If this is useful outside this class, make it public - needs some work
/// </summary>
- public sealed class IdentityHashSet<KType> : IEnumerable<KType> // LUCENENET TODO: API - This was internal in Lucene
+ internal sealed class IdentityHashSet<KType> : IEnumerable<KType>
{
/// <summary>
/// Default load factor.
[12/38] lucenenet git commit: API: Lucene.Net.Util.RamUsageEstimator:
Added SizeOf() overloads for ulong, uint, and ushort
Posted by ni...@apache.org.
API: Lucene.Net.Util.RamUsageEstimator: Added SizeOf() overloads for ulong, uint, and ushort
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5ebf735c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5ebf735c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5ebf735c
Branch: refs/heads/master
Commit: 5ebf735c8ff16ce11b8a1c012a4340f661722b75
Parents: a6b5a87
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:56:34 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:56:34 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/RamUsageEstimator.cs | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5ebf735c/src/Lucene.Net/Util/RamUsageEstimator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/RamUsageEstimator.cs b/src/Lucene.Net/Util/RamUsageEstimator.cs
index 5ae74a8..6dc5a14 100644
--- a/src/Lucene.Net/Util/RamUsageEstimator.cs
+++ b/src/Lucene.Net/Util/RamUsageEstimator.cs
@@ -349,7 +349,29 @@ namespace Lucene.Net.Util
return AlignObjectSize((long)NUM_BYTES_ARRAY_HEADER + (long)NUM_BYTES_DOUBLE * arr.Length);
}
- // LUCENENET TODO: API - Add SizeOf() overloads for ulong, ushort, uint
+ /// <summary>
+ /// Returns the size in bytes of the <see cref="T:ulong[]"/> object. </summary>
+ [CLSCompliant(false)]
+ public static long SizeOf(ulong[] arr)
+ {
+ return AlignObjectSize((long)NUM_BYTES_ARRAY_HEADER + (long)NUM_BYTES_INT64 * arr.Length);
+ }
+
+ /// <summary>
+ /// Returns the size in bytes of the <see cref="T:uint[]"/> object. </summary>
+ [CLSCompliant(false)]
+ public static long SizeOf(uint[] arr)
+ {
+ return AlignObjectSize((long)NUM_BYTES_ARRAY_HEADER + (long)NUM_BYTES_INT32 * arr.Length);
+ }
+
+ /// <summary>
+ /// Returns the size in bytes of the <see cref="T:ushort[]"/> object. </summary>
+ [CLSCompliant(false)]
+ public static long SizeOf(ushort[] arr)
+ {
+ return AlignObjectSize((long)NUM_BYTES_ARRAY_HEADER + (long)NUM_BYTES_INT16 * arr.Length);
+ }
/// <summary>
/// Estimates the RAM usage by the given object. It will
[05/38] lucenenet git commit: API:
Lucene.Net.Search.Similarites.BasicStats: Changed m_field to private and
renamed field, made Field property non-virtual.
Posted by ni...@apache.org.
API: Lucene.Net.Search.Similarites.BasicStats: Changed m_field to private and renamed field, made Field property non-virtual.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f77728b2
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f77728b2
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f77728b2
Branch: refs/heads/master
Commit: f77728b25d28483c7b490d12e9158f217784b6c3
Parents: 169598c
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:08:51 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:08:51 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/Similarities/BasicStats.cs | 12 ++++++++----
src/Lucene.Net/Search/Similarities/SimilarityBase.cs | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f77728b2/src/Lucene.Net/Search/Similarities/BasicStats.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/Similarities/BasicStats.cs b/src/Lucene.Net/Search/Similarities/BasicStats.cs
index 0c534bb..e16fdec 100644
--- a/src/Lucene.Net/Search/Similarities/BasicStats.cs
+++ b/src/Lucene.Net/Search/Similarities/BasicStats.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Search.Similarities
#endif
public class BasicStats : Similarity.SimWeight
{
- protected internal readonly string m_field; // LUCENENET TODO: API This was internal in Lucene
+ private readonly string field;
/// <summary>
/// The number of documents. </summary>
@@ -72,7 +72,7 @@ namespace Lucene.Net.Search.Similarities
/// Constructor. Sets the query boost. </summary>
public BasicStats(string field, float queryBoost)
{
- this.m_field = field;
+ this.field = field;
this.m_queryBoost = queryBoost;
this.m_totalBoost = queryBoost;
}
@@ -150,9 +150,13 @@ namespace Lucene.Net.Search.Similarities
}
}
- public virtual string Field // LUCENENET TODO: API - eliminate and use internal field instead
+ /// <summary>
+ /// The field.
+ /// </summary>
+ // LUCENENET specific
+ public string Field
{
- get { return m_field; }
+ get { return field; }
}
// -------------------------- Boost-related stuff --------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f77728b2/src/Lucene.Net/Search/Similarities/SimilarityBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/Similarities/SimilarityBase.cs b/src/Lucene.Net/Search/Similarities/SimilarityBase.cs
index 744db3f..68ba97a 100644
--- a/src/Lucene.Net/Search/Similarities/SimilarityBase.cs
+++ b/src/Lucene.Net/Search/Similarities/SimilarityBase.cs
@@ -212,14 +212,14 @@ namespace Lucene.Net.Search.Similarities
for (int i = 0; i < subScorers.Length; i++)
{
BasicStats basicstats = (BasicStats)subStats[i];
- subScorers[i] = new BasicSimScorer(this, basicstats, context.AtomicReader.GetNormValues(basicstats.m_field));
+ subScorers[i] = new BasicSimScorer(this, basicstats, context.AtomicReader.GetNormValues(basicstats.Field));
}
return new MultiSimilarity.MultiSimScorer(subScorers);
}
else
{
BasicStats basicstats = (BasicStats)stats;
- return new BasicSimScorer(this, basicstats, context.AtomicReader.GetNormValues(basicstats.m_field));
+ return new BasicSimScorer(this, basicstats, context.AtomicReader.GetNormValues(basicstats.Field));
}
}
[31/38] lucenenet git commit: Lucene.Net.Search.NGramPhraseQuery:
Added documentation to show usage of collection initializer
Posted by ni...@apache.org.
Lucene.Net.Search.NGramPhraseQuery: Added documentation to show usage of collection initializer
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/121684b7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/121684b7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/121684b7
Branch: refs/heads/master
Commit: 121684b7a929de22aa637c9e016981f7f5c4adb6
Parents: 2de9a6a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 23:55:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:03 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/NGramPhraseQuery.cs | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/121684b7/src/Lucene.Net/Search/NGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/NGramPhraseQuery.cs b/src/Lucene.Net/Search/NGramPhraseQuery.cs
index 2f208ae..7ad97e8 100644
--- a/src/Lucene.Net/Search/NGramPhraseQuery.cs
+++ b/src/Lucene.Net/Search/NGramPhraseQuery.cs
@@ -29,6 +29,20 @@ namespace Lucene.Net.Search
/// <see cref="NGramPhraseQuery"/> rather than <see cref="PhraseQuery"/>, because <see cref="NGramPhraseQuery"/>
/// will <see cref="Rewrite(IndexReader)"/> the query to "AB/0 CD/2", while <see cref="PhraseQuery"/>
/// will query "AB/0 BC/1 CD/2" (where term/position).
+ /// <para/>
+ /// Collection initializer note: To create and populate a <see cref="PhraseQuery"/>
+ /// in a single statement, you can use the following example as a guide:
+ ///
+ /// <code>
+ /// var phraseQuery = new NGramPhraseQuery(2) {
+ /// new Term("field", "ABCD"),
+ /// new Term("field", "EFGH")
+ /// };
+ /// </code>
+ /// Note that as long as you specify all of the parameters, you can use either
+ /// <see cref="PhraseQuery.Add(Term)"/> or <see cref="PhraseQuery.Add(Term, int)"/>
+ /// as the method to use to initialize. If there are multiple parameters, each parameter set
+ /// must be surrounded by curly braces.
/// </summary>
#if FEATURE_SERIALIZABLE
[Serializable]
[20/38] lucenenet git commit: API:
Lucene.Net.Index.SegmentReader.ICoreClosedListener: Renamed
ICoreDisposedListener, OnClose() > OnDispose()
Posted by ni...@apache.org.
API: Lucene.Net.Index.SegmentReader.ICoreClosedListener: Renamed ICoreDisposedListener, OnClose() > OnDispose()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/56025d33
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/56025d33
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/56025d33
Branch: refs/heads/master
Commit: 56025d33d39cbd95f97c4882c8a48f55343d736d
Parents: e1d225b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 15:15:42 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 15:37:29 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Index/SegmentCoreReaders.cs | 12 ++++++------
src/Lucene.Net/Index/SegmentReader.cs | 24 +++++++++++++-----------
src/Lucene.Net/Search/FieldCacheImpl.cs | 8 ++++----
3 files changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/56025d33/src/Lucene.Net/Index/SegmentCoreReaders.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentCoreReaders.cs b/src/Lucene.Net/Index/SegmentCoreReaders.cs
index e9b03fb..c37aea7 100644
--- a/src/Lucene.Net/Index/SegmentCoreReaders.cs
+++ b/src/Lucene.Net/Index/SegmentCoreReaders.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Index
using Directory = Lucene.Net.Store.Directory;
using DocValuesProducer = Lucene.Net.Codecs.DocValuesProducer;
using FieldsProducer = Lucene.Net.Codecs.FieldsProducer;
- using ICoreClosedListener = Lucene.Net.Index.SegmentReader.ICoreClosedListener;
+ using ICoreDisposedListener = Lucene.Net.Index.SegmentReader.ICoreDisposedListener;
using IOContext = Lucene.Net.Store.IOContext;
using IOUtils = Lucene.Net.Util.IOUtils;
using PostingsFormat = Lucene.Net.Codecs.PostingsFormat;
@@ -115,7 +115,7 @@ namespace Lucene.Net.Index
}
}
- private readonly ISet<ICoreClosedListener> coreClosedListeners = new ConcurrentHashSet<ICoreClosedListener>(new IdentityComparer<ICoreClosedListener>());
+ private readonly ISet<ICoreDisposedListener> coreClosedListeners = new ConcurrentHashSet<ICoreDisposedListener>(new IdentityComparer<ICoreDisposedListener>());
internal SegmentCoreReaders(SegmentReader owner, Directory dir, SegmentCommitInfo si, IOContext context, int termsIndexDivisor)
{
@@ -267,13 +267,13 @@ namespace Lucene.Net.Index
{
lock (coreClosedListeners)
{
- foreach (ICoreClosedListener listener in coreClosedListeners)
+ foreach (ICoreDisposedListener listener in coreClosedListeners)
{
// SegmentReader uses our instance as its
// coreCacheKey:
try
{
- listener.OnClose(this);
+ listener.OnDispose(this);
}
catch (Exception t)
{
@@ -292,12 +292,12 @@ namespace Lucene.Net.Index
}
}
- internal void AddCoreClosedListener(ICoreClosedListener listener)
+ internal void AddCoreDisposedListener(ICoreDisposedListener listener)
{
coreClosedListeners.Add(listener);
}
- internal void RemoveCoreClosedListener(ICoreClosedListener listener)
+ internal void RemoveCoreDisposedListener(ICoreDisposedListener listener)
{
coreClosedListeners.Remove(listener);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/56025d33/src/Lucene.Net/Index/SegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentReader.cs b/src/Lucene.Net/Index/SegmentReader.cs
index c5baf10..4af36b5 100644
--- a/src/Lucene.Net/Index/SegmentReader.cs
+++ b/src/Lucene.Net/Index/SegmentReader.cs
@@ -666,39 +666,41 @@ namespace Lucene.Net.Index
/// <summary>
/// Called when the shared core for this <see cref="SegmentReader"/>
/// is disposed.
- /// <para>
+ /// <para/>
/// This listener is called only once all <see cref="SegmentReader"/>s
/// sharing the same core are disposed. At this point it
/// is safe for apps to evict this reader from any caches
/// keyed on <see cref="CoreCacheKey"/>. This is the same
/// interface that <see cref="Search.IFieldCache"/> uses, internally,
- /// to evict entries.</para>
- ///
+ /// to evict entries.
+ /// <para/>
+ /// NOTE: This was CoreClosedListener in Lucene.
+ /// <para/>
/// @lucene.experimental
/// </summary>
- public interface ICoreClosedListener // LUCENENET TODO: API Rename ICoreDisposedListener
+ public interface ICoreDisposedListener
{
/// <summary>
/// Invoked when the shared core of the original
/// <see cref="SegmentReader"/> has disposed.
/// </summary>
- void OnClose(object ownerCoreCacheKey); // LUCENENET TODO: API Rename OnDispose()
+ void OnDispose(object ownerCoreCacheKey);
}
/// <summary>
- /// Expert: adds a <see cref="ICoreClosedListener"/> to this reader's shared core </summary>
- public void AddCoreClosedListener(ICoreClosedListener listener)
+ /// Expert: adds a <see cref="ICoreDisposedListener"/> to this reader's shared core </summary>
+ public void AddCoreDisposedListener(ICoreDisposedListener listener)
{
EnsureOpen();
- core.AddCoreClosedListener(listener);
+ core.AddCoreDisposedListener(listener);
}
/// <summary>
- /// Expert: removes a <see cref="ICoreClosedListener"/> from this reader's shared core </summary>
- public void RemoveCoreClosedListener(ICoreClosedListener listener)
+ /// Expert: removes a <see cref="ICoreDisposedListener"/> from this reader's shared core </summary>
+ public void RemoveCoreDisposedListener(ICoreDisposedListener listener)
{
EnsureOpen();
- core.RemoveCoreClosedListener(listener);
+ core.RemoveCoreDisposedListener(listener);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/56025d33/src/Lucene.Net/Search/FieldCacheImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/FieldCacheImpl.cs b/src/Lucene.Net/Search/FieldCacheImpl.cs
index 30ca516..5cd00b8 100644
--- a/src/Lucene.Net/Search/FieldCacheImpl.cs
+++ b/src/Lucene.Net/Search/FieldCacheImpl.cs
@@ -139,12 +139,12 @@ namespace Lucene.Net.Search
}
// per-segment fieldcaches don't purge until the shared core closes.
- internal readonly SegmentReader.ICoreClosedListener purgeCore;
+ internal readonly SegmentReader.ICoreDisposedListener purgeCore;
#if FEATURE_SERIALIZABLE
[Serializable]
#endif
- private class CoreClosedListenerAnonymousInnerClassHelper : SegmentReader.ICoreClosedListener
+ private class CoreClosedListenerAnonymousInnerClassHelper : SegmentReader.ICoreDisposedListener
{
private FieldCacheImpl outerInstance;
@@ -153,7 +153,7 @@ namespace Lucene.Net.Search
this.outerInstance = outerInstance;
}
- public void OnClose(object ownerCoreCacheKey)
+ public void OnDispose(object ownerCoreCacheKey)
{
outerInstance.PurgeByCacheKey(ownerCoreCacheKey);
}
@@ -185,7 +185,7 @@ namespace Lucene.Net.Search
{
if (reader is SegmentReader)
{
- ((SegmentReader)reader).AddCoreClosedListener(purgeCore);
+ ((SegmentReader)reader).AddCoreDisposedListener(purgeCore);
}
else
{
[33/38] lucenenet git commit: Lucene.Net.Queries.CommonTermsQuery:
Implemented IEnumerable so collection initializer can be used and added
documentation to show usage of collection initializer
Posted by ni...@apache.org.
Lucene.Net.Queries.CommonTermsQuery: Implemented IEnumerable<T> so collection initializer can be used and added documentation to show usage of collection initializer
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a632950c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a632950c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a632950c
Branch: refs/heads/master
Commit: a632950c14a7608e2f98e3f38a740e21d5787c72
Parents: 121684b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 23:56:32 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:04 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/CommonTermsQuery.cs | 35 +++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a632950c/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index dfc4b4a..701dbd6 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Search;
using Lucene.Net.Support;
using Lucene.Net.Util;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
@@ -27,7 +28,7 @@ namespace Lucene.Net.Queries
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
/// A query that executes high-frequency terms in a optional sub-query to prevent
/// slow queries due to "common" terms like stopwords. This query
@@ -52,8 +53,18 @@ namespace Lucene.Net.Queries
/// rewritten into a plain conjunction query ie. all high-frequency terms need to
/// match in order to match a document.
/// </para>
+ /// <para/>
+ /// Collection initializer note: To create and populate a <see cref="CommonTermsQuery"/>
+ /// in a single statement, you can use the following example as a guide:
+ ///
+ /// <code>
+ /// var query = new CommonTermsQuery() {
+ /// new Term("field", "microsoft"),
+ /// new Term("field", "office")
+ /// };
+ /// </code>
/// </summary>
- public class CommonTermsQuery : Query
+ public class CommonTermsQuery : Query, IEnumerable<Term> // LUCENENET specific - implemented IEnumerable<Term>, which allows for use of collection initializer. See: https://stackoverflow.com/a/9195144
{
/*
* TODO maybe it would make sense to abstract this even further and allow to
@@ -476,5 +487,25 @@ namespace Lucene.Net.Queries
{
return context == null ? new TermQuery(term) : new TermQuery(term, context);
}
+
+ /// <summary>
+ /// Returns an enumerator that iterates through the <see cref="m_terms"/> collection.
+ /// </summary>
+ /// <returns>An enumerator that can be used to iterate through the <see cref="m_terms"/> collection.</returns>
+ // LUCENENET specific
+ public IEnumerator<Term> GetEnumerator()
+ {
+ return this.m_terms.GetEnumerator();
+ }
+
+ /// <summary>
+ /// Returns an enumerator that iterates through the <see cref="m_terms"/> collection.
+ /// </summary>
+ /// <returns>An enumerator that can be used to iterate through the <see cref="m_terms"/> collection.</returns>
+ // LUCENENET specific
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return GetEnumerator();
+ }
}
}
\ No newline at end of file
[38/38] lucenenet git commit: Lucene.Net.IOUtils: Removed TODO about
ReThrowUnchecked method - throwing a new exception causes tests to fail. In
Java, most exceptions we are interested in would just be rethrown,
anyway because they subclass RuntimeExcept
Posted by ni...@apache.org.
Lucene.Net.IOUtils: Removed TODO about ReThrowUnchecked method - throwing a new exception causes tests to fail. In Java, most exceptions we are interested in would just be rethrown, anyway because they subclass RuntimeException.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/468199e3
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/468199e3
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/468199e3
Branch: refs/heads/master
Commit: 468199e3fa95c7e1f77b14e7f00aeaafd7c2f8b9
Parents: ab75145
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jun 22 12:13:15 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 12:13:15 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/IOUtils.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/468199e3/src/Lucene.Net/Util/IOUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/IOUtils.cs b/src/Lucene.Net/Util/IOUtils.cs
index 76aa7a4..5907b60 100644
--- a/src/Lucene.Net/Util/IOUtils.cs
+++ b/src/Lucene.Net/Util/IOUtils.cs
@@ -516,7 +516,7 @@ namespace Lucene.Net.Util
/// </summary>
public static void ReThrowUnchecked(Exception th)
{
- if (th != null) // LUCENENET TODO: BUG - In Lucene we throw a new exception type in some cases which may not be caught in a different layer
+ if (th != null)
{
throw th;
}
[30/38] lucenenet git commit: Lucene.Net.Search.MultiPhraseQuery:
Implemented IEnumerable so collection initializer can be used and added
documentation to show usage of collection initializer
Posted by ni...@apache.org.
Lucene.Net.Search.MultiPhraseQuery: Implemented IEnumerable<T> so collection initializer can be used and added documentation to show usage of collection initializer
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/86873c5a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/86873c5a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/86873c5a
Branch: refs/heads/master
Commit: 86873c5aa279831d336a7487819e3284682f8083
Parents: 56d6d6d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 23:53:22 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:02 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/MultiPhraseQuery.cs | 37 +++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86873c5a/src/Lucene.Net/Search/MultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/MultiPhraseQuery.cs b/src/Lucene.Net/Search/MultiPhraseQuery.cs
index 5e2491d..ea93931 100644
--- a/src/Lucene.Net/Search/MultiPhraseQuery.cs
+++ b/src/Lucene.Net/Search/MultiPhraseQuery.cs
@@ -42,6 +42,7 @@ namespace Lucene.Net.Search
using TermsEnum = Lucene.Net.Index.TermsEnum;
using TermState = Lucene.Net.Index.TermState;
using ToStringUtils = Lucene.Net.Util.ToStringUtils;
+ using System.Collections;
/// <summary>
/// <see cref="MultiPhraseQuery"/> is a generalized version of <see cref="PhraseQuery"/>, with an added
@@ -51,11 +52,25 @@ namespace Lucene.Net.Search
/// <see cref="Add(Term)"/> on the term "Microsoft", then find all terms that have "app" as
/// prefix using <c>MultiFields.GetFields(IndexReader).GetTerms(string)</c>, and use <see cref="MultiPhraseQuery.Add(Term[])"/>
/// to add them to the query.
+ /// <para/>
+ /// Collection initializer note: To create and populate a <see cref="MultiPhraseQuery"/>
+ /// in a single statement, you can use the following example as a guide:
+ ///
+ /// <code>
+ /// var multiPhraseQuery = new MultiPhraseQuery() {
+ /// new Term("field", "microsoft"),
+ /// new Term("field", "office")
+ /// };
+ /// </code>
+ /// Note that as long as you specify all of the parameters, you can use either
+ /// <see cref="Add(Term)"/>, <see cref="Add(Term[])"/>, or <see cref="Add(Term[], int)"/>
+ /// as the method to use to initialize. If there are multiple parameters, each parameter set
+ /// must be surrounded by curly braces.
/// </summary>
#if FEATURE_SERIALIZABLE
[Serializable]
#endif
- public class MultiPhraseQuery : Query
+ public class MultiPhraseQuery : Query, IEnumerable<Term[]> // LUCENENET specific - implemented IEnumerable<Term[]>, which allows for use of collection initializer. See: https://stackoverflow.com/a/9195144
{
private string field;
private List<Term[]> termArrays = new List<Term[]>();
@@ -503,6 +518,26 @@ namespace Lucene.Net.Search
}
return true;
}
+
+ /// <summary>
+ /// Returns an enumerator that iterates through the <see cref="termArrays"/> collection.
+ /// </summary>
+ /// <returns>An enumerator that can be used to iterate through the <see cref="termArrays"/> collection.</returns>
+ // LUCENENET specific
+ public IEnumerator<Term[]> GetEnumerator()
+ {
+ return termArrays.GetEnumerator();
+ }
+
+ /// <summary>
+ /// Returns an enumerator that iterates through the <see cref="termArrays"/>.
+ /// </summary>
+ /// <returns>An enumerator that can be used to iterate through the <see cref="termArrays"/> collection.</returns>
+ // LUCENENET specific
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return GetEnumerator();
+ }
}
/// <summary>
[24/38] lucenenet git commit: Lucene.Net.Analysis.Analyzer: fixed
documentation comments
Posted by ni...@apache.org.
Lucene.Net.Analysis.Analyzer: fixed documentation comments
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cf3a71c5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cf3a71c5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cf3a71c5
Branch: refs/heads/master
Commit: cf3a71c5f9339de46822b2decfdbfd53b00eae81
Parents: 7842db8
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 20:14:20 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jun 21 23:59:56 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Analysis/Analyzer.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf3a71c5/src/Lucene.Net/Analysis/Analyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/Analyzer.cs b/src/Lucene.Net/Analysis/Analyzer.cs
index a768d05..f0c2c9d 100644
--- a/src/Lucene.Net/Analysis/Analyzer.cs
+++ b/src/Lucene.Net/Analysis/Analyzer.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Analysis
/// LUCENENET specific
/// </summary>
/// <param name="createComponents">
- /// An delegate method that represents (is called by) the <see cref="CreateComponents(string, TextReader)"/>
+ /// A delegate method that represents (is called by) the <see cref="CreateComponents(string, TextReader)"/>
/// method. It accepts a <see cref="string"/> fieldName and a <see cref="TextReader"/> reader and
/// returns the <see cref="TokenStreamComponents"/> for this analyzer.
/// </param>
@@ -149,7 +149,7 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Creates a new instance with the ability to specify the body of the <see cref="CreateComponents(string, TextReader)"/>
- /// method through the <paramref name="createComponents"/> parameter, the body of the <see cref="InitReader(string, TextReader)"/>
+ /// method through the <paramref name="createComponents"/> parameter and the body of the <see cref="InitReader(string, TextReader)"/>
/// method through the <paramref name="initReader"/> parameter.
/// Simple example:
/// <code>
[35/38] lucenenet git commit: Lucene.Net.Search.DisjunctionMaxQuery:
Added documentation to show usage of collection initializer
Posted by ni...@apache.org.
Lucene.Net.Search.DisjunctionMaxQuery: Added documentation to show usage of collection initializer
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/06e1a902
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/06e1a902
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/06e1a902
Branch: refs/heads/master
Commit: 06e1a902bda741c89d50254a1fd2cab613c7122c
Parents: b1668eb
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 15:47:56 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:25:29 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/DisjunctionMaxQuery.cs | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/06e1a902/src/Lucene.Net/Search/DisjunctionMaxQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/DisjunctionMaxQuery.cs b/src/Lucene.Net/Search/DisjunctionMaxQuery.cs
index dab4dea..24161e0 100644
--- a/src/Lucene.Net/Search/DisjunctionMaxQuery.cs
+++ b/src/Lucene.Net/Search/DisjunctionMaxQuery.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Search
/// <summary>
/// A query that generates the union of documents produced by its subqueries, and that scores each document with the maximum
/// score for that document as produced by any subquery, plus a tie breaking increment for any additional matching subqueries.
- /// this is useful when searching for a word in multiple fields with different boost factors (so that the fields cannot be
+ /// This is useful when searching for a word in multiple fields with different boost factors (so that the fields cannot be
/// combined equivalently into a single search field). We want the primary score to be the one associated with the highest boost,
/// not the sum of the field scores (as <see cref="BooleanQuery"/> would give).
/// <para/>
@@ -44,6 +44,16 @@ namespace Lucene.Net.Search
/// The tie breaker capability allows results that include the same term in multiple fields to be judged better than results that
/// include this term in only the best of those multiple fields, without confusing this with the better case of two different terms
/// in the multiple fields.
+ /// <para/>
+ /// Collection initializer note: To create and populate a <see cref="DisjunctionMaxQuery"/>
+ /// in a single statement, you can use the following example as a guide:
+ ///
+ /// <code>
+ /// var disjunctionMaxQuery = new DisjunctionMaxQuery(0.1f) {
+ /// new TermQuery(new Term("field1", "albino")),
+ /// new TermQuery(new Term("field2", "elephant"))
+ /// };
+ /// </code>
/// </summary>
#if FEATURE_SERIALIZABLE
[Serializable]
@@ -91,9 +101,9 @@ namespace Lucene.Net.Search
/// <summary>
/// Add a collection of disjuncts to this disjunction
- /// via <see cref="T:ICollection{Query}"/> </summary>
+ /// via <see cref="T:IEnumerable{Query}"/> </summary>
/// <param name="disjuncts"> A collection of queries to add as disjuncts. </param>
- public virtual void Add(ICollection<Query> disjuncts) // LUCENENET TODO: API: change back to IEnumerable<Query>. Rename AddRange?
+ public virtual void Add(ICollection<Query> disjuncts)
{
this.disjuncts.AddRange(disjuncts);
}
@@ -104,6 +114,7 @@ namespace Lucene.Net.Search
return disjuncts.GetEnumerator();
}
+ // LUCENENET specific
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
[26/38] lucenenet git commit: API: Lucene.Net.Search.Filter: Added
NewAnonymous() method for easy creation of anonymous classes via delegate
methods.
Posted by ni...@apache.org.
API: Lucene.Net.Search.Filter: Added NewAnonymous() method for easy creation of anonymous classes via delegate methods.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cbb4d3fb
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cbb4d3fb
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cbb4d3fb
Branch: refs/heads/master
Commit: cbb4d3fb8e5e226fdbcba859c34d348142fc482a
Parents: de55c63
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 20:21:06 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:00 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/Filter.cs | 47 +++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cbb4d3fb/src/Lucene.Net/Search/Filter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/Filter.cs b/src/Lucene.Net/Search/Filter.cs
index ad0d726..3910edd 100644
--- a/src/Lucene.Net/Search/Filter.cs
+++ b/src/Lucene.Net/Search/Filter.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Search
#if FEATURE_SERIALIZABLE
[Serializable]
#endif
- public abstract class Filter // LUCENENET TODO: API - Make static NewAnonymous() factory method with delegate method for GetDocIdSet()
+ public abstract class Filter
{
/// <summary>
/// Creates a <see cref="DocIdSet"/> enumerating the documents that should be
@@ -59,5 +59,50 @@ namespace Lucene.Net.Search
/// the filter doesn't accept any documents otherwise internal optimization might not apply
/// in the case an <i>empty</i> <see cref="DocIdSet"/> is returned. </returns>
public abstract DocIdSet GetDocIdSet(AtomicReaderContext context, IBits acceptDocs);
+
+
+ /// <summary>
+ /// Creates a new instance with the ability to specify the body of the <see cref="GetDocIdSet(AtomicReaderContext, IBits)"/>
+ /// method through the <paramref name="getDocIdSet"/> parameter.
+ /// Simple example:
+ /// <code>
+ /// var filter = Filter.NewAnonymous(getDocIdSet: (context, acceptDocs) =>
+ /// {
+ /// if (acceptDocs == null) acceptDocs = new Bits.MatchAllBits(5);
+ /// OpenBitSet bitset = new OpenBitSet(5);
+ /// if (acceptDocs.Get(1)) bitset.Set(1);
+ /// if (acceptDocs.Get(3)) bitset.Set(3);
+ /// return new DocIdBitSet(bitset);
+ /// });
+ /// </code>
+ /// <para/>
+ /// LUCENENET specific
+ /// </summary>
+ /// <param name="getDocIdSet">
+ /// A delegate method that represents (is called by) the <see cref="GetDocIdSet(AtomicReaderContext, IBits)"/>
+ /// method. It accepts a <see cref="AtomicReaderContext"/> context and a <see cref="IBits"/> acceptDocs and
+ /// returns the <see cref="DocIdSet"/> for this filter.
+ /// </param>
+ /// <returns></returns>
+ public static Filter NewAnonymous(Func<AtomicReaderContext, IBits, DocIdSet> getDocIdSet)
+ {
+ return new AnonymousFilter(getDocIdSet);
+ }
+
+ // LUCENENET specific
+ private class AnonymousFilter : Filter
+ {
+ private readonly Func<AtomicReaderContext, IBits, DocIdSet> getDocIdSet;
+
+ public AnonymousFilter(Func<AtomicReaderContext, IBits, DocIdSet> getDocIdSet)
+ {
+ this.getDocIdSet = getDocIdSet;
+ }
+
+ public override DocIdSet GetDocIdSet(AtomicReaderContext context, IBits acceptDocs)
+ {
+ return this.getDocIdSet(context, acceptDocs);
+ }
+ }
}
}
\ No newline at end of file
[22/38] lucenenet git commit: API: Lucene.Net.Util.IOUtils: Renamed
Close() > Dispose(),
CloseWhileHandlingException() > DisposeWhileHandlingException()
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs
index f8a3d07..b519986 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Codecs.Lucene42
}
else
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs
index 6d83470..4208dfe 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs
@@ -130,7 +130,7 @@ namespace Lucene.Net.Codecs.MockIntBlock
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs
index ff6353e..891aab5 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Codecs.MockIntBlock
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 87c232d..82929ca 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Codecs.MockSep
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(@out);
+ IOUtils.DisposeWhileHandlingException(@out);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs
index 3f12ebe..216c8fb 100644
--- a/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Codecs.NestedPulsing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriterInner, pulsingWriter);
+ IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriterInner, pulsingWriter);
}
}
}
@@ -90,7 +90,7 @@ namespace Lucene.Net.Codecs.NestedPulsing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsReader, pulsingReaderInner, pulsingReader);
+ IOUtils.DisposeWhileHandlingException(docsReader, pulsingReaderInner, pulsingReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 9a8f03d..62cb78d 100644
--- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
@@ -686,11 +686,11 @@ namespace Lucene.Net.Codecs.RAMOnly
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(@out);
+ IOUtils.DisposeWhileHandlingException(@out);
}
else
{
- IOUtils.Close(@out);
+ IOUtils.Dispose(@out);
}
}
@@ -721,11 +721,11 @@ namespace Lucene.Net.Codecs.RAMOnly
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
else
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
index 5860f89..22c6a5b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Analysis.Core
}
finally
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
index 447bf18..d98f782 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.Analysis.Core
}
finally
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
}
@@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.Core
}
finally
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
}
@@ -114,7 +114,7 @@ namespace Lucene.Net.Analysis.Core
}
finally
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
index 2c691a7..f911bfe 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
@@ -65,8 +65,8 @@ namespace Lucene.Net.Analysis.Hunspell
}
finally
{
- IOUtils.CloseWhileHandlingException(affixStream);
- IOUtils.CloseWhileHandlingException(null, dictStreams);
+ IOUtils.DisposeWhileHandlingException(affixStream);
+ IOUtils.DisposeWhileHandlingException(null, dictStreams);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index 8873b7a..4ece2fb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Analysis.Hunspell
}
finally
{
- IOUtils.CloseWhileHandlingException(affixStream, dictStream);
+ IOUtils.DisposeWhileHandlingException(affixStream, dictStream);
}
}
@@ -140,7 +140,7 @@ namespace Lucene.Net.Analysis.Hunspell
}
finally
{
- IOUtils.CloseWhileHandlingException(affixStream, dictStream);
+ IOUtils.DisposeWhileHandlingException(affixStream, dictStream);
}
Analyzer a = new AnalyzerAnonymousInnerClassHelper3(this, d);
CheckOneTerm(a, "NoChAnGy", "NoChAnGy");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
index c08c1db..e3aa88e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
}
finally
{
- IOUtils.CloseWhileHandlingException(tokenStream);
+ IOUtils.DisposeWhileHandlingException(tokenStream);
}
tokenStream = analyzer.GetTokenStream("special", text);
@@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
}
finally
{
- IOUtils.CloseWhileHandlingException(tokenStream);
+ IOUtils.DisposeWhileHandlingException(tokenStream);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
index a711d7d..e5caf56 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Analysis.Shingle
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
ScoreDoc[] hits = searcher.Search(q, null, 1000).ScoreDocs;
@@ -143,7 +143,7 @@ namespace Lucene.Net.Analysis.Shingle
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
ScoreDoc[] hits = searcher.Search(q, null, 1000).ScoreDocs;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
index f9f935f..79249c8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
// just for fun
@@ -205,7 +205,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
// just for fun
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
index 7a5f12f..7bbfcef 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Analysis.Util
{
try
{
- IOUtils.CloseWhileHandlingException(rl.OpenResource("/this-directory-really-really-really-should-not-exist/foo/bar.txt"));
+ IOUtils.DisposeWhileHandlingException(rl.OpenResource("/this-directory-really-really-really-should-not-exist/foo/bar.txt"));
fail("The resource does not exist, should fail!");
}
catch (IOException)
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.CloseWhileHandlingException(os);
+ IOUtils.DisposeWhileHandlingException(os);
}
IResourceLoader rl = new FilesystemResourceLoader(@base);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
index 9233dfd..048ebcf 100644
--- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
@@ -280,7 +280,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual(11, dsr.Hits.TotalHits);
Assert.AreEqual("dim=dim path=[] value=11 childCount=2\n b (8)\n a (3)\n", dsr.Facets.GetTopChildren(10, "dim").ToString());
Assert.AreEqual("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n", dsr.Facets.GetTopChildren(10, "field").ToString());
- IOUtils.Close(tw, tr, td, w, r, d);
+ IOUtils.Dispose(tw, tr, td, w, r, d);
}
private class DrillSidewaysAnonymousInnerClassHelper : DrillSideways
@@ -349,7 +349,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n", facets.GetTopChildren(10, "field").ToString());
- IOUtils.Close(w, r, d);
+ IOUtils.Dispose(w, r, d);
}
[Test]
@@ -377,7 +377,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n", facets.GetTopChildren(10, "field").ToString());
- IOUtils.Close(w, r, d);
+ IOUtils.Dispose(w, r, d);
}
[Test]
@@ -570,7 +570,7 @@ namespace Lucene.Net.Facet.Range
}
}
- IOUtils.Close(w, r, dir);
+ IOUtils.Dispose(w, r, dir);
}
[Test]
@@ -775,7 +775,7 @@ namespace Lucene.Net.Facet.Range
}
}
- IOUtils.Close(w, r, dir);
+ IOUtils.Dispose(w, r, dir);
}
[Test]
@@ -962,7 +962,7 @@ namespace Lucene.Net.Facet.Range
}
}
- IOUtils.Close(w, r, dir);
+ IOUtils.Dispose(w, r, dir);
}
// LUCENE-5178
@@ -997,7 +997,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual("dim=field path=[] value=16 childCount=5\n less than 10 (8)\n less than or equal to 10 (8)\n over 90 (8)\n 90 or above (8)\n over 1000 (0)\n", facets.GetTopChildren(10, "field").ToString());
- IOUtils.Close(w, r, d);
+ IOUtils.Dispose(w, r, d);
}
[Test]
@@ -1062,7 +1062,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual(1, dsr.Hits.TotalHits);
Assert.AreEqual("dim=field path=[] value=3 childCount=6\n < 1 (0)\n < 2 (1)\n < 5 (3)\n < 10 (3)\n < 20 (3)\n < 50 (3)\n", dsr.Facets.GetTopChildren(10, "field").ToString());
- IOUtils.Close(r, writer, dir);
+ IOUtils.Dispose(r, writer, dir);
}
private class ValueSourceAnonymousInnerClassHelper : ValueSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
index fe385d1..91ea391 100644
--- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
+++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
@@ -95,7 +95,7 @@ namespace Lucene.Net.Facet.SortedSet
TopDocs hits = searcher.Search(q, 1);
Assert.AreEqual(1, hits.TotalHits);
- IOUtils.Close(writer, searcher.IndexReader, dir);
+ IOUtils.Dispose(writer, searcher.IndexReader, dir);
}
// LUCENE-5090
@@ -280,7 +280,7 @@ namespace Lucene.Net.Facet.SortedSet
// Ask for top 10 labels for any dims that have counts:
Assert.AreEqual("dim=a path=[] value=2 childCount=2\n foo1 (1)\n foo2 (1)\n", facets.GetTopChildren(10, "a").ToString());
- IOUtils.Close(writer, searcher.IndexReader, dir);
+ IOUtils.Dispose(writer, searcher.IndexReader, dir);
}
@@ -387,7 +387,7 @@ namespace Lucene.Net.Facet.SortedSet
CollectionAssert.AreEqual(expected, actual);
}
- IOUtils.Close(w, searcher.IndexReader, indexDir, taxoDir);
+ IOUtils.Dispose(w, searcher.IndexReader, indexDir, taxoDir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
index a6981a1..fc8db8f 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
validate(dirs[0], dirs[1], map);
- IOUtils.Close(dirs);
+ IOUtils.Dispose(dirs);
}
private class ThreadAnonymousInnerClassHelper : ThreadClass
@@ -175,7 +175,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
validate(dest, src, map);
- IOUtils.Close(dest, src);
+ IOUtils.Dispose(dest, src);
}
[Test]
@@ -196,7 +196,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
validate(dest, src, map);
- IOUtils.Close(dest, src);
+ IOUtils.Dispose(dest, src);
}
// A more comprehensive and big random test.
@@ -242,7 +242,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
validate(dest, src, map);
- IOUtils.Close(dest, src);
+ IOUtils.Dispose(dest, src);
}
[Test]
@@ -285,7 +285,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
dtr.Dispose();
- IOUtils.Close(src, dest);
+ IOUtils.Dispose(src, dest);
}
private class ThreadAnonymousInnerClassHelper2 : ThreadClass
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
index ee95b0d..969a970 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
@@ -166,7 +166,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
}
- IOUtils.Close(tw, iw, tr, taxoDir, indexDir);
+ IOUtils.Dispose(tw, iw, tr, taxoDir, indexDir);
}
private class ThreadAnonymousInnerClassHelper : ThreadClass
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
index 3fcabb8..d4b8f90 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
finally
{
- IOUtils.Close(ltw, ltr, dir);
+ IOUtils.Dispose(ltw, ltr, dir);
}
}
@@ -193,7 +193,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
finally
{
- IOUtils.Close(tr as DirectoryTaxonomyReader, tw, dir);
+ IOUtils.Dispose(tr as DirectoryTaxonomyReader, tw, dir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
index a8c3930..62ca95c 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
@@ -342,7 +342,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
}
- IOUtils.Close(dtr, dir);
+ IOUtils.Dispose(dtr, dir);
}
private class ThreadAnonymousInnerClassHelper : ThreadClass
@@ -541,7 +541,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
// when too large components were allowed to be added, this resulted in a new added category
Assert.AreEqual(ordinal, taxoWriter.AddCategory(cp));
- IOUtils.Close(indexWriter, taxoWriter);
+ IOUtils.Dispose(indexWriter, taxoWriter);
DirectoryReader indexReader = DirectoryReader.Open(indexDir);
var taxoReader = new DirectoryTaxonomyReader(taxoDir);
@@ -550,7 +550,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
ddq.Add("dim", bigs);
Assert.AreEqual(1, searcher.Search(ddq, 10).TotalHits);
- IOUtils.Close(indexReader, taxoReader, indexDir, taxoDir);
+ IOUtils.Dispose(indexReader, taxoReader, indexDir, taxoDir);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
index 77aa338..b48c6c5 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
}
- IOUtils.Close(writer, taxoWriter, reader, indexDir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, reader, indexDir, taxoDir);
}
private class ThreadAnonymousInnerClassHelper : ThreadClass
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
index a7ff6d6..f587bd4 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
@@ -207,7 +207,7 @@ namespace Lucene.Net.Facet.Taxonomy
Console.WriteLine("TEST: now stop");
}
- IOUtils.Close(mgr, tw, w, taxoDir, dir);
+ IOUtils.Dispose(mgr, tw, w, taxoDir, dir);
}
private class ThreadAnonymousInnerClassHelper : ThreadClass
@@ -314,7 +314,7 @@ namespace Lucene.Net.Facet.Taxonomy
Console.WriteLine("TEST: now stop");
}
- IOUtils.Close(mgr, tw, w, taxoDir, indexDir);
+ IOUtils.Dispose(mgr, tw, w, taxoDir, indexDir);
}
[Test]
@@ -344,7 +344,7 @@ namespace Lucene.Net.Facet.Taxonomy
// expected
}
- IOUtils.Close(mgr, tw, w, taxoDir, dir);
+ IOUtils.Dispose(mgr, tw, w, taxoDir, dir);
}
[Test]
@@ -390,7 +390,7 @@ namespace Lucene.Net.Facet.Taxonomy
mgr.Release(pair);
}
- IOUtils.Close(mgr, tw, w, taxoDir, indexDir);
+ IOUtils.Dispose(mgr, tw, w, taxoDir, indexDir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 6f3b1e5..774377b 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -211,7 +211,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
// expected
}
- IOUtils.Close(writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, dir, taxoDir);
}
[Test]
@@ -236,7 +236,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
// expected
}
- IOUtils.Close(writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, dir, taxoDir);
}
[Test]
@@ -261,7 +261,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
// expected
}
- IOUtils.Close(writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, dir, taxoDir);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index 705b476..4fcdc36 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -148,7 +148,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.True(result.IndexOf(" /2012", StringComparison.Ordinal) != -1);
Assert.True(result.IndexOf(" /20", StringComparison.Ordinal) != -1);
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir);
}
// LUCENE-5333
@@ -209,7 +209,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual("dim=b path=[] value=2 childCount=2\n bar1 (1)\n bar2 (1)\n", results[1].ToString());
Assert.AreEqual("dim=c path=[] value=1 childCount=1\n baz1 (1)\n", results[2].ToString());
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir);
}
[Test]
@@ -279,7 +279,7 @@ namespace Lucene.Net.Facet.Taxonomy
// expected
}
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir);
}
[Test]
@@ -297,7 +297,7 @@ namespace Lucene.Net.Facet.Taxonomy
doc.Add(NewTextField("field", "text", Field.Store.NO));
doc.Add(new FacetField("a", "path"));
writer.AddDocument(config.Build(taxoWriter, doc));
- IOUtils.Close(writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, dir, taxoDir);
}
private class PerFieldSimilarityWrapperAnonymousInnerClassHelper : PerFieldSimilarityWrapper
@@ -366,7 +366,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(1, result.LabelValues.Length);
Assert.AreEqual(1, (int)result.LabelValues[0].Value);
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
}
[Test]
@@ -401,7 +401,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetResult result = facets.GetTopChildren(10, "dim");
Assert.AreEqual("dim=dim path=[] value=-1 childCount=2\n test\u001Fone (1)\n test\u001Etwo (1)\n", result.ToString());
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
}
[Test]
@@ -455,7 +455,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
Assert.AreEqual(1, facets.GetSpecificValue("dim2"));
Assert.AreEqual(1, facets.GetSpecificValue("dim3"));
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
}
// LUCENE-4583: make sure if we require > 32 KB for one
@@ -509,7 +509,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
Assert.AreEqual(numLabels, allLabels.Count);
- IOUtils.Close(searcher.IndexReader, taxoWriter, writer, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoWriter, writer, taxoReader, dir, taxoDir);
}
// Make sure we catch when app didn't declare field as
@@ -535,7 +535,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
// expected
}
- IOUtils.Close(writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, dir, taxoDir);
}
// Make sure we catch when app didn't declare field as
@@ -562,7 +562,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
// expected
}
- IOUtils.Close(writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, dir, taxoDir);
}
[Test]
@@ -594,7 +594,7 @@ namespace Lucene.Net.Facet.Taxonomy
Facets facets2 = GetTaxonomyFacetCounts(taxoReader, config, sfc, "$b");
Assert.AreEqual(r.MaxDoc, (int)facets1.GetTopChildren(10, "a").Value);
Assert.AreEqual(r.MaxDoc, (int)facets2.GetTopChildren(10, "b").Value);
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -626,7 +626,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(r.NumDocs, (int)result.Value);
}
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -656,7 +656,7 @@ namespace Lucene.Net.Facet.Taxonomy
IList<FacetResult> res2 = facets.GetAllDims(10);
Assert.AreEqual(res1, res2, "calling getFacetResults twice should return the .equals()=true result");
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -685,7 +685,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(10, facets.GetTopChildren(2, "a").ChildCount);
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
private void indexTwoDocs(ITaxonomyWriter taxoWriter, IndexWriter indexWriter, FacetsConfig config, bool withContent)
@@ -731,7 +731,7 @@ namespace Lucene.Net.Facet.Taxonomy
indexTwoDocs(taxoWriter, indexWriter, null, true); // 5th segment, with content, no categories
indexTwoDocs(taxoWriter, indexWriter, config, true); // 6th segment, with content, with categories
indexTwoDocs(taxoWriter, indexWriter, null, true); // 7th segment, with content, no categories
- IOUtils.Close(indexWriter, taxoWriter);
+ IOUtils.Dispose(indexWriter, taxoWriter);
DirectoryReader indexReader = DirectoryReader.Open(indexDir);
var taxoReader = new DirectoryTaxonomyReader(taxoDir);
@@ -749,7 +749,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(2, (int)labelValue.Value, "wrong weight for child " + labelValue.Label);
}
- IOUtils.Close(indexReader, taxoReader, indexDir, taxoDir);
+ IOUtils.Dispose(indexReader, taxoReader, indexDir, taxoDir);
}
[Test]
@@ -854,7 +854,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(expected, actual);
}
- IOUtils.Close(w, tw, searcher.IndexReader, tr, indexDir, taxoDir);
+ IOUtils.Dispose(w, tw, searcher.IndexReader, tr, indexDir, taxoDir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index ef1f02c..a154a73 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Facet.Taxonomy
[OneTimeTearDown]
public override void AfterClass() // LUCENENET specific - renamed from AfterClassCountingFacetsAggregatorTest() to ensure calling order
{
- IOUtils.Close(indexDir, taxoDir);
+ IOUtils.Dispose(indexDir, taxoDir);
base.AfterClass();
}
@@ -280,7 +280,7 @@ namespace Lucene.Net.Facet.Taxonomy
// segment w/ categories and some content
IndexDocsWithFacetsAndSomeTerms(indexWriter, taxoWriter, allExpectedCounts);
- IOUtils.Close(indexWriter, taxoWriter);
+ IOUtils.Dispose(indexWriter, taxoWriter);
}
[Test]
@@ -308,7 +308,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(termExpectedCounts[CP_B + "/" + labelValue.Label], labelValue.Value);
}
- IOUtils.Close(indexReader, taxoReader);
+ IOUtils.Dispose(indexReader, taxoReader);
}
[Test]
@@ -343,7 +343,7 @@ namespace Lucene.Net.Facet.Taxonomy
prevValue = (int)labelValue.Value;
}
- IOUtils.Close(indexReader, taxoReader);
+ IOUtils.Dispose(indexReader, taxoReader);
}
[Test]
@@ -371,7 +371,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(allExpectedCounts[CP_B + "/" + labelValue.Label], labelValue.Value);
}
- IOUtils.Close(indexReader, taxoReader);
+ IOUtils.Dispose(indexReader, taxoReader);
}
[Test]
@@ -399,7 +399,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(allExpectedCounts[CP_D + "/" + labelValue.Label], labelValue.Value);
}
- IOUtils.Close(indexReader, taxoReader);
+ IOUtils.Dispose(indexReader, taxoReader);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
index 950ef32..0923018 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
@@ -197,7 +197,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual("dim=b path=[] value=50.0 childCount=2\n bar2 (30.0)\n bar1 (20.0)\n", results[1].ToString());
Assert.AreEqual("dim=c path=[] value=30.0 childCount=1\n baz1 (30.0)\n", results[2].ToString());
- IOUtils.Close(searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoReader, dir, taxoDir);
}
[Test]
@@ -258,7 +258,7 @@ namespace Lucene.Net.Facet.Taxonomy
// expected
}
- IOUtils.Close(searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoReader, dir, taxoDir);
}
[Test]
@@ -297,7 +297,7 @@ namespace Lucene.Net.Facet.Taxonomy
int expected = (int)(td.MaxScore * td.TotalHits);
Assert.AreEqual(expected, (int)facets.GetSpecificValue("dim", "a"));
- IOUtils.Close(iw, taxoWriter, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(iw, taxoWriter, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -325,7 +325,7 @@ namespace Lucene.Net.Facet.Taxonomy
Facets facets = new TaxonomyFacetSumValueSource(taxoReader, config, sfc, new Int64FieldSource("price"));
Assert.AreEqual("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.GetTopChildren(10, "a").ToString());
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -359,7 +359,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.GetTopChildren(10, "a").ToString());
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
private class ValueSourceAnonymousInnerClassHelper : ValueSource
@@ -451,7 +451,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.GetTopChildren(10, "a").ToString());
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -485,7 +485,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(r.MaxDoc, (int)facets1.GetTopChildren(10, "a").Value);
Assert.AreEqual(r.MaxDoc, (double)facets2.GetTopChildren(10, "b").Value, 1E-10);
- IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
[Test]
@@ -600,7 +600,7 @@ namespace Lucene.Net.Facet.Taxonomy
AssertFloatValuesEquals(expected, actual);
}
- IOUtils.Close(w, tw, searcher.IndexReader, tr, indexDir, taxoDir);
+ IOUtils.Dispose(w, tw, searcher.IndexReader, tr, indexDir, taxoDir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 4227f8c..221f815 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.Facet
[OneTimeTearDown]
public override void AfterClass() // LUCENENET specific - renamed from AfterClassDrillDownQueryTest() to ensure calling order
{
- IOUtils.Close(reader, taxo, dir, taxoDir);
+ IOUtils.Dispose(reader, taxo, dir, taxoDir);
reader = null;
taxo = null;
dir = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
index 636a0e5..b8f1ab6 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
@@ -246,7 +246,7 @@ namespace Lucene.Net.Facet
Assert.AreEqual(0, r.Hits.TotalHits);
Assert.Null(r.Facets.GetTopChildren(10, "Publish Date"));
Assert.Null(r.Facets.GetTopChildren(10, "Author"));
- IOUtils.Close(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir);
}
[Test]
@@ -302,7 +302,7 @@ namespace Lucene.Net.Facet
// published once:
Assert.AreEqual("dim=Author path=[] value=2 childCount=2\n Bob (1)\n Lisa (1)\n", r.Facets.GetTopChildren(10, "Author").ToString());
- IOUtils.Close(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir);
}
[Test]
@@ -359,7 +359,7 @@ namespace Lucene.Net.Facet
Assert.AreEqual("dim=dim path=[] value=6 childCount=4\n a (3)\n b (1)\n c (1)\n d (1)\n", r.Facets.GetTopChildren(10, "dim").ToString());
Assert.AreEqual("dim=dim path=[a] value=3 childCount=3\n x (1)\n y (1)\n z (1)\n", r.Facets.GetTopChildren(10, "dim", "a").ToString());
- IOUtils.Close(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir);
}
internal class Doc : IComparable<Doc>
@@ -802,7 +802,7 @@ namespace Lucene.Net.Facet
}
}
- IOUtils.Close(r, tr, w, tw, d, td);
+ IOUtils.Dispose(r, tr, w, tw, d, td);
}
private class FilterAnonymousInnerClassHelper : Filter
@@ -1318,7 +1318,7 @@ namespace Lucene.Net.Facet
r = ds.Search(ddq, null, null, 10, new Sort(new SortField("foo", SortFieldType.INT32)), false, false); // this used to fail on IllegalArgEx
Assert.AreEqual(0, r.Hits.TotalHits);
- IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
index a0772dc..cb2db07 100644
--- a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
+++ b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Facet
// these two addDocument() used to fail
indexWriter.AddDocument(doc);
indexWriter.AddDocument(doc);
- IOUtils.Close(indexWriter, taxoWriter);
+ IOUtils.Dispose(indexWriter, taxoWriter);
DirectoryReader indexReader = DirectoryReader.Open(indexDir);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
@@ -91,9 +91,9 @@ namespace Lucene.Net.Facet
FacetResult res = facets.GetTopChildren(10, "a");
Assert.AreEqual(1, res.LabelValues.Length);
Assert.AreEqual(2, res.LabelValues[0].Value);
- IOUtils.Close(indexReader, taxoReader);
+ IOUtils.Dispose(indexReader, taxoReader);
- IOUtils.Close(indexDir, taxoDir);
+ IOUtils.Dispose(indexDir, taxoDir);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
index 8c4d86b..a8612e8 100644
--- a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
+++ b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Facet
assertOrdinalsExist("$facets", ir);
- IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir);
+ IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir);
}
[Test]
@@ -125,7 +125,7 @@ namespace Lucene.Net.Facet
assertOrdinalsExist("$facets", ir);
assertOrdinalsExist("$author", ir);
- IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir);
+ IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir);
}
[Test]
@@ -168,7 +168,7 @@ namespace Lucene.Net.Facet
assertOrdinalsExist("$music", ir);
assertOrdinalsExist("$music", ir);
- IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir);
+ IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir);
}
private void assertOrdinalsExist(string field, IndexReader ir)
@@ -222,7 +222,7 @@ namespace Lucene.Net.Facet
assertOrdinalsExist("$bands", ir);
assertOrdinalsExist("$composers", ir);
- IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir);
+ IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir);
}
[Test]
@@ -265,8 +265,8 @@ namespace Lucene.Net.Facet
assertOrdinalsExist("$music", ir);
assertOrdinalsExist("$literature", ir);
- IOUtils.Close(tr, ir, iw, tw);
- IOUtils.Close(indexDir, taxoDir);
+ IOUtils.Dispose(tr, ir, iw, tw);
+ IOUtils.Dispose(indexDir, taxoDir);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
index b98b283..078484e 100644
--- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
+++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Facet
// NRT open
IndexSearcher searcher = NewSearcher(writer.Reader);
var taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- IOUtils.Close(writer, taxoWriter);
+ IOUtils.Dispose(writer, taxoWriter);
// Test empty results
RandomSamplingFacetsCollector collectRandomZeroResults = new RandomSamplingFacetsCollector(numDocs / 10, random.NextLong());
@@ -146,7 +146,7 @@ namespace Lucene.Net.Facet
Assert.True(sigma < 200);
Assert.True(targetMu - 3 * sigma < mu && mu < targetMu + 3 * sigma);
- IOUtils.Close(searcher.IndexReader, taxoReader, dir, taxoDir);
+ IOUtils.Dispose(searcher.IndexReader, taxoReader, dir, taxoDir);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs
index 6518171..21b4a98 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs
@@ -191,7 +191,7 @@ namespace Lucene.Net.Search.VectorHighlight
}
finally
{
- IOUtils.CloseWhileHandlingException(tokenStream);
+ IOUtils.DisposeWhileHandlingException(tokenStream);
}
return bytesRefs;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
index a7681d7..3eba683 100644
--- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
+++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
@@ -141,7 +141,7 @@ namespace Lucene.Net.Index.Memory
AtomicReader reader = (AtomicReader)memory.CreateSearcher().IndexReader;
DirectoryReader competitor = DirectoryReader.Open(ramdir);
DuellReaders(competitor, reader);
- IOUtils.Close(reader, competitor);
+ IOUtils.Dispose(reader, competitor);
AssertAllQueries(memory, ramdir, analyzer);
ramdir.Dispose();
}
@@ -506,7 +506,7 @@ namespace Lucene.Net.Index.Memory
DirectoryReader competitor = DirectoryReader.Open(dir);
AtomicReader memIndexReader = (AtomicReader)memory.CreateSearcher().IndexReader;
DuellReaders(competitor, memIndexReader);
- IOUtils.Close(competitor, memIndexReader);
+ IOUtils.Dispose(competitor, memIndexReader);
memory.Reset();
dir.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs
index 8d66f19..a48ea0b 100644
--- a/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs
@@ -345,7 +345,7 @@ namespace Lucene.Net.QueryParsers.Classic
if ("f1".equals(fieldName))
{
// we don't use the reader, so close it:
- IOUtils.CloseWhileHandlingException(reader);
+ IOUtils.DisposeWhileHandlingException(reader);
// return empty reader, so MockTokenizer returns no tokens:
return new StringReader("");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs
index 825dfe1..030678b 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs
@@ -412,7 +412,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
if ("f1".equals(fieldName))
{
// we don't use the reader, so close it:
- IOUtils.CloseWhileHandlingException(reader);
+ IOUtils.DisposeWhileHandlingException(reader);
// return empty reader, so MockTokenizer returns no tokens:
return new StringReader("");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs b/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs
index 06215e3..075cc2c 100644
--- a/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs
+++ b/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Spatial
public override void TearDown()
{
- IOUtils.Close(indexWriter, indexReader, directory);
+ IOUtils.Dispose(indexWriter, indexReader, directory);
base.TearDown();
}
@@ -99,7 +99,7 @@ namespace Lucene.Net.Spatial
protected virtual void Commit()
{
indexWriter.Commit();
- IOUtils.Close(indexReader);
+ IOUtils.Dispose(indexReader);
indexReader = indexWriter.Reader;
indexSearcher = NewSearcher(indexReader);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
index e2e813b..07b4f6e 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
@@ -191,7 +191,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
index bbd141c..5f8ad17 100644
--- a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
@@ -213,7 +213,7 @@ namespace Lucene.Net.Analysis
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, stream);
+ IOUtils.DisposeWhileHandlingException(priorException, stream);
}
AssertAnalyzesTo(analyzer, testString, new string[] { "t" });
@@ -298,7 +298,7 @@ namespace Lucene.Net.Analysis
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, ts);
+ IOUtils.DisposeWhileHandlingException(priorException, ts);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
index 4935c0d..ed5102f 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Codecs.Lucene40
Assert.AreEqual(terms.Count, enums.Count);
}
- IOUtils.Close(writer, open, dir);
+ IOUtils.Dispose(writer, open, dir);
}
// tests for reuse only if bits are the same either null or the same instance
@@ -129,7 +129,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
Assert.AreEqual(1, enums.Count);
}
- IOUtils.Close(writer, open, dir);
+ IOUtils.Dispose(writer, open, dir);
}
// make sure we never reuse from another reader even if it is the same field & codec etc
@@ -177,7 +177,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
Assert.AreEqual(terms.Count, enums.Count);
}
- IOUtils.Close(writer, firstReader, secondReader, dir);
+ IOUtils.Dispose(writer, firstReader, secondReader, dir);
}
public virtual DocsEnum RandomDocsEnum(string field, BytesRef term, IList<AtomicReaderContext> readers, IBits bits)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
index ec53ddf..5be15ec 100644
--- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
@@ -1392,7 +1392,7 @@ namespace Lucene.Net.Index
// expected
}
- IOUtils.Close(w1, w2, src, dest);
+ IOUtils.Dispose(w1, w2, src, dest);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs b/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs
index 9267a8a..2779dd5 100644
--- a/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs
+++ b/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs
@@ -102,11 +102,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
index e142ad0..0b6d28c 100644
--- a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
+++ b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
@@ -107,11 +107,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
index 3b5e738..1b0b02c 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
@@ -261,7 +261,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(1, GetValue(bdv1, 0, scratch));
Assert.AreEqual(10, GetValue(bdv2, 0, scratch));
- IOUtils.Close(writer, reader1, reader2, dir);
+ IOUtils.Dispose(writer, reader1, reader2, dir);
}
[Test]
@@ -988,7 +988,7 @@ namespace Lucene.Net.Index
// System.out.println();
}
- IOUtils.Close(writer, reader, dir);
+ IOUtils.Dispose(writer, reader, dir);
}
[Test]
@@ -1583,7 +1583,7 @@ namespace Lucene.Net.Index
}
reader_.Dispose();
- IOUtils.Close(dir1, dir2);
+ IOUtils.Dispose(dir1, dir2);
}
[Test]
@@ -1852,7 +1852,7 @@ namespace Lucene.Net.Index
}
finally
{
- IOUtils.Close(indexReader, taxoReader, nFsd);
+ IOUtils.Dispose(indexReader, taxoReader, nFsd);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
index f9aa9b3..5386ab4 100644
--- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
@@ -904,11 +904,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 201bf33..827be36 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -1280,7 +1280,7 @@ namespace Lucene.Net.Index
}
finally
{
- IOUtils.CloseWhileHandlingException(r);
+ IOUtils.DisposeWhileHandlingException(r);
}
}
if (i % 10 == 0)
@@ -1379,7 +1379,7 @@ namespace Lucene.Net.Index
}
try
{
- IOUtils.Close(dir);
+ IOUtils.Dispose(dir);
}
catch (IOException e)
{
@@ -1387,7 +1387,7 @@ namespace Lucene.Net.Index
}
try
{
- IOUtils.Close(Adder);
+ IOUtils.Dispose(Adder);
}
catch (IOException e)
{
@@ -2589,7 +2589,7 @@ namespace Lucene.Net.Index
}
}
Assert.IsTrue(liveIds.Count == 0);
- IOUtils.Close(reader, w, dir);
+ IOUtils.Dispose(reader, w, dir);
}
private class RandomFailingFieldIterable : IEnumerable<IEnumerable<IIndexableField>>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestLongPostings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
index 68a9a6a..cd1eae7 100644
--- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
@@ -94,7 +94,7 @@ namespace Lucene.Net.Index
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, ts);
+ IOUtils.DisposeWhileHandlingException(priorException, ts);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
index ddfd858..fe7225a 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
@@ -221,7 +221,7 @@ namespace Lucene.Net.Index
// System.out.println();
}
- IOUtils.Close(writer, reader, dir);
+ IOUtils.Dispose(writer, reader, dir);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
index 9a0dee7..455671c 100644
--- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
@@ -222,7 +222,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(1, ((AtomicReader)reader1.Leaves[0].Reader).GetNumericDocValues("val").Get(0));
Assert.AreEqual(10, ((AtomicReader)reader2.Leaves[0].Reader).GetNumericDocValues("val").Get(0));
- IOUtils.Close(writer, reader1, reader2, dir);
+ IOUtils.Dispose(writer, reader1, reader2, dir);
}
[Test]
@@ -938,7 +938,7 @@ namespace Lucene.Net.Index
// System.out.println();
}
- IOUtils.Close(writer, reader, dir);
+ IOUtils.Dispose(writer, reader, dir);
}
[Test]
@@ -1499,7 +1499,7 @@ namespace Lucene.Net.Index
}
reader_.Dispose();
- IOUtils.Close(dir1, dir2);
+ IOUtils.Dispose(dir1, dir2);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
index 6eb23dc..4fc5676 100644
--- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
@@ -560,11 +560,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(riw, dir);
+ IOUtils.Dispose(riw, dir);
}
else
{
- IOUtils.CloseWhileHandlingException(riw, dir);
+ IOUtils.DisposeWhileHandlingException(riw, dir);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
index ea79401..bef659b 100644
--- a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
@@ -211,7 +211,7 @@ namespace Lucene.Net.Index
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, stream);
+ IOUtils.DisposeWhileHandlingException(priorException, stream);
}
w.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
index f92dd19..2948fd0 100644
--- a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Search
[TearDown]
public override void TearDown()
{
- IOUtils.Close(Iw, Ir, Dir);
+ IOUtils.Dispose(Iw, Ir, Dir);
base.TearDown();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
index 8ce1937..96c8be9 100644
--- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
@@ -435,7 +435,7 @@ namespace Lucene.Net.Search
}
thread.Dispose();
thread.Join();
- IOUtils.Close(manager, _writer, d);
+ IOUtils.Dispose(manager, _writer, d);
}
private class ThreadAnonymousInnerClassHelper : ThreadClass
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
index ef34a8f..28b9649 100644
--- a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
@@ -505,7 +505,7 @@ namespace Lucene.Net.Search
TopDocs search = searcher.Search(query, 10);
Assert.AreEqual(totalDocsWithZero, search.TotalHits);
- IOUtils.Close(reader, writer, directory);
+ IOUtils.Dispose(reader, writer, directory);
}
private class FilterAnonymousInnerClassHelper3 : Filter
@@ -627,7 +627,7 @@ namespace Lucene.Net.Search
TopDocs search = searcher.Search(query, 10);
Assert.AreEqual(totalDocsWithZero, search.TotalHits);
- IOUtils.Close(reader, writer, directory);
+ IOUtils.Dispose(reader, writer, directory);
}
private class FilterAnonymousInnerClassHelper4 : Filter
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs b/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
index c2456ba..31391ca 100644
--- a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
+++ b/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
@@ -138,7 +138,7 @@ namespace Lucene.Net.Search
}
finally
{
- IOUtils.Close(r, dir);
+ IOUtils.Dispose(r, dir);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
index b1dab24..fde7116 100644
--- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
@@ -680,7 +680,7 @@ namespace Lucene.Net.Search
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, ts);
+ IOUtils.DisposeWhileHandlingException(priorException, ts);
}
}
else
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/Search/TestTermVectors.cs
index ae6939a..454aa02 100644
--- a/src/Lucene.Net.Tests/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/Search/TestTermVectors.cs
@@ -248,7 +248,7 @@ namespace Lucene.Net.Search
VerifyIndex(target);
- IOUtils.Close(target, input[0], input[1]);
+ IOUtils.Dispose(target, input[0], input[1]);
}
[Test]
@@ -273,7 +273,7 @@ namespace Lucene.Net.Search
writer.Dispose();
VerifyIndex(target);
- IOUtils.Close(target, input[0], input[1]);
+ IOUtils.Dispose(target, input[0], input[1]);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Util/TestIOUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Util/TestIOUtils.cs b/src/Lucene.Net.Tests/Util/TestIOUtils.cs
index 2f5ce7d..e27c9df 100644
--- a/src/Lucene.Net.Tests/Util/TestIOUtils.cs
+++ b/src/Lucene.Net.Tests/Util/TestIOUtils.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Util
try
{
TestException t = new TestException();
- IOUtils.CloseWhileHandlingException(t, new BrokenIDisposable(1), new BrokenIDisposable(2));
+ IOUtils.DisposeWhileHandlingException(t, new BrokenIDisposable(1), new BrokenIDisposable(2));
}
catch (TestException e1)
{
@@ -74,7 +74,7 @@ namespace Lucene.Net.Util
// test without prior exception
try
{
- IOUtils.CloseWhileHandlingException((TestException)null, new BrokenIDisposable(1), new BrokenIDisposable(2));
+ IOUtils.DisposeWhileHandlingException((TestException)null, new BrokenIDisposable(1), new BrokenIDisposable(2));
}
#pragma warning disable 168
catch (TestException e1)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
index b4a73bf..c141783 100644
--- a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
+++ b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
@@ -212,7 +212,7 @@ namespace Lucene.Net.Codecs
if (!success)
{
// this.Dispose() will close in:
- IOUtils.CloseWhileHandlingException(indexIn, this);
+ IOUtils.DisposeWhileHandlingException(indexIn, this);
}
}
}
@@ -272,7 +272,7 @@ namespace Lucene.Net.Codecs
{
try
{
- IOUtils.Close(@in, postingsReader);
+ IOUtils.Dispose(@in, postingsReader);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs b/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs
index a0aafe4..3b1938c 100644
--- a/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs
+++ b/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs
@@ -326,7 +326,7 @@ namespace Lucene.Net.Codecs
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(@out, indexOut);
+ IOUtils.DisposeWhileHandlingException(@out, indexOut);
}
}
this.indexOut = indexOut;
@@ -1240,7 +1240,7 @@ namespace Lucene.Net.Codecs
}
finally
{
- IOUtils.CloseWhileHandlingException(ioe, @out, indexOut, postingsWriter);
+ IOUtils.DisposeWhileHandlingException(ioe, @out, indexOut, postingsWriter);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs
index b2fbb74..c82fffc 100644
--- a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs
+++ b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs
@@ -159,7 +159,7 @@ namespace Lucene.Net.Codecs.Compressing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this, indexStream);
+ IOUtils.DisposeWhileHandlingException(this, indexStream);
}
}
}
@@ -180,7 +180,7 @@ namespace Lucene.Net.Codecs.Compressing
{
if (!closed)
{
- IOUtils.Close(fieldsStream);
+ IOUtils.Dispose(fieldsStream);
closed = true;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs
index 465e1d1..879bb7a 100644
--- a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs
+++ b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs
@@ -124,7 +124,7 @@ namespace Lucene.Net.Codecs.Compressing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(indexStream);
+ IOUtils.DisposeWhileHandlingException(indexStream);
Abort();
}
}
@@ -136,7 +136,7 @@ namespace Lucene.Net.Codecs.Compressing
{
try
{
- IOUtils.Close(fieldsStream, indexWriter);
+ IOUtils.Dispose(fieldsStream, indexWriter);
}
finally
{
@@ -421,7 +421,7 @@ namespace Lucene.Net.Codecs.Compressing
public override void Abort()
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
IOUtils.DeleteFilesIgnoringExceptions(directory, IndexFileNames.SegmentFileName(segment, segmentSuffix, Lucene40StoredFieldsWriter.FIELDS_EXTENSION), IndexFileNames.SegmentFileName(segment, segmentSuffix, Lucene40StoredFieldsWriter.FIELDS_INDEX_EXTENSION));
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs
index 5b69663..db6b99d 100644
--- a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs
+++ b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Codecs.Compressing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this, indexStream);
+ IOUtils.DisposeWhileHandlingException(this, indexStream);
}
}
}
@@ -188,7 +188,7 @@ namespace Lucene.Net.Codecs.Compressing
{
if (!closed)
{
- IOUtils.Close(vectorsStream);
+ IOUtils.Dispose(vectorsStream);
closed = true;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs
index 2d23dbc..8155a9c 100644
--- a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs
+++ b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs
@@ -284,7 +284,7 @@ namespace Lucene.Net.Codecs.Compressing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(indexStream);
+ IOUtils.DisposeWhileHandlingException(indexStream);
Abort();
}
}
@@ -296,7 +296,7 @@ namespace Lucene.Net.Codecs.Compressing
{
try
{
- IOUtils.Close(vectorsStream, indexWriter);
+ IOUtils.Dispose(vectorsStream, indexWriter);
}
finally
{
@@ -308,7 +308,7 @@ namespace Lucene.Net.Codecs.Compressing
public override void Abort()
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
IOUtils.DeleteFilesIgnoringExceptions(directory, IndexFileNames.SegmentFileName(segment, segmentSuffix, VECTORS_EXTENSION), IndexFileNames.SegmentFileName(segment, segmentSuffix, VECTORS_INDEX_EXTENSION));
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs
index 3e3d0ac..df4b09f 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Codecs.Lucene3x
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs
index 81aae0d..a98f2f1 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs
@@ -199,7 +199,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (disposing)
{
- IOUtils.Close(Tis, TisNoIndex, /*cfsReader,*/ FreqStream, ProxStream); // LUCENENET NOTE: cfsReader not used
+ IOUtils.Dispose(Tis, TisNoIndex, /*cfsReader,*/ FreqStream, ProxStream); // LUCENENET NOTE: cfsReader not used
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs
index ed32a6f..b689f47 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs
@@ -141,7 +141,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(openFiles);
+ IOUtils.DisposeWhileHandlingException(openFiles);
}
}
ramBytesUsed = new AtomicInt64();
@@ -153,7 +153,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
try
{
- IOUtils.Close(openFiles.ToArray());
+ IOUtils.Dispose(openFiles.ToArray());
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs
index 2e4b015..8b721f1 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
else
{
[32/38] lucenenet git commit: Lucene.Net.Search.PhraseQuery:
Implemented IEnumerable so collection initializer can be used and added
documentation to show usage of collection initializer
Posted by ni...@apache.org.
Lucene.Net.Search.PhraseQuery: Implemented IEnumerable<T> so collection initializer can be used and added documentation to show usage of collection initializer
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2de9a6aa
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2de9a6aa
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2de9a6aa
Branch: refs/heads/master
Commit: 2de9a6aa4c88e5e0e417259498f2f0846501e045
Parents: 86873c5
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 23:54:33 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:03 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/PhraseQuery.cs | 37 ++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2de9a6aa/src/Lucene.Net/Search/PhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/PhraseQuery.cs b/src/Lucene.Net/Search/PhraseQuery.cs
index 224eef3..043cd36 100644
--- a/src/Lucene.Net/Search/PhraseQuery.cs
+++ b/src/Lucene.Net/Search/PhraseQuery.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Index;
using Lucene.Net.Support;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
@@ -47,11 +48,25 @@ namespace Lucene.Net.Search
/// A <see cref="PhraseQuery"/> is built by QueryParser for input like <c>"new york"</c>.
///
/// <para/>This query may be combined with other terms or queries with a <see cref="BooleanQuery"/>.
+ /// <para/>
+ /// Collection initializer note: To create and populate a <see cref="PhraseQuery"/>
+ /// in a single statement, you can use the following example as a guide:
+ ///
+ /// <code>
+ /// var phraseQuery = new PhraseQuery() {
+ /// new Term("field", "microsoft"),
+ /// new Term("field", "office")
+ /// };
+ /// </code>
+ /// Note that as long as you specify all of the parameters, you can use either
+ /// <see cref="Add(Term)"/> or <see cref="Add(Term, int)"/>
+ /// as the method to use to initialize. If there are multiple parameters, each parameter set
+ /// must be surrounded by curly braces.
/// </summary>
#if FEATURE_SERIALIZABLE
[Serializable]
#endif
- public class PhraseQuery : Query
+ public class PhraseQuery : Query, IEnumerable<Term> // LUCENENET specific - implemented IEnumerable<Term>, which allows for use of collection initializer. See: https://stackoverflow.com/a/9195144
{
private string field;
private IList<Term> terms = new EquatableList<Term>(4);
@@ -523,5 +538,25 @@ namespace Lucene.Net.Search
^ terms.GetHashCode()
^ positions.GetHashCode();
}
+
+ /// <summary>
+ /// Returns an enumerator that iterates through the <see cref="terms"/> collection.
+ /// </summary>
+ /// <returns>An enumerator that can be used to iterate through the <see cref="terms"/> collection.</returns>
+ // LUCENENET specific
+ public IEnumerator<Term> GetEnumerator()
+ {
+ return this.terms.GetEnumerator();
+ }
+
+ /// <summary>
+ /// Returns an enumerator that iterates through the <see cref="terms"/> collection.
+ /// </summary>
+ /// <returns>An enumerator that can be used to iterate through the <see cref="terms"/> collection.</returns>
+ // LUCENENET specific
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return GetEnumerator();
+ }
}
}
\ No newline at end of file
[23/38] lucenenet git commit: API: Lucene.Net.Util.IOUtils: Renamed
Close() > Dispose(),
CloseWhileHandlingException() > DisposeWhileHandlingException()
Posted by ni...@apache.org.
API: Lucene.Net.Util.IOUtils: Renamed Close() > Dispose(), CloseWhileHandlingException() > DisposeWhileHandlingException()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7842db8a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7842db8a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7842db8a
Branch: refs/heads/master
Commit: 7842db8aac18f88649bb951cc1e220140094996b
Parents: 8d6fb69
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 15:36:01 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jun 21 17:18:54 2017 +0700
----------------------------------------------------------------------
...HyphenationCompoundWordTokenFilterFactory.cs | 2 +-
.../Hunspell/HunspellStemFilterFactory.cs | 4 +-
.../Analysis/Synonym/SynonymMap.cs | 2 +-
.../Analysis/Util/StopwordAnalyzerBase.cs | 6 +-
.../Analysis/Util/WordlistLoader.cs | 8 +-
.../SimpleNaiveBayesClassifier.cs | 2 +-
.../BlockTerms/BlockTermsWriter.cs | 4 +-
.../BlockTerms/FixedGapTermsIndexReader.cs | 2 +-
.../BlockTerms/FixedGapTermsIndexWriter.cs | 6 +-
.../BlockTerms/VariableGapTermsIndexWriter.cs | 2 +-
.../Bloom/BloomFilteringPostingsFormat.cs | 6 +-
.../Memory/DirectDocValuesConsumer.cs | 6 +-
.../Memory/DirectDocValuesProducer.cs | 6 +-
.../Memory/FSTOrdPostingsFormat.cs | 4 +-
.../Memory/FSTOrdPulsing41PostingsFormat.cs | 4 +-
.../Memory/FSTOrdTermsReader.cs | 6 +-
.../Memory/FSTOrdTermsWriter.cs | 4 +-
.../Memory/FSTPostingsFormat.cs | 4 +-
.../Memory/FSTPulsing41PostingsFormat.cs | 4 +-
src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 6 +-
src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs | 4 +-
.../Memory/MemoryDocValuesConsumer.cs | 6 +-
.../Memory/MemoryDocValuesProducer.cs | 6 +-
.../Memory/MemoryPostingsFormat.cs | 2 +-
.../Pulsing/PulsingPostingsFormat.cs | 4 +-
.../Pulsing/PulsingPostingsReader.cs | 2 +-
.../Pulsing/PulsingPostingsWriter.cs | 2 +-
src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 2 +-
src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs | 4 +-
.../SimpleText/SimpleTextDocValuesWriter.cs | 4 +-
.../SimpleText/SimpleTextFieldInfosReader.cs | 2 +-
.../SimpleText/SimpleTextFieldInfosWriter.cs | 2 +-
.../SimpleText/SimpleTextFieldsReader.cs | 2 +-
.../SimpleText/SimpleTextLiveDocsFormat.cs | 8 +-
.../SimpleText/SimpleTextSegmentInfoReader.cs | 2 +-
.../SimpleText/SimpleTextSegmentInfoWriter.cs | 2 +-
.../SimpleText/SimpleTextStoredFieldsReader.cs | 2 +-
.../SimpleText/SimpleTextStoredFieldsWriter.cs | 2 +-
.../SimpleText/SimpleTextTermVectorsReader.cs | 2 +-
.../SimpleText/SimpleTextTermVectorsWriter.cs | 2 +-
.../Directory/DirectoryTaxonomyReader.cs | 2 +-
.../Taxonomy/SearcherTaxonomyManager.cs | 2 +-
.../Highlight/WeightedSpanTermExtractor.cs | 4 +-
src/Lucene.Net.Misc/Index/PKIndexSplitter.cs | 8 +-
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 2 +-
.../Analyzing/AnalyzingQueryParser.cs | 2 +-
.../Classic/QueryParserBase.cs | 2 +-
.../Processors/AnalyzerQueryNodeProcessor.cs | 2 +-
.../Xml/Builders/LikeThisQueryBuilder.cs | 2 +-
.../Xml/Builders/SpanOrTermsBuilder.cs | 2 +-
.../Xml/Builders/TermsFilterBuilder.cs | 2 +-
.../Xml/Builders/TermsQueryBuilder.cs | 2 +-
.../Queries/FuzzyLikeThisQuery.cs | 2 +-
.../Spell/PlainTextDictionary.cs | 4 +-
.../Analyzing/AnalyzingInfixSuggester.cs | 8 +-
.../Suggest/Analyzing/AnalyzingSuggester.cs | 8 +-
.../Suggest/Analyzing/FreeTextSuggester.cs | 6 +-
.../Suggest/FileDictionary.cs | 4 +-
.../Suggest/Fst/ExternalRefSorter.cs | 4 +-
.../Suggest/Fst/FSTCompletionLookup.cs | 4 +-
src/Lucene.Net.Suggest/Suggest/Lookup.cs | 4 +-
.../Suggest/SortedInputIterator.cs | 6 +-
.../Suggest/SortedTermFreqIteratorWrapper.cs | 6 +-
.../Analysis/BaseTokenStreamTestCase.cs | 6 +-
.../Lucene3x/PreFlexRWFieldInfosWriter.cs | 2 +-
.../Codecs/Lucene3x/PreFlexRWFieldsWriter.cs | 6 +-
.../Codecs/Lucene3x/PreFlexRWNormsConsumer.cs | 4 +-
.../Lucene3x/PreFlexRWStoredFieldsWriter.cs | 2 +-
.../Lucene3x/PreFlexRWTermVectorsWriter.cs | 2 +-
.../Codecs/Lucene3x/TermInfosWriter.cs | 4 +-
.../Codecs/Lucene40/Lucene40DocValuesWriter.cs | 20 ++--
.../Codecs/Lucene40/Lucene40FieldInfosWriter.cs | 2 +-
.../Codecs/Lucene40/Lucene40PostingsWriter.cs | 2 +-
.../Lucene42/Lucene42DocValuesConsumer.cs | 6 +-
.../Codecs/Lucene42/Lucene42FieldInfosWriter.cs | 2 +-
.../MockFixedIntBlockPostingsFormat.cs | 2 +-
.../MockVariableIntBlockPostingsFormat.cs | 2 +-
.../Codecs/MockSep/MockSingleIntIndexOutput.cs | 2 +-
.../NestedPulsingPostingsFormat.cs | 4 +-
.../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 8 +-
.../Analysis/Core/TestKeywordAnalyzer.cs | 2 +-
.../Analysis/Core/TestStopAnalyzer.cs | 6 +-
.../Analysis/Hunspell/StemmerTestBase.cs | 4 +-
.../Analysis/Hunspell/TestHunspellStemFilter.cs | 4 +-
.../TestPerFieldAnalyzerWrapper.cs | 4 +-
.../Shingle/ShingleAnalyzerWrapperTest.cs | 4 +-
.../Analysis/Util/TestCharTokenizers.cs | 4 +-
.../Util/TestFilesystemResourceLoader.cs | 4 +-
.../Range/TestRangeFacetCounts.cs | 16 +--
.../SortedSet/TestSortedSetDocValuesFacets.cs | 6 +-
.../Taxonomy/Directory/TestAddTaxonomy.cs | 10 +-
.../Directory/TestConcurrentFacetedIndexing.cs | 2 +-
.../Directory/TestDirectoryTaxonomyReader.cs | 4 +-
.../Directory/TestDirectoryTaxonomyWriter.cs | 6 +-
.../Taxonomy/TestCachedOrdinalsReader.cs | 2 +-
.../Taxonomy/TestSearcherTaxonomyManager.cs | 8 +-
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 6 +-
.../Taxonomy/TestTaxonomyFacetCounts.cs | 34 +++---
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 12 +-
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 16 +--
.../TestDrillDownQuery.cs | 2 +-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 10 +-
src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs | 6 +-
.../TestMultipleIndexFields.cs | 12 +-
.../TestRandomSamplingFacetsCollector.cs | 4 +-
.../VectorHighlight/AbstractTestCase.cs | 2 +-
.../Index/Memory/MemoryIndexTest.cs | 4 +-
.../Classic/TestMultiFieldQueryParser.cs | 2 +-
.../Flexible/Standard/TestMultiFieldQPHelper.cs | 2 +-
src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs | 4 +-
.../Analyzing/AnalyzingInfixSuggesterTest.cs | 2 +-
.../Analysis/TestMockAnalyzer.cs | 4 +-
.../Codecs/Lucene40/TestReuseDocsEnum.cs | 6 +-
src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 2 +-
.../Index/TestAllFilesHaveChecksumFooter.cs | 4 +-
.../Index/TestAllFilesHaveCodecHeader.cs | 4 +-
.../Index/TestBinaryDocValuesUpdates.cs | 8 +-
src/Lucene.Net.Tests/Index/TestCompoundFile.cs | 4 +-
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 8 +-
src/Lucene.Net.Tests/Index/TestLongPostings.cs | 2 +-
.../Index/TestMixedDocValuesUpdates.cs | 2 +-
.../Index/TestNumericDocValuesUpdates.cs | 6 +-
.../Index/TestPostingsOffsets.cs | 4 +-
.../Index/TestTermVectorsWriter.cs | 2 +-
.../Search/TestCachingWrapperFilter.cs | 2 +-
.../TestControlledRealTimeReopenThread.cs | 2 +-
.../Search/TestFilteredQuery.cs | 4 +-
.../Search/TestIndexSearcher.cs | 2 +-
src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 2 +-
src/Lucene.Net.Tests/Search/TestTermVectors.cs | 4 +-
src/Lucene.Net.Tests/Util/TestIOUtils.cs | 4 +-
src/Lucene.Net/Codecs/BlockTreeTermsReader.cs | 4 +-
src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs | 4 +-
.../CompressingStoredFieldsReader.cs | 4 +-
.../CompressingStoredFieldsWriter.cs | 6 +-
.../Compressing/CompressingTermVectorsReader.cs | 4 +-
.../Compressing/CompressingTermVectorsWriter.cs | 6 +-
.../Codecs/Lucene3x/Lucene3xFieldInfosReader.cs | 2 +-
.../Codecs/Lucene3x/Lucene3xFields.cs | 2 +-
.../Codecs/Lucene3x/Lucene3xNormsProducer.cs | 4 +-
.../Lucene3x/Lucene3xSegmentInfoReader.cs | 2 +-
.../Lucene3x/Lucene3xStoredFieldsReader.cs | 2 +-
.../Lucene3x/Lucene3xTermVectorsReader.cs | 2 +-
.../Codecs/Lucene3x/TermInfosReader.cs | 2 +-
src/Lucene.Net/Codecs/Lucene40/BitVector.cs | 2 +-
.../Codecs/Lucene40/Lucene40DocValuesReader.cs | 24 ++--
.../Codecs/Lucene40/Lucene40FieldInfosReader.cs | 2 +-
.../Codecs/Lucene40/Lucene40PostingsReader.cs | 2 +-
.../Lucene40/Lucene40SegmentInfoReader.cs | 2 +-
.../Lucene40/Lucene40SegmentInfoWriter.cs | 2 +-
.../Lucene40/Lucene40StoredFieldsReader.cs | 2 +-
.../Lucene40/Lucene40StoredFieldsWriter.cs | 2 +-
.../Lucene40/Lucene40TermVectorsReader.cs | 2 +-
.../Lucene40/Lucene40TermVectorsWriter.cs | 2 +-
.../Codecs/Lucene41/Lucene41PostingsFormat.cs | 4 +-
.../Codecs/Lucene41/Lucene41PostingsReader.cs | 4 +-
.../Codecs/Lucene41/Lucene41PostingsWriter.cs | 6 +-
.../Lucene42/Lucene42DocValuesProducer.cs | 6 +-
.../Codecs/Lucene42/Lucene42FieldInfosReader.cs | 2 +-
.../Codecs/Lucene42/Lucene42NormsConsumer.cs | 6 +-
.../Lucene45/Lucene45DocValuesConsumer.cs | 6 +-
.../Lucene45/Lucene45DocValuesProducer.cs | 6 +-
.../Codecs/Lucene46/Lucene46FieldInfosReader.cs | 2 +-
.../Codecs/Lucene46/Lucene46FieldInfosWriter.cs | 2 +-
.../Lucene46/Lucene46SegmentInfoReader.cs | 2 +-
.../Lucene46/Lucene46SegmentInfoWriter.cs | 2 +-
.../Codecs/PerField/PerFieldDocValuesFormat.cs | 6 +-
.../Codecs/PerField/PerFieldPostingsFormat.cs | 6 +-
src/Lucene.Net/Index/DocInverterPerField.cs | 2 +-
src/Lucene.Net/Index/DocValuesProcessor.cs | 4 +-
src/Lucene.Net/Index/FreqProxTermsWriter.cs | 4 +-
src/Lucene.Net/Index/IndexWriter.cs | 22 ++--
src/Lucene.Net/Index/NormsConsumer.cs | 4 +-
.../Index/PersistentSnapshotDeletionPolicy.cs | 4 +-
src/Lucene.Net/Index/ReadersAndUpdates.cs | 2 +-
src/Lucene.Net/Index/SegmentCoreReaders.cs | 2 +-
src/Lucene.Net/Index/SegmentInfos.cs | 10 +-
src/Lucene.Net/Index/SegmentMerger.cs | 12 +-
src/Lucene.Net/Index/SegmentReader.cs | 2 +-
src/Lucene.Net/Index/StandardDirectoryReader.cs | 2 +-
src/Lucene.Net/Index/StoredFieldsProcessor.cs | 4 +-
src/Lucene.Net/Index/TermVectorsConsumer.cs | 2 +-
.../Search/SearcherLifetimeManager.cs | 2 +-
src/Lucene.Net/Store/CompoundFileDirectory.cs | 6 +-
src/Lucene.Net/Store/CompoundFileWriter.cs | 10 +-
src/Lucene.Net/Store/Directory.cs | 2 +-
src/Lucene.Net/Store/FSDirectory.cs | 2 +-
src/Lucene.Net/Store/LockVerifyServer.cs | 2 +-
src/Lucene.Net/Store/NRTCachingDirectory.cs | 2 +-
src/Lucene.Net/Store/NativeFSLockFactory.cs | 4 +-
src/Lucene.Net/Util/Fst/FST.cs | 8 +-
src/Lucene.Net/Util/IOUtils.cs | 116 ++++++++++++++++---
src/Lucene.Net/Util/OfflineSorter.cs | 8 +-
src/Lucene.Net/Util/QueryBuilder.cs | 2 +-
194 files changed, 535 insertions(+), 445 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
index 8c53368..5624b0d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Analysis.Compound
}
finally
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
index 93734b5..d27fa3b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
@@ -98,8 +98,8 @@ namespace Lucene.Net.Analysis.Hunspell
}
finally
{
- IOUtils.CloseWhileHandlingException(affix);
- IOUtils.CloseWhileHandlingException(dictionaries);
+ IOUtils.DisposeWhileHandlingException(affix);
+ IOUtils.DisposeWhileHandlingException(dictionaries);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
index 9184a19..16f0ea0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
@@ -396,7 +396,7 @@ namespace Lucene.Net.Analysis.Synonym
}
finally
{
- IOUtils.CloseWhileHandlingException(priorException, ts);
+ IOUtils.DisposeWhileHandlingException(priorException, ts);
}
if (reuse.Length == 0)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
index 29ea3e2..8bb3f0b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
}
@@ -131,7 +131,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
}
@@ -155,7 +155,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(stopwords);
+ IOUtils.Dispose(stopwords);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
index 631879d..23fa016 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
return result;
}
@@ -123,7 +123,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
return result;
}
@@ -167,7 +167,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
return result;
}
@@ -212,7 +212,7 @@ namespace Lucene.Net.Analysis.Util
}
finally
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs b/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
index 638c428..b0b1de4 100644
--- a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
+++ b/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
@@ -125,7 +125,7 @@ namespace Lucene.Net.Classification
}
finally
{
- IOUtils.CloseWhileHandlingException(tokenStream);
+ IOUtils.DisposeWhileHandlingException(tokenStream);
}
}
var ret = new string[result.Count];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 149a8f7..de61035 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Codecs.BlockTerms
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(m_output);
+ IOUtils.DisposeWhileHandlingException(m_output);
}
}
}
@@ -161,7 +161,7 @@ namespace Lucene.Net.Codecs.BlockTerms
}
finally
{
- IOUtils.Close(m_output, postingsWriter, termsIndexWriter);
+ IOUtils.Dispose(m_output, postingsWriter, termsIndexWriter);
m_output = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 1891d3b..35b721e 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Codecs.BlockTerms
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
if (indexDivisor > 0)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 41ed974..44ca474 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Codecs.BlockTerms
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(m_output);
+ IOUtils.DisposeWhileHandlingException(m_output);
}
}
}
@@ -274,11 +274,11 @@ namespace Lucene.Net.Codecs.BlockTerms
{
if (success)
{
- IOUtils.Close(m_output);
+ IOUtils.Dispose(m_output);
}
else
{
- IOUtils.CloseWhileHandlingException(m_output);
+ IOUtils.DisposeWhileHandlingException(m_output);
}
m_output = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 47a46cc..bdb9609 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs
@@ -196,7 +196,7 @@ namespace Lucene.Net.Codecs.BlockTerms
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(m_output);
+ IOUtils.DisposeWhileHandlingException(m_output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 cf0ca01..cc2c248 100644
--- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
@@ -168,14 +168,14 @@ namespace Lucene.Net.Codecs.Bloom
#pragma warning restore 612, 618
}
- IOUtils.Close(bloomIn);
+ IOUtils.Dispose(bloomIn);
success = true;
}
finally
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(bloomIn, _delegateFieldsProducer);
+ IOUtils.DisposeWhileHandlingException(bloomIn, _delegateFieldsProducer);
}
}
}
@@ -482,7 +482,7 @@ namespace Lucene.Net.Codecs.Bloom
}
finally
{
- IOUtils.Close(bloomOutput);
+ IOUtils.Dispose(bloomOutput);
}
//We are done with large bitsets so no need to keep them hanging around
_bloomFilters.Clear();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
index ca2c405..4877481 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
}
}
}
@@ -174,11 +174,11 @@ namespace Lucene.Net.Codecs.Memory
{
if (success)
{
- IOUtils.Close(data, meta);
+ IOUtils.Dispose(data, meta);
}
else
{
- IOUtils.CloseWhileHandlingException(data, meta);
+ IOUtils.DisposeWhileHandlingException(data, meta);
}
data = meta = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
index fe4c95a..317c5c3 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
@@ -86,11 +86,11 @@ namespace Lucene.Net.Codecs.Memory
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
@@ -111,7 +111,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this.data);
+ IOUtils.DisposeWhileHandlingException(this.data);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
index 0fa8f2a..bb35701 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
@@ -54,7 +54,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(postingsWriter);
+ IOUtils.DisposeWhileHandlingException(postingsWriter);
}
}
}
@@ -74,7 +74,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(postingsReader);
+ IOUtils.DisposeWhileHandlingException(postingsReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
index 01826bb..77afc20 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
@@ -65,7 +65,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriter);
+ IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriter);
}
}
}
@@ -87,7 +87,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsReader, pulsingReader);
+ IOUtils.DisposeWhileHandlingException(docsReader, pulsingReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 84ad53c..2f68422 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
@@ -107,11 +107,11 @@ namespace Lucene.Net.Codecs.Memory
{
if (success)
{
- IOUtils.Close(indexIn, blockIn);
+ IOUtils.Dispose(indexIn, blockIn);
}
else
{
- IOUtils.CloseWhileHandlingException(indexIn, blockIn);
+ IOUtils.DisposeWhileHandlingException(indexIn, blockIn);
}
}
}
@@ -186,7 +186,7 @@ namespace Lucene.Net.Codecs.Memory
{
try
{
- IOUtils.Close(postingsReader);
+ IOUtils.Dispose(postingsReader);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 888cb12..859c579 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
@@ -177,7 +177,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(indexOut, blockOut);
+ IOUtils.DisposeWhileHandlingException(indexOut, blockOut);
}
}
}
@@ -231,7 +231,7 @@ namespace Lucene.Net.Codecs.Memory
}
finally
{
- IOUtils.CloseWhileHandlingException(ioe, blockOut, indexOut, postingsWriter);
+ IOUtils.DisposeWhileHandlingException(ioe, blockOut, indexOut, postingsWriter);
blockOut = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
index b792653..055e219 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
@@ -54,7 +54,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(postingsWriter);
+ IOUtils.DisposeWhileHandlingException(postingsWriter);
}
}
}
@@ -74,7 +74,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(postingsReader);
+ IOUtils.DisposeWhileHandlingException(postingsReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
index 839588a..c4790b0 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
@@ -66,7 +66,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriter);
+ IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriter);
}
}
}
@@ -88,7 +88,7 @@
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsReader, pulsingReader);
+ IOUtils.DisposeWhileHandlingException(docsReader, pulsingReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 6a19546..4caf087 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
@@ -107,11 +107,11 @@ namespace Lucene.Net.Codecs.Memory
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
}
@@ -182,7 +182,7 @@ namespace Lucene.Net.Codecs.Memory
{
try
{
- IOUtils.Close(postingsReader);
+ IOUtils.Dispose(postingsReader);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 8077e37..7e76b93 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
@@ -145,7 +145,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(_output);
+ IOUtils.DisposeWhileHandlingException(_output);
}
}
}
@@ -200,7 +200,7 @@ namespace Lucene.Net.Codecs.Memory
}
finally
{
- IOUtils.CloseWhileHandlingException(ioe, _output, _postingsWriter);
+ IOUtils.DisposeWhileHandlingException(ioe, _output, _postingsWriter);
_output = null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
index 4aef40c..8bbb765 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
}
}
}
@@ -253,11 +253,11 @@ namespace Lucene.Net.Codecs.Memory
{
if (success)
{
- IOUtils.Close(data, meta);
+ IOUtils.Dispose(data, meta);
}
else
{
- IOUtils.CloseWhileHandlingException(data, meta);
+ IOUtils.DisposeWhileHandlingException(data, meta);
}
data = meta = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
index 9e32c5a..c1fafaa 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
@@ -100,11 +100,11 @@ namespace Lucene.Net.Codecs.Memory
{
if (success)
{
- IOUtils.Close(@in);
+ IOUtils.Dispose(@in);
}
else
{
- IOUtils.CloseWhileHandlingException(@in);
+ IOUtils.DisposeWhileHandlingException(@in);
}
}
@@ -127,7 +127,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this.data);
+ IOUtils.DisposeWhileHandlingException(this.data);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 eba1941..0786f5d 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
@@ -333,7 +333,7 @@ namespace Lucene.Net.Codecs.Memory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(@out);
+ IOUtils.DisposeWhileHandlingException(@out);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs
index 550c422..49cb9c1 100644
--- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Codecs.Pulsing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriter);
+ IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriter);
}
}
}
@@ -112,7 +112,7 @@ namespace Lucene.Net.Codecs.Pulsing
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docsReader, pulsingReader);
+ IOUtils.DisposeWhileHandlingException(docsReader, pulsingReader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs
index 9b3627d..38cbc19 100644
--- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs
+++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Codecs.Pulsing
}
finally
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs
index c515426..38034f7 100644
--- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs
+++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs
@@ -459,7 +459,7 @@ namespace Lucene.Net.Codecs.Pulsing
}
finally
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
index 90fb85e..b929d0c 100644
--- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
@@ -98,7 +98,7 @@ namespace Lucene.Net.Codecs.Sep
{
if (disposing)
{
- IOUtils.Close(freqIn, docIn, skipIn, posIn, payloadIn);
+ IOUtils.Dispose(freqIn, docIn, skipIn, posIn, payloadIn);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
index 9a1e895..530a8eb 100644
--- a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
@@ -152,7 +152,7 @@ namespace Lucene.Net.Codecs.Sep
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(docOut, skipOut, freqOut, posOut, payloadOut);
+ IOUtils.DisposeWhileHandlingException(docOut, skipOut, freqOut, posOut, payloadOut);
}
}
}
@@ -408,7 +408,7 @@ namespace Lucene.Net.Codecs.Sep
{
if (disposing)
{
- IOUtils.Close(docOut, skipOut, freqOut, posOut, payloadOut);
+ IOUtils.Dispose(docOut, skipOut, freqOut, posOut, payloadOut);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
index 1a01db9..3598d6a 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
@@ -435,11 +435,11 @@ namespace Lucene.Net.Codecs.SimpleText
{
if (success)
{
- IOUtils.Close(data);
+ IOUtils.Dispose(data);
}
else
{
- IOUtils.CloseWhileHandlingException(data);
+ IOUtils.DisposeWhileHandlingException(data);
}
data = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
index a53519a..dc74dbf 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
@@ -153,7 +153,7 @@ namespace Lucene.Net.Codecs.SimpleText
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs
index 4e3eee1..82735dc 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs
@@ -152,7 +152,7 @@ namespace Lucene.Net.Codecs.SimpleText
}
else
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 a7c33f8..a2de3ee 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
@@ -76,7 +76,7 @@ namespace Lucene.Net.Codecs.SimpleText
{
if (!success)
{
- IOUtils.CloseWhileHandlingException();
+ IOUtils.DisposeWhileHandlingException();
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs
index ef1c6d2..3b32d74 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs
@@ -103,11 +103,11 @@ namespace Lucene.Net.Codecs.SimpleText
{
if (success)
{
- IOUtils.Close(input);
+ IOUtils.Dispose(input);
}
else
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
}
}
@@ -154,11 +154,11 @@ namespace Lucene.Net.Codecs.SimpleText
{
if (success)
{
- IOUtils.Close(output);
+ IOUtils.Dispose(output);
}
else
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs
index 6e7a072..2cb7884 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Codecs.SimpleText
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(input);
+ IOUtils.DisposeWhileHandlingException(input);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs
index e966a7c..d83b672 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Codecs.SimpleText
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
try
{
dir.DeleteFile(segFileName);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs
index 9131d31..03a0b51 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs
@@ -235,7 +235,7 @@ namespace Lucene.Net.Codecs.SimpleText
try
{
- IOUtils.Close(_input);
+ IOUtils.Dispose(_input);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
index ae67cc3..92d68ce 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
@@ -214,7 +214,7 @@ namespace Lucene.Net.Codecs.SimpleText
if (!disposing) return;
try
{
- IOUtils.Close(_output);
+ IOUtils.Dispose(_output);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
index a4d7fc5..a3018de 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
@@ -244,7 +244,7 @@ namespace Lucene.Net.Codecs.SimpleText
try
{
- IOUtils.Close(_input);
+ IOUtils.Dispose(_input);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs
index c376c46..869eda0 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs
@@ -207,7 +207,7 @@ namespace Lucene.Net.Codecs.SimpleText
try
{
- IOUtils.Close(_output);
+ IOUtils.Dispose(_output);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
index b66517e..9b0f8e7 100644
--- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
@@ -228,7 +228,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(r2);
+ IOUtils.DisposeWhileHandlingException(r2);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs b/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
index 24ca87b..1427f15 100644
--- a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
@@ -165,7 +165,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
else if (taxoWriter != null && taxoWriter.TaxonomyEpoch != taxoEpoch)
{
- IOUtils.Close(newReader, tr);
+ IOUtils.Dispose(newReader, tr);
throw new InvalidOperationException("DirectoryTaxonomyWriter.replaceTaxonomy was called, which is not allowed when using SearcherTaxonomyManager");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
index 029c047..25b2cbe 100644
--- a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
+++ b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
@@ -502,7 +502,7 @@ namespace Lucene.Net.Search.Highlight
}
finally
{
- IOUtils.Close(internalReader);
+ IOUtils.Dispose(internalReader);
}
return terms;
@@ -545,7 +545,7 @@ namespace Lucene.Net.Search.Highlight
}
finally
{
- IOUtils.Close(internalReader);
+ IOUtils.Dispose(internalReader);
}
return terms;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs b/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs
index 0196d11..aa4ac7b 100644
--- a/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs
+++ b/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs
@@ -89,11 +89,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
}
else
{
- IOUtils.CloseWhileHandlingException(reader);
+ IOUtils.DisposeWhileHandlingException(reader);
}
}
}
@@ -118,11 +118,11 @@ namespace Lucene.Net.Index
{
if (success)
{
- IOUtils.Close(w);
+ IOUtils.Dispose(w);
}
else
{
- IOUtils.CloseWhileHandlingException(w);
+ IOUtils.DisposeWhileHandlingException(w);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index f9effad..0d9a375 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -619,7 +619,7 @@ namespace Lucene.Net.Queries.Mlt
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
index 25b869a..f401501 100644
--- a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
@@ -212,7 +212,7 @@ namespace Lucene.Net.QueryParsers.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(stream);
+ IOUtils.DisposeWhileHandlingException(stream);
}
return analyzed;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
index 0042a46..dcc4d64 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
@@ -624,7 +624,7 @@ namespace Lucene.Net.QueryParsers.Classic
}
finally
{
- IOUtils.CloseWhileHandlingException(source);
+ IOUtils.DisposeWhileHandlingException(source);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
index 7927210..49fdce1 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
@@ -155,7 +155,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
}
finally
{
- IOUtils.CloseWhileHandlingException(source);
+ IOUtils.DisposeWhileHandlingException(source);
}
// rewind the buffer stream
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs
index 4e6a70a..0af6739 100644
--- a/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs
index 5083797..9b6c09d 100644
--- a/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs
index b081a06..0fcaf99 100644
--- a/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
return new TermsFilter(fieldName, terms);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs
index 946496c..9a054a7 100644
--- a/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
bq.Boost = DOMUtils.GetAttribute(e, "boost", 1.0f);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
index d866954..3cc7e2c 100644
--- a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
+++ b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
@@ -265,7 +265,7 @@ namespace Lucene.Net.Sandbox.Queries
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs b/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs
index 7250220..bac8c7a 100644
--- a/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs
+++ b/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs
@@ -102,7 +102,7 @@ namespace Lucene.Net.Search.Spell
else
{
done = true;
- IOUtils.Close(outerInstance.@in);
+ IOUtils.Dispose(outerInstance.@in);
result = null;
}
success = true;
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search.Spell
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(outerInstance.@in);
+ IOUtils.DisposeWhileHandlingException(outerInstance.@in);
}
}
return result;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
index edd912e..bbe19fb 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs
@@ -236,11 +236,11 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
if (success)
{
- IOUtils.Close(r);
+ IOUtils.Dispose(r);
}
else
{
- IOUtils.CloseWhileHandlingException(writer, r);
+ IOUtils.DisposeWhileHandlingException(writer, r);
writer = null;
}
}
@@ -499,7 +499,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
// TODO: we could allow blended sort here, combining
@@ -674,7 +674,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
index 0f85629..6eff94b 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs
@@ -609,11 +609,11 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
if (success)
{
- IOUtils.Close(reader, writer);
+ IOUtils.Dispose(reader, writer);
}
else
{
- IOUtils.CloseWhileHandlingException(reader, writer);
+ IOUtils.DisposeWhileHandlingException(reader, writer);
}
tempInput.Delete();
@@ -958,7 +958,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
ReplaceSep(automaton);
@@ -988,7 +988,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
// TODO: we could use the end offset to "guess"
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
index aeeb8be..31b7839 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
@@ -415,11 +415,11 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
if (success)
{
- IOUtils.Close(writer, reader);
+ IOUtils.Dispose(writer, reader);
}
else
{
- IOUtils.CloseWhileHandlingException(writer, reader);
+ IOUtils.DisposeWhileHandlingException(writer, reader);
}
}
finally
@@ -800,7 +800,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
finally
{
- IOUtils.CloseWhileHandlingException(ts);
+ IOUtils.DisposeWhileHandlingException(ts);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs b/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs
index 35d6ab0..0928676 100644
--- a/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs
+++ b/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Suggest
if (outerInstance.line == null)
{
outerInstance.done = true;
- IOUtils.Close(outerInstance.@in);
+ IOUtils.Dispose(outerInstance.@in);
}
else
{
@@ -225,7 +225,7 @@ namespace Lucene.Net.Search.Suggest
else
{
outerInstance.done = true;
- IOUtils.Close(outerInstance.@in);
+ IOUtils.Dispose(outerInstance.@in);
return null;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
index d55c944..08a0737 100644
--- a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Suggest.Fst
}
else
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
scratch = null;
}
success = true;
@@ -150,7 +150,7 @@ namespace Lucene.Net.Search.Suggest.Fst
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(reader);
+ IOUtils.DisposeWhileHandlingException(reader);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs b/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs
index 417b73d..ebd9094 100644
--- a/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs
@@ -226,11 +226,11 @@ namespace Lucene.Net.Search.Suggest.Fst
{
if (success)
{
- IOUtils.Close(reader, writer, sorter);
+ IOUtils.Dispose(reader, writer, sorter);
}
else
{
- IOUtils.CloseWhileHandlingException(reader, writer, sorter);
+ IOUtils.DisposeWhileHandlingException(reader, writer, sorter);
}
tempInput.Delete();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Lookup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Lookup.cs b/src/Lucene.Net.Suggest/Suggest/Lookup.cs
index d2188c1..93b55fb 100644
--- a/src/Lucene.Net.Suggest/Suggest/Lookup.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Lookup.cs
@@ -218,7 +218,7 @@ namespace Lucene.Net.Search.Suggest
}
finally
{
- IOUtils.Close(input);
+ IOUtils.Dispose(input);
}
}
@@ -235,7 +235,7 @@ namespace Lucene.Net.Search.Suggest
}
finally
{
- IOUtils.Close(output);
+ IOUtils.Dispose(output);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
index 19ff0b7..bfad1c6 100644
--- a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
+++ b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs
@@ -237,13 +237,13 @@ namespace Lucene.Net.Search.Suggest
{
if (success)
{
- IOUtils.Close(writer);
+ IOUtils.Dispose(writer);
}
else
{
try
{
- IOUtils.CloseWhileHandlingException(writer);
+ IOUtils.DisposeWhileHandlingException(writer);
}
finally
{
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search.Suggest
private void Dispose()
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
if (tempInput != null)
{
tempInput.Delete();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
index 3af48e7..7f0fc99 100644
--- a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
+++ b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs
@@ -172,13 +172,13 @@ namespace Lucene.Net.Search.Suggest
{
if (success)
{
- IOUtils.Close(writer);
+ IOUtils.Dispose(writer);
}
else
{
try
{
- IOUtils.CloseWhileHandlingException(writer);
+ IOUtils.DisposeWhileHandlingException(writer);
}
finally
{
@@ -190,7 +190,7 @@ namespace Lucene.Net.Search.Suggest
private void Dispose()
{
- IOUtils.Close(reader);
+ IOUtils.Dispose(reader);
if (tempInput != null)
{
tempInput.Delete();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index 5c97b0d..78cdd7a 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -725,11 +725,11 @@ namespace Lucene.Net.Analysis
{
if (success)
{
- IOUtils.Close(iw, dir);
+ IOUtils.Dispose(iw, dir);
}
else
{
- IOUtils.CloseWhileHandlingException(iw, dir); // checkindex
+ IOUtils.DisposeWhileHandlingException(iw, dir); // checkindex
}
}
}
@@ -862,7 +862,7 @@ namespace Lucene.Net.Analysis
}
finally
{
- IOUtils.CloseWhileHandlingException(docs);
+ IOUtils.DisposeWhileHandlingException(docs);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs
index 6651cb2..3b4d9c3 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs
@@ -122,7 +122,7 @@ namespace Lucene.Net.Codecs.Lucene3x
}
else
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 ff80ffb..486c5c1 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(TermsOut);
+ IOUtils.DisposeWhileHandlingException(TermsOut);
}
}
@@ -77,7 +77,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(TermsOut, FreqOut);
+ IOUtils.DisposeWhileHandlingException(TermsOut, FreqOut);
}
}
@@ -100,7 +100,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (disposing)
{
- IOUtils.Close(TermsOut, FreqOut, ProxOut);
+ IOUtils.Dispose(TermsOut, FreqOut, ProxOut);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs
index 2a91121..595c4a2 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
@@ -95,7 +95,7 @@ namespace Lucene.Net.Codecs.Lucene3x
protected override void Dispose(bool disposing)
{
if (disposing)
- IOUtils.Close(@out);
+ IOUtils.Dispose(@out);
}
public override void AddBinaryField(FieldInfo field, IEnumerable<BytesRef> values)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs
index f37ffe1..22ccdf0 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
try
{
- IOUtils.Close(FieldsStream, IndexStream);
+ IOUtils.Dispose(FieldsStream, IndexStream);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs
index c1797fa..c68a67d 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs
@@ -228,7 +228,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
// make an effort to close all streams we can but remember and re-throw
// the first exception encountered in this process
- IOUtils.Close(Tvx, Tvd, Tvf);
+ IOUtils.Dispose(Tvx, Tvd, Tvf);
Tvx = Tvd = Tvf = null;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs
index f64a99b..edd82dc 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs
@@ -108,7 +108,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(Output);
+ IOUtils.DisposeWhileHandlingException(Output);
try
{
@@ -149,7 +149,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(Output);
+ IOUtils.DisposeWhileHandlingException(Output);
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/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 18b157f..5ffa6f7 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs
@@ -93,11 +93,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data);
+ IOUtils.Dispose(data);
}
else
{
- IOUtils.CloseWhileHandlingException(data);
+ IOUtils.DisposeWhileHandlingException(data);
}
}
}
@@ -232,11 +232,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
}
@@ -258,11 +258,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data);
+ IOUtils.Dispose(data);
}
else
{
- IOUtils.CloseWhileHandlingException(data);
+ IOUtils.DisposeWhileHandlingException(data);
}
}
}
@@ -285,11 +285,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
}
@@ -520,11 +520,11 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (success)
{
- IOUtils.Close(data, index);
+ IOUtils.Dispose(data, index);
}
else
{
- IOUtils.CloseWhileHandlingException(data, index);
+ IOUtils.DisposeWhileHandlingException(data, index);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs
index 908ee7d..0e0a7c7 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
else
{
- IOUtils.CloseWhileHandlingException(output);
+ IOUtils.DisposeWhileHandlingException(output);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs
index 4d99635..4ae4a18 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(FreqOut, proxOut);
+ IOUtils.DisposeWhileHandlingException(FreqOut, proxOut);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
index 32e943b..4f63876 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Codecs.Lucene42
{
if (!success)
{
- IOUtils.CloseWhileHandlingException(this);
+ IOUtils.DisposeWhileHandlingException(this);
}
}
}
@@ -224,11 +224,11 @@ namespace Lucene.Net.Codecs.Lucene42
{
if (success)
{
- IOUtils.Close(Data, Meta);
+ IOUtils.Dispose(Data, Meta);
}
else
{
- IOUtils.CloseWhileHandlingException(Data, Meta);
+ IOUtils.DisposeWhileHandlingException(Data, Meta);
}
}
}
[09/38] lucenenet git commit: API:
Lucene.Net.Util.PackedInt32s.Format: Changed Values() > Values (property)
Posted by ni...@apache.org.
API: Lucene.Net.Util.PackedInt32s.Format: Changed Values() > Values (property)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/8a19d273
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/8a19d273
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/8a19d273
Branch: refs/heads/master
Commit: 8a19d2733cc37007687565d6ea0f91de55f9cc76
Parents: c29ca08
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:27:52 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:27:52 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 6 +++---
src/Lucene.Net/Codecs/Lucene41/ForUtil.cs | 2 +-
src/Lucene.Net/Util/Packed/PackedInts.cs | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8a19d273/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
index 3ea32c9..6e3010a 100644
--- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
+++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Util.Packed
for (int i = 0; i < iters; ++i)
{
int valueCount = RandomInts.NextIntBetween(Random(), 1, int.MaxValue);
- foreach (PackedInt32s.Format format in PackedInt32s.Format.Values())
+ foreach (PackedInt32s.Format format in PackedInt32s.Format.Values)
{
for (int bpv = 1; bpv <= 64; ++bpv)
{
@@ -222,7 +222,7 @@ namespace Lucene.Net.Util.Packed
{
for (int bpv = 1; bpv <= 64; ++bpv)
{
- foreach (PackedInt32s.Format format in PackedInt32s.Format.Values())
+ foreach (PackedInt32s.Format format in PackedInt32s.Format.Values)
{
if (!format.IsSupported(bpv))
{
@@ -993,7 +993,7 @@ namespace Lucene.Net.Util.Packed
[Test]
public virtual void TestEncodeDecode()
{
- foreach (PackedInt32s.Format format in PackedInt32s.Format.Values())
+ foreach (PackedInt32s.Format format in PackedInt32s.Format.Values)
{
for (int bpv = 1; bpv <= 64; ++bpv)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8a19d273/src/Lucene.Net/Codecs/Lucene41/ForUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/Lucene41/ForUtil.cs b/src/Lucene.Net/Codecs/Lucene41/ForUtil.cs
index d65a350..ce76c8f 100644
--- a/src/Lucene.Net/Codecs/Lucene41/ForUtil.cs
+++ b/src/Lucene.Net/Codecs/Lucene41/ForUtil.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Codecs.Lucene41
int maxDataSize = 0;
for (int version = PackedInt32s.VERSION_START; version <= PackedInt32s.VERSION_CURRENT; version++)
{
- foreach (PackedInt32s.Format format in PackedInt32s.Format.Values()/* Enum.GetValues(typeof(PackedInts.Format))*/)
+ foreach (PackedInt32s.Format format in PackedInt32s.Format.Values/* Enum.GetValues(typeof(PackedInts.Format))*/)
{
for (int bpv = 1; bpv <= 32; ++bpv)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8a19d273/src/Lucene.Net/Util/Packed/PackedInts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/Packed/PackedInts.cs b/src/Lucene.Net/Util/Packed/PackedInts.cs
index fcd2adc..615d5b4 100644
--- a/src/Lucene.Net/Util/Packed/PackedInts.cs
+++ b/src/Lucene.Net/Util/Packed/PackedInts.cs
@@ -169,9 +169,9 @@ namespace Lucene.Net.Util.Packed
private static readonly Format[] values = new Format[] { PACKED, PACKED_SINGLE_BLOCK };
- public static IEnumerable<Format> Values() // LUCENENET TODO: API - make property
+ public static IEnumerable<Format> Values
{
- return values;
+ get { return values; }
}
/// <summary>
@@ -179,7 +179,7 @@ namespace Lucene.Net.Util.Packed
/// </summary>
public static Format ById(int id)
{
- foreach (Format format in Values())
+ foreach (Format format in Values)
{
if (format.Id == id)
{
[15/38] lucenenet git commit: Lucene.Net.Util.WeakIdentityMap:
Corrected documentation to reflect that Keys and Values properties return
IEnumerable instead of ICollection
Posted by ni...@apache.org.
Lucene.Net.Util.WeakIdentityMap: Corrected documentation to reflect that Keys and Values properties return IEnumerable<T> instead of ICollection<T>
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6f24c032
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6f24c032
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6f24c032
Branch: refs/heads/master
Commit: 6f24c032c3ff6d2b2e822f3d5f26761fc1831b92
Parents: e837081
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 14:17:33 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 14:17:33 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/WeakIdentityMap.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f24c032/src/Lucene.Net/Util/WeakIdentityMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/WeakIdentityMap.cs b/src/Lucene.Net/Util/WeakIdentityMap.cs
index a1ba475..8444eb6 100644
--- a/src/Lucene.Net/Util/WeakIdentityMap.cs
+++ b/src/Lucene.Net/Util/WeakIdentityMap.cs
@@ -158,9 +158,9 @@ namespace Lucene.Net.Util
}
/// <summary>
- /// Gets an <see cref="ICollection{TKey}"/> object containing the keys of the <see cref="WeakIdentityMap{TKey, TValue}"/>.
+ /// Gets an <see cref="IEnumerable{TKey}"/> object containing the keys of the <see cref="WeakIdentityMap{TKey, TValue}"/>.
/// </summary>
- public IEnumerable<TKey> Keys // LUCENENET TODO: API - change to ICollection<T>
+ public IEnumerable<TKey> Keys
{
get
{
@@ -197,9 +197,9 @@ namespace Lucene.Net.Util
}
/// <summary>
- /// Gets an <see cref="ICollection{TKey}"/> object containing the values of the <see cref="WeakIdentityMap{TKey, TValue}"/>.
+ /// Gets an <see cref="IEnumerable{TKey}"/> object containing the values of the <see cref="WeakIdentityMap{TKey, TValue}"/>.
/// </summary>
- public IEnumerable<TValue> Values // LUCENENET TODO: API - change to ICollection<T>
+ public IEnumerable<TValue> Values
{
get
{
[27/38] lucenenet git commit: API: Lucene.Net.Search.DocIdSet: Added
NewAnonymous() method for easy creation of anonymous classes via delegate
methods.
Posted by ni...@apache.org.
API: Lucene.Net.Search.DocIdSet: Added NewAnonymous() method for easy creation of anonymous classes via delegate methods.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/bd6a1bec
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/bd6a1bec
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/bd6a1bec
Branch: refs/heads/master
Commit: bd6a1bec42952afbe679719bf0c61a6ff16d4167
Parents: cbb4d3f
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 20:21:27 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:00 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/DocIdSet.cs | 178 +++++++++++++++++++++++++++++++++
1 file changed, 178 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bd6a1bec/src/Lucene.Net/Search/DocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/DocIdSet.cs b/src/Lucene.Net/Search/DocIdSet.cs
index 7528f20..8f0cc23 100644
--- a/src/Lucene.Net/Search/DocIdSet.cs
+++ b/src/Lucene.Net/Search/DocIdSet.cs
@@ -76,5 +76,183 @@ namespace Lucene.Net.Search
return false;
}
}
+
+ /// <summary>
+ /// Creates a new instance with the ability to specify the body of the <see cref="GetIterator()"/>
+ /// method through the <paramref name="getIterator"/> parameter.
+ /// Simple example:
+ /// <code>
+ /// var docIdSet = DocIdSet.NewAnonymous(getIterator: () =>
+ /// {
+ /// OpenBitSet bitset = new OpenBitSet(5);
+ /// bitset.Set(0, 5);
+ /// return new DocIdBitSet(bitset);
+ /// });
+ /// </code>
+ /// <para/>
+ /// LUCENENET specific
+ /// </summary>
+ /// <param name="getIterator">
+ /// A delegate method that represents (is called by) the <see cref="GetIterator()"/>
+ /// method. It returns the <see cref="DocIdSetIterator"/> for this <see cref="DocIdSet"/>.
+ /// </param>
+ /// <returns> A new <see cref="AnonymousDocIdSet"/> instance. </returns>
+ public static DocIdSet NewAnonymous(Func<DocIdSetIterator> getIterator)
+ {
+ return NewAnonymous(getIterator, null, null);
+ }
+
+ /// <summary>
+ /// Creates a new instance with the ability to specify the body of the <see cref="GetIterator()"/>
+ /// method through the <paramref name="getIterator"/> parameter and the body of the <see cref="Bits"/>
+ /// property through the <paramref name="bits"/> parameter.
+ /// Simple example:
+ /// <code>
+ /// var docIdSet = DocIdSet.NewAnonymous(getIterator: () =>
+ /// {
+ /// OpenBitSet bitset = new OpenBitSet(5);
+ /// bitset.Set(0, 5);
+ /// return new DocIdBitSet(bitset);
+ /// }, bits: () =>
+ /// {
+ /// return bits;
+ /// });
+ /// </code>
+ /// <para/>
+ /// LUCENENET specific
+ /// </summary>
+ /// <param name="getIterator">
+ /// A delegate method that represents (is called by) the <see cref="GetIterator()"/>
+ /// method. It returns the <see cref="DocIdSetIterator"/> for this <see cref="DocIdSet"/>.
+ /// </param>
+ /// <param name="bits">
+ /// A delegate method that represents (is called by) the <see cref="Bits"/>
+ /// property. It returns the <see cref="IBits"/> instance for this <see cref="DocIdSet"/>.
+ /// </param>
+ /// <returns> A new <see cref="AnonymousDocIdSet"/> instance. </returns>
+ public static DocIdSet NewAnonymous(Func<DocIdSetIterator> getIterator, Func<IBits> bits)
+ {
+ return NewAnonymous(getIterator, bits, null);
+ }
+
+ /// <summary>
+ /// Creates a new instance with the ability to specify the body of the <see cref="GetIterator()"/>
+ /// method through the <paramref name="getIterator"/> parameter and the body of the <see cref="Bits"/>
+ /// property through the <paramref name="bits"/> parameter.
+ /// Simple example:
+ /// <code>
+ /// var docIdSet = DocIdSet.NewAnonymous(getIterator: () =>
+ /// {
+ /// OpenBitSet bitset = new OpenBitSet(5);
+ /// bitset.Set(0, 5);
+ /// return new DocIdBitSet(bitset);
+ /// }, isCacheable: () =>
+ /// {
+ /// return true;
+ /// });
+ /// </code>
+ /// <para/>
+ /// LUCENENET specific
+ /// </summary>
+ /// <param name="getIterator">
+ /// A delegate method that represents (is called by) the <see cref="GetIterator()"/>
+ /// method. It returns the <see cref="DocIdSetIterator"/> for this <see cref="DocIdSet"/>.
+ /// </param>
+ /// <param name="isCacheable">
+ /// A delegate method that represents (is called by) the <see cref="IsCacheable"/>
+ /// property. It returns a <see cref="bool"/> value.
+ /// </param>
+ /// <returns> A new <see cref="AnonymousDocIdSet"/> instance. </returns>
+ public static DocIdSet NewAnonymous(Func<DocIdSetIterator> getIterator, Func<bool> isCacheable)
+ {
+ return NewAnonymous(getIterator, null, isCacheable);
+ }
+
+ /// <summary>
+ /// Creates a new instance with the ability to specify the body of the <see cref="GetIterator()"/>
+ /// method through the <paramref name="getIterator"/> parameter and the body of the <see cref="Bits"/>
+ /// property through the <paramref name="bits"/> parameter.
+ /// Simple example:
+ /// <code>
+ /// var docIdSet = DocIdSet.NewAnonymous(getIterator: () =>
+ /// {
+ /// OpenBitSet bitset = new OpenBitSet(5);
+ /// bitset.Set(0, 5);
+ /// return new DocIdBitSet(bitset);
+ /// }, bits: () =>
+ /// {
+ /// return bits;
+ /// }, isCacheable: () =>
+ /// {
+ /// return true;
+ /// });
+ /// </code>
+ /// <para/>
+ /// LUCENENET specific
+ /// </summary>
+ /// <param name="getIterator">
+ /// A delegate method that represents (is called by) the <see cref="GetIterator()"/>
+ /// method. It returns the <see cref="DocIdSetIterator"/> for this <see cref="DocIdSet"/>.
+ /// </param>
+ /// <param name="bits">
+ /// A delegate method that represents (is called by) the <see cref="Bits"/>
+ /// property. It returns the <see cref="IBits"/> instance for this <see cref="DocIdSet"/>.
+ /// </param>
+ /// <param name="isCacheable">
+ /// A delegate method that represents (is called by) the <see cref="IsCacheable"/>
+ /// property. It returns a <see cref="bool"/> value.
+ /// </param>
+ /// <returns> A new <see cref="AnonymousDocIdSet"/> instance. </returns>
+ public static DocIdSet NewAnonymous(Func<DocIdSetIterator> getIterator, Func<IBits> bits, Func<bool> isCacheable)
+ {
+ return new AnonymousDocIdSet(getIterator, bits, isCacheable);
+ }
+
+ // LUCENENET specific
+ private class AnonymousDocIdSet : DocIdSet
+ {
+ private readonly Func<DocIdSetIterator> getIterator;
+ private readonly Func<IBits> bits;
+ private readonly Func<bool> isCacheable;
+
+ public AnonymousDocIdSet(Func<DocIdSetIterator> getIterator, Func<IBits> bits, Func<bool> isCacheable)
+ {
+ if (getIterator == null)
+ throw new ArgumentNullException("getIterator");
+
+ this.getIterator = getIterator;
+ this.bits = bits;
+ this.isCacheable = isCacheable;
+ }
+
+ public override DocIdSetIterator GetIterator()
+ {
+ return this.getIterator();
+ }
+
+ public override IBits Bits
+ {
+ get
+ {
+ if (this.bits != null)
+ {
+ return this.bits();
+ }
+ return base.Bits;
+ }
+ }
+
+ public override bool IsCacheable
+ {
+ get
+ {
+ if (this.isCacheable != null)
+ {
+ return this.isCacheable();
+ }
+ return base.IsCacheable;
+ }
+ }
+ }
}
}
\ No newline at end of file
[17/38] lucenenet git commit: Removed TODO about changing HasNext to
a method, since it acts like a property anyway
Posted by ni...@apache.org.
Removed TODO about changing HasNext to a method, since it acts like a property anyway
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e1d225b3
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e1d225b3
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e1d225b3
Branch: refs/heads/master
Commit: e1d225b363e3bf832e71ff2152004d31c34386c6
Parents: 07c8801
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 15:09:27 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 15:37:28 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e1d225b3/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs b/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs
index 718daed..04e5df3 100644
--- a/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs
+++ b/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs
@@ -190,7 +190,7 @@ namespace Lucene.Net.Util.Packed
/// <summary>
/// Whether or not there are remaining values. </summary>
- public bool HasNext // LUCENENET TODO: API - Change to HasNext() method (makes calculation)
+ public bool HasNext
{
get { return pOff < currentCount; }
}
[28/38] lucenenet git commit: API: Lucene.Net.Search.Collector: Added
Collector.NewAnonymous() method for easy creation of anonymous classes via
delegate methods.
Posted by ni...@apache.org.
API: Lucene.Net.Search.Collector: Added Collector.NewAnonymous() method for easy creation of anonymous classes via delegate methods.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f674dc6d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f674dc6d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f674dc6d
Branch: refs/heads/master
Commit: f674dc6d70eb4ca2e4799685e4fd91d600ef6042
Parents: bd6a1be
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jun 21 20:23:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 00:13:01 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Search/Collector.cs | 113 +++++++++++++++++++++++++++++++-
1 file changed, 111 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f674dc6d/src/Lucene.Net/Search/Collector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/Collector.cs b/src/Lucene.Net/Search/Collector.cs
index f3f9c31..986e5ee 100644
--- a/src/Lucene.Net/Search/Collector.cs
+++ b/src/Lucene.Net/Search/Collector.cs
@@ -1,3 +1,5 @@
+using System;
+
namespace Lucene.Net.Search
{
/*
@@ -186,6 +188,113 @@ namespace Lucene.Net.Search
/// </summary>
bool AcceptsDocsOutOfOrder { get; }
}
-}
-// LUCENENET TODO: API: Create Collector.NewAnonymous() static delegate method to allow creation of collectors inline.
\ No newline at end of file
+ /// <summary>
+ /// LUCENENET specific class used to hold the
+ /// <see cref="NewAnonymous(Action{Scorer}, Action{int}, Action{AtomicReaderContext}, Func{bool})"/> static method.
+ /// </summary>
+ public static class Collector
+ {
+ /// <summary>
+ /// Creates a new instance with the ability to specify the body of the <see cref="ICollector.SetScorer(Scorer)"/>
+ /// method through the <paramref name="setScorer"/> parameter, the body of the <see cref="ICollector.Collect(int)"/>
+ /// method through the <paramref name="collect"/> parameter, the body of the <see cref="ICollector.SetNextReader(AtomicReaderContext)"/>
+ /// method through the <paramref name="setNextReader"/> parameter, and the body of the <see cref="ICollector.AcceptsDocsOutOfOrder"/>
+ /// property through the <paramref name="acceptsDocsOutOfOrder"/> parameter.
+ /// Simple example:
+ /// <code>
+ /// IndexSearcher searcher = new IndexSearcher(indexReader);
+ /// OpenBitSet bits = new OpenBitSet(indexReader.MaxDoc);
+ /// int docBase;
+ /// searcher.Search(query,
+ /// Collector.NewAnonymous(setScorer: (scorer) =>
+ /// {
+ /// // ignore scorer
+ /// }, collect: (doc) =>
+ /// {
+ /// bits.Set(doc + docBase);
+ /// }, setNextReader: (context) =>
+ /// {
+ /// docBase = context.DocBase;
+ /// }, acceptsDocsOutOfOrder: () =>
+ /// {
+ /// return true;
+ /// })
+ /// );
+ /// </code>
+ /// </summary>
+ /// <param name="setScorer">
+ /// A delegate method that represents (is called by) the <see cref="ICollector.SetScorer(Scorer)"/>
+ /// method. It accepts a <see cref="Scorer"/> scorer and
+ /// has no return value.
+ /// </param>
+ /// <param name="collect">
+ /// A delegate method that represents (is called by) the <see cref="ICollector.Collect(int)"/>
+ /// method. It accepts an <see cref="int"/> doc and
+ /// has no return value.
+ /// </param>
+ /// <param name="setNextReader">
+ /// A delegate method that represents (is called by) the <see cref="ICollector.SetNextReader(AtomicReaderContext)"/>
+ /// method. It accepts a <see cref="AtomicReaderContext"/> context and
+ /// has no return value.
+ /// </param>
+ /// <param name="acceptsDocsOutOfOrder">
+ /// A delegate method that represents (is called by) the <see cref="ICollector.AcceptsDocsOutOfOrder"/>
+ /// property. It returns a <see cref="bool"/> value.
+ /// </param>
+ /// <returns> A new <see cref="AnonymousCollector"/> instance. </returns>
+ public static ICollector NewAnonymous(Action<Scorer> setScorer, Action<int> collect, Action<AtomicReaderContext> setNextReader, Func<bool> acceptsDocsOutOfOrder)
+ {
+ return new AnonymousCollector(setScorer, collect, setNextReader, acceptsDocsOutOfOrder);
+ }
+
+ // LUCENENET specific
+ private class AnonymousCollector : ICollector
+ {
+ private readonly Action<Scorer> setScorer;
+ private readonly Action<int> collect;
+ private readonly Action<AtomicReaderContext> setNextReader;
+ private readonly Func<bool> acceptsDocsOutOfOrder;
+
+ public AnonymousCollector(Action<Scorer> setScorer, Action<int> collect, Action<AtomicReaderContext> setNextReader, Func<bool> acceptsDocsOutOfOrder)
+ {
+ if (setScorer == null)
+ throw new ArgumentNullException("setScorer");
+ if (collect == null)
+ throw new ArgumentNullException("collect");
+ if (setNextReader == null)
+ throw new ArgumentNullException("setNextReader");
+ if (acceptsDocsOutOfOrder == null)
+ throw new ArgumentNullException("acceptsDocsOutOfOrder");
+
+ this.setScorer = setScorer;
+ this.collect = collect;
+ this.setNextReader = setNextReader;
+ this.acceptsDocsOutOfOrder = acceptsDocsOutOfOrder;
+ }
+
+ public bool AcceptsDocsOutOfOrder
+ {
+ get
+ {
+ return this.acceptsDocsOutOfOrder();
+ }
+ }
+
+ public void Collect(int doc)
+ {
+ this.collect(doc);
+ }
+
+ public void SetNextReader(AtomicReaderContext context)
+ {
+ this.setNextReader(context);
+ }
+
+ public void SetScorer(Scorer scorer)
+ {
+ this.setScorer(scorer);
+ }
+ }
+ }
+}
\ No newline at end of file
[37/38] lucenenet git commit: BUG: Lucene.Net.Util.OfflineSorter:
Added line to delete the output file (that existed in Lucene).
Posted by ni...@apache.org.
BUG: Lucene.Net.Util.OfflineSorter: Added line to delete the output file (that existed in Lucene).
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ab75145b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ab75145b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ab75145b
Branch: refs/heads/master
Commit: ab75145b8969b475c19375fd2bcde9b66c125c36
Parents: 484f268
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jun 22 01:33:24 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jun 22 01:33:24 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/OfflineSorter.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ab75145b/src/Lucene.Net/Util/OfflineSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs
index 91dc2c0..e7ccb95 100644
--- a/src/Lucene.Net/Util/OfflineSorter.cs
+++ b/src/Lucene.Net/Util/OfflineSorter.cs
@@ -251,9 +251,7 @@ namespace Lucene.Net.Util
{
sortInfo = new SortInfo(this) { TotalTime = Environment.TickCount };
- // LUCENENET NOTE: Can't do this because another thread could recreate the file before we are done here.
- // and cause this to bomb. We use the existence of the file as an indicator that we are done using it.
- //output.Delete(); // LUCENENET TODO: BUG: Put this back in (we now have thread-safe file creation, so this should be like the original).
+ output.Delete();
var merges = new List<FileInfo>();
bool success2 = false;
[03/38] lucenenet git commit: API:
Lucene.Net.Index.SegmentCommitInfo: Renamed Files() > GetFiles()
(consistency)
Posted by ni...@apache.org.
API: Lucene.Net.Index.SegmentCommitInfo: Renamed Files() > GetFiles() (consistency)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/21097229
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/21097229
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/21097229
Branch: refs/heads/master
Commit: 2109722960deafd24a5d0ae0db076714f7b0b05b
Parents: 93d80d3
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 12:50:58 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 12:53:51 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Misc/Index/IndexSplitter.cs | 2 +-
src/Lucene.Net/Index/CheckIndex.cs | 4 ++--
.../Index/DocumentsWriterPerThread.cs | 2 +-
src/Lucene.Net/Index/IndexWriter.cs | 22 ++++++++++----------
src/Lucene.Net/Index/SegmentCommitInfo.cs | 4 ++--
src/Lucene.Net/Index/SegmentInfos.cs | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net.Misc/Index/IndexSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/IndexSplitter.cs b/src/Lucene.Net.Misc/Index/IndexSplitter.cs
index a8847fc..9710943 100644
--- a/src/Lucene.Net.Misc/Index/IndexSplitter.cs
+++ b/src/Lucene.Net.Misc/Index/IndexSplitter.cs
@@ -156,7 +156,7 @@ namespace Lucene.Net.Index
SegmentInfo newInfo = new SegmentInfo(destFSDir, info.Version, info.Name, info.DocCount, info.UseCompoundFile, info.Codec, info.Diagnostics);
destInfos.Add(new SegmentCommitInfo(newInfo, infoPerCommit.DelCount, infoPerCommit.DelGen, infoPerCommit.FieldInfosGen));
// now copy files over
- ICollection<string> files = infoPerCommit.Files();
+ ICollection<string> files = infoPerCommit.GetFiles();
foreach (string srcName in files)
{
FileInfo srcFile = new FileInfo(Path.Combine(dir.FullName, srcName));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/CheckIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/CheckIndex.cs b/src/Lucene.Net/Index/CheckIndex.cs
index 5ef6586..6a43b1b 100644
--- a/src/Lucene.Net/Index/CheckIndex.cs
+++ b/src/Lucene.Net/Index/CheckIndex.cs
@@ -741,8 +741,8 @@ namespace Lucene.Net.Index
segInfoStat.Codec = codec;
Msg(infoStream, " compound=" + info.Info.UseCompoundFile);
segInfoStat.Compound = info.Info.UseCompoundFile;
- Msg(infoStream, " numFiles=" + info.Files().Count);
- segInfoStat.NumFiles = info.Files().Count;
+ Msg(infoStream, " numFiles=" + info.GetFiles().Count);
+ segInfoStat.NumFiles = info.GetFiles().Count;
segInfoStat.SizeMB = info.GetSizeInBytes() / (1024.0 * 1024.0);
#pragma warning disable 612, 618
if (info.Info.GetAttribute(Lucene3xSegmentInfoFormat.DS_OFFSET_KEY) == null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
index a516d36..3fe6c9c 100644
--- a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
@@ -578,7 +578,7 @@ namespace Lucene.Net.Index
{
infoStream.Message("DWPT", "new segment has " + (flushState.LiveDocs == null ? 0 : (flushState.SegmentInfo.DocCount - flushState.DelCountOnFlush)) + " deleted docs");
infoStream.Message("DWPT", "new segment has " + (flushState.FieldInfos.HasVectors ? "vectors" : "no vectors") + "; " + (flushState.FieldInfos.HasNorms ? "norms" : "no norms") + "; " + (flushState.FieldInfos.HasDocValues ? "docValues" : "no docValues") + "; " + (flushState.FieldInfos.HasProx ? "prox" : "no prox") + "; " + (flushState.FieldInfos.HasFreq ? "freqs" : "no freqs"));
- infoStream.Message("DWPT", "flushedFiles=" + Arrays.ToString(segmentInfoPerCommit.Files()));
+ infoStream.Message("DWPT", "flushedFiles=" + Arrays.ToString(segmentInfoPerCommit.GetFiles()));
infoStream.Message("DWPT", "flushed codec=" + codec);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs
index 0c81ccb..0f7d3dc 100644
--- a/src/Lucene.Net/Index/IndexWriter.cs
+++ b/src/Lucene.Net/Index/IndexWriter.cs
@@ -3096,7 +3096,7 @@ namespace Lucene.Net.Index
{
foreach (SegmentCommitInfo sipc in infos)
{
- foreach (string file in sipc.Files())
+ foreach (string file in sipc.GetFiles())
{
try
{
@@ -3124,7 +3124,7 @@ namespace Lucene.Net.Index
{
foreach (SegmentCommitInfo sipc in infos)
{
- foreach (string file in sipc.Files())
+ foreach (string file in sipc.GetFiles())
{
try
{
@@ -3267,7 +3267,7 @@ namespace Lucene.Net.Index
{
if (stopMerges)
{
- deleter.DeleteNewFiles(infoPerCommit.Files());
+ deleter.DeleteNewFiles(infoPerCommit.GetFiles());
return;
}
EnsureOpen();
@@ -3277,7 +3277,7 @@ namespace Lucene.Net.Index
// Now create the compound file if needed
if (useCompoundFile)
{
- ICollection<string> filesToDelete = infoPerCommit.Files();
+ ICollection<string> filesToDelete = infoPerCommit.GetFiles();
try
{
CreateCompoundFile(infoStream, directory, CheckAbort.NONE, info, context);
@@ -3393,7 +3393,7 @@ namespace Lucene.Net.Index
// Build up new segment's file names. Must do this
// before writing SegmentInfo:
- foreach (string file in info.Files())
+ foreach (string file in info.GetFiles())
{
string newFileName;
if (docStoreFiles3xOnly != null && docStoreFiles3xOnly.Contains(file))
@@ -3438,7 +3438,7 @@ namespace Lucene.Net.Index
try
{
// Copy the segment's files
- foreach (string file in info.Files())
+ foreach (string file in info.GetFiles())
{
string newFileName;
if (docStoreFiles3xOnly != null && docStoreFiles3xOnly.Contains(file))
@@ -4388,7 +4388,7 @@ namespace Lucene.Net.Index
// doing this makes MockDirWrapper angry in
// TestNRTThreads (LUCENE-5434):
readerPool.Drop(merge.info);
- deleter.DeleteNewFiles(merge.info.Files());
+ deleter.DeleteNewFiles(merge.info.GetFiles());
return false;
}
@@ -4455,7 +4455,7 @@ namespace Lucene.Net.Index
{
Debug.Assert(!segmentInfos.Contains(merge.info));
readerPool.Drop(merge.info);
- deleter.DeleteNewFiles(merge.info.Files());
+ deleter.DeleteNewFiles(merge.info.GetFiles());
}
bool success_ = false;
@@ -5121,7 +5121,7 @@ namespace Lucene.Net.Index
{
success = false;
- ICollection<string> filesToRemove = merge.info.Files();
+ ICollection<string> filesToRemove = merge.info.GetFiles();
try
{
@@ -5161,7 +5161,7 @@ namespace Lucene.Net.Index
{
deleter.DeleteFile(Lucene.Net.Index.IndexFileNames.SegmentFileName(mergedName, "", Lucene.Net.Index.IndexFileNames.COMPOUND_FILE_EXTENSION));
deleter.DeleteFile(Lucene.Net.Index.IndexFileNames.SegmentFileName(mergedName, "", Lucene.Net.Index.IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION));
- deleter.DeleteNewFiles(merge.info.Files());
+ deleter.DeleteNewFiles(merge.info.GetFiles());
}
}
}
@@ -5215,7 +5215,7 @@ namespace Lucene.Net.Index
{
lock (this)
{
- deleter.DeleteNewFiles(merge.info.Files());
+ deleter.DeleteNewFiles(merge.info.GetFiles());
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/SegmentCommitInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentCommitInfo.cs b/src/Lucene.Net/Index/SegmentCommitInfo.cs
index e788d38..34c3f49 100644
--- a/src/Lucene.Net/Index/SegmentCommitInfo.cs
+++ b/src/Lucene.Net/Index/SegmentCommitInfo.cs
@@ -164,7 +164,7 @@ namespace Lucene.Net.Index
if (sizeInBytes == -1)
{
long sum = 0;
- foreach (string fileName in Files())
+ foreach (string fileName in GetFiles())
{
sum += Info.Dir.FileLength(fileName);
}
@@ -176,7 +176,7 @@ namespace Lucene.Net.Index
/// <summary>
/// Returns all files in use by this segment. </summary>
- public virtual ICollection<string> Files() // LUCENENET TODO: API Rename GetFiles()
+ public virtual ICollection<string> GetFiles()
{
// Start from the wrapped info's files:
ISet<string> files = new HashSet<string>(Info.GetFiles());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/SegmentInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentInfos.cs b/src/Lucene.Net/Index/SegmentInfos.cs
index 4eb63bf..51f866a 100644
--- a/src/Lucene.Net/Index/SegmentInfos.cs
+++ b/src/Lucene.Net/Index/SegmentInfos.cs
@@ -1175,7 +1175,7 @@ namespace Lucene.Net.Index
Debug.Assert(info.Info.Dir == dir);
if (info.Info.Dir == dir)
{
- files.UnionWith(info.Files());
+ files.UnionWith(info.GetFiles());
}
}
[19/38] lucenenet git commit: API:
Lucene.Net.Search.ReferenceManager: Implemented proper dispose pattern.
Posted by ni...@apache.org.
API: Lucene.Net.Search.ReferenceManager: Implemented 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/8d6fb691
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/8d6fb691
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/8d6fb691
Branch: refs/heads/master
Commit: 8d6fb69158d1f31f58e7fdd6ad1b9b925b6554ce
Parents: 56025d3
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 15:30:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 15:37:29 2017 +0700
----------------------------------------------------------------------
.../Search/TestSearcherManager.cs | 2 +-
src/Lucene.Net/Search/ReferenceManager.cs | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8d6fb691/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
index 243e421..550adb8 100644
--- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
@@ -431,7 +431,7 @@ namespace Lucene.Net.Search
{
// test that we can close SM twice (per IDisposable's contract).
Directory dir = NewDirectory();
- (new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null))).Dispose();
+ using (var iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null))) { }
SearcherManager sm = new SearcherManager(dir, null);
sm.Dispose();
sm.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8d6fb691/src/Lucene.Net/Search/ReferenceManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/ReferenceManager.cs b/src/Lucene.Net/Search/ReferenceManager.cs
index 8cc4174..0d58f11 100644
--- a/src/Lucene.Net/Search/ReferenceManager.cs
+++ b/src/Lucene.Net/Search/ReferenceManager.cs
@@ -159,14 +159,8 @@ namespace Lucene.Net.Search
{
lock (this)
{
- if (current != null)
- {
- // make sure we can call this more than once
- // closeable javadoc says:
- // if this is already closed then invoking this method has no effect.
- SwapReference(null);
- AfterClose();
- }
+ Dispose(true);
+ GC.SuppressFinalize(this);
}
}
@@ -179,8 +173,15 @@ namespace Lucene.Net.Search
/// Called after <see cref="Dispose()"/>, so subclass can free any resources. </summary>
/// <exception cref="System.IO.IOException"> if the after dispose operation in a sub-class throws an <see cref="System.IO.IOException"/>
/// </exception>
- protected virtual void AfterClose() // LUCENENET TODO: API: Rename AfterDispose() ? Or perhaps just use dispose pattern.
+ protected virtual void Dispose(bool disposing)
{
+ if (disposing && current != null)
+ {
+ // make sure we can call this more than once
+ // closeable javadoc says:
+ // if this is already closed then invoking this method has no effect.
+ SwapReference(null);
+ }
}
private void DoMaybeRefresh()
[04/38] lucenenet git commit: API: Lucene.Net.Index.SegmentInfos:
Renamed Files() > GetFiles() (consistency)
Posted by ni...@apache.org.
API: Lucene.Net.Index.SegmentInfos: Renamed Files() > GetFiles() (consistency)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/169598cd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/169598cd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/169598cd
Branch: refs/heads/master
Commit: 169598cd7ed9337247e202a43d0cdc5711fa129d
Parents: 2109722
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 12:58:08 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 12:58:08 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs | 2 +-
src/Lucene.Net/Index/IndexFileDeleter.cs | 8 ++++----
src/Lucene.Net/Index/IndexWriter.cs | 8 ++++----
src/Lucene.Net/Index/SegmentInfos.cs | 2 +-
src/Lucene.Net/Index/StandardDirectoryReader.cs | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/169598cd/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 cfcce58..c87714a 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -1008,7 +1008,7 @@ namespace Lucene.Net.Store
try
{
- ISet<string> ghosts = new HashSet<string>(sis.Files(m_input, false));
+ ISet<string> ghosts = new HashSet<string>(sis.GetFiles(m_input, false));
foreach (string s in ghosts)
{
if (endSet.Contains(s) && !startSet.Contains(s))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/169598cd/src/Lucene.Net/Index/IndexFileDeleter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexFileDeleter.cs b/src/Lucene.Net/Index/IndexFileDeleter.cs
index fd1d414..76c3d9a 100644
--- a/src/Lucene.Net/Index/IndexFileDeleter.cs
+++ b/src/Lucene.Net/Index/IndexFileDeleter.cs
@@ -577,7 +577,7 @@ namespace Lucene.Net.Index
lastFiles.Clear();
// Save files so we can decr on next checkpoint/commit:
- lastFiles.AddRange(segmentInfos.Files(directory, false));
+ lastFiles.AddRange(segmentInfos.GetFiles(directory, false));
}
if (infoStream.IsEnabled("IFD"))
{
@@ -591,7 +591,7 @@ namespace Lucene.Net.Index
Debug.Assert(IsLocked);
// If this is a commit point, also incRef the
// segments_N file:
- foreach (string fileName in segmentInfos.Files(directory, isCommit))
+ foreach (string fileName in segmentInfos.GetFiles(directory, isCommit))
{
IncRef(fileName);
}
@@ -652,7 +652,7 @@ namespace Lucene.Net.Index
internal void DecRef(SegmentInfos segmentInfos)
{
Debug.Assert(IsLocked);
- foreach (string file in segmentInfos.Files(directory, false))
+ foreach (string file in segmentInfos.GetFiles(directory, false))
{
DecRef(file);
}
@@ -825,7 +825,7 @@ namespace Lucene.Net.Index
userData = segmentInfos.UserData;
segmentsFileName = segmentInfos.GetSegmentsFileName();
generation = segmentInfos.Generation;
- files = segmentInfos.Files(directory, true);
+ files = segmentInfos.GetFiles(directory, true);
segmentCount = segmentInfos.Count;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/169598cd/src/Lucene.Net/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs
index 0f7d3dc..5ad4af8 100644
--- a/src/Lucene.Net/Index/IndexWriter.cs
+++ b/src/Lucene.Net/Index/IndexWriter.cs
@@ -1975,7 +1975,7 @@ namespace Lucene.Net.Index
{
lock (this)
{
- return segmentInfos.Files(directory, true);
+ return segmentInfos.GetFiles(directory, true);
}
}
}
@@ -3599,7 +3599,7 @@ namespace Lucene.Net.Index
// we are trying to sync all referenced files, a
// merge completes which would otherwise have
// removed the files we are now syncing.
- filesToCommit = toCommit.Files(directory, false);
+ filesToCommit = toCommit.GetFiles(directory, false);
deleter.IncRef(filesToCommit);
}
success = true;
@@ -5409,7 +5409,7 @@ namespace Lucene.Net.Index
// called only from assert
private bool FilesExist(SegmentInfos toSync)
{
- ICollection<string> files = toSync.Files(directory, false);
+ ICollection<string> files = toSync.GetFiles(directory, false);
foreach (string fileName in files)
{
Debug.Assert(SlowFileExists(directory, fileName), "file " + fileName + " does not exist; files=" + Arrays.ToString(directory.ListAll()));
@@ -5529,7 +5529,7 @@ namespace Lucene.Net.Index
ICollection<string> filesToSync;
try
{
- filesToSync = toSync.Files(directory, false);
+ filesToSync = toSync.GetFiles(directory, false);
directory.Sync(filesToSync);
success = true;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/169598cd/src/Lucene.Net/Index/SegmentInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentInfos.cs b/src/Lucene.Net/Index/SegmentInfos.cs
index 51f866a..f330d11 100644
--- a/src/Lucene.Net/Index/SegmentInfos.cs
+++ b/src/Lucene.Net/Index/SegmentInfos.cs
@@ -1157,7 +1157,7 @@ namespace Lucene.Net.Index
/// The returned collection is recomputed on each
/// invocation.
/// </summary>
- public ICollection<string> Files(Directory dir, bool includeSegmentsFile) // LUCENENET TODO: API Rename GetFiles()
+ public ICollection<string> GetFiles(Directory dir, bool includeSegmentsFile)
{
var files = new HashSet<string>();
if (includeSegmentsFile)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/169598cd/src/Lucene.Net/Index/StandardDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/StandardDirectoryReader.cs b/src/Lucene.Net/Index/StandardDirectoryReader.cs
index 303d2ca..2484c68 100644
--- a/src/Lucene.Net/Index/StandardDirectoryReader.cs
+++ b/src/Lucene.Net/Index/StandardDirectoryReader.cs
@@ -525,7 +525,7 @@ namespace Lucene.Net.Index
segmentsFileName = infos.GetSegmentsFileName();
this.dir = dir;
userData = infos.UserData;
- files = infos.Files(dir, true);
+ files = infos.GetFiles(dir, true);
generation = infos.Generation;
segmentCount = infos.Count;
}
[07/38] lucenenet git commit: API: Lucene.Net.Util.MapOfSets: Changed
to use ISet instead of HashSet (as was done in Lucene)
Posted by ni...@apache.org.
API: Lucene.Net.Util.MapOfSets: Changed to use ISet<T> instead of HashSet<T> (as was done in Lucene)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d683f0fc
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d683f0fc
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d683f0fc
Branch: refs/heads/master
Commit: d683f0fcaff218be71d83259e59e693308193b14
Parents: cf7e749
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 13:16:50 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 13:16:50 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net/Util/FieldCacheSanityChecker.cs | 16 ++++++++--------
src/Lucene.Net/Util/MapOfSets.cs | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d683f0fc/src/Lucene.Net/Util/FieldCacheSanityChecker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/FieldCacheSanityChecker.cs b/src/Lucene.Net/Util/FieldCacheSanityChecker.cs
index ca6d281..c0bd042 100644
--- a/src/Lucene.Net/Util/FieldCacheSanityChecker.cs
+++ b/src/Lucene.Net/Util/FieldCacheSanityChecker.cs
@@ -118,9 +118,9 @@ namespace Lucene.Net.Util
// the indirect mapping lets MapOfSet dedup identical valIds for us
// maps the (valId) identityhashCode of cache values to
// sets of CacheEntry instances
- MapOfSets<int, FieldCache.CacheEntry> valIdToItems = new MapOfSets<int, FieldCache.CacheEntry>(new Dictionary<int, HashSet<FieldCache.CacheEntry>>(17));
+ MapOfSets<int, FieldCache.CacheEntry> valIdToItems = new MapOfSets<int, FieldCache.CacheEntry>(new Dictionary<int, ISet<FieldCache.CacheEntry>>(17));
// maps ReaderField keys to Sets of ValueIds
- MapOfSets<ReaderField, int> readerFieldToValIds = new MapOfSets<ReaderField, int>(new Dictionary<ReaderField, HashSet<int>>(17));
+ MapOfSets<ReaderField, int> readerFieldToValIds = new MapOfSets<ReaderField, int>(new Dictionary<ReaderField, ISet<int>>(17));
// any keys that we know result in more then one valId
ISet<ReaderField> valMismatchKeys = new HashSet<ReaderField>();
@@ -178,8 +178,8 @@ namespace Lucene.Net.Util
{
// we have multiple values for some ReaderFields
- IDictionary<ReaderField, HashSet<int>> rfMap = readerFieldToValIds.Map;
- IDictionary<int, HashSet<FieldCache.CacheEntry>> valMap = valIdToItems.Map;
+ IDictionary<ReaderField, ISet<int>> rfMap = readerFieldToValIds.Map;
+ IDictionary<int, ISet<FieldCache.CacheEntry>> valMap = valIdToItems.Map;
foreach (ReaderField rf in valMismatchKeys)
{
IList<FieldCache.CacheEntry> badEntries = new List<FieldCache.CacheEntry>(valMismatchKeys.Count * 2);
@@ -211,11 +211,11 @@ namespace Lucene.Net.Util
{
List<Insanity> insanity = new List<Insanity>(23);
- Dictionary<ReaderField, HashSet<ReaderField>> badChildren = new Dictionary<ReaderField, HashSet<ReaderField>>(17);
+ Dictionary<ReaderField, ISet<ReaderField>> badChildren = new Dictionary<ReaderField, ISet<ReaderField>>(17);
MapOfSets<ReaderField, ReaderField> badKids = new MapOfSets<ReaderField, ReaderField>(badChildren); // wrapper
- IDictionary<int, HashSet<FieldCache.CacheEntry>> viToItemSets = valIdToItems.Map;
- IDictionary<ReaderField, HashSet<int>> rfToValIdSets = readerFieldToValIds.Map;
+ IDictionary<int, ISet<FieldCache.CacheEntry>> viToItemSets = valIdToItems.Map;
+ IDictionary<ReaderField, ISet<int>> rfToValIdSets = readerFieldToValIds.Map;
HashSet<ReaderField> seen = new HashSet<ReaderField>();
@@ -253,7 +253,7 @@ namespace Lucene.Net.Util
// every mapping in badKids represents an Insanity
foreach (ReaderField parent in badChildren.Keys)
{
- HashSet<ReaderField> kids = badChildren[parent];
+ ISet<ReaderField> kids = badChildren[parent];
List<FieldCache.CacheEntry> badEntries = new List<FieldCache.CacheEntry>(kids.Count * 2);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d683f0fc/src/Lucene.Net/Util/MapOfSets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/MapOfSets.cs b/src/Lucene.Net/Util/MapOfSets.cs
index df4ce9d..b8e83e4 100644
--- a/src/Lucene.Net/Util/MapOfSets.cs
+++ b/src/Lucene.Net/Util/MapOfSets.cs
@@ -26,16 +26,16 @@ namespace Lucene.Net.Util
/// </summary>
public class MapOfSets<TKey, TValue>
{
- private readonly IDictionary<TKey, HashSet<TValue>> theMap; // LUCENENET TODO: API Change to ISet
+ private readonly IDictionary<TKey, ISet<TValue>> theMap;
/// <param name="m"> The backing store for this object. </param>
- public MapOfSets(IDictionary<TKey, HashSet<TValue>> m) // LUCENENET TODO: API Change to ISet
+ public MapOfSets(IDictionary<TKey, ISet<TValue>> m)
{
theMap = m;
}
/// <returns> Direct access to the map backing this object. </returns>
- public virtual IDictionary<TKey, HashSet<TValue>> Map // LUCENENET TODO: API Change to ISet
+ public virtual IDictionary<TKey, ISet<TValue>> Map
{
get
{
@@ -50,7 +50,7 @@ namespace Lucene.Net.Util
/// <returns> The size of the <see cref="ISet{T}"/> associated with key once val is added to it. </returns>
public virtual int Put(TKey key, TValue val)
{
- HashSet<TValue> theSet; // LUCENENET TODO: API Change to ISet
+ ISet<TValue> theSet;
if (theMap.ContainsKey(key))
{
theSet = theMap[key];
@@ -71,7 +71,7 @@ namespace Lucene.Net.Util
/// <returns> The size of the <see cref="ISet{T}"/> associated with key once val is added to it. </returns>
public virtual int PutAll(TKey key, IEnumerable<TValue> vals)
{
- HashSet<TValue> theSet; // LUCENENET TODO: API Change to ISet
+ ISet<TValue> theSet;
if (theMap.ContainsKey(key))
{
theSet = theMap[key];
[02/38] lucenenet git commit: API:
Lucene.Net.Codecs.MultiLevelSkipListReader: implemented proper dispose
pattern
Posted by ni...@apache.org.
API: Lucene.Net.Codecs.MultiLevelSkipListReader: implemented 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/93d80d32
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/93d80d32
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/93d80d32
Branch: refs/heads/master
Commit: 93d80d322b757a870ccc747171588d35df3fdbf1
Parents: 2663003
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 12:47:46 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 12:47:46 2017 +0700
----------------------------------------------------------------------
.../Codecs/MultiLevelSkipListReader.cs | 21 ++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/93d80d32/src/Lucene.Net/Codecs/MultiLevelSkipListReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Codecs/MultiLevelSkipListReader.cs b/src/Lucene.Net/Codecs/MultiLevelSkipListReader.cs
index 63d25f9..078354d 100644
--- a/src/Lucene.Net/Codecs/MultiLevelSkipListReader.cs
+++ b/src/Lucene.Net/Codecs/MultiLevelSkipListReader.cs
@@ -228,13 +228,26 @@ namespace Lucene.Net.Codecs
/// <summary>
/// Disposes all resources used by this object.
/// </summary>
- public void Dispose() // LUCENENET TODO: API - implement dispose pattern
+ public void Dispose()
{
- for (int i = 1; i < skipStream.Length; i++)
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Disposes all resources used by this object. Subclasses may override
+ /// to dispose their own resources.
+ /// </summary>
+ protected virtual void Dispose(bool disposing)
+ {
+ if (disposing)
{
- if (skipStream[i] != null)
+ for (int i = 1; i < skipStream.Length; i++)
{
- skipStream[i].Dispose();
+ if (skipStream[i] != null)
+ {
+ skipStream[i].Dispose();
+ }
}
}
}
[18/38] lucenenet git commit: API: Lucene.Net.MultiTermQuery: Removed
nested ConstantScoreAutoRewrite class,
since it is exactly the same as the non-nested ConstantScoreAutoRewriteClass.
Removed the internal constructor from the latter.
Posted by ni...@apache.org.
API: Lucene.Net.MultiTermQuery: Removed nested ConstantScoreAutoRewrite class, since it is exactly the same as the non-nested ConstantScoreAutoRewriteClass. Removed the internal constructor from the latter.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/07c8801e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/07c8801e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/07c8801e
Branch: refs/heads/master
Commit: 07c8801e994e878bdb970187bb0087aba2760615
Parents: 20de987
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jun 17 15:08:14 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jun 17 15:37:28 2017 +0700
----------------------------------------------------------------------
.../Search/TestMultiTermQueryRewrites.cs | 2 +-
.../Search/ConstantScoreAutoRewrite.cs | 17 ++++++++---
src/Lucene.Net/Search/MultiTermQuery.cs | 32 +++++++++++---------
3 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/07c8801e/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
index 8f681c5..e6e102c 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
@@ -167,7 +167,7 @@ namespace Lucene.Net.Search
CheckDuplicateTerms(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(1024));
// Test auto rewrite (but only boolean mode), so we set the limits to large values to always get a BQ
- MultiTermQuery.ConstantScoreAutoRewrite rewrite = new MultiTermQuery.ConstantScoreAutoRewrite();
+ ConstantScoreAutoRewrite rewrite = new ConstantScoreAutoRewrite();
rewrite.TermCountCutoff = int.MaxValue;
rewrite.DocCountPercent = 100.0;
CheckDuplicateTerms(rewrite);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/07c8801e/src/Lucene.Net/Search/ConstantScoreAutoRewrite.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/ConstantScoreAutoRewrite.cs b/src/Lucene.Net/Search/ConstantScoreAutoRewrite.cs
index 7c4f2a4..aa741b9 100644
--- a/src/Lucene.Net/Search/ConstantScoreAutoRewrite.cs
+++ b/src/Lucene.Net/Search/ConstantScoreAutoRewrite.cs
@@ -31,15 +31,24 @@ namespace Lucene.Net.Search
using TermsEnum = Lucene.Net.Index.TermsEnum;
using TermState = Lucene.Net.Index.TermState;
- // LUCENENET NOTE: made this class public, since a derived class with the same name is public
+
+ /// <summary>
+ /// A rewrite method that tries to pick the best
+ /// constant-score rewrite method based on term and
+ /// document counts from the query. If both the number of
+ /// terms and documents is small enough, then
+ /// <see cref="CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE"/> is used.
+ /// Otherwise, <see cref="CONSTANT_SCORE_FILTER_REWRITE"/> is
+ /// used.
+ /// </summary>
+ // LUCENENET specific: made this class public. In Lucene there was a derived class
+ // with the same name that was nested within MultiTermQuery, but in .NET it is
+ // more intuitive if our classes are not nested.
#if FEATURE_SERIALIZABLE
[Serializable]
#endif
public class ConstantScoreAutoRewrite : TermCollectingRewrite<BooleanQuery>
{
- // LUCENENET specific - making constructor internal since the class was meant to be internal
- internal ConstantScoreAutoRewrite() { }
-
/// <summary>
/// Defaults derived from rough tests with a 20.0 million
/// doc Wikipedia index. With more than 350 terms in the
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/07c8801e/src/Lucene.Net/Search/MultiTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/MultiTermQuery.cs b/src/Lucene.Net/Search/MultiTermQuery.cs
index 8fbad5e..6c264ca 100644
--- a/src/Lucene.Net/Search/MultiTermQuery.cs
+++ b/src/Lucene.Net/Search/MultiTermQuery.cs
@@ -243,21 +243,23 @@ namespace Lucene.Net.Search
}
}
- /// <summary>
- /// A rewrite method that tries to pick the best
- /// constant-score rewrite method based on term and
- /// document counts from the query. If both the number of
- /// terms and documents is small enough, then
- /// <see cref="CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE"/> is used.
- /// Otherwise, <see cref="CONSTANT_SCORE_FILTER_REWRITE"/> is
- /// used.
- /// </summary>
-#if FEATURE_SERIALIZABLE
- [Serializable]
-#endif
- public class ConstantScoreAutoRewrite : Lucene.Net.Search.ConstantScoreAutoRewrite // LUCENENET TODO: API Remove duplicate type with same name (confusing)
- {
- }
+ // LUCENENET specific - just use the non-nested class directly. This is
+ // confusing in .NET.
+// /// <summary>
+// /// A rewrite method that tries to pick the best
+// /// constant-score rewrite method based on term and
+// /// document counts from the query. If both the number of
+// /// terms and documents is small enough, then
+// /// <see cref="CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE"/> is used.
+// /// Otherwise, <see cref="CONSTANT_SCORE_FILTER_REWRITE"/> is
+// /// used.
+// /// </summary>
+//#if FEATURE_SERIALIZABLE
+// [Serializable]
+//#endif
+// public class ConstantScoreAutoRewrite : Lucene.Net.Search.ConstantScoreAutoRewrite
+// {
+// }
/// <summary>
/// Read-only default instance of