You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2011/11/13 00:51:44 UTC
[Lucene.Net] svn commit: r1201357 [2/4] - in
/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk: src/core/
src/core/Search/ src/core/Search/Spans/ src/core/Support/ src/core/Util/
test/core/ test/core/Document/ test/core/Index/ test/core/Search/
test/core/Search...
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFieldsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFieldsReader.cs?rev=1201357&r1=1201356&r2=1201357&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFieldsReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFieldsReader.cs Sat Nov 12 23:51:42 2011
@@ -59,7 +59,7 @@ namespace Lucene.Net.Index
}
public virtual FieldSelectorResult Accept(System.String fieldName)
{
- if (fieldName.Equals(DocHelper.TEXT_FIELD_1_KEY) || fieldName.Equals(DocHelper.COMPRESSED_TEXT_FIELD_2_KEY) || fieldName.Equals(DocHelper.LAZY_FIELD_BINARY_KEY))
+ if (fieldName.Equals(DocHelper.TEXT_FIELD_1_KEY) || fieldName.Equals(DocHelper.LAZY_FIELD_BINARY_KEY))
return FieldSelectorResult.SIZE;
else if (fieldName.Equals(DocHelper.TEXT_FIELD_3_KEY))
return FieldSelectorResult.LOAD;
@@ -121,7 +121,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(field.IsStoreOffsetWithTermVector() == true);
Assert.IsTrue(field.IsStorePositionWithTermVector() == true);
Assert.IsTrue(field.GetOmitNorms() == false);
- Assert.IsTrue(field.GetOmitTf() == false);
+ Assert.IsTrue(field.GetOmitTermFreqAndPositions() == false);
field = doc.GetField(DocHelper.TEXT_FIELD_3_KEY);
Assert.IsTrue(field != null);
@@ -129,7 +129,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(field.IsStoreOffsetWithTermVector() == false);
Assert.IsTrue(field.IsStorePositionWithTermVector() == false);
Assert.IsTrue(field.GetOmitNorms() == true);
- Assert.IsTrue(field.GetOmitTf() == false);
+ Assert.IsTrue(field.GetOmitTermFreqAndPositions() == false);
field = doc.GetField(DocHelper.NO_TF_KEY);
Assert.IsTrue(field != null);
@@ -137,7 +137,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(field.IsStoreOffsetWithTermVector() == false);
Assert.IsTrue(field.IsStorePositionWithTermVector() == false);
Assert.IsTrue(field.GetOmitNorms() == false);
- Assert.IsTrue(field.GetOmitTf() == true);
+ Assert.IsTrue(field.GetOmitTermFreqAndPositions() == true);
reader.Close();
}
@@ -159,7 +159,6 @@ namespace Lucene.Net.Index
CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.LAZY_FIELD_KEY);
CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.LAZY_FIELD_BINARY_KEY);
CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.TEXT_FIELD_UTF2_KEY);
- CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.COMPRESSED_TEXT_FIELD_2_KEY);
SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(loadFieldNames, lazyFieldNames);
Document doc = reader.Doc(0, fieldSelector);
Assert.IsTrue(doc != null, "doc is null and it shouldn't be");
@@ -169,13 +168,6 @@ namespace Lucene.Net.Index
System.String value_Renamed = field.StringValue();
Assert.IsTrue(value_Renamed != null, "value is null and it shouldn't be");
Assert.IsTrue(value_Renamed.Equals(DocHelper.LAZY_FIELD_TEXT) == true, value_Renamed + " is not equal to " + DocHelper.LAZY_FIELD_TEXT);
- field = doc.GetFieldable(DocHelper.COMPRESSED_TEXT_FIELD_2_KEY);
- Assert.IsTrue(field != null, "field is null and it shouldn't be");
- Assert.IsTrue(field.IsLazy(), "field is not lazy and it should be");
- Assert.IsTrue(field.BinaryValue() == null, "binaryValue isn't null for lazy string field");
- value_Renamed = field.StringValue();
- Assert.IsTrue(value_Renamed != null, "value is null and it shouldn't be");
- Assert.IsTrue(value_Renamed.Equals(DocHelper.FIELD_2_COMPRESSED_TEXT) == true, value_Renamed + " is not equal to " + DocHelper.FIELD_2_COMPRESSED_TEXT);
field = doc.GetFieldable(DocHelper.TEXT_FIELD_1_KEY);
Assert.IsTrue(field != null, "field is null and it shouldn't be");
Assert.IsTrue(field.IsLazy() == false, "Field is lazy and it should not be");
@@ -193,7 +185,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(field != null, "field is null and it shouldn't be");
Assert.IsTrue(field.StringValue() == null, "stringValue isn't null for lazy binary field");
- byte[] bytes = field.BinaryValue();
+ byte[] bytes = field.GetBinaryValue();
Assert.IsTrue(bytes != null, "bytes is null and it shouldn't be");
Assert.IsTrue(DocHelper.LAZY_FIELD_BINARY_BYTES.Length == bytes.Length, "");
for (int i = 0; i < bytes.Length; i++)
@@ -218,7 +210,6 @@ namespace Lucene.Net.Index
CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.LAZY_FIELD_KEY);
CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.LAZY_FIELD_BINARY_KEY);
CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.TEXT_FIELD_UTF2_KEY);
- CollectionsHelper.AddIfNotContains(lazyFieldNames, DocHelper.COMPRESSED_TEXT_FIELD_2_KEY);
SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(loadFieldNames, lazyFieldNames);
Document doc = reader.Doc(0, fieldSelector);
Assert.IsTrue(doc != null, "doc is null and it shouldn't be");
@@ -249,7 +240,7 @@ namespace Lucene.Net.Index
Document doc = reader.Doc(0, fieldSelector);
Assert.IsTrue(doc != null, "doc is null and it shouldn't be");
int count = 0;
- System.Collections.IList l = doc.GetFields();
+ var l = doc.GetFields();
for (System.Collections.IEnumerator iter = l.GetEnumerator(); iter.MoveNext(); )
{
Field field = (Field) iter.Current;
@@ -273,7 +264,7 @@ namespace Lucene.Net.Index
System.String tmpIODir = AppSettings.Get("tempDir", "");
System.String userName = System.Environment.UserName;
System.String path = tmpIODir + System.IO.Path.DirectorySeparatorChar.ToString() + "lazyDir" + userName;
- System.IO.FileInfo file = new System.IO.FileInfo(path);
+ System.IO.DirectoryInfo file = new System.IO.DirectoryInfo(path);
_TestUtil.RmDir(file);
FSDirectory tmpDir = FSDirectory.Open(file);
Assert.IsTrue(tmpDir != null);
@@ -347,9 +338,9 @@ namespace Lucene.Net.Index
Assert.IsTrue(f1.IsBinary());
Assert.IsTrue(!f3.IsBinary());
Assert.IsTrue(fb.IsBinary());
- AssertSizeEquals(2 * DocHelper.FIELD_1_TEXT.Length, f1.BinaryValue());
+ AssertSizeEquals(2 * DocHelper.FIELD_1_TEXT.Length, f1.GetBinaryValue());
Assert.AreEqual(DocHelper.FIELD_3_TEXT, f3.StringValue());
- AssertSizeEquals(DocHelper.LAZY_FIELD_BINARY_BYTES.Length, fb.BinaryValue());
+ AssertSizeEquals(DocHelper.LAZY_FIELD_BINARY_BYTES.Length, fb.GetBinaryValue());
reader.Close();
}
@@ -366,7 +357,7 @@ namespace Lucene.Net.Index
{
internal FSDirectory fsDir;
- public FaultyFSDirectory(System.IO.FileInfo dir)
+ public FaultyFSDirectory(System.IO.DirectoryInfo dir)
{
fsDir = FSDirectory.Open(dir);
lockFactory = fsDir.GetLockFactory();
@@ -375,10 +366,6 @@ namespace Lucene.Net.Index
{
return new FaultyIndexInput(fsDir.OpenInput(name));
}
- public override System.String[] List()
- {
- return fsDir.List();
- }
public override System.String[] ListAll()
{
return fsDir.ListAll();
@@ -399,10 +386,6 @@ namespace Lucene.Net.Index
{
fsDir.DeleteFile(name);
}
- public override void RenameFile(System.String name, System.String newName)
- {
- fsDir.RenameFile(name, newName);
- }
public override long FileLength(System.String name)
{
return fsDir.FileLength(name);
@@ -469,7 +452,7 @@ namespace Lucene.Net.Index
System.String tempDir = System.IO.Path.GetTempPath();
if (tempDir == null)
throw new System.IO.IOException("java.io.tmpdir undefined, cannot run test");
- System.IO.FileInfo indexDir = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "testfieldswriterexceptions"));
+ System.IO.DirectoryInfo indexDir = new System.IO.DirectoryInfo(System.IO.Path.Combine(tempDir, "testfieldswriterexceptions"));
try
{
@@ -480,7 +463,7 @@ namespace Lucene.Net.Index
writer.Optimize();
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, true);
FaultyIndexInput.doFail = true;
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFilterIndexReader.cs?rev=1201357&r1=1201356&r2=1201357&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFilterIndexReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestFilterIndexReader.cs Sat Nov 12 23:51:42 2011
@@ -121,7 +121,7 @@ namespace Lucene.Net.Index
writer.Close();
- IndexReader reader = new TestReader(IndexReader.Open(directory));
+ IndexReader reader = new TestReader(IndexReader.Open(directory, true));
Assert.IsTrue(reader.IsOptimized());
Added: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexCommit.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexCommit.cs?rev=1201357&view=auto
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexCommit.cs (added)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexCommit.cs Sat Nov 12 23:51:42 2011
@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Lucene.Net.Index;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
+
+namespace Lucene.Net.Test.Index
+{
+ public class TestIndexCommit : LuceneTestCase
+ {
+ private Directory dir;
+
+ private class IndexCommitFirst : IndexCommit
+ {
+ private readonly Directory _dir;
+
+ public IndexCommitFirst(Directory dir)
+ {
+ _dir = dir;
+ }
+
+ public override string GetSegmentsFileName()
+ {
+ return "a";
+ }
+
+ public override ICollection<string> GetFileNames()
+ {
+ return null;
+ }
+
+ public override void Delete()
+ { }
+
+ public override bool IsDeleted()
+ {
+ return false;
+ }
+
+ public override bool IsOptimized()
+ {
+ return false;
+ }
+
+ public override long GetVersion()
+ {
+ return 12;
+ }
+
+ public override long GetGeneration()
+ {
+ return 0;
+ }
+
+ public override IDictionary<string, string> GetUserData()
+ {
+ return null;
+ }
+
+ public override Directory GetDirectory()
+ {
+ return _dir;
+ }
+
+ public override long GetTimestamp()
+ {
+ return 1;
+ }
+ }
+ private class IndexCommitSecond : IndexCommit
+ {
+ private readonly Directory _dir;
+
+ public IndexCommitSecond(Directory dir)
+ {
+ _dir = dir;
+ }
+
+ public override string GetSegmentsFileName()
+ {
+ return "b";
+ }
+
+ public override ICollection<string> GetFileNames()
+ {
+ return null;
+ }
+
+ public override void Delete()
+ { }
+
+ public override bool IsDeleted()
+ {
+ return false;
+ }
+
+ public override bool IsOptimized()
+ {
+ return false;
+ }
+
+ public override long GetVersion()
+ {
+ return 12;
+ }
+
+ public override long GetGeneration()
+ {
+ return 0;
+ }
+
+ public override IDictionary<string, string> GetUserData()
+ {
+ return null;
+ }
+
+ public override Directory GetDirectory()
+ {
+ return _dir;
+ }
+
+ public override long GetTimestamp()
+ {
+ return 1;
+ }
+ }
+
+ [Test]
+ public void TestEqualsHashCode()
+ {
+ dir = new RAMDirectory();
+ var ic1 = new IndexCommitFirst(dir);
+ var ic2 = new IndexCommitSecond(dir);
+ Assert.AreEqual(ic1, ic2);
+ Assert.AreEqual(ic1.GetHashCode(), ic2.GetHashCode(), "Hash codes are not equals");
+ }
+ }
+}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexFileDeleter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexFileDeleter.cs?rev=1201357&r1=1201356&r2=1201357&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexFileDeleter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexFileDeleter.cs Sat Nov 12 23:51:42 2011
@@ -59,7 +59,7 @@ namespace Lucene.Net.Index
writer.Close();
// Delete one doc so we get a .del file:
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
Term searchTerm = new Term("id", "7");
int delCount = reader.DeleteDocuments(searchTerm);
Assert.AreEqual(1, delCount, "didn't delete the right number of documents");
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReader.cs?rev=1201357&r1=1201356&r2=1201357&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReader.cs Sat Nov 12 23:51:42 2011
@@ -75,20 +75,20 @@ namespace Lucene.Net.Index
commitUserData["foo"] = "fighters";
// set up writer
- IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
writer.SetMaxBufferedDocs(2);
for (int i = 0; i < 27; i++)
AddDocumentWithFields(writer);
writer.Close();
- IndexReader r = IndexReader.Open(d);
+ IndexReader r = IndexReader.Open(d, false);
r.DeleteDocument(5);
r.Flush(commitUserData);
r.Close();
SegmentInfos sis = new SegmentInfos();
sis.Read(d);
- IndexReader r2 = IndexReader.Open(d);
+ IndexReader r2 = IndexReader.Open(d, false);
IndexCommit c = r.GetIndexCommit();
Assert.AreEqual(c.GetUserData(), commitUserData);
@@ -97,7 +97,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(c.Equals(r.GetIndexCommit()));
// Change the index
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
writer.SetMaxBufferedDocs(2);
for (int i = 0; i < 7; i++)
AddDocumentWithFields(writer);
@@ -107,8 +107,8 @@ namespace Lucene.Net.Index
Assert.IsFalse(c.Equals(r3.GetIndexCommit()));
Assert.IsFalse(r2.GetIndexCommit().IsOptimized());
r3.Close();
-
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
writer.Optimize();
writer.Close();
@@ -123,19 +123,19 @@ namespace Lucene.Net.Index
public virtual void TestIsCurrent()
{
RAMDirectory d = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
// set up reader:
- IndexReader reader = IndexReader.Open(d);
+ IndexReader reader = IndexReader.Open(d, false);
Assert.IsTrue(reader.IsCurrent());
// modify index by adding another document:
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
Assert.IsFalse(reader.IsCurrent());
// re-create index:
- writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
Assert.IsFalse(reader.IsCurrent());
@@ -150,11 +150,11 @@ namespace Lucene.Net.Index
{
RAMDirectory d = new MockRAMDirectory();
// set up writer
- IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
// set up reader
- IndexReader reader = IndexReader.Open(d);
+ IndexReader reader = IndexReader.Open(d, true);
System.Collections.Generic.ICollection<string> fieldNames = reader.GetFieldNames(IndexReader.FieldOption.ALL);
Assert.IsTrue(CollectionsHelper.Contains(fieldNames, "keyword"));
Assert.IsTrue(CollectionsHelper.Contains(fieldNames, "text"));
@@ -162,7 +162,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(CollectionsHelper.Contains(fieldNames, "unstored"));
reader.Close();
// add more documents
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
// want to get some more segments here
for (int i = 0; i < 5 * writer.GetMergeFactor(); i++)
{
@@ -181,7 +181,7 @@ namespace Lucene.Net.Index
writer.Close();
// verify fields again
- reader = IndexReader.Open(d);
+ reader = IndexReader.Open(d, true);
fieldNames = reader.GetFieldNames(IndexReader.FieldOption.ALL);
Assert.AreEqual(13, fieldNames.Count); // the following fields
Assert.IsTrue(CollectionsHelper.Contains(fieldNames, "keyword"));
@@ -244,7 +244,7 @@ namespace Lucene.Net.Index
{
RAMDirectory d = new MockRAMDirectory();
// set up writer
- IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
// want to get some more segments here
// new termvector fields
for (int i = 0; i < 5 * writer.GetMergeFactor(); i++)
@@ -259,7 +259,7 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
writer.Close();
- IndexReader reader = IndexReader.Open(d);
+ IndexReader reader = IndexReader.Open(d, false);
FieldSortedTermVectorMapper mapper = new FieldSortedTermVectorMapper(new TermVectorEntryFreqSortedComparator());
reader.GetTermFreqVector(0, mapper);
System.Collections.IDictionary map = mapper.GetFieldToTerms();
@@ -317,14 +317,14 @@ namespace Lucene.Net.Index
// OPEN READER AT THIS POINT - this should fix the view of the
// index at the point of having 100 "aaa" documents and 0 "bbb"
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader.DocFreq(searchTerm), "first docFreq");
AssertTermDocsCount("first reader", reader, searchTerm, 100);
reader.Close();
// DELETE DOCUMENTS CONTAINING TERM: aaa
int deleted = 0;
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
deleted = reader.DeleteDocuments(searchTerm);
Assert.AreEqual(100, deleted, "deleted count");
Assert.AreEqual(100, reader.DocFreq(searchTerm), "deleted docFreq");
@@ -333,11 +333,11 @@ namespace Lucene.Net.Index
// open a 2nd reader to make sure first reader can
// commit its changes (.del) while second reader
// is open:
- IndexReader reader2 = IndexReader.Open(dir);
+ IndexReader reader2 = IndexReader.Open(dir, false);
reader.Close();
// CREATE A NEW READER and re-test
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader.DocFreq(searchTerm), "deleted docFreq");
AssertTermDocsCount("deleted termDocs", reader, searchTerm, 0);
reader.Close();
@@ -364,11 +364,10 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
doc.Add(new Field("bin1", bin, Field.Store.YES));
- doc.Add(new Field("bin2", bin, Field.Store.COMPRESS));
doc.Add(new Field("junk", "junk text", Field.Store.NO, Field.Index.ANALYZED));
writer.AddDocument(doc);
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
doc = reader.Document(reader.MaxDoc() - 1);
Field[] fields = doc.GetFields("bin1");
Assert.IsNotNull(fields);
@@ -381,17 +380,6 @@ namespace Lucene.Net.Index
{
Assert.AreEqual(bin[i], data1[i + b1.GetBinaryOffset()]);
}
- fields = doc.GetFields("bin2");
- Assert.IsNotNull(fields);
- Assert.AreEqual(1, fields.Length);
- b1 = fields[0];
- Assert.IsTrue(b1.IsBinary());
- data1 = b1.GetBinaryValue();
- Assert.AreEqual(bin.Length, b1.GetBinaryLength());
- for (int i = 0; i < bin.Length; i++)
- {
- Assert.AreEqual(bin[i], data1[i + b1.GetBinaryOffset()]);
- }
System.Collections.Hashtable lazyFields = new System.Collections.Hashtable();
CollectionsHelper.AddIfNotContains(lazyFields, "bin1");
FieldSelector sel = new SetBasedFieldSelector(new System.Collections.Hashtable(), lazyFields);
@@ -415,7 +403,7 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
writer.Optimize();
writer.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
doc = reader.Document(reader.MaxDoc() - 1);
fields = doc.GetFields("bin1");
Assert.IsNotNull(fields);
@@ -428,17 +416,6 @@ namespace Lucene.Net.Index
{
Assert.AreEqual(bin[i], data1[i + b1.GetBinaryOffset()]);
}
- fields = doc.GetFields("bin2");
- Assert.IsNotNull(fields);
- Assert.AreEqual(1, fields.Length);
- b1 = fields[0];
- Assert.IsTrue(b1.IsBinary());
- data1 = b1.GetBinaryValue();
- Assert.AreEqual(bin.Length, b1.GetBinaryLength());
- for (int i = 0; i < bin.Length; i++)
- {
- Assert.AreEqual(bin[i], data1[i + b1.GetBinaryOffset()]);
- }
reader.Close();
}
@@ -461,7 +438,7 @@ namespace Lucene.Net.Index
}
writer.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
// Close reader:
reader.Close();
@@ -516,7 +493,7 @@ namespace Lucene.Net.Index
}
// Create reader:
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
// Try to make changes
try
@@ -560,8 +537,8 @@ namespace Lucene.Net.Index
System.String tempDir = AppSettings.Get("tempDir", "");
if (tempDir == null)
throw new System.IO.IOException("tempDir undefined, cannot run test");
-
- System.IO.FileInfo indexDir = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "lucenetestnormwriter"));
+
+ System.IO.DirectoryInfo indexDir = new System.IO.DirectoryInfo(System.IO.Path.Combine(tempDir, "lucenetestnormwriter"));
Directory dir = FSDirectory.Open(indexDir);
IndexWriter writer;
IndexReader reader;
@@ -573,28 +550,28 @@ namespace Lucene.Net.Index
writer.Close();
// now open reader & set norm for doc 0
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
reader.SetNorm(0, "content", (float) 2.0);
// we should be holding the write lock now:
- Assert.IsTrue(IndexReader.IsLocked(dir), "locked");
+ Assert.IsTrue(IndexWriter.IsLocked(dir), "locked");
reader.Commit();
// we should not be holding the write lock now:
- Assert.IsTrue(!IndexReader.IsLocked(dir), "not locked");
+ Assert.IsTrue(!IndexWriter.IsLocked(dir), "not locked");
// open a 2nd reader:
- IndexReader reader2 = IndexReader.Open(dir);
+ IndexReader reader2 = IndexReader.Open(dir, false);
// set norm again for doc 0
reader.SetNorm(0, "content", (float) 3.0);
- Assert.IsTrue(IndexReader.IsLocked(dir), "locked");
+ Assert.IsTrue(IndexWriter.IsLocked(dir), "locked");
reader.Close();
// we should not be holding the write lock now:
- Assert.IsTrue(!IndexReader.IsLocked(dir), "not locked");
+ Assert.IsTrue(!IndexWriter.IsLocked(dir), "not locked");
reader2.Close();
dir.Close();
@@ -621,12 +598,12 @@ namespace Lucene.Net.Index
// now open reader & set norm for doc 0 (writes to
// _0_1.s0)
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
reader.SetNorm(0, "content", (float) 2.0);
reader.Close();
// now open reader again & set norm for doc 0 (writes to _0_2.s0)
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
reader.SetNorm(0, "content", (float) 2.0);
reader.Close();
Assert.IsFalse(dir.FileExists("_0_1.s0"), "failed to remove first generation norms file on writing second generation");
@@ -641,31 +618,31 @@ namespace Lucene.Net.Index
DeleteReaderWriterConflict(false);
}
- [Test]
- public virtual void TestOpenEmptyDirectory()
- {
- System.String dirName = "test.empty";
- System.IO.FileInfo fileDirName = new System.IO.FileInfo(dirName);
- bool tmpBool;
- if (System.IO.File.Exists(fileDirName.FullName))
- tmpBool = true;
- else
- tmpBool = System.IO.Directory.Exists(fileDirName.FullName);
- if (!tmpBool)
- {
- System.IO.Directory.CreateDirectory(fileDirName.FullName);
- }
- try
- {
- IndexReader.Open(fileDirName);
- Assert.Fail("opening IndexReader on empty directory failed to produce FileNotFoundException");
- }
- catch (System.IO.FileNotFoundException e)
- {
- // GOOD
- }
- RmDir(fileDirName);
- }
+ //[Test]
+ //public virtual void TestOpenEmptyDirectory()
+ //{
+ // System.String dirName = "test.empty";
+ // System.IO.FileInfo fileDirName = new System.IO.FileInfo(dirName);
+ // bool tmpBool;
+ // if (System.IO.File.Exists(fileDirName.FullName))
+ // tmpBool = true;
+ // else
+ // tmpBool = System.IO.Directory.Exists(fileDirName.FullName);
+ // if (!tmpBool)
+ // {
+ // System.IO.Directory.CreateDirectory(fileDirName.FullName);
+ // }
+ // try
+ // {
+ // IndexReader.Open(fileDirName);
+ // Assert.Fail("opening IndexReader on empty directory failed to produce FileNotFoundException");
+ // }
+ // catch (System.IO.FileNotFoundException e)
+ // {
+ // // GOOD
+ // }
+ // RmDir(fileDirName);
+ //}
[Test]
public virtual void TestDeleteReaderWriterConflictOptimized()
@@ -691,7 +668,7 @@ namespace Lucene.Net.Index
// OPEN READER AT THIS POINT - this should fix the view of the
// index at the point of having 100 "aaa" documents and 0 "bbb"
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader.DocFreq(searchTerm), "first docFreq");
Assert.AreEqual(0, reader.DocFreq(searchTerm2), "first docFreq");
AssertTermDocsCount("first reader", reader, searchTerm, 100);
@@ -736,7 +713,7 @@ namespace Lucene.Net.Index
// Re-open index reader and try again. This time it should see
// the new data.
reader.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader.DocFreq(searchTerm), "first docFreq");
Assert.AreEqual(100, reader.DocFreq(searchTerm2), "first docFreq");
AssertTermDocsCount("first reader", reader, searchTerm, 100);
@@ -751,7 +728,7 @@ namespace Lucene.Net.Index
reader.Close();
// CREATE A NEW READER and re-test
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader.DocFreq(searchTerm), "deleted docFreq");
Assert.AreEqual(100, reader.DocFreq(searchTerm2), "deleted docFreq");
AssertTermDocsCount("deleted termDocs", reader, searchTerm, 0);
@@ -761,14 +738,14 @@ namespace Lucene.Net.Index
private Directory GetDirectory()
{
- return FSDirectory.Open(new System.IO.FileInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "testIndex")));
+ return FSDirectory.Open(new System.IO.DirectoryInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "testIndex")));
}
[Test]
public virtual void TestFilesOpenClose()
{
// Create initial data set
- System.IO.FileInfo dirFile = new System.IO.FileInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "testIndex"));
+ System.IO.DirectoryInfo dirFile = new System.IO.DirectoryInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "testIndex"));
Directory dir = GetDirectory();
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
AddDoc(writer, "test");
@@ -787,7 +764,7 @@ namespace Lucene.Net.Index
// Now open existing directory and test that reader closes all files
dir = GetDirectory();
- IndexReader reader1 = IndexReader.Open(dir);
+ IndexReader reader1 = IndexReader.Open(dir, false);
reader1.Close();
dir.Close();
@@ -799,8 +776,7 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestLastModified()
{
- Assert.IsFalse(IndexReader.IndexExists("there_is_no_such_index"));
- System.IO.FileInfo fileDir = new System.IO.FileInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "testIndex"));
+ System.IO.DirectoryInfo fileDir = new System.IO.DirectoryInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "testIndex"));
for (int i = 0; i < 2; i++)
{
try
@@ -813,15 +789,15 @@ namespace Lucene.Net.Index
Assert.IsFalse(IndexReader.IndexExists(dir));
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
- Assert.IsTrue(IndexReader.IsLocked(dir)); // writer open, so dir is locked
+ Assert.IsTrue(IndexWriter.IsLocked(dir)); // writer open, so dir is locked
writer.Close();
Assert.IsTrue(IndexReader.IndexExists(dir));
- IndexReader reader = IndexReader.Open(dir);
- Assert.IsFalse(IndexReader.IsLocked(dir)); // reader only, no lock
+ IndexReader reader = IndexReader.Open(dir, false);
+ Assert.IsFalse(IndexWriter.IsLocked(dir)); // reader only, no lock
long version = IndexReader.LastModified(dir);
if (i == 1)
{
- long version2 = IndexReader.LastModified(fileDir);
+ long version2 = IndexReader.LastModified(dir);
Assert.AreEqual(version, version2);
}
reader.Close();
@@ -832,7 +808,7 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.IsTrue(version <= IndexReader.LastModified(dir), "old lastModified is " + version + "; new lastModified is " + IndexReader.LastModified(dir));
reader.Close();
dir.Close();
@@ -848,16 +824,15 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestVersion()
{
- Assert.IsFalse(IndexReader.IndexExists("there_is_no_such_index"));
Directory dir = new MockRAMDirectory();
Assert.IsFalse(IndexReader.IndexExists(dir));
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
- Assert.IsTrue(IndexReader.IsLocked(dir)); // writer open, so dir is locked
+ Assert.IsTrue(IndexWriter.IsLocked(dir)); // writer open, so dir is locked
writer.Close();
Assert.IsTrue(IndexReader.IndexExists(dir));
- IndexReader reader = IndexReader.Open(dir);
- Assert.IsFalse(IndexReader.IsLocked(dir)); // reader only, no lock
+ IndexReader reader = IndexReader.Open(dir, false);
+ Assert.IsFalse(IndexWriter.IsLocked(dir)); // reader only, no lock
long version = IndexReader.GetCurrentVersion(dir);
reader.Close();
// modify index and check version has been
@@ -865,7 +840,7 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.IsTrue(version < IndexReader.GetCurrentVersion(dir), "old version is " + version + "; new version is " + IndexReader.GetCurrentVersion(dir));
reader.Close();
dir.Close();
@@ -879,7 +854,7 @@ namespace Lucene.Net.Index
AddDocumentWithFields(writer);
writer.Close();
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
try
{
reader.DeleteDocument(0);
@@ -889,7 +864,7 @@ namespace Lucene.Net.Index
{
// expected exception
}
- IndexReader.Unlock(dir); // this should not be done in the real world!
+ IndexWriter.Unlock(dir); // this should not be done in the real world!
reader.DeleteDocument(0);
reader.Close();
writer.Close();
@@ -904,12 +879,12 @@ namespace Lucene.Net.Index
AddDocumentWithFields(writer);
AddDocumentWithFields(writer);
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
reader.DeleteDocument(0);
reader.DeleteDocument(1);
reader.UndeleteAll();
reader.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
reader.Close();
dir.Close();
@@ -923,11 +898,11 @@ namespace Lucene.Net.Index
AddDocumentWithFields(writer);
AddDocumentWithFields(writer);
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
reader.DeleteDocument(0);
reader.DeleteDocument(1);
reader.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
reader.UndeleteAll();
Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
reader.Close();
@@ -942,14 +917,14 @@ namespace Lucene.Net.Index
AddDocumentWithFields(writer);
AddDocumentWithFields(writer);
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
reader.DeleteDocument(0);
reader.DeleteDocument(1);
reader.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
reader.UndeleteAll();
reader.Close();
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
reader.Close();
dir.Close();
@@ -1007,7 +982,7 @@ namespace Lucene.Net.Index
// the same files again.
dir.SetPreventDoubleWrite(false);
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
// For each disk size, first try to commit against
// dir that will hit random IOExceptions & disk
@@ -1133,7 +1108,7 @@ namespace Lucene.Net.Index
IndexReader newReader = null;
try
{
- newReader = IndexReader.Open(dir);
+ newReader = IndexReader.Open(dir, false);
}
catch (System.IO.IOException e)
{
@@ -1214,7 +1189,7 @@ namespace Lucene.Net.Index
AddDoc(writer, "aaa");
}
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
// Try to delete an invalid docId, yet, within range
// of the final bits of the BitVector:
@@ -1260,7 +1235,7 @@ namespace Lucene.Net.Index
AddDoc(writer, "aaa");
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
try
{
reader.DeleteDocument(1);
@@ -1271,12 +1246,12 @@ namespace Lucene.Net.Index
// expected
}
reader.Close();
- if (IndexReader.IsLocked(dir))
+ if (IndexWriter.IsLocked(dir))
{
Assert.Fail("write lock is still held after close");
}
- reader = IndexReader.Open(dir);
+ reader = IndexReader.Open(dir, false);
try
{
reader.SetNorm(1, "content", (float) 2.0);
@@ -1287,7 +1262,7 @@ namespace Lucene.Net.Index
// expected
}
reader.Close();
- if (IndexReader.IsLocked(dir))
+ if (IndexWriter.IsLocked(dir))
{
Assert.Fail("write lock is still held after close");
}
@@ -1311,11 +1286,11 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestOpenReaderAfterDelete()
{
- System.IO.FileInfo dirFile = new System.IO.FileInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "deletetest"));
+ System.IO.DirectoryInfo dirFile = new System.IO.DirectoryInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "deletetest"));
Directory dir = FSDirectory.Open(dirFile);
try
{
- IndexReader.Open(dir);
+ IndexReader.Open(dir, false);
Assert.Fail("expected FileNotFoundException");
}
catch (System.IO.FileNotFoundException e)
@@ -1341,7 +1316,7 @@ namespace Lucene.Net.Index
// Make sure we still get a CorruptIndexException (not NPE):
try
{
- IndexReader.Open(dir);
+ IndexReader.Open(dir, false);
Assert.Fail("expected FileNotFoundException");
}
catch (System.IO.FileNotFoundException e)
@@ -1376,7 +1351,7 @@ namespace Lucene.Net.Index
// OPEN TWO READERS
// Both readers get segment info as exists at this time
- IndexReader reader1 = IndexReader.Open(dir);
+ IndexReader reader1 = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader1.DocFreq(searchTerm1), "first opened");
Assert.AreEqual(100, reader1.DocFreq(searchTerm2), "first opened");
Assert.AreEqual(100, reader1.DocFreq(searchTerm3), "first opened");
@@ -1384,7 +1359,7 @@ namespace Lucene.Net.Index
AssertTermDocsCount("first opened", reader1, searchTerm2, 100);
AssertTermDocsCount("first opened", reader1, searchTerm3, 100);
- IndexReader reader2 = IndexReader.Open(dir);
+ IndexReader reader2 = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader2.DocFreq(searchTerm1), "first opened");
Assert.AreEqual(100, reader2.DocFreq(searchTerm2), "first opened");
Assert.AreEqual(100, reader2.DocFreq(searchTerm3), "first opened");
@@ -1428,7 +1403,7 @@ namespace Lucene.Net.Index
// RECREATE READER AND TRY AGAIN
reader1.Close();
- reader1 = IndexReader.Open(dir);
+ reader1 = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader1.DocFreq(searchTerm1), "reopened");
Assert.AreEqual(100, reader1.DocFreq(searchTerm2), "reopened");
Assert.AreEqual(100, reader1.DocFreq(searchTerm3), "reopened");
@@ -1446,7 +1421,7 @@ namespace Lucene.Net.Index
reader1.Close();
// Open another reader to confirm that everything is deleted
- reader2 = IndexReader.Open(dir);
+ reader2 = IndexReader.Open(dir, false);
Assert.AreEqual(100, reader2.DocFreq(searchTerm1), "reopened 2");
Assert.AreEqual(100, reader2.DocFreq(searchTerm2), "reopened 2");
Assert.AreEqual(100, reader2.DocFreq(searchTerm3), "reopened 2");
@@ -1497,7 +1472,7 @@ namespace Lucene.Net.Index
doc.Add(new Field("content", value_Renamed, Field.Store.NO, Field.Index.ANALYZED));
writer.AddDocument(doc);
}
- private void RmDir(System.IO.FileInfo dir)
+ private void RmDir(System.IO.DirectoryInfo dir)
{
System.IO.FileInfo[] files = FileSupport.GetFiles(dir);
for (int i = 0; i < files.Length; i++)
@@ -1544,8 +1519,8 @@ namespace Lucene.Net.Index
System.Collections.Generic.ICollection<string> fieldsNames1 = index1.GetFieldNames(FieldOption.ALL);
System.Collections.Generic.ICollection<string> fieldsNames2 = index1.GetFieldNames(FieldOption.ALL);
- System.Collections.ICollection fields1 = null;
- System.Collections.ICollection fields2 = null;
+ System.Collections.Generic.ICollection<Fieldable> fields1 = null;
+ System.Collections.Generic.ICollection<Fieldable> fields2 = null;
Assert.AreEqual(fieldsNames1.Count, fieldsNames2.Count, "IndexReaders have different numbers of fields.");
System.Collections.IEnumerator it1 = fieldsNames1.GetEnumerator();
@@ -1631,11 +1606,10 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestGetIndexCommit()
{
-
RAMDirectory d = new MockRAMDirectory();
// set up writer
- IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
writer.SetMaxBufferedDocs(2);
for (int i = 0; i < 27; i++)
AddDocumentWithFields(writer);
@@ -1643,7 +1617,7 @@ namespace Lucene.Net.Index
SegmentInfos sis = new SegmentInfos();
sis.Read(d);
- IndexReader r = IndexReader.Open(d);
+ IndexReader r = IndexReader.Open(d, false);
IndexCommit c = r.GetIndexCommit();
Assert.AreEqual(sis.GetCurrentSegmentFileName(), c.GetSegmentsFileName());
@@ -1651,7 +1625,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(c.Equals(r.GetIndexCommit()));
// Change the index
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
writer.SetMaxBufferedDocs(2);
for (int i = 0; i < 7; i++)
AddDocumentWithFields(writer);
@@ -1662,7 +1636,7 @@ namespace Lucene.Net.Index
Assert.IsFalse(r2.GetIndexCommit().IsOptimized());
r2.Close();
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
writer.Optimize();
writer.Close();
@@ -1678,7 +1652,7 @@ namespace Lucene.Net.Index
public virtual void TestReadOnly()
{
RAMDirectory d = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Commit();
AddDocumentWithFields(writer);
@@ -1695,7 +1669,7 @@ namespace Lucene.Net.Index
// expected
}
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
AddDocumentWithFields(writer);
writer.Close();
@@ -1714,8 +1688,8 @@ namespace Lucene.Net.Index
{
// expected
}
-
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
writer.Optimize();
writer.Close();
@@ -1736,91 +1710,28 @@ namespace Lucene.Net.Index
}
// Make sure write lock isn't held
- writer = new IndexWriter(d, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
+ writer = new IndexWriter(d, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
writer.Close();
r3.Close();
}
- [Test]
- public virtual void TestFalseDirectoryAlreadyClosed()
- {
-
- System.IO.FileInfo indexDir = _TestUtil.GetTempDir("lucenetestdiralreadyclosed");
-
- try
- {
- FSDirectory dir = FSDirectory.GetDirectory(indexDir);
- IndexWriter w = new IndexWriter(indexDir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
- w.SetUseCompoundFile(false);
- Document doc = new Document();
- w.AddDocument(doc);
- w.Close();
- bool tmpBool;
- if (System.IO.File.Exists(new System.IO.FileInfo(System.IO.Path.Combine(indexDir.FullName, "_0.fnm")).FullName))
- {
- System.IO.File.Delete(new System.IO.FileInfo(System.IO.Path.Combine(indexDir.FullName, "_0.fnm")).FullName);
- tmpBool = true;
- }
- else if (System.IO.Directory.Exists(new System.IO.FileInfo(System.IO.Path.Combine(indexDir.FullName, "_0.fnm")).FullName))
- {
- System.IO.Directory.Delete(new System.IO.FileInfo(System.IO.Path.Combine(indexDir.FullName, "_0.fnm")).FullName);
- tmpBool = true;
- }
- else
- tmpBool = false;
- Assert.IsTrue(tmpBool);
-
- try
- {
- IndexReader.Open(indexDir);
- Assert.Fail("did not hit expected exception");
- }
- catch (AlreadyClosedException ace)
- {
- Assert.Fail("should not have hit AlreadyClosedException");
- }
- catch (System.IO.FileNotFoundException ioe)
- {
- // expected
- }
-
- // Make sure we really did close the dir inside IndexReader.open
- dir.Close();
-
- try
- {
- dir.FileExists("hi");
- Assert.Fail("did not hit expected exception");
- }
- catch (AlreadyClosedException ace)
- {
- // expected
- }
- }
- finally
- {
- _TestUtil.RmDir(indexDir);
- }
- }
-
-
// LUCENE-1474
[Test]
public virtual void TestIndexReader_Rename()
{
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), IndexWriter.MaxFieldLength.UNLIMITED);
writer.AddDocument(CreateDocument("a"));
writer.AddDocument(CreateDocument("b"));
writer.AddDocument(CreateDocument("c"));
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
reader.DeleteDocuments(new Term("id", "a"));
reader.Flush();
reader.DeleteDocuments(new Term("id", "b"));
reader.Close();
- IndexReader.Open(dir).Close();
+ IndexReader.Open(dir, true).Close();
}
// LUCENE-1647
@@ -1829,19 +1740,19 @@ namespace Lucene.Net.Index
{
MockRAMDirectory dir = new MockRAMDirectory();
dir.SetPreventDoubleWrite(false);
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), IndexWriter.MaxFieldLength.UNLIMITED);
writer.AddDocument(CreateDocument("a"));
writer.AddDocument(CreateDocument("b"));
writer.AddDocument(CreateDocument("c"));
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
reader.DeleteDocuments(new Term("id", "a"));
reader.Flush();
reader.DeleteDocuments(new Term("id", "b"));
reader.UndeleteAll();
reader.DeleteDocuments(new Term("id", "b"));
reader.Close();
- IndexReader.Open(dir).Close();
+ IndexReader.Open(dir, false).Close();
dir.Close();
}
@@ -1861,7 +1772,7 @@ namespace Lucene.Net.Index
Directory dir = FSDirectory.Open(_TestUtil.GetTempDir("doesnotexist"));
try
{
- IndexReader.Open(dir);
+ IndexReader.Open(dir, true);
Assert.Fail("did not hit expected exception");
}
catch (NoSuchDirectoryException nsde)
@@ -1877,8 +1788,8 @@ namespace Lucene.Net.Index
{
Directory dir = new MockRAMDirectory();
-
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
+
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT), IndexWriter.MaxFieldLength.LIMITED);
writer.SetMaxBufferedDocs(2);
writer.AddDocument(CreateDocument("a"));
@@ -1886,11 +1797,11 @@ namespace Lucene.Net.Index
writer.AddDocument(CreateDocument("a"));
writer.Close();
- System.Collections.ICollection commits = IndexReader.ListCommits(dir);
- System.Collections.IEnumerator it = commits.GetEnumerator();
+ var commits = IndexReader.ListCommits(dir);
+ var it = commits.GetEnumerator();
while (it.MoveNext())
{
- IndexCommit commit = (IndexCommit) it.Current;
+ IndexCommit commit = it.Current;
System.Collections.Generic.ICollection<string> files = commit.GetFileNames();
System.Collections.Hashtable seen = new System.Collections.Hashtable();
System.Collections.IEnumerator it2 = files.GetEnumerator();
@@ -1951,7 +1862,7 @@ namespace Lucene.Net.Index
writer.Commit();
// Open reader1
- IndexReader r = IndexReader.Open(dir);
+ IndexReader r = IndexReader.Open(dir, false);
IndexReader r1 = SegmentReader.GetOnlySegmentReader(r);
int[] ints = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetInts(r1, "number");
Assert.AreEqual(1, ints.Length);
@@ -1985,7 +1896,7 @@ namespace Lucene.Net.Index
writer.Commit();
// Open reader1
- IndexReader r = IndexReader.Open(dir);
+ IndexReader r = IndexReader.Open(dir, false);
Assert.IsTrue(r is DirectoryReader);
IndexReader r1 = SegmentReader.GetOnlySegmentReader(r);
int[] ints = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetInts(r1, "number");
@@ -2029,7 +1940,7 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
writer.Commit();
- IndexReader r = IndexReader.Open(dir);
+ IndexReader r = IndexReader.Open(dir, false);
IndexReader r1 = SegmentReader.GetOnlySegmentReader(r);
Assert.AreEqual(36, r1.GetUniqueTermCount());
writer.AddDocument(doc);
@@ -2079,8 +1990,8 @@ namespace Lucene.Net.Index
// expected
}
Assert.IsFalse(((SegmentReader) r.GetSequentialSubReaders()[0]).TermsIndexLoaded());
-
- Assert.AreEqual(- 1, r.GetTermInfosIndexDivisor());
+
+ Assert.AreEqual(-1, (r.GetSequentialSubReaders()[0]).GetTermInfosIndexDivisor());
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
writer.AddDocument(doc);
writer.Close();
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderClone.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderClone.cs?rev=1201357&r1=1201356&r2=1201357&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderClone.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderClone.cs Sat Nov 12 23:51:42 2011
@@ -48,7 +48,7 @@ namespace Lucene.Net.Index
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, false);
- IndexReader reader = IndexReader.Open(dir1);
+ IndexReader reader = IndexReader.Open(dir1, false);
IndexReader readOnlyReader = reader.Clone(true);
if (!IsReadOnly(readOnlyReader))
{
@@ -63,39 +63,6 @@ namespace Lucene.Net.Index
dir1.Close();
}
- // LUCENE-1453
- [Test]
- public virtual void TestFSDirectoryClone()
- {
-
- System.String tempDir = System.IO.Path.GetTempPath();
- if (tempDir == null)
- throw new System.IO.IOException("java.io.tmpdir undefined, cannot run test");
- System.IO.FileInfo indexDir2 = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "FSDirIndexReaderClone"));
-
- Directory dir1 = FSDirectory.GetDirectory(indexDir2);
- TestIndexReaderReopen.CreateIndex(dir1, false);
-
- IndexReader reader = IndexReader.Open(indexDir2);
- IndexReader readOnlyReader = (IndexReader) reader.Clone();
- reader.Close();
- readOnlyReader.Close();
-
- // Make sure we didn't pick up too many incRef's along
- // the way -- this close should be the final close:
- dir1.Close();
-
- try
- {
- dir1.ListAll();
- Assert.Fail("did not hit AlreadyClosedException");
- }
- catch (AlreadyClosedException ace)
- {
- // expected
- }
- }
-
// open non-readOnly reader1, clone to non-readOnly
// reader2, make sure we can change reader2
[Test]
@@ -298,7 +265,7 @@ namespace Lucene.Net.Index
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, true);
- IndexReader reader = IndexReader.Open(dir1);
+ IndexReader reader = IndexReader.Open(dir1, false);
IndexReader readOnlyReader = reader.Clone(true);
if (!IsReadOnly(readOnlyReader))
{
@@ -323,8 +290,8 @@ namespace Lucene.Net.Index
TestIndexReaderReopen.CreateIndex(dir1, true);
Directory dir2 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir2, true);
- IndexReader r1 = IndexReader.Open(dir1);
- IndexReader r2 = IndexReader.Open(dir2);
+ IndexReader r1 = IndexReader.Open(dir1, false);
+ IndexReader r2 = IndexReader.Open(dir2, false);
ParallelReader pr1 = new ParallelReader();
pr1.Add(r1);
@@ -379,8 +346,8 @@ namespace Lucene.Net.Index
TestIndexReaderReopen.CreateIndex(dir1, true);
Directory dir2 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir2, true);
- IndexReader r1 = IndexReader.Open(dir1);
- IndexReader r2 = IndexReader.Open(dir2);
+ IndexReader r1 = IndexReader.Open(dir1, false);
+ IndexReader r2 = IndexReader.Open(dir2, false);
MultiReader multiReader = new MultiReader(new IndexReader[]{r1, r2});
PerformDefaultTests(multiReader);
@@ -418,7 +385,7 @@ namespace Lucene.Net.Index
origSegmentReader.Close();
AssertDelDocsRefCountEquals(1, origSegmentReader);
// check the norm refs
- Norm norm = (Norm) clonedSegmentReader.norms_ForNUnit["field1"];
+ Norm norm = clonedSegmentReader.norms_ForNUnit["field1"];
Assert.AreEqual(1, norm.BytesRef().RefCount());
clonedSegmentReader.Close();
dir1.Close();
@@ -430,7 +397,7 @@ namespace Lucene.Net.Index
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, false);
- IndexReader origReader = IndexReader.Open(dir1);
+ IndexReader origReader = IndexReader.Open(dir1, false);
SegmentReader origSegmentReader = SegmentReader.GetOnlySegmentReader(origReader);
// deletedDocsRef should be null because nothing has updated yet
Assert.IsNull(origSegmentReader.deletedDocsRef_ForNUnit);
@@ -497,14 +464,14 @@ namespace Lucene.Net.Index
{
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, false);
- IndexReader origReader = IndexReader.Open(dir1);
+ IndexReader origReader = IndexReader.Open(dir1, false);
origReader.DeleteDocument(1);
IndexReader clonedReader = (IndexReader) origReader.Clone();
origReader.Close();
clonedReader.Close();
- IndexReader r = IndexReader.Open(dir1);
+ IndexReader r = IndexReader.Open(dir1, false);
Assert.IsTrue(r.IsDeleted(1));
r.Close();
dir1.Close();
@@ -516,7 +483,7 @@ namespace Lucene.Net.Index
{
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, false);
- IndexReader orig = IndexReader.Open(dir1);
+ IndexReader orig = IndexReader.Open(dir1, false);
orig.SetNorm(1, "field1", 17.0f);
byte encoded = Similarity.EncodeNorm(17.0f);
Assert.AreEqual(encoded, orig.Norms("field1")[1]);
@@ -527,7 +494,7 @@ namespace Lucene.Net.Index
orig.Close();
clonedReader.Close();
- IndexReader r = IndexReader.Open(dir1);
+ IndexReader r = IndexReader.Open(dir1, false);
Assert.AreEqual(encoded, r.Norms("field1")[1]);
r.Close();
dir1.Close();
@@ -549,7 +516,7 @@ namespace Lucene.Net.Index
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, true);
- IndexReader reader = IndexReader.Open(dir1);
+ IndexReader reader = IndexReader.Open(dir1, false);
reader.DeleteDocument(1); // acquire write lock
IndexReader[] subs = reader.GetSequentialSubReaders();
System.Diagnostics.Debug.Assert(subs.Length > 1);
@@ -572,7 +539,7 @@ namespace Lucene.Net.Index
{
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, false);
- IndexReader r1 = IndexReader.Open(dir1);
+ IndexReader r1 = IndexReader.Open(dir1, false);
r1.IncRef();
IndexReader r2 = r1.Clone(false);
r1.DeleteDocument(5);
@@ -596,7 +563,7 @@ namespace Lucene.Net.Index
doc.Add(new Field("field", "yes it's stored", Field.Store.YES, Field.Index.ANALYZED));
w.AddDocument(doc);
w.Close();
- IndexReader r1 = IndexReader.Open(dir);
+ IndexReader r1 = IndexReader.Open(dir, false);
IndexReader r2 = r1.Clone(false);
r1.Close();
r2.Close();
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderCloneNorms.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderCloneNorms.cs?rev=1201357&r1=1201356&r2=1201357&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderCloneNorms.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/test/core/Index/TestIndexReaderCloneNorms.cs Sat Nov 12 23:51:42 2011
@@ -96,7 +96,7 @@ namespace Lucene.Net.Index
{
base.SetUp();
similarityOne = new SimilarityOne(this);
- anlzr = new StandardAnalyzer();
+ anlzr = new StandardAnalyzer(Util.Version.LUCENE_CURRENT);
}
/// <summary> Test that norms values are preserved as the index is maintained. Including
@@ -114,7 +114,7 @@ namespace Lucene.Net.Index
}
// test with a single index: index1
- System.IO.FileInfo indexDir1 = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "lucenetestindex1"));
+ System.IO.DirectoryInfo indexDir1 = new System.IO.DirectoryInfo(System.IO.Path.Combine(tempDir, "lucenetestindex1"));
Directory dir1 = FSDirectory.Open(indexDir1);
IndexWriter.Unlock(dir1);
@@ -133,21 +133,22 @@ namespace Lucene.Net.Index
modifiedNorms = new System.Collections.ArrayList();
numDocNorms = 0;
- System.IO.FileInfo indexDir2 = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "lucenetestindex2"));
+ System.IO.DirectoryInfo indexDir2 = new System.IO.DirectoryInfo(System.IO.Path.Combine(tempDir, "lucenetestindex2"));
Directory dir2 = FSDirectory.Open(indexDir2);
CreateIndex(dir2);
DoTestNorms(dir2);
// add index1 and index2 to a third index: index3
- System.IO.FileInfo indexDir3 = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "lucenetestindex3"));
+ System.IO.DirectoryInfo indexDir3 = new System.IO.DirectoryInfo(System.IO.Path.Combine(tempDir, "lucenetestindex3"));
Directory dir3 = FSDirectory.Open(indexDir3);
CreateIndex(dir3);
IndexWriter iw = new IndexWriter(dir3, anlzr, false, IndexWriter.MaxFieldLength.LIMITED);
iw.SetMaxBufferedDocs(5);
iw.SetMergeFactor(3);
- iw.AddIndexes(new Directory[]{dir1, dir2});
+ iw.AddIndexesNoOptimize(new Directory[]{dir1, dir2});
+ iw.Optimize();
iw.Close();
norms1.AddRange(norms);
@@ -177,10 +178,10 @@ namespace Lucene.Net.Index
private void DoTestNorms(Directory dir)
{
AddDocs(dir, 12, true);
- IndexReader ir = IndexReader.Open(dir);
+ IndexReader ir = IndexReader.Open(dir, false);
VerifyIndex(ir);
ModifyNormsForF1(ir);
- IndexReader irc = (IndexReader) ir.Clone(); // IndexReader.open(dir);//ir.clone();
+ IndexReader irc = (IndexReader) ir.Clone(); // IndexReader.open(dir, false);//ir.clone();
VerifyIndex(irc);
ModifyNormsForF1(irc);
@@ -200,7 +201,7 @@ namespace Lucene.Net.Index
TestIndexReaderReopen.CreateIndex(dir1, false);
SegmentReader reader1 = SegmentReader.GetOnlySegmentReader(dir1);
reader1.Norms("field1");
- Norm r1norm = (Norm) reader1.norms_ForNUnit["field1"];
+ Norm r1norm = reader1.norms_ForNUnit["field1"];
SegmentReader.Ref r1BytesRef = r1norm.BytesRef();
SegmentReader reader2 = (SegmentReader) reader1.Clone();
Assert.AreEqual(2, r1norm.BytesRef().RefCount());
@@ -216,19 +217,19 @@ namespace Lucene.Net.Index
{
Directory dir1 = new MockRAMDirectory();
TestIndexReaderReopen.CreateIndex(dir1, false);
- IndexReader reader1 = IndexReader.Open(dir1);
+ IndexReader reader1 = IndexReader.Open(dir1, false);
IndexReader reader2C = (IndexReader) reader1.Clone();
SegmentReader segmentReader2C = SegmentReader.GetOnlySegmentReader(reader2C);
segmentReader2C.Norms("field1"); // load the norms for the field
- Norm reader2CNorm = (Norm) segmentReader2C.norms_ForNUnit["field1"];
+ Norm reader2CNorm = segmentReader2C.norms_ForNUnit["field1"];
Assert.IsTrue(reader2CNorm.BytesRef().RefCount() == 2, "reader2CNorm.bytesRef()=" + reader2CNorm.BytesRef());
IndexReader reader3C = (IndexReader) reader2C.Clone();
SegmentReader segmentReader3C = SegmentReader.GetOnlySegmentReader(reader3C);
- Norm reader3CCNorm = (Norm) segmentReader3C.norms_ForNUnit["field1"];
+ Norm reader3CCNorm = segmentReader3C.norms_ForNUnit["field1"];
Assert.AreEqual(3, reader3CCNorm.BytesRef().RefCount());
// edit a norm and the refcount should be 1
@@ -250,13 +251,13 @@ namespace Lucene.Net.Index
// norm values should be different
Assert.IsTrue(Similarity.DecodeNorm(segmentReader3C.Norms("field1")[5]) != Similarity.DecodeNorm(segmentReader4C.Norms("field1")[5]));
- Norm reader4CCNorm = (Norm) segmentReader4C.norms_ForNUnit["field1"];
+ Norm reader4CCNorm = segmentReader4C.norms_ForNUnit["field1"];
Assert.AreEqual(3, reader3CCNorm.BytesRef().RefCount());
Assert.AreEqual(1, reader4CCNorm.BytesRef().RefCount());
IndexReader reader5C = (IndexReader) reader4C.Clone();
SegmentReader segmentReader5C = SegmentReader.GetOnlySegmentReader(reader5C);
- Norm reader5CCNorm = (Norm) segmentReader5C.norms_ForNUnit["field1"];
+ Norm reader5CCNorm = segmentReader5C.norms_ForNUnit["field1"];
reader5C.SetNorm(5, "field1", 0.7f);
Assert.AreEqual(1, reader5CCNorm.BytesRef().RefCount());
@@ -280,7 +281,7 @@ namespace Lucene.Net.Index
private void ModifyNormsForF1(Directory dir)
{
- IndexReader ir = IndexReader.Open(dir);
+ IndexReader ir = IndexReader.Open(dir, false);
ModifyNormsForF1(ir);
}
@@ -292,13 +293,13 @@ namespace Lucene.Net.Index
{
// modify for every third doc
int k = (i * 3) % modifiedNorms.Count;
- float origNorm = (float) ((System.Single) modifiedNorms[i]);
- float newNorm = (float) ((System.Single) modifiedNorms[k]);
+ float origNorm = (float) (modifiedNorms[i]);
+ float newNorm = (float) (modifiedNorms[k]);
// System.out.println("Modifying: for "+i+" from "+origNorm+" to
// "+newNorm);
// System.out.println(" and: for "+k+" from "+newNorm+" to "+origNorm);
- modifiedNorms[i] = (float) newNorm;
- modifiedNorms[k] = (float) origNorm;
+ modifiedNorms[i] = newNorm;
+ modifiedNorms[k] = origNorm;
ir.SetNorm(i, "f" + 1, newNorm);
ir.SetNorm(k, "f" + 1, origNorm);
// System.out.println("setNorm i: "+i);
@@ -309,7 +310,7 @@ namespace Lucene.Net.Index
private void VerifyIndex(Directory dir)
{
- IndexReader ir = IndexReader.Open(dir);
+ IndexReader ir = IndexReader.Open(dir, false);
VerifyIndex(ir);
ir.Close();
}
@@ -325,7 +326,7 @@ namespace Lucene.Net.Index
for (int j = 0; j < b.Length; j++)
{
float norm = Similarity.DecodeNorm(b[j]);
- float norm1 = (float) ((System.Single) storedNorms[j]);
+ float norm1 = (float) storedNorms[j];
Assert.AreEqual(norm, norm1, 0.000001, "stored norm value of " + field + " for doc " + j + " is " + norm + " - a mismatch!");
}
}
@@ -375,8 +376,8 @@ namespace Lucene.Net.Index
norm += normDelta;
}
while (true);
- norms.Insert(numDocNorms, (float) norm);
- modifiedNorms.Insert(numDocNorms, (float) norm);
+ norms.Insert(numDocNorms, norm);
+ modifiedNorms.Insert(numDocNorms, norm);
// System.out.println("creating norm("+numDocNorms+"): "+norm);
numDocNorms++;
lastNorm = (norm > 10?0:norm); // there's a limit to how many distinct