Author: digy Revision: 888204 Modified property: svn:log Modified: svn:log at Tue Dec 8 01:01:02 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Dec 8 01:01:02 2009 @@ -0,0 +1 @@ +Test.csproj
Author: digy
Date: Tue Dec 8 00:36:35 2009
New Revision: 888204
URL: http://svn.apache.org/viewvc?rev=888204&view=rev
Log: (empty)
Modified:
incubator/lucene.net/trunk/C#/src/Test/Test.csproj
Modified: incubator/lucene.net/trunk/C#/src/Test/Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Test.csproj?rev=888204&r1=888203&r2=888204&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Test.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Test.csproj Tue Dec 8 00:36:35 2009
@@ -82,10 +82,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\Lucene-2.9\SharpZipLib\netcf-20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
- <Reference Include="Lucene.Net">
- <Name>Lucene.Net</Name>
- <HintPath>..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
- </Reference>
<Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77,
processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\Lucene-2.9\NUnit.Net\NUnit-2.5.2.9222\bin\net-2.0\framework\nunit.framework.dll</HintPath>
@@ -480,6 +476,12 @@
<EmbeddedResource Include="Messages\MessagesTestBundle.ja.resources" />
<EmbeddedResource Include="Messages\MessagesTestBundle.resources" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj">
+ <Project>{5D4AD9BE-1FFB-41AB-9943-25737971BF57}</Project>
+ <Name>Lucene.Net</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Author: digy
Date: Tue Dec 8 00:17:56 2009
New Revision: 888200
URL: http://svn.apache.org/viewvc?rev=888200&view=rev
Log:
Rename some tests
Modified:
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888200&r1=888199&r2=888200&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Tue Dec 8 00:17:56 2009
@@ -747,7 +747,7 @@
//-------------------------------------------
[Test]
[Description("LUCENENET-170")]
- public void Test_Lucene_Net_Util_Parameter()
+ public void Test_Util_Parameter()
{
Lucene.Net.Search.BooleanQuery queryPreSerialized = new Lucene.Net.Search.BooleanQuery();
queryPreSerialized.Add(new Lucene.Net.Search.TermQuery(new Lucene.Net.Index.Term("country",
"Russia")), Lucene.Net.Search.BooleanClause.Occur.MUST);
@@ -770,7 +770,7 @@
//-------------------------------------------
[Test]
[Description("LUCENENET-174")]
- public void Test_Lucene_Net_Store_RAMDirectory()
+ public void Test_Store_RAMDirectory()
{
Lucene.Net.Store.RAMDirectory ramDIR = new Lucene.Net.Store.RAMDirectory();
@@ -816,7 +816,7 @@
//-------------------------------------------
[Test]
[Description("LUCENENET-150")]
- public void Test_Lucene_Net_Index_ReusableStringReader()
+ public void Test_Index_ReusableStringReader()
{
Lucene.Net.Index.IndexWriter wr = new Lucene.Net.Index.IndexWriter(new Lucene.Net.Store.RAMDirectory(),
new TestAnalyzer(), true);
@@ -858,7 +858,7 @@
//-------------------------------------------
[Test]
[Description("LUCENENET-100")]
- public void Lucene_Net_Search_FieldDoc()
+ public void Test_Search_FieldDoc()
{
try
{
Author: digy
Date: Tue Dec 8 00:13:07 2009
New Revision: 888198
URL: http://svn.apache.org/viewvc?rev=888198&view=rev
Log:
A new test case for LUCENENET-100 + patches
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldDoc.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Searcher.cs
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldDoc.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldDoc.cs?rev=888198&r1=888197&r2=888198&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldDoc.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldDoc.cs Tue Dec 8 00:13:07 2009
@@ -56,6 +56,7 @@
/// </seealso>
/// <seealso cref="Searcher.Search(Query,Filter,int,Sort)">
/// </seealso>
+ [NonSerialized]
public System.IComparable[] fields;
/// <summary>Expert: Creates one of these objects with empty sort information. </summary>
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Searcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Searcher.cs?rev=888198&r1=888197&r2=888198&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Searcher.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Searcher.cs Tue Dec 8 00:13:07 2009
@@ -31,7 +31,7 @@
/// Note that you can only access hits from a Searcher as long as it is not yet
/// closed, otherwise an IOException will be thrown.
/// </summary>
- public abstract class Searcher : Searchable
+ public abstract class Searcher : System.MarshalByRefObject, Searchable
{
public Searcher()
{
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888198&r1=888197&r2=888198&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Tue Dec 8 00:13:07 2009
@@ -61,27 +61,27 @@
}
}
-/// <summary>
-/// </summary>
- [TestFixture]
- public class TestSupportClass
- {
- /// <summary></summary>
- /// <throws></throws>
- [Test]
- public virtual void TestCRC32()
- {
- byte[] b = new byte[256];
- for (int i = 0; i < b.Length; i++)
- b[i] = (byte)i;
-
- SupportClass.Checksum digest = new SupportClass.CRC32();
- digest.Update(b, 0, b.Length);
-
- Int64 expected = 688229491;
- Assert.AreEqual(expected, digest.GetValue());
- }
- }
+ /// <summary>
+ /// </summary>
+ [TestFixture]
+ public class TestSupportClass
+ {
+ /// <summary></summary>
+ /// <throws></throws>
+ [Test]
+ public virtual void TestCRC32()
+ {
+ byte[] b = new byte[256];
+ for (int i = 0; i < b.Length; i++)
+ b[i] = (byte)i;
+
+ SupportClass.Checksum digest = new SupportClass.CRC32();
+ digest.Update(b, 0, b.Length);
+
+ Int64 expected = 688229491;
+ Assert.AreEqual(expected, digest.GetValue());
+ }
+ }
[TestFixture]
public class TestWeakHashTable
@@ -145,7 +145,7 @@
[Test]
public void B_TestOutOfMemory()
{
- IDictionary wht = TestWeakHashTableBehavior.CreateDictionary();
+ IDictionary wht = TestWeakHashTableBehavior.CreateDictionary();
int OOMECount = 0;
for (int i = 0; i < 1024 * 24 + 32; i++) // total requested Mem. > 24GB
@@ -153,7 +153,7 @@
try
{
wht.Add(new BigObject(i), i);
- if(i%1024==0) Console.WriteLine("Requested Mem: " + i.ToString() + "
MB");
+ if (i % 1024 == 0) Console.WriteLine("Requested Mem: " + i.ToString()
+ " MB");
OOMECount = 0;
}
catch (OutOfMemoryException oom)
@@ -752,7 +752,7 @@
Lucene.Net.Search.BooleanQuery queryPreSerialized = new Lucene.Net.Search.BooleanQuery();
queryPreSerialized.Add(new Lucene.Net.Search.TermQuery(new Lucene.Net.Index.Term("country",
"Russia")), Lucene.Net.Search.BooleanClause.Occur.MUST);
queryPreSerialized.Add(new Lucene.Net.Search.TermQuery(new Lucene.Net.Index.Term("country",
"France")), Lucene.Net.Search.BooleanClause.Occur.MUST);
-
+
//now serialize it
System.Runtime.Serialization.Formatters.Binary.BinaryFormatter serializer = new
System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
@@ -761,7 +761,7 @@
//now deserialize
memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
Lucene.Net.Search.BooleanQuery queryPostSerialized = (Lucene.Net.Search.BooleanQuery)serializer.Deserialize(memoryStream);
-
+
memoryStream.Close();
Assert.AreEqual(queryPreSerialized, queryPostSerialized, "See the issue: LUCENENET-170");
@@ -775,7 +775,7 @@
Lucene.Net.Store.RAMDirectory ramDIR = new Lucene.Net.Store.RAMDirectory();
//Index 1 Doc
- Lucene.Net.Index.IndexWriter wr = new Lucene.Net.Index.IndexWriter(ramDIR, new
Lucene.Net.Analysis.WhitespaceAnalyzer(),true);
+ Lucene.Net.Index.IndexWriter wr = new Lucene.Net.Index.IndexWriter(ramDIR, new
Lucene.Net.Analysis.WhitespaceAnalyzer(), true);
Lucene.Net.Documents.Document doc = new Lucene.Net.Documents.Document();
doc.Add(new Lucene.Net.Documents.Field("field1", "value1 value11", Lucene.Net.Documents.Field.Store.YES,
Lucene.Net.Documents.Field.Index.TOKENIZED));
wr.AddDocument(doc);
@@ -800,15 +800,15 @@
doc.Add(new Lucene.Net.Documents.Field("field1", "value1 value11", Lucene.Net.Documents.Field.Store.YES,
Lucene.Net.Documents.Field.Index.TOKENIZED));
wr.AddDocument(doc);
wr.Close();
-
+
//Search
Lucene.Net.Search.IndexSearcher s = new Lucene.Net.Search.IndexSearcher(ramDIR2);
Lucene.Net.QueryParsers.QueryParser qp = new Lucene.Net.QueryParsers.QueryParser("field1",
new Lucene.Net.Analysis.Standard.StandardAnalyzer());
Lucene.Net.Search.Query q = qp.Parse("value1");
- Lucene.Net.Search.TopDocs topDocs = s.Search(q,100);
+ Lucene.Net.Search.TopDocs topDocs = s.Search(q, 100);
s.Close();
- Assert.AreEqual(topDocs.totalHits, 2,"See the issue: LUCENENET-174");
+ Assert.AreEqual(topDocs.totalHits, 2, "See the issue: LUCENENET-174");
}
@@ -853,7 +853,88 @@
return char.IsLetterOrDigit(c);
}
}
+
+
+ //-------------------------------------------
+ [Test]
+ [Description("LUCENENET-100")]
+ public void Lucene_Net_Search_FieldDoc()
+ {
+ try
+ {
+ LUCENENET_100_CreateIndex();
+
+ System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(new System.Runtime.Remoting.Channels.Tcp.TcpChannel(38085));
+
+ Lucene.Net.Search.IndexSearcher indexSearcher = new Lucene.Net.Search.IndexSearcher(LUCENENET_100_Dir);
+ System.Runtime.Remoting.RemotingServices.Marshal(indexSearcher, "Searcher");
+
+ LUCENENET_100_ClientSearch();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+
+ //Wait Client to finish
+ while (LUCENENET_100_testFinished == false) System.Threading.Thread.Sleep(10);
+
+ if (LUCENENET_100_Exception != null) throw LUCENENET_100_Exception;
+
+ }
+
+ Lucene.Net.Store.RAMDirectory LUCENENET_100_Dir = new Lucene.Net.Store.RAMDirectory();
+ bool LUCENENET_100_testFinished = false;
+ Exception LUCENENET_100_Exception = null;
+
+
+ void LUCENENET_100_ClientSearch()
+ {
+ try
+ {
+ Lucene.Net.Search.Searchable s = (Lucene.Net.Search.Searchable)Activator.GetObject(typeof(Lucene.Net.Search.Searchable),
@"tcp://localhost:38085/Searcher");
+ Lucene.Net.Search.MultiSearcher searcher = new Lucene.Net.Search.MultiSearcher(new
Lucene.Net.Search.Searchable[] { s });
+
+ Lucene.Net.Search.Query q = new Lucene.Net.Search.TermQuery(new Lucene.Net.Index.Term("field1",
"moon"));
+
+ Lucene.Net.Search.Sort sort = new Lucene.Net.Search.Sort();
+ sort.SetSort(new Lucene.Net.Search.SortField("field2", Lucene.Net.Search.SortField.INT));
+
+ Lucene.Net.Search.Hits h = searcher.Search(q, sort);
+ }
+ catch (Exception ex)
+ {
+ LUCENENET_100_Exception = ex;
+ }
+ finally
+ {
+ LUCENENET_100_testFinished = true;
+ }
+ }
+
+ void LUCENENET_100_CreateIndex()
+ {
+ Lucene.Net.Index.IndexWriter w = new Lucene.Net.Index.IndexWriter(LUCENENET_100_Dir,
new Lucene.Net.Analysis.Standard.StandardAnalyzer(), true);
+
+ Lucene.Net.Documents.Field f1 = new Lucene.Net.Documents.Field("field1", "dark
side of the moon", Lucene.Net.Documents.Field.Store.YES, Lucene.Net.Documents.Field.Index.TOKENIZED);
+ Lucene.Net.Documents.Field f2 = new Lucene.Net.Documents.Field("field2", "123",
Lucene.Net.Documents.Field.Store.YES, Lucene.Net.Documents.Field.Index.UN_TOKENIZED);
+ Lucene.Net.Documents.Document d = new Lucene.Net.Documents.Document();
+ d.Add(f1);
+ d.Add(f2);
+ w.AddDocument(d);
+
+ f1 = new Lucene.Net.Documents.Field("field1", "Fly me to the moon", Lucene.Net.Documents.Field.Store.YES,
Lucene.Net.Documents.Field.Index.TOKENIZED);
+ f2 = new Lucene.Net.Documents.Field("field2", "456", Lucene.Net.Documents.Field.Store.YES,
Lucene.Net.Documents.Field.Index.UN_TOKENIZED);
+ d = new Lucene.Net.Documents.Document();
+ d.Add(f1);
+ d.Add(f2);
+ w.AddDocument(d);
+
+ w.Close();
+ }
+
//-------------------------------------------
+
}
}
\ No newline at end of file
Author: digy
Date: Mon Dec 7 22:23:28 2009
New Revision: 888160
URL: http://svn.apache.org/viewvc?rev=888160&view=rev
Log:
Test for ReusableStringReader related with LUCENENET-150
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ReusableStringReader.cs
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ReusableStringReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/ReusableStringReader.cs?rev=888160&r1=888159&r2=888160&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ReusableStringReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ReusableStringReader.cs Mon Dec 7
22:23:28 2009
@@ -24,46 +24,72 @@
/// that can be reset to a new string; we use this when
/// tokenizing the string value from a Field.
/// </summary>
- sealed class ReusableStringReader:System.IO.TextReader
- {
- internal int upto;
- internal int left;
- internal System.String s;
- internal void Init(System.String s)
- {
- this.s = s;
- left = s.Length;
- this.upto = 0;
- }
- public int Read(char[] c)
- {
- return Read(c, 0, c.Length);
- }
- public override int Read(System.Char[] c, int off, int len)
- {
- if (left > len)
- {
- SupportClass.TextSupport.GetCharsFromString(s, upto, upto + len, c, off);
- upto += len;
- left -= len;
- return len;
- }
- else if (0 == left)
- {
- return 0;
- }
- else
- {
- SupportClass.TextSupport.GetCharsFromString(s, upto, upto + left, c, off);
- int r = left;
- left = 0;
- upto = s.Length;
- return r;
- }
- }
- public override void Close()
- {
- }
-
- }
+ sealed class ReusableStringReader : System.IO.TextReader
+ {
+ internal int upto;
+ internal int left;
+ internal System.String s;
+ internal void Init(System.String s)
+ {
+ this.s = s;
+ left = s.Length;
+ this.upto = 0;
+ }
+ public int Read(char[] c)
+ {
+ return Read(c, 0, c.Length);
+ }
+ public override int Read(System.Char[] c, int off, int len)
+ {
+ if (left > len)
+ {
+ SupportClass.TextSupport.GetCharsFromString(s, upto, upto + len, c, off);
+ upto += len;
+ left -= len;
+ return len;
+ }
+ else if (0 == left)
+ {
+ return 0;
+ }
+ else
+ {
+ SupportClass.TextSupport.GetCharsFromString(s, upto, upto + left, c, off);
+ int r = left;
+ left = 0;
+ upto = s.Length;
+ return r;
+ }
+ }
+ public override void Close()
+ {
+ }
+
+
+ public override int Read()
+ {
+ throw new NotImplementedException("This method is not implemented");
+ }
+
+ public override int ReadBlock(char[] buffer, int index, int count)
+ {
+ throw new NotImplementedException("This method is not implemented");
+ }
+
+ public override string ReadLine()
+ {
+ throw new NotImplementedException("This method is not implemented");
+ }
+
+ public override int Peek()
+ {
+ throw new NotImplementedException("This method is not implemented");
+ }
+
+ public override string ReadToEnd()
+ {
+ left = 0;
+ return s;
+ }
+ }
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888160&r1=888159&r2=888160&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Mon Dec 7 22:23:28 2009
@@ -744,6 +744,7 @@
[TestFixture]
public class TestOldPatches
{
+ //-------------------------------------------
[Test]
[Description("LUCENENET-170")]
public void Test_Lucene_Net_Util_Parameter()
@@ -766,6 +767,7 @@
Assert.AreEqual(queryPreSerialized, queryPostSerialized, "See the issue: LUCENENET-170");
}
+ //-------------------------------------------
[Test]
[Description("LUCENENET-174")]
public void Test_Lucene_Net_Store_RAMDirectory()
@@ -808,5 +810,50 @@
Assert.AreEqual(topDocs.totalHits, 2,"See the issue: LUCENENET-174");
}
+
+
+
+ //-------------------------------------------
+ [Test]
+ [Description("LUCENENET-150")]
+ public void Test_Lucene_Net_Index_ReusableStringReader()
+ {
+ Lucene.Net.Index.IndexWriter wr = new Lucene.Net.Index.IndexWriter(new Lucene.Net.Store.RAMDirectory(),
new TestAnalyzer(), true);
+
+ Lucene.Net.Documents.Document doc = new Lucene.Net.Documents.Document();
+ Lucene.Net.Documents.Field f1 = new Lucene.Net.Documents.Field("f1", TEST_STRING,
Lucene.Net.Documents.Field.Store.YES, Lucene.Net.Documents.Field.Index.TOKENIZED);
+ doc.Add(f1);
+ wr.AddDocument(doc);
+
+ wr.Close();
+ }
+
+ static string TEST_STRING = "Some Text and some more Text";
+
+ class TestAnalyzer : Lucene.Net.Analysis.Analyzer
+ {
+ public override Lucene.Net.Analysis.TokenStream TokenStream(string fieldName,
System.IO.TextReader reader)
+ {
+ return new TestTokenizer(reader);
+ }
+ }
+
+ class TestTokenizer : Lucene.Net.Analysis.CharTokenizer
+ {
+ public TestTokenizer(System.IO.TextReader Reader)
+ : base(Reader)
+ {
+ //Caution: "Reader" is actually of type "ReusableStringReader" and some
+ //methods (for ex. "ReadToEnd", "Peek", "ReadLine") is not implemented.
+ Assert.AreEqual(TEST_STRING, Reader.ReadToEnd(), "Issue LUCENENET-150: \"ReadToEnd\"
method is not implemented");
+ }
+
+ protected override bool IsTokenChar(char c)
+ {
+ return char.IsLetterOrDigit(c);
+ }
+ }
+ //-------------------------------------------
+
}
}
\ No newline at end of file
Author: digy
Date: Mon Dec 7 21:52:08 2009
New Revision: 888147
URL: http://svn.apache.org/viewvc?rev=888147&view=rev
Log:
To avoid loosing the old (Lucene.Net specific) patches when a new port is done, I added 2
new test cases.
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Directory.cs
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Directory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/Directory.cs?rev=888147&r1=888146&r2=888147&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Directory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Directory.cs Mon Dec 7 21:52:08 2009
@@ -41,8 +41,6 @@
[Serializable]
public abstract class Directory
{
-
- [NonSerialized]
protected internal volatile bool isOpen = true;
/// <summary>Holds the LockFactory instance (implements locking for
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888147&r1=888146&r2=888147&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Mon Dec 7 21:52:08 2009
@@ -740,4 +740,73 @@
Assert.IsNotNull(cache.Get("c"));
}
}
+
+ [TestFixture]
+ public class TestOldPatches
+ {
+ [Test]
+ [Description("LUCENENET-170")]
+ public void Test_Lucene_Net_Util_Parameter()
+ {
+ Lucene.Net.Search.BooleanQuery queryPreSerialized = new Lucene.Net.Search.BooleanQuery();
+ queryPreSerialized.Add(new Lucene.Net.Search.TermQuery(new Lucene.Net.Index.Term("country",
"Russia")), Lucene.Net.Search.BooleanClause.Occur.MUST);
+ queryPreSerialized.Add(new Lucene.Net.Search.TermQuery(new Lucene.Net.Index.Term("country",
"France")), Lucene.Net.Search.BooleanClause.Occur.MUST);
+
+ //now serialize it
+ System.Runtime.Serialization.Formatters.Binary.BinaryFormatter serializer = new
System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
+ System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
+ serializer.Serialize(memoryStream, queryPreSerialized);
+
+ //now deserialize
+ memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
+ Lucene.Net.Search.BooleanQuery queryPostSerialized = (Lucene.Net.Search.BooleanQuery)serializer.Deserialize(memoryStream);
+
+ memoryStream.Close();
+
+ Assert.AreEqual(queryPreSerialized, queryPostSerialized, "See the issue: LUCENENET-170");
+ }
+
+ [Test]
+ [Description("LUCENENET-174")]
+ public void Test_Lucene_Net_Store_RAMDirectory()
+ {
+ Lucene.Net.Store.RAMDirectory ramDIR = new Lucene.Net.Store.RAMDirectory();
+
+ //Index 1 Doc
+ Lucene.Net.Index.IndexWriter wr = new Lucene.Net.Index.IndexWriter(ramDIR, new
Lucene.Net.Analysis.WhitespaceAnalyzer(),true);
+ Lucene.Net.Documents.Document doc = new Lucene.Net.Documents.Document();
+ doc.Add(new Lucene.Net.Documents.Field("field1", "value1 value11", Lucene.Net.Documents.Field.Store.YES,
Lucene.Net.Documents.Field.Index.TOKENIZED));
+ wr.AddDocument(doc);
+ wr.Close();
+
+ //now serialize it
+ System.Runtime.Serialization.Formatters.Binary.BinaryFormatter serializer = new
System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
+ System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
+ serializer.Serialize(memoryStream, ramDIR);
+
+ //Close DIR
+ ramDIR.Close();
+ ramDIR = null;
+
+ //now deserialize
+ memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
+ Lucene.Net.Store.RAMDirectory ramDIR2 = (Lucene.Net.Store.RAMDirectory)serializer.Deserialize(memoryStream);
+
+ //Add 1 more doc
+ wr = new Lucene.Net.Index.IndexWriter(ramDIR2, new Lucene.Net.Analysis.WhitespaceAnalyzer(),
false);
+ doc = new Lucene.Net.Documents.Document();
+ doc.Add(new Lucene.Net.Documents.Field("field1", "value1 value11", Lucene.Net.Documents.Field.Store.YES,
Lucene.Net.Documents.Field.Index.TOKENIZED));
+ wr.AddDocument(doc);
+ wr.Close();
+
+ //Search
+ Lucene.Net.Search.IndexSearcher s = new Lucene.Net.Search.IndexSearcher(ramDIR2);
+ Lucene.Net.QueryParsers.QueryParser qp = new Lucene.Net.QueryParsers.QueryParser("field1",
new Lucene.Net.Analysis.Standard.StandardAnalyzer());
+ Lucene.Net.Search.Query q = qp.Parse("value1");
+ Lucene.Net.Search.TopDocs topDocs = s.Search(q,100);
+ s.Close();
+
+ Assert.AreEqual(topDocs.totalHits, 2,"See the issue: LUCENENET-174");
+ }
+ }
}
\ No newline at end of file
Author: digy
Date: Mon Dec 7 19:43:32 2009
New Revision: 888107
URL: http://svn.apache.org/viewvc?rev=888107&view=rev
Log:
Since SimpleLRUCache is not a direct port from Lucene.Java, I add another test case which
I used in testing LUCENENET-190.
Modified:
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888107&r1=888106&r2=888107&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Mon Dec 7 19:43:32 2009
@@ -718,4 +718,26 @@
}
}
}
+
+ [TestFixture]
+ public class TestLRUCache
+ {
+ [Test]
+ public void Test()
+ {
+ Lucene.Net.Util.Cache.SimpleLRUCache cache = new Lucene.Net.Util.Cache.SimpleLRUCache(3);
+ cache.Put("a", "a");
+ cache.Put("b", "b");
+ cache.Put("c", "c");
+ Assert.IsNotNull(cache.Get("a"));
+ Assert.IsNotNull(cache.Get("b"));
+ Assert.IsNotNull(cache.Get("c"));
+ cache.Put("d", "d");
+ Assert.IsNull(cache.Get("a"));
+ Assert.IsNotNull(cache.Get("c"));
+ cache.Put("e", "e");
+ cache.Put("f", "f");
+ Assert.IsNotNull(cache.Get("c"));
+ }
+ }
}
\ No newline at end of file
Author: digy
Date: Mon Dec 7 19:08:11 2009
New Revision: 888087
URL: http://svn.apache.org/viewvc?rev=888087&view=rev
Log:
Some Corrections to TestWeakHashTable.B_TestOutOfMemory
Modified:
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888087&r1=888086&r2=888087&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Mon Dec 7 19:08:11 2009
@@ -145,11 +145,26 @@
[Test]
public void B_TestOutOfMemory()
{
- IDictionary wht = TestWeakHashTableBehavior.CreateDictionary(); //new SupportClass.TjWeakHashTable();
+ IDictionary wht = TestWeakHashTableBehavior.CreateDictionary();
+ int OOMECount = 0;
- for (int i = 0; i < 1024 * 8 + 32; i++) // requested Mem. > 8GB
+ for (int i = 0; i < 1024 * 24 + 32; i++) // total requested Mem. > 24GB
{
- wht.Add(new BigObject(i), i);
+ try
+ {
+ wht.Add(new BigObject(i), i);
+ if(i%1024==0) Console.WriteLine("Requested Mem: " + i.ToString() + "
MB");
+ OOMECount = 0;
+ }
+ catch (OutOfMemoryException oom)
+ {
+ if (OOMECount++ > 10) throw new Exception("Memory Allocation Error
in B_TestOutOfMemory");
+ //Try Again. GC will eventually release some memory.
+ Console.WriteLine("OOME WHEN i=" + i.ToString() + ". Try Again");
+ System.Threading.Thread.Sleep(10);
+ i--;
+ continue;
+ }
}
GC.Collect();
Author: digy
Date: Mon Dec 7 18:25:49 2009
New Revision: 888067
URL: http://svn.apache.org/viewvc?rev=888067&view=rev
Log:
Changed "SupportClassTestCases.Count" from "Fail" to "Ignore"
Modified:
incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestSupportClass.cs?rev=888067&r1=888066&r2=888067&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs Mon Dec 7 18:25:49 2009
@@ -55,8 +55,9 @@
}
}
}
-
- Assert.Fail("Lucene.Net TestCases:" + countSupport + " Other TestCases:"
+ countOther);
+ string msg = "Lucene.Net TestCases:" + countSupport + " Other TestCases:"
+ countOther;
+ Console.WriteLine(msg);
+ Assert.Ignore("[Intentionally ignored test case] " + msg);
}
}
Author: digy
Date: Mon Dec 7 18:09:48 2009
New Revision: 888063
URL: http://svn.apache.org/viewvc?rev=888063&view=rev
Log:
Small bug fixes to get TempPath.
Modified:
incubator/lucene.net/trunk/C#/src/Test/Store/TestDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestLockFactory.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Store/TestDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Store/TestDirectory.cs?rev=888063&r1=888062&r2=888063&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Store/TestDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Store/TestDirectory.cs Mon Dec 7 18:09:48 2009
@@ -43,7 +43,7 @@
{
}
- dir = FSDirectory.Open(new System.IO.FileInfo(SupportClass.AppSettings.Get("tempDir",
"")));
+ dir = FSDirectory.Open(new System.IO.FileInfo(SupportClass.AppSettings.Get("tempDir",
System.IO.Path.GetTempPath())));
dir.Close();
try
{
@@ -61,7 +61,7 @@
[Test]
public virtual void TestDirectInstantiation()
{
- System.IO.FileInfo path = new System.IO.FileInfo(SupportClass.AppSettings.Get("tempDir",
""));
+ System.IO.FileInfo path = new System.IO.FileInfo(SupportClass.AppSettings.Get("tempDir",
System.IO.Path.GetTempPath()));
int sz = 2;
Directory[] dirs = new Directory[sz];
Modified: incubator/lucene.net/trunk/C#/src/Test/Store/TestLockFactory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Store/TestLockFactory.cs?rev=888063&r1=888062&r2=888063&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Store/TestLockFactory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Store/TestLockFactory.cs Mon Dec 7 18:09:48 2009
@@ -397,7 +397,7 @@
public virtual void TestNativeFSLockFactory()
{
- NativeFSLockFactory f = new NativeFSLockFactory(SupportClass.AppSettings.Get("tempDir",
""));
+ NativeFSLockFactory f = new NativeFSLockFactory(SupportClass.AppSettings.Get("tempDir",
System.IO.Path.GetTempPath()));
f.SetLockPrefix("test");
Lock l = f.MakeLock("commit");
Author: digy
Date: Mon Dec 7 17:22:15 2009
New Revision: 888026
URL: http://svn.apache.org/viewvc?rev=888026&view=rev
Log:
LUCENENET-322 3 failing tests of TestIndexWriter
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SupportClass.cs?rev=888026&r1=888025&r2=888026&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs Mon Dec 7 17:22:15 2009
@@ -2229,6 +2229,14 @@
return (int)deflaterType.InvokeMember("Deflate", System.Reflection.BindingFlags.InvokeMethod,
null, deflaterInstance, new object[] { output });
}
}
+ }
+ public class BuildType
+ {
+#if DEBUG
+ public static bool Debug = true;
+#else
+ public static bool Debug = false;
+#endif
}
}
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexWriter.cs?rev=888026&r1=888025&r2=888026&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs Mon Dec 7 17:22:15 2009
@@ -3885,8 +3885,12 @@
try
{
w.AddDocument(doc);
- Assert.Fail("did not hit exception");
- }
+
+ if (SupportClass.BuildType.Debug)
+ Assert.Fail("did not hit exception");
+ else
+ Assert.Ignore("This test is not executed in release mode");
+ }
catch (System.SystemException re)
{
// expected
@@ -3983,7 +3987,10 @@
}
((ConcurrentMergeScheduler) w.GetMergeScheduler()).Sync();
- Assert.IsTrue(w.failed);
+ if (SupportClass.BuildType.Debug)
+ Assert.IsTrue(w.failed);
+ else
+ Assert.Ignore("This test is not executed in release mode");
w.Close();
dir.Close();
}
@@ -4916,7 +4923,11 @@
try
{
w.Rollback();
- Assert.Fail("did not hit intentional RuntimeException");
+ if (SupportClass.BuildType.Debug)
+ Assert.Fail("did not hit intentional RuntimeException");
+ else
+ Assert.Ignore("This test is not executed in release mode");
+
}
catch (System.SystemException re)
{
Author: digy
Date: Mon Dec 7 11:12:38 2009
New Revision: 887885
URL: http://svn.apache.org/viewvc?rev=887885&view=rev
Log:
LUCENENET-318 TestDisjunctionMaxQuery.TestBooleanOptionalWithTiebreaker failure
Modified:
incubator/lucene.net/trunk/C#/src/Test/Search/QueryUtils.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/QueryUtils.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/QueryUtils.cs?rev=887885&r1=887884&r2=887885&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/QueryUtils.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/QueryUtils.cs Mon Dec 7 11:12:38 2009
@@ -419,7 +419,7 @@
private static void CheckFirstSkipTo(Query q, IndexSearcher s)
{
//System.out.println("checkFirstSkipTo: "+q);
- float maxDiff = 1e-5f;
+ float maxDiff = 1e-4f; //{{Lucene.Net-2.9.1}}Intentional diversion from Java
Lucene
int[] lastDoc = new int[]{- 1};
s.Search(q, new AnonymousClassCollector1(lastDoc, q, s, maxDiff));
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestDisjunctionMaxQuery.cs?rev=887885&r1=887884&r2=887885&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs Mon Dec 7 11:12:38
2009
@@ -48,7 +48,7 @@
}
/// <summary>threshold for comparing floats </summary>
- public const float SCORE_COMP_THRESH = 0.0000f;
+ public const float SCORE_COMP_THRESH = 0.000001f;
/// <summary> Similarity to eliminate tf, idf and lengthNorm effects to
/// isolate test case.
Author: digy
Date: Mon Dec 7 11:09:20 2009
New Revision: 887884
URL: http://svn.apache.org/viewvc?rev=887884&view=rev
Log:
LUCENENET-321 Compression support via reflection
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Document/CompressionTools.cs?rev=887884&r1=887883&r2=887884&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs Mon Dec 7 11:09:20
2009
@@ -23,11 +23,6 @@
using System;
-#if SHARP_ZIP_LIB
-using ICSharpCode.SharpZipLib;
-using ICSharpCode.SharpZipLib.Zip.Compression;
-#endif
-
using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
namespace Lucene.Net.Documents
@@ -55,14 +50,13 @@
/// </summary>
public static byte[] Compress(byte[] value_Renamed, int offset, int length, int compressionLevel)
{
- #if SHARP_ZIP_LIB
/* Create an expandable byte array to hold the compressed data.
* You cannot use an array that's the same size as the orginal because
* there is no guarantee that the compressed data will be smaller than
* the uncompressed data. */
System.IO.MemoryStream bos = new System.IO.MemoryStream(length);
-
- Deflater compressor = new Deflater();
+
+ SupportClass.SharpZipLib.Deflater compressor = SupportClass.SharpZipLib.CreateDeflater();
try
{
@@ -83,40 +77,24 @@
}
return bos.ToArray();
- #else
- throw new System.SystemException("Compression support not configured");
- #endif
}
/// <summary>Compresses the specified byte range, with default BEST_COMPRESSION level
</summary>
public static byte[] Compress(byte[] value_Renamed, int offset, int length)
{
- #if SHARP_ZIP_LIB
- return Compress(value_Renamed, offset, length, Deflater.BEST_COMPRESSION);
- #else
- throw new System.SystemException("Compression support not configured");
- #endif
+ return Compress(value_Renamed, offset, length, SupportClass.SharpZipLib.Deflater.BEST_COMPRESSION);
}
/// <summary>Compresses all bytes in the array, with default BEST_COMPRESSION level
</summary>
public static byte[] Compress(byte[] value_Renamed)
{
- #if SHARP_ZIP_LIB
- return Compress(value_Renamed, 0, value_Renamed.Length, Deflater.BEST_COMPRESSION);
- #else
- throw new System.SystemException("Compression support not configured");
- #endif
+ return Compress(value_Renamed, 0, value_Renamed.Length, SupportClass.SharpZipLib.Deflater.BEST_COMPRESSION);
}
/// <summary>Compresses the String value, with default BEST_COMPRESSION level </summary>
public static byte[] CompressString(System.String value_Renamed)
{
-
- #if SHARP_ZIP_LIB
- return CompressString(value_Renamed, Deflater.BEST_COMPRESSION);
- #else
- throw new System.SystemException("Compression support not configured");
- #endif
+ return CompressString(value_Renamed, SupportClass.SharpZipLib.Deflater.BEST_COMPRESSION);
}
/// <summary>Compresses the String value using the specified
@@ -135,11 +113,10 @@
/// </summary>
public static byte[] Decompress(byte[] value_Renamed)
{
- #if SHARP_ZIP_LIB
// Create an expandable byte array to hold the decompressed data
System.IO.MemoryStream bos = new System.IO.MemoryStream(value_Renamed.Length);
- Inflater decompressor = new Inflater();
+ SupportClass.SharpZipLib.Inflater decompressor = SupportClass.SharpZipLib.CreateInflater();
try
{
@@ -158,9 +135,6 @@
}
return bos.ToArray();
- #else
- throw new System.SystemException("Compression support not configured");
- #endif
}
/// <summary>Decompress the byte array previously returned by
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SupportClass.cs?rev=887884&r1=887883&r2=887884&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs Mon Dec 7 11:09:20 2009
@@ -2130,4 +2130,105 @@
get { return isWindows; }
}
}
+
+ public class SharpZipLib
+ {
+ static System.Reflection.Assembly asm = null;
+
+ static SharpZipLib()
+ {
+ try
+ {
+ asm = System.Reflection.Assembly.Load("ICSharpCode.SharpZipLib");
+ }
+ catch{}
+ }
+
+ public static Deflater CreateDeflater()
+ {
+ if (asm == null) throw new System.IO.FileNotFoundException("Can not load ICSharpCode.SharpZipLib.dll");
+ return new Deflater(asm.CreateInstance("ICSharpCode.SharpZipLib.Zip.Compression.Deflater"));
+ }
+
+ public static Inflater CreateInflater()
+ {
+ if (asm == null) throw new System.IO.FileNotFoundException("Can not load ICSharpCode.SharpZipLib.dll");
+ return new Inflater(asm.CreateInstance("ICSharpCode.SharpZipLib.Zip.Compression.Inflater"));
+ }
+
+
+ public class Inflater
+ {
+ object inflaterInstance = null;
+ Type inflaterType;
+
+ internal Inflater(object inflaterInstance)
+ {
+ this.inflaterInstance = inflaterInstance;
+ this.inflaterType = inflaterInstance.GetType();
+ }
+
+ public void SetInput(byte[] buffer)
+ {
+ inflaterType.InvokeMember("SetInput", System.Reflection.BindingFlags.InvokeMethod,
null, inflaterInstance, new object[] { buffer });
+ }
+
+ public bool IsFinished
+ {
+ get
+ {
+ return (bool)inflaterType.InvokeMember("get_IsFinished", System.Reflection.BindingFlags.InvokeMethod,
null, inflaterInstance, null);
+ }
+ }
+
+ public int Inflate(byte[] buffer)
+ {
+ return (int)inflaterType.InvokeMember("Inflate", System.Reflection.BindingFlags.InvokeMethod,
null, inflaterInstance, new object[] { buffer });
+ }
+ }
+
+
+ public class Deflater
+ {
+ public const int BEST_COMPRESSION = 9;
+
+ object deflaterInstance = null;
+ Type deflaterType;
+
+ internal Deflater(object deflaterInstance)
+ {
+ this.deflaterInstance = deflaterInstance;
+ this.deflaterType = deflaterInstance.GetType();
+ }
+
+ public void SetLevel(int level)
+ {
+ deflaterType.InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod,
null, deflaterInstance, new object[] { level });
+ }
+
+ public void SetInput(byte[] input, int offset, int count)
+ {
+ deflaterType.InvokeMember("SetInput", System.Reflection.BindingFlags.InvokeMethod,
null, deflaterInstance, new object[] { input,offset,count });
+ }
+
+ public void Finish()
+ {
+ deflaterType.InvokeMember("Finish", System.Reflection.BindingFlags.InvokeMethod,
null, deflaterInstance, null);
+ }
+
+ public bool IsFinished
+ {
+ get
+ {
+ return (bool)deflaterType.InvokeMember("get_IsFinished", System.Reflection.BindingFlags.InvokeMethod,
null, deflaterInstance, null); ;
+ }
+ }
+
+ public int Deflate(byte[] output)
+ {
+ return (int)deflaterType.InvokeMember("Deflate", System.Reflection.BindingFlags.InvokeMethod,
null, deflaterInstance, new object[] { output });
+ }
+ }
+
+ }
}
Author: aroush
Date: Mon Dec 7 05:25:34 2009
New Revision: 887837
URL: http://svn.apache.org/viewvc?rev=887837&view=rev
Log:
port of org.apache.lucene.messages
Added:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/
incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Message.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/MessageImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLS.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLSException.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Package.html
incubator/lucene.net/trunk/C#/src/Test/Messages/
incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.cs
incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.ja.resources (with
props)
incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.resources (with props)
incubator/lucene.net/trunk/C#/src/Test/Messages/TestNLS.cs
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
incubator/lucene.net/trunk/C#/src/Test/Test.csproj
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Lucene.Net.csproj?rev=887837&r1=887836&r2=887837&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj Mon Dec 7 05:25:34 2009
@@ -448,6 +448,10 @@
<Compile Include="LucenePackage.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="Messages\Message.cs" />
+ <Compile Include="Messages\MessageImpl.cs" />
+ <Compile Include="Messages\NLS.cs" />
+ <Compile Include="Messages\NLSException.cs" />
<Compile Include="QueryParser\CharStream.cs">
<SubType>Code</SubType>
</Compile>
@@ -900,6 +904,7 @@
<Content Include="Document\Package.html" />
<Content Include="Index\Package.html" />
<Content Include="Lucene.Net.xml" />
+ <Content Include="Messages\Package.html" />
<Content Include="Overview.html" />
<Content Include="Package.html" />
<Content Include="QueryParser\Package.html" />
Added: incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Message.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Messages/Message.cs?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Message.cs (added)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Message.cs Mon Dec 7 05:25:34 2009
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Lucene.Net.Messages
+{
+
+ /// <summary> Message Interface for a lazy loading.
+ /// For Native Language Support (NLS), system of software internationalization.
+ /// </summary>
+ public interface Message
+ {
+
+ System.String GetKey();
+
+ System.Object[] GetArguments();
+
+ System.String GetLocalizedMessage();
+
+ System.String GetLocalizedMessage(System.Globalization.CultureInfo locale);
+ }
+}
\ No newline at end of file
Added: incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/MessageImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Messages/MessageImpl.cs?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/MessageImpl.cs (added)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/MessageImpl.cs Mon Dec 7 05:25:34
2009
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Lucene.Net.Messages
+{
+
+ /// <summary> Default implementation of Message interface.
+ /// For Native Language Support (NLS), system of software internationalization.
+ /// </summary>
+ [Serializable]
+ public class MessageImpl : Message
+ {
+
+ private const long serialVersionUID = - 3077643314630884523L;
+
+ private System.String key;
+
+ private System.Object[] arguments = new System.Object[0];
+
+ public MessageImpl(System.String key)
+ {
+ this.key = key;
+ }
+
+ public MessageImpl(System.String key, System.Object[] args):this(key)
+ {
+ this.arguments = args;
+ }
+
+ public virtual System.Object[] GetArguments()
+ {
+ return this.arguments;
+ }
+
+ public virtual System.String GetKey()
+ {
+ return this.key;
+ }
+
+ public virtual System.String GetLocalizedMessage()
+ {
+ return GetLocalizedMessage(System.Threading.Thread.CurrentThread.CurrentCulture);
+ }
+
+ public virtual System.String GetLocalizedMessage(System.Globalization.CultureInfo locale)
+ {
+ return NLS.GetLocalizedMessage(GetKey(), locale, GetArguments());
+ }
+
+ public override System.String ToString()
+ {
+ System.Object[] args = GetArguments();
+ System.String argsString = "";
+ if (args != null)
+ {
+ for (int i = 0; i < args.Length; i++)
+ {
+ argsString += (args[i] + (i < args.Length?"":", "));
+ }
+ }
+ return GetKey() + " " + argsString;
+ }
+ }
+}
\ No newline at end of file
Added: incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLS.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Messages/NLS.cs?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLS.cs (added)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLS.cs Mon Dec 7 05:25:34 2009
@@ -0,0 +1,253 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Lucene.Net.Messages
+{
+
+ /// <summary> MessageBundles classes extend this class, to implement a bundle.
+ ///
+ /// For Native Language Support (NLS), system of software internationalization.
+ ///
+ /// This interface is similar to the NLS class in eclipse.osgi.util.NLS class -
+ /// initializeMessages() method resets the values of all static strings, should
+ /// only be called by classes that extend from NLS (see TestMessages.java for
+ /// reference) - performs validation of all message in a bundle, at class load
+ /// time - performs per message validation at runtime - see NLSTest.java for
+ /// usage reference
+ ///
+ /// MessageBundle classes may subclass this type.
+ /// </summary>
+ public class NLS
+ {
+ public interface IPriviligedAction
+ {
+ /// <summary>
+ /// Performs the priviliged action.
+ /// </summary>
+ /// <returns>A value that may represent the result of the action.</returns>
+ System.Object Run();
+ }
+
+ private class AnonymousClassPrivilegedAction : IPriviligedAction
+ {
+ public AnonymousClassPrivilegedAction(System.Reflection.FieldInfo field)
+ {
+ InitBlock(field);
+ }
+ private void InitBlock(System.Reflection.FieldInfo field)
+ {
+ this.field = field;
+ }
+ private System.Reflection.FieldInfo field;
+ public virtual System.Object Run()
+ {
+ // field.setAccessible(true); // {{Aroush-2.9}} java.lang.reflect.AccessibleObject.setAccessible
+ return null;
+ }
+ }
+
+ private static System.Collections.IDictionary bundles = new System.Collections.Hashtable(0);
+
+ protected internal NLS()
+ {
+ // Do not instantiate
+ }
+
+ public static System.String GetLocalizedMessage(System.String key)
+ {
+ return GetLocalizedMessage(key, System.Threading.Thread.CurrentThread.CurrentCulture);
+ }
+
+ public static System.String GetLocalizedMessage(System.String key, System.Globalization.CultureInfo
locale)
+ {
+ System.Object message = GetResourceBundleObject(key, locale);
+ if (message == null)
+ {
+ return "Message with key:" + key + " and locale: " + locale + " not found.";
+ }
+ return message.ToString();
+ }
+
+ public static System.String GetLocalizedMessage(System.String key, System.Globalization.CultureInfo
locale, System.Object[] args)
+ {
+ System.String str = GetLocalizedMessage(key, locale);
+
+ if (args.Length > 0)
+ {
+ str = System.String.Format(str, args);
+ }
+
+ return str;
+ }
+
+ public static System.String GetLocalizedMessage(System.String key, System.Object[] args)
+ {
+ return GetLocalizedMessage(key, System.Threading.Thread.CurrentThread.CurrentCulture,
args);
+ }
+
+ /// <summary> Initialize a given class with the message bundle Keys Should be called
from
+ /// a class that extends NLS in a static block at class load time.
+ ///
+ /// </summary>
+ /// <param name="bundleName">Property file with that contains the message bundle
+ /// </param>
+ /// <param name="clazz">where constants will reside
+ /// </param>
+ //@SuppressWarnings("unchecked")
+ protected internal static void InitializeMessages(System.String bundleName, System.Type
clazz)
+ {
+ try
+ {
+ Load(clazz);
+ if (!bundles.Contains(bundleName))
+ bundles[bundleName] = clazz;
+ }
+ catch (System.Exception e)
+ {
+ // ignore all errors and exceptions
+ // because this function is supposed to be called at class load time.
+ }
+ }
+
+ private static System.Object GetResourceBundleObject(System.String messageKey, System.Globalization.CultureInfo
locale)
+ {
+
+ // slow resource checking
+ // need to loop thru all registered resource bundles
+ for (System.Collections.IEnumerator it = bundles.Keys.GetEnumerator(); it.MoveNext();
)
+ {
+ System.Type clazz = (System.Type) bundles[(System.String) it.Current];
+ System.Threading.Thread.CurrentThread.CurrentUICulture = locale;
+ System.Resources.ResourceManager resourceBundle = System.Resources.ResourceManager.CreateFileBasedResourceManager(clazz.FullName,
"", null);
+ if (resourceBundle != null)
+ {
+ try
+ {
+ System.Object obj = resourceBundle.GetObject(messageKey);
+ if (obj != null)
+ return obj;
+ }
+ catch (System.Resources.MissingManifestResourceException e)
+ {
+ // just continue it might be on the next resource bundle
+ }
+ }
+ }
+ // if resource is not found
+ return null;
+ }
+
+ /// <param name="clazz">
+ /// </param>
+ private static void Load(System.Type clazz)
+ {
+ System.Reflection.FieldInfo[] fieldArray = clazz.GetFields(System.Reflection.BindingFlags.Instance
| System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.DeclaredOnly
| System.Reflection.BindingFlags.Static);
+
+ bool isFieldAccessible = clazz.IsPublic;
+
+ // build a map of field names to Field objects
+ int len = fieldArray.Length;
+ System.Collections.IDictionary fields = new System.Collections.Hashtable(len * 2);
+ for (int i = 0; i < len; i++)
+ {
+ fields[fieldArray[i].Name] = fieldArray[i];
+ LoadfieldValue(fieldArray[i], isFieldAccessible, clazz);
+ }
+ }
+
+ /// <param name="field">
+ /// </param>
+ /// <param name="isFieldAccessible">
+ /// </param>
+ private static void LoadfieldValue(System.Reflection.FieldInfo field, bool isFieldAccessible,
System.Type clazz)
+ {
+ /*
+ int MOD_EXPECTED = Modifier.PUBLIC | Modifier.STATIC;
+ int MOD_MASK = MOD_EXPECTED | Modifier.FINAL;
+ if ((field.getModifiers() & MOD_MASK) != MOD_EXPECTED)
+ return ;
+ */
+ if (!(field.IsPublic || field.IsStatic))
+ return ;
+
+ // Set a value for this empty field.
+ if (!isFieldAccessible)
+ MakeAccessible(field);
+ try
+ {
+ field.SetValue(null, field.Name);
+ ValidateMessage(field.Name, clazz);
+ }
+ catch (System.ArgumentException e)
+ {
+ // should not happen
+ }
+ catch (System.UnauthorizedAccessException e)
+ {
+ // should not happen
+ }
+ }
+
+ /// <param name="key">- Message Key
+ /// </param>
+ private static void ValidateMessage(System.String key, System.Type clazz)
+ {
+ // Test if the message is present in the resource bundle
+ try
+ {
+ System.Threading.Thread.CurrentThread.CurrentUICulture = System.Threading.Thread.CurrentThread.CurrentCulture;
+ System.Resources.ResourceManager resourceBundle = System.Resources.ResourceManager.CreateFileBasedResourceManager(clazz.FullName,
"", null);
+ if (resourceBundle != null)
+ {
+ System.Object obj = resourceBundle.GetObject(key);
+ if (obj == null)
+ {
+ System.Console.Error.WriteLine("WARN: Message with key:" + key + " and locale: " +
System.Threading.Thread.CurrentThread.CurrentCulture + " not found.");
+ }
+ }
+ }
+ catch (System.Resources.MissingManifestResourceException e)
+ {
+ System.Console.Error.WriteLine("WARN: Message with key:" + key + " and locale: " + System.Threading.Thread.CurrentThread.CurrentCulture
+ " not found.");
+ }
+ catch (System.Exception e)
+ {
+ // ignore all other errors and exceptions
+ // since this code is just a test to see if the message is present on the
+ // system
+ }
+ }
+
+ /*
+ * Make a class field accessible
+ */
+ //@SuppressWarnings("unchecked")
+ private static void MakeAccessible(System.Reflection.FieldInfo field)
+ {
+ if (System.Security.SecurityManager.SecurityEnabled)
+ {
+ //field.setAccessible(true); // {{Aroush-2.9}} java.lang.reflect.AccessibleObject.setAccessible
+ }
+ else
+ {
+ //AccessController.doPrivileged(new AnonymousClassPrivilegedAction(field));
// {{Aroush-2.9}} java.security.AccessController.doPrivileged
+ }
+ }
+ }
+}
\ No newline at end of file
Added: incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLSException.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Messages/NLSException.cs?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLSException.cs (added)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/NLSException.cs Mon Dec 7 05:25:34
2009
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Lucene.Net.Messages
+{
+
+ /// <summary> Interface that exceptions should implement to support lazy loading of
messages.
+ ///
+ /// For Native Language Support (NLS), system of software internationalization.
+ ///
+ /// This Interface should be implemented by all exceptions that require
+ /// translation
+ ///
+ /// </summary>
+ public interface NLSException
+ {
+ /// <returns> a instance of a class that implements the Message interface
+ /// </returns>
+ Message GetMessageObject();
+ }
+}
\ No newline at end of file
Added: incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Package.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Messages/Package.html?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Package.html (added)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Messages/Package.html Mon Dec 7 05:25:34
2009
@@ -0,0 +1,99 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body>
+
+For Native Language Support (NLS), system of software internationalization.
+
+<h2>NLS message API</h2>
+<p>
+This utility API, adds support for NLS messages in the apache code.
+It is currently used by the lucene "New Flexible Query PArser".
+</p>
+<p>
+Features:
+ <ol>
+ <li>Message reference in the code, using static Strings</li>
+ <li>Message resource validation at class load time, for easier debugging</li>
+ <li>Allows for message IDs to be re-factored using eclipse or other code re-factor
tools</li>
+ <li>Allows for reference count on messages, just like code</li>
+ <li>Lazy loading of Message Strings</li>
+ <li>Normal loading Message Strings</li>
+ </ol>
+</p>
+
+<br/>
+<br/>
+<p>
+Lazy loading of Message Strings
+
+<pre>
+ public class MessagesTestBundle extends NLS {
+
+ private static final String BUNDLE_NAME = MessagesTestBundle.class.getName();
+
+ private MessagesTestBundle() {
+ // should never be instantiated
+ }
+
+ static {
+ // register all string ids with NLS class and initialize static string
+ // values
+ NLS.initializeMessages(BUNDLE_NAME, MessagesTestBundle.class);
+ }
+
+ // static string must match the strings in the property files.
+ public static String Q0001E_INVALID_SYNTAX;
+ public static String Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION;
+
+ // this message is missing from the properties file
+ public static String Q0005E_MESSAGE_NOT_IN_BUNDLE;
+ }
+
+ // Create a message reference
+ Message invalidSyntax = new MessageImpl(MessagesTestBundle.Q0001E_INVALID_SYNTAX, "XXX");
+
+ // Do other stuff in the code...
+ // when is time to display the message to the user or log the message on a file
+ // the message is loaded from the correct bundle
+
+ String message1 = invalidSyntax.getLocalizedMessage();
+ String message2 = invalidSyntax.getLocalizedMessage(Locale.JAPANESE);
+</pre>
+</p>
+
+<br/>
+<br/>
+<p>
+Normal loading of Message Strings
+
+<pre>
+ String message1 = NLS.getLocalizedMessage(MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION);
+ String message2 = NLS.getLocalizedMessage(MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION,
Locale.JAPANESE);
+</pre>
+</p>
+
+<p>
+The org.apache.lucene.messages.TestNLS junit contains several other examples.
+The TestNLS java code is available from the Apache Lucene code repository.
+</p>
+</body>
+</html>
Added: incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Messages/MessagesTestBundle.cs?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.cs (added)
+++ incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.cs Mon Dec 7 05:25:34
2009
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Lucene.Net.Messages
+{
+
+ public class MessagesTestBundle:NLS
+ {
+
+ private static readonly System.String BUNDLE_NAME;
+
+ private MessagesTestBundle()
+ {
+ // should never be instantiated
+ }
+
+ // static string must match the strings in the property files.
+ public static System.String Q0001E_INVALID_SYNTAX;
+ public static System.String Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION;
+
+ // this message is missing from the properties file
+ public static System.String Q0005E_MESSAGE_NOT_IN_BUNDLE;
+ static MessagesTestBundle()
+ {
+ BUNDLE_NAME = typeof(MessagesTestBundle).FullName;
+ {
+ // register all string ids with NLS class and initialize static string
+ // values
+ NLS.InitializeMessages(BUNDLE_NAME, typeof(MessagesTestBundle));
+ }
+ }
+ }
+}
\ No newline at end of file
Added: incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.ja.resources
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Messages/MessagesTestBundle.ja.resources?rev=887837&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.ja.resources
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.resources
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Messages/MessagesTestBundle.resources?rev=887837&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lucene.net/trunk/C#/src/Test/Messages/MessagesTestBundle.resources
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lucene.net/trunk/C#/src/Test/Messages/TestNLS.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Messages/TestNLS.cs?rev=887837&view=auto
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Messages/TestNLS.cs (added)
+++ incubator/lucene.net/trunk/C#/src/Test/Messages/TestNLS.cs Mon Dec 7 05:25:34 2009
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+using NUnit.Framework;
+
+namespace Lucene.Net.Messages
+{
+
+
+ [TestFixture]
+ public class TestNLS
+ {
+ [Test]
+ public virtual void TestMessageLoading()
+ {
+ Message invalidSyntax = new MessageImpl(MessagesTestBundle.Q0001E_INVALID_SYNTAX, new
System.Object[]{"XXX"});
+ Assert.AreEqual("Syntax Error: XXX", invalidSyntax.GetLocalizedMessage());
+ }
+
+ [Test]
+ public virtual void TestMessageLoading_ja()
+ {
+ Message invalidSyntax = new MessageImpl(MessagesTestBundle.Q0001E_INVALID_SYNTAX, new
System.Object[]{"XXX"});
+ Assert.AreEqual("æ§æã¨ã©ã¼: XXX", invalidSyntax.GetLocalizedMessage(new
System.Globalization.CultureInfo("ja")));
+ }
+
+ [Test]
+ public virtual void TestNLSLoading()
+ {
+ System.String message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION);
+ Assert.AreEqual("Truncated unicode escape sequence.", message);
+
+ message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0001E_INVALID_SYNTAX, new System.Object[]{"XXX"});
+ Assert.AreEqual("Syntax Error: XXX", message);
+ }
+
+ [Test]
+ public virtual void TestNLSLoading_ja()
+ {
+ System.String message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION,
new System.Globalization.CultureInfo("ja"));
+ Assert.AreEqual("åãæ¨ã¦ãããã¦ãã³ã¼ãã»ã¨ã¹ã±ã¼ãã»ã·ã¼ã±ã³ã¹ã",
message);
+
+ message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0001E_INVALID_SYNTAX, new System.Globalization.CultureInfo("ja"),
new System.Object[]{"XXX"});
+ Assert.AreEqual("æ§æã¨ã©ã¼: XXX", message);
+ }
+
+ [Test]
+ public virtual void TestNLSLoading_xx_XX()
+ {
+ System.Globalization.CultureInfo locale = new System.Globalization.CultureInfo("xx" +
"-" + "XX");
+ System.String message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0004E_INVALID_SYNTAX_ESCAPE_UNICODE_TRUNCATION,
locale);
+ Assert.AreEqual("Truncated unicode escape sequence.", message);
+
+ message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0001E_INVALID_SYNTAX, locale, new
System.Object[]{"XXX"});
+ Assert.AreEqual("Syntax Error: XXX", message);
+ }
+
+ [Test]
+ public virtual void TestMissingMessage()
+ {
+ System.Globalization.CultureInfo locale = new System.Globalization.CultureInfo("en");
+ System.String message = NLS.GetLocalizedMessage(MessagesTestBundle.Q0005E_MESSAGE_NOT_IN_BUNDLE,
locale);
+
+ Assert.AreEqual("Message with key:Q0005E_MESSAGE_NOT_IN_BUNDLE and locale: " + locale.ToString()
+ " not found.", message);
+ }
+ }
+}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Test/Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Test.csproj?rev=887837&r1=887836&r2=887837&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Test.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Test.csproj Mon Dec 7 05:25:34 2009
@@ -272,6 +272,8 @@
<Compile Include="Index\TestWordlistLoader.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="Messages\MessagesTestBundle.cs" />
+ <Compile Include="Messages\TestNLS.cs" />
<Compile Include="QueryParser\TestMultiAnalyzer.cs">
<SubType>Code</SubType>
</Compile>
@@ -474,6 +476,10 @@
<None Include="Index\index.24.cfs.zip" />
<None Include="Index\index.24.nocfs.zip" />
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Messages\MessagesTestBundle.ja.resources" />
+ <EmbeddedResource Include="Messages\MessagesTestBundle.resources" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Author: digy
Date: Thu Dec 3 20:17:21 2009
New Revision: 886902
URL: http://svn.apache.org/viewvc?rev=886902&view=rev
Log:
LUCENENET-308 TestIndexWriter.TestThreadInterruptDeadlock
Modified:
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexWriter.cs?rev=886902&r1=886901&r2=886902&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs Thu Dec 3 20:17:21 2009
@@ -5479,21 +5479,31 @@
catch (System.SystemException re)
{
System.Exception e = re.InnerException;
- if (e is System.Threading.ThreadInterruptedException)
+ if (re is System.Threading.ThreadInterruptedException || e is System.Threading.ThreadInterruptedException)
{
- // Make sure IW restored interrupted bit
- if (Instance.ThreadState != System.Threading.ThreadState.Running) // {{Aroush-2.9}}
in Java, this is: java.lang.Thread.interrupted()
- {
- System.Console.Out.WriteLine("FAILED; InterruptedException hit but thread.interrupted()
was false");
- System.Console.Out.WriteLine(e.StackTrace);
- failed = true;
- break;
- }
+ // {{Aroush-2.9}} in Java, this is: java.lang.Thread.interrupted()
+ //{There is no way in .Net to check interrupted state. So comment
it out
+
+ //// Make sure IW restored interrupted bit
+ //if ((Instance.ThreadState & (System.Threading.ThreadState.Stopped
| System.Threading.ThreadState.Unstarted)) != System.Threading.ThreadState.Running) // {{Aroush-2.9}}
in Java, this is: java.lang.Thread.interrupted()
+ //{
+ // System.Console.Out.WriteLine("FAILED; InterruptedException
hit but thread.interrupted() was false");
+ // System.Console.Out.WriteLine(e.StackTrace);
+ // failed = true;
+ // break;
+ //}
}
else
{
System.Console.Out.WriteLine("FAILED; unexpected exception");
- System.Console.Out.WriteLine(e.StackTrace);
+ if (e != null)
+ {
+ System.Console.Out.WriteLine(e.StackTrace);
+ }
+ else
+ {
+ System.Console.Out.WriteLine(re.StackTrace);
+ }
failed = true;
break;
}
Author: digy
Date: Thu Dec 3 17:49:46 2009
New Revision: 886862
URL: http://svn.apache.org/viewvc?rev=886862&view=rev
Log: (empty)
Removed:
incubator/lucene.net/trunk/C#/src/Test/Index/Store/
Author: digy
Date: Thu Dec 3 17:40:19 2009
New Revision: 886860
URL: http://svn.apache.org/viewvc?rev=886860&view=rev
Log:
LUCENENET-317 The release configuration in the Lucene.Net project file is not configured correctly
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Lucene.Net.csproj?rev=886860&r1=886859&r2=886860&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj Thu Dec 3 17:40:19 2009
@@ -57,19 +57,18 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG</DefineConstants>
+ <DefineConstants>TRACE</DefineConstants>
<DocumentationFile>Lucene.Net.xml</DocumentationFile>
- <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
- <Optimize>false</Optimize>
+ <Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>full</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
Author: digy
Date: Thu Dec 3 16:15:55 2009
New Revision: 886838
URL: http://svn.apache.org/viewvc?rev=886838&view=rev
Log:
LUCENENET-316 Unncesary TestFixture Attribute on LocalizedTestCase
Modified:
incubator/lucene.net/trunk/C#/src/Test/Util/LocalizedTestCase.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Util/LocalizedTestCase.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Util/LocalizedTestCase.cs?rev=886838&r1=886837&r2=886838&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Util/LocalizedTestCase.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Util/LocalizedTestCase.cs Thu Dec 3 16:15:55 2009
@@ -29,7 +29,6 @@
/// not fail under a different environment.
/// </p>
/// </summary>
- [TestFixture]
public class LocalizedTestCase:LuceneTestCase
{
/// <summary> Before changing the default Locale, save the default Locale here so
that it
Author: digy
Date: Thu Dec 3 16:11:23 2009
New Revision: 886836
URL: http://svn.apache.org/viewvc?rev=886836&view=rev
Log:
LUCENENET-202 Compile warnings trying to build source code, svn revision 829945
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ComplexExplanation.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiPhraseQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanWeight.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermQuery.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ComplexExplanation.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/ComplexExplanation.cs?rev=886836&r1=886835&r2=886836&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ComplexExplanation.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ComplexExplanation.cs Thu Dec 3 16:11:23
2009
@@ -26,7 +26,7 @@
[Serializable]
public class ComplexExplanation:Explanation
{
- private System.Boolean match;
+ private System.Boolean? match;
private bool isMatchSet = false;
public ComplexExplanation():base()
@@ -42,14 +42,14 @@
/// <summary> The match status of this explanation node.</summary>
/// <returns> May be null if match status is unknown
/// </returns>
- public virtual System.Boolean GetMatch()
+ public virtual System.Boolean? GetMatch()
{
return match;
}
/// <summary> Sets the match status assigned to this explanation node.</summary>
/// <param name="match">May be null if match status is unknown
/// </param>
- public virtual void SetMatch(System.Boolean match)
+ public virtual void SetMatch(System.Boolean? match)
{
this.match = match;
this.isMatchSet = true;
@@ -65,8 +65,8 @@
/// </seealso>
public override bool IsMatch()
{
- System.Boolean m = GetMatch();
- return (null != m?m:base.IsMatch());
+ System.Boolean? m = GetMatch();
+ return m ?? base.IsMatch();
}
protected internal override System.String GetSummary()
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiPhraseQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/MultiPhraseQuery.cs?rev=886836&r1=886835&r2=886836&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiPhraseQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiPhraseQuery.cs Thu Dec 3 16:11:23
2009
@@ -279,7 +279,7 @@
fieldExpl.SetValue(tfExpl.GetValue() * idfExpl.GetValue() * fieldNormExpl.GetValue());
result.AddDetail(fieldExpl);
- System.Boolean tempAux = fieldExpl.GetMatch();
+ System.Boolean? tempAux = fieldExpl.GetMatch();
result.SetMatch(tempAux);
// combine them
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanWeight.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Spans/SpanWeight.cs?rev=886836&r1=886835&r2=886836&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanWeight.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanWeight.cs Thu Dec 3 16:11:23
2009
@@ -119,7 +119,7 @@
fieldExpl.SetValue(tfExpl.GetValue() * idfExpl.GetValue() * fieldNormExpl.GetValue());
result.AddDetail(fieldExpl);
- System.Boolean tempAux = fieldExpl.GetMatch();
+ System.Boolean? tempAux = fieldExpl.GetMatch();
result.SetMatch(tempAux);
// combine them
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/TermQuery.cs?rev=886836&r1=886835&r2=886836&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermQuery.cs Thu Dec 3 16:11:23 2009
@@ -146,7 +146,7 @@
fieldExpl.SetValue(tfExpl.GetValue() * expl.GetValue() * fieldNormExpl.GetValue());
result.AddDetail(fieldExpl);
- System.Boolean tempAux = fieldExpl.GetMatch();
+ System.Boolean? tempAux = fieldExpl.GetMatch();
result.SetMatch(tempAux);
// combine them
Author: digy
Date: Thu Dec 3 16:00:34 2009
New Revision: 886834
URL: http://svn.apache.org/viewvc?rev=886834&view=rev
Log:
LUCENENET-315 SimpleLRUCache Implementation
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Cache/SimpleLRUCache.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Cache/SimpleLRUCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/Cache/SimpleLRUCache.cs?rev=886834&r1=886833&r2=886834&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Cache/SimpleLRUCache.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Cache/SimpleLRUCache.cs Thu Dec 3 16:00:34
2009
@@ -20,161 +20,88 @@
namespace Lucene.Net.Util.Cache
{
- public class SimpleLRUCache : SimpleLRUCache_LUCENENET_190_1
+ public class SimpleLRUCache : SimpleMapCache
{
- public SimpleLRUCache(int Capacity)
- : base(Capacity)
- {
- }
- }
-
-
- /// <summary> Simple LRU cache implementation that uses a LinkedHashMap.
- /// This cache is not synchronized, use {@link Cache#SynchronizedCache(Cache)}
- /// if needed.
- ///
- /// Implemented for LUCENENET-190. Good for capacity < 1536
- /// </summary>
- [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
- public class SimpleLRUCache_LUCENENET_190_1 : Cache
- {
- System.Collections.Generic.Dictionary<object, LRUCacheValueEntry> Data = new
Dictionary<object, LRUCacheValueEntry>();
- SortedList<long, object> TimeStamps = new SortedList<long, object>();
+ /// <summary>
+ /// The maximum number of items to cache.
+ /// </summary>
+ private int capacity;
+
+ /// <summary>
+ /// The list to efficiently maintain the LRU state.
+ /// </summary>
+ private LinkedList<ListValueEntry> list;
+
+ /// <summary>
+ /// The dictionary to hash into any location in the list.
+ /// </summary>
+ private Dictionary<object, LinkedListNode<ListValueEntry>> lookup;
+
+ /// <summary>
+ /// The node instance to use/re-use when adding an item to the cache.
+ /// </summary>
+ private LinkedListNode<ListValueEntry> openNode;
- long TimeStamp = 0;
- int Capacity = 1024;
-
- /// <summary> Creates a last-recently-used cache with the specified size. </summary>
- public SimpleLRUCache_LUCENENET_190_1(int Capacity)
+ public SimpleLRUCache(int Capacity)
{
- this.Capacity = Capacity;
+ this.capacity = Capacity;
+ this.list = new LinkedList<ListValueEntry>();
+ this.lookup = new Dictionary<object, LinkedListNode<ListValueEntry>>(Capacity
+ 1);
+ this.openNode = new LinkedListNode<ListValueEntry>(new ListValueEntry(null,
null));
}
public override void Put(object Key, object Value)
{
if (Get(Key) == null)
{
- TimeStamp++;
- Data.Add(Key, new LRUCacheValueEntry(TimeStamp, Value));
- TimeStamps.Add(TimeStamp, Key);
+ this.openNode.Value.ItemKey = Key;
+ this.openNode.Value.ItemValue = Value;
+ this.list.AddFirst(this.openNode);
+ this.lookup.Add(Key, this.openNode);
- if (Data.Count > Capacity)
+ if (this.list.Count > this.capacity)
{
- long key = TimeStamps.Keys[0];
- Data.Remove(TimeStamps[key]);
- TimeStamps.RemoveAt(0);
- }
- }
- }
-
- public override object Get(object Key)
- {
- LRUCacheValueEntry e = null;
- Data.TryGetValue(Key, out e);
- if (e == null) return null;
-
- TimeStamps.Remove(e.TimeStamp);
- e.TimeStamp = ++TimeStamp;
- TimeStamps.Add(e.TimeStamp, Key);
- return e.Value;
-
- }
-
- public override bool ContainsKey(object key)
- {
- return Data.ContainsKey(key);
- }
-
- public override void Close()
- {
- }
-
- class LRUCacheValueEntry
- {
- public long TimeStamp = 0;
- public object Value;
-
- public LRUCacheValueEntry(long TimeStamp, object Value)
- {
- this.TimeStamp = TimeStamp;
- this.Value = Value;
- }
- }
- }
-
-
- /// <summary> Simple LRU cache implementation that uses a LinkedHashMap.
- /// This cache is not synchronized, use {@link Cache#SynchronizedCache(Cache)}
- /// if needed.
- ///
- /// Implemented for LUCENENET-190. Good for capacity > 1536
- /// </summary>
- [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
- public class SimpleLRUCache_LUCENENET_190_2 : Lucene.Net.Util.Cache.Cache
- {
- System.Collections.Generic.Dictionary<object, LRUCacheValueEntry> Data = new
Dictionary<object, LRUCacheValueEntry>();
- System.Collections.Generic.SortedDictionary<long, object> TimeStamps = new
SortedDictionary<long, object>();
-
- long TimeStamp = 0;
- int Capacity = 1024;
-
- /// <summary> Creates a last-recently-used cache with the specified size. </summary>
- public SimpleLRUCache_LUCENENET_190_2(int Capacity)
- {
- this.Capacity = Capacity;
- }
-
- public override void Put(object Key, object Value)
- {
- if (Get(Key) == null)
- {
- TimeStamp++;
- Data.Add(Key, new LRUCacheValueEntry(TimeStamp, Value));
- TimeStamps.Add(TimeStamp, Key);
+ // last node is to be removed and saved for the next addition to the
cache
+ this.openNode = this.list.Last;
- if (Data.Count > Capacity)
+ // remove from list & dictionary
+ this.list.RemoveLast();
+ this.lookup.Remove(this.openNode.Value.ItemKey);
+ }
+ else
{
- SortedDictionary<long, object>.Enumerator enumTimeStamps = TimeStamps.GetEnumerator();
- enumTimeStamps.MoveNext();
- long key = enumTimeStamps.Current.Key;
- Data.Remove(TimeStamps[key]);
- TimeStamps.Remove(key);
+ // still filling the cache, create a new open node for the next time
+ this.openNode = new LinkedListNode<ListValueEntry>(new ListValueEntry(null,
null));
}
-
}
}
public override object Get(object Key)
{
- LRUCacheValueEntry e = null;
- Data.TryGetValue(Key, out e);
- if (e == null) return null;
-
- TimeStamps.Remove(e.TimeStamp);
- e.TimeStamp = ++TimeStamp;
- TimeStamps.Add(e.TimeStamp, Key);
- return e.Value;
- }
-
- class LRUCacheValueEntry
- {
- public long TimeStamp = 0;
- public object Value;
-
- public LRUCacheValueEntry(long TimeStamp, object Value)
+ LinkedListNode<ListValueEntry> node = null;
+ if(!this.lookup.TryGetValue(Key, out node))
{
- this.TimeStamp = TimeStamp;
- this.Value = Value;
+ return null;
}
+ this.list.Remove(node);
+ this.list.AddFirst(node);
+ return node.Value.ItemValue;
}
- public override bool ContainsKey(object key)
+ /// <summary>
+ /// Container to hold the key and value to aid in removal from
+ /// the <see cref="lookup"/> dictionary when an item is removed from cache.
+ /// </summary>
+ class ListValueEntry
{
- return Data.ContainsKey(key);
- }
+ internal object ItemValue;
+ internal object ItemKey;
- public override void Close()
- {
+ internal ListValueEntry(object key, object value)
+ {
+ this.ItemKey = key;
+ this.ItemValue = value;
+ }
}
}
Author: digy
Date: Tue Dec 1 19:28:21 2009
New Revision: 885884
URL: http://svn.apache.org/viewvc?rev=885884&view=rev
Log:
Analysis/TeeSinkTokenTest.cs removed
Removed:
incubator/lucene.net/trunk/C#/src/Test/Analysis/TeeSinkTokenTest.cs
Author: digy Revision: 885877 Modified property: svn:log Modified: svn:log at Tue Dec 1 19:21:44 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Dec 1 19:21:44 2009 @@ -0,0 +1 @@ +LUCENENET-314 Excluded files from project
Author: digy
Date: Tue Dec 1 19:21:06 2009
New Revision: 885877
URL: http://svn.apache.org/viewvc?rev=885877&view=rev
Log: (empty)
Removed:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/DirectoryIndexReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiSegmentReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ReadOnlyMultiSegmentReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/StoredFieldWriterPerThread.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/StoredFieldsWriterPerField.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ExtendedFieldCacheImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/NonMatchingScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/RemoteCachingWrapperFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/RemoteSearchable.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/NearSpans.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/PayloadSpans.cs
incubator/lucene.net/trunk/C#/src/Test/AnalysisTest.cs
incubator/lucene.net/trunk/C#/src/Test/Index/DocTest.cs
incubator/lucene.net/trunk/C#/src/Test/Index/MockInputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TermInfosTest.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestCloseableThreadLocal.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestInputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestMultiSegmentReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTermVectorsWriter.cs
incubator/lucene.net/trunk/C#/src/Test/IndexTest.cs
incubator/lucene.net/trunk/C#/src/Test/Search/RemoteCachingWrapperFilterHelper.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestConstantScoreRangeQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestExtendedFieldCache.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRangeFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRangeQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRemoteCachingWrapperFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRemoteSearchable.cs
incubator/lucene.net/trunk/C#/src/Test/SearchTest.cs
incubator/lucene.net/trunk/C#/src/Test/SearchTestForDuplicates.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestMMapDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/StoreTest.cs
incubator/lucene.net/trunk/C#/src/Test/ThreadSafetyTest.cs
incubator/lucene.net/trunk/C#/src/Test/Util/StringHelperTest.cs
Author: digy
Date: Tue Dec 1 17:26:39 2009
New Revision: 885842
URL: http://svn.apache.org/viewvc?rev=885842&view=rev
Log:
Lucene.Net.csproj to reflect the deletion of SharpZipLibAdapter
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Lucene.Net.csproj?rev=885842&r1=885841&r2=885842&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj Tue Dec 1 17:26:39 2009
@@ -73,10 +73,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral,
processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\Lucene-2.9\SharpZipLib\netcf-20\ICSharpCode.SharpZipLib.dll</HintPath>
- </Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
@@ -778,9 +774,6 @@
<Compile Include="Search\WildcardTermEnum.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="SharpZipLibAdapter.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="Store\AlreadyClosedException.cs" />
<Compile Include="Store\BufferedIndexInput.cs">
<SubType>Code</SubType>
Author: digy
Date: Tue Dec 1 16:55:17 2009
New Revision: 885832
URL: http://svn.apache.org/viewvc?rev=885832&view=rev
Log:
LUCENENET-313 SharpZipLib dependency
Removed:
incubator/lucene.net/trunk/C#/src/Lucene.Net/SharpZipLibAdapter.cs
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Document/CompressionTools.cs?rev=885832&r1=885831&r2=885832&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/CompressionTools.cs Tue Dec 1 16:55:17
2009
@@ -15,10 +15,18 @@
* limitations under the License.
*/
+
+/// To enable compression support in Lucene.Net ,
+/// you will need to define 'SHARP_ZIP_LIB' and reference the SharpLibZip
+/// library. The SharpLibZip library can be downloaded from:
+/// http://www.icsharpcode.net/OpenSource/SharpZipLib/
+
using System;
+#if SHARP_ZIP_LIB
using ICSharpCode.SharpZipLib;
using ICSharpCode.SharpZipLib.Zip.Compression;
+#endif
using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
@@ -47,7 +55,7 @@
/// </summary>
public static byte[] Compress(byte[] value_Renamed, int offset, int length, int compressionLevel)
{
-
+ #if SHARP_ZIP_LIB
/* Create an expandable byte array to hold the compressed data.
* You cannot use an array that's the same size as the orginal because
* there is no guarantee that the compressed data will be smaller than
@@ -75,24 +83,40 @@
}
return bos.ToArray();
+ #else
+ throw new System.SystemException("Compression support not configured");
+ #endif
}
/// <summary>Compresses the specified byte range, with default BEST_COMPRESSION level
</summary>
public static byte[] Compress(byte[] value_Renamed, int offset, int length)
- {
+ {
+ #if SHARP_ZIP_LIB
return Compress(value_Renamed, offset, length, Deflater.BEST_COMPRESSION);
+ #else
+ throw new System.SystemException("Compression support not configured");
+ #endif
}
/// <summary>Compresses all bytes in the array, with default BEST_COMPRESSION level
</summary>
public static byte[] Compress(byte[] value_Renamed)
{
+ #if SHARP_ZIP_LIB
return Compress(value_Renamed, 0, value_Renamed.Length, Deflater.BEST_COMPRESSION);
+ #else
+ throw new System.SystemException("Compression support not configured");
+ #endif
}
/// <summary>Compresses the String value, with default BEST_COMPRESSION level </summary>
public static byte[] CompressString(System.String value_Renamed)
{
+
+ #if SHARP_ZIP_LIB
return CompressString(value_Renamed, Deflater.BEST_COMPRESSION);
+ #else
+ throw new System.SystemException("Compression support not configured");
+ #endif
}
/// <summary>Compresses the String value using the specified
@@ -111,6 +135,7 @@
/// </summary>
public static byte[] Decompress(byte[] value_Renamed)
{
+ #if SHARP_ZIP_LIB
// Create an expandable byte array to hold the decompressed data
System.IO.MemoryStream bos = new System.IO.MemoryStream(value_Renamed.Length);
@@ -133,6 +158,9 @@
}
return bos.ToArray();
+ #else
+ throw new System.SystemException("Compression support not configured");
+ #endif
}
/// <summary>Decompress the byte array previously returned by
@@ -146,4 +174,5 @@
return new System.String(result.result, 0, result.length);
}
}
-}
\ No newline at end of file
+}
+
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SupportClass.cs?rev=885832&r1=885831&r2=885832&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs Tue Dec 1 16:55:17 2009
@@ -1146,52 +1146,6 @@
return false;
}
}
-
- /// <summary>
- /// Use for .NET 1.1 Framework only.
- /// </summary>
- public class CompressionSupport
- {
- public interface ICompressionAdapter
- {
- byte[] Compress(byte[] input, int offset, int length);
- byte[] Uncompress(byte[] input);
- }
-
-#if SHARP_ZIP_LIB
- private static ICompressionAdapter compressionAdapter = new Lucene.Net.Index.Compression.SharpZipLibAdapter();
-#else
- private static ICompressionAdapter compressionAdapter;
-#endif
-
- public static byte[] Uncompress(byte[] input)
- {
- CheckCompressionSupport();
- return compressionAdapter.Uncompress(input);
- }
-
- public static byte[] Compress(byte[] input, int offset, int length)
- {
- CheckCompressionSupport();
- return compressionAdapter.Compress(input, offset, length);
- }
-
- private static void CheckCompressionSupport()
- {
- if (compressionAdapter == null)
- {
- System.String compressionLibClassName = SupportClass.AppSettings.Get("Lucene.Net.CompressionLib.class",
null);
- if (compressionLibClassName == null)
- throw new System.SystemException("Compression support not configured");
-
- Type compressionLibClass = Type.GetType(compressionLibClassName, true);
- object compressionAdapterObj = Activator.CreateInstance(compressionLibClass);
- compressionAdapter = compressionAdapterObj as ICompressionAdapter;
- if (compressionAdapter == null)
- throw new System.SystemException("Compression adapter does not support
the ICompressionAdapter interface");
- }
- }
- }
#region WEAKHASHTABLE
/// <summary>
Author: digy
Date: Tue Dec 1 16:43:13 2009
New Revision: 885829
URL: http://svn.apache.org/viewvc?rev=885829&view=rev
Log:
LUCENENET-260 src\Test\Index\TestStressIndexing2.cs
Modified:
incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing2.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestStressIndexing2.cs?rev=885829&r1=885828&r2=885829&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing2.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing2.cs Tue Dec 1 16:43:13
2009
@@ -279,7 +279,8 @@
System.Collections.ArrayList fields = new System.Collections.ArrayList();
fields.AddRange(d.GetFields());
// put fields in same order each time
- SupportClass.CollectionsHelper.Sort(fields, fieldNameComparator);
+ //{{Lucene.Net-2.9.1}} No, don't change the order of the fields
+ //SupportClass.CollectionsHelper.Sort(fields, fieldNameComparator);
Document d1 = new Document();
d1.SetBoost(d.GetBoost());
Author: digy
Date: Tue Dec 1 16:33:31 2009
New Revision: 885824
URL: http://svn.apache.org/viewvc?rev=885824&view=rev
Log:
LUCENENET-303 Running TestComplexExplanations.TestMA3 after TestBoolean2.TestQueries01 fails.
Modified:
incubator/lucene.net/trunk/C#/src/Test/Util/LuceneTestCase.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Util/LuceneTestCase.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Util/LuceneTestCase.cs?rev=885824&r1=885823&r2=885824&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Util/LuceneTestCase.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Util/LuceneTestCase.cs Tue Dec 1 16:33:31 2009
@@ -52,7 +52,8 @@
[NonSerialized]
private bool savedAPISetting = false;
-
+ bool allowDocsOutOfOrder = true;
+
public LuceneTestCase():base()
{
}
@@ -60,10 +61,14 @@
public LuceneTestCase(System.String name)
{
}
-
+
+
[SetUp]
public virtual void SetUp()
{
+ //{{Lucene.Net-2.9.1}}
+ allowDocsOutOfOrder = Lucene.Net.Search.BooleanQuery.GetAllowDocsOutOfOrder();
+
ConcurrentMergeScheduler.SetTestMode();
savedAPISetting = TokenStream.GetOnlyUseNewAPI();
@@ -117,6 +122,9 @@
TokenStream.SetOnlyUseNewAPI(savedAPISetting);
//base.TearDown(); // {{Aroush-2.9}}
this.seed_init = false;
+
+ //{{Lucene.Net-2.9.1}}
+ Lucene.Net.Search.BooleanQuery.SetAllowDocsOutOfOrder(allowDocsOutOfOrder);
}
/// <summary> Asserts that FieldCacheSanityChecker does not detect any
Author: digy
Date: Sun Nov 29 18:09:01 2009
New Revision: 885250
URL: http://svn.apache.org/viewvc?rev=885250&view=rev
Log:
patch for TestFieldCacheSanityChecker.TestInsanity1 & TestFieldCacheSanityChecker.TestInsanity2
Since too simple, I'll commit the patch directly.
Modified:
incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Util/TestFieldCacheSanityChecker.cs?rev=885250&r1=885249&r2=885250&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs Sun Nov 29
18:09:01 2009
@@ -56,7 +56,7 @@
long theLong = System.Int64.MaxValue;
double theDouble = System.Double.MaxValue;
- byte theByte = (byte) System.SByte.MaxValue;
+ sbyte theByte = (sbyte) System.SByte.MaxValue;
short theShort = System.Int16.MaxValue;
int theInt = System.Int32.MaxValue;
float theFloat = System.Single.MaxValue;
@@ -65,7 +65,7 @@
Document doc = new Document();
doc.Add(new Field("theLong", System.Convert.ToString(theLong--), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.Add(new Field("theDouble", (theDouble--).ToString("E16"), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.Add(new Field("theByte", System.Convert.ToString((byte) theByte--), Field.Store.NO,
Field.Index.NOT_ANALYZED));
+ doc.Add(new Field("theByte", System.Convert.ToString((sbyte) theByte--), Field.Store.NO,
Field.Index.NOT_ANALYZED));
doc.Add(new Field("theShort", System.Convert.ToString(theShort--), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.Add(new Field("theInt", System.Convert.ToString(theInt--), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.Add(new Field("theFloat", (theFloat--).ToString("E8"), Field.Store.NO, Field.Index.NOT_ANALYZED));
Author: digy
Date: Sun Nov 29 09:18:42 2009
New Revision: 885207
URL: http://svn.apache.org/viewvc?rev=885207&view=rev
Log:
LUCENENET-312 TestDateSort.TestReverseDateSort
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortField.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortField.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/SortField.cs?rev=885207&r1=885206&r2=885207&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortField.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortField.cs Sun Nov 29 09:18:42 2009
@@ -645,32 +645,12 @@
if ((System.Object) term.Field() == (System.Object) field)
{
System.String termtext = term.Text().Trim();
-
- try
- {
- System.Int32.Parse(termtext);
- ret = SortField.INT;
- }
- catch (System.FormatException nfe1)
- {
- try
- {
- System.Int64.Parse(termtext);
- ret = SortField.LONG;
- }
- catch (System.FormatException nfe2)
- {
- try
- {
- SupportClass.Single.Parse(termtext);
- ret = SortField.FLOAT;
- }
- catch (System.FormatException nfe3)
- {
- ret = SortField.STRING;
- }
- }
- }
+
+ int tmpI32; long tmpI64; float tmpF;
+ if (System.Int32.TryParse(termtext, out tmpI32)) ret = SortField.INT;
+ else if (System.Int64.TryParse(termtext, out tmpI64)) ret = SortField.LONG;
+ else if (SupportClass.Single.TryParse(termtext, out tmpF)) ret = SortField.FLOAT;
+ else ret = SortField.STRING;
}
else
{
Author: aroush
Date: Sun Nov 29 05:58:00 2009
New Revision: 885194
URL: http://svn.apache.org/viewvc?rev=885194&view=rev
Log:
Fixed output directory for release build.
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Lucene.Net.csproj?rev=885194&r1=885193&r2=885194&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.csproj Sun Nov 29 05:58:00 2009
@@ -51,7 +51,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Author: digy
Date: Sat Nov 28 21:13:01 2009
New Revision: 885147
URL: http://svn.apache.org/viewvc?rev=885147&view=rev
Log:
Patch to TestTimeLimitingCollector as in LUCENENET-301 (TestTimeLimitedCollector.patch)
Modified:
incubator/lucene.net/trunk/C#/src/Test/Search/TestTimeLimitingCollector.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestTimeLimitingCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestTimeLimitingCollector.cs?rev=885147&r1=885146&r2=885147&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestTimeLimitingCollector.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestTimeLimitingCollector.cs Sat Nov 28
21:13:01 2009
@@ -396,6 +396,7 @@
}
}
System.Diagnostics.Debug.Assert(docId >= 0, "base=" + docBase + " doc=" + doc);
+ bits.Length = Math.Max(bits.Length, docId + 1);
bits.Set(docId, true);
lastDocCollected = docId;
}
Author: digy
Date: Fri Nov 27 19:03:56 2009
New Revision: 884954
URL: http://svn.apache.org/viewvc?rev=884954&view=rev
Log:
LUCENENET-311 TestNRTReaderWithThreads.TestIndexing + LUCENENET-287 TestIndexWriterReader.TestUpdateDocument
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexWriter.cs?rev=884954&r1=884953&r2=884954&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs Fri Nov 27 19:03:56
2009
@@ -5795,7 +5795,8 @@
merge.mergeDocStores = true;
lock (this)
{
- if (dss.Contains(docWriter.GetDocStoreSegment()))
+ String key = docWriter.GetDocStoreSegment();
+ if (key!=null && dss.Contains(key))
{
if (infoStream != null)
Message("now flush at mergeMiddle");
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentInfos.cs?rev=884954&r1=884953&r2=884954&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs Fri Nov 27 19:03:56
2009
@@ -1102,6 +1102,47 @@
if (Info(i).dir != dir)
return true;
return false;
- }
+ }
+
+ #region Lucene.NET (Equals & GetHashCode )
+ /// <summary>
+ /// Simple brute force implementation.
+ /// If size is equal, compare items one by one.
+ /// </summary>
+ /// <param name="obj">SegmentInfos object to check equality for</param>
+ /// <returns>true if lists are equal, false otherwise</returns>
+ public override bool Equals(object obj)
+ {
+ if (obj == null) return false;
+
+ SegmentInfos objToCompare = obj as SegmentInfos;
+ if (objToCompare == null) return false;
+
+ if (this.Count != objToCompare.Count) return false;
+
+ for (int idx = 0; idx < this.Count; idx++)
+ {
+ if (!this[idx].Equals(objToCompare[idx])) return false;
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// Calculate hash code of SegmentInfos
+ /// </summary>
+ /// <returns>hash code as in java version of ArrayList</returns>
+ public override int GetHashCode()
+ {
+ int h = 1;
+ for (int i = 0; i < this.Count; i++)
+ {
+ SegmentInfo si = (this[i] as SegmentInfo);
+ h = 31 * h + (si == null ? 0 : si.GetHashCode());
+ }
+
+ return h;
+ }
+ #endregion
}
}
\ No newline at end of file
Author: digy Revision: 883994 Modified property: svn:log Modified: svn:log at Wed Nov 25 06:55:28 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Nov 25 06:55:28 2009 @@ -1,2 +1,3 @@ -LUCENENET-309 TestSort.TestTypedSort fails (2) -needs documentation!!! +LUCENENET-309 TestSort.TestTypedSort fails (2). + +!!!needs documentation!!!
Author: digy
Date: Wed Nov 25 06:50:08 2009
New Revision: 883994
URL: http://svn.apache.org/viewvc?rev=883994&view=rev
Log:
LUCENENET-309 TestSort.TestTypedSort fails (2)
needs documentation!!!
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheRangeFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldComparator.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldSortedHitQueue.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/AverageGuessMemoryModel.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestFieldCache.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldCache.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs Wed Nov 25 06:50:08
2009
@@ -197,13 +197,9 @@
[Serializable]
public class AnonymousClassByteParser : ByteParser
{
- public virtual byte ParseByte(System.String value_Renamed)
+ public virtual sbyte ParseByte(System.String value_Renamed)
{
- if (value_Renamed[0] == '-')
- {
- return (byte) System.SByte.Parse(value_Renamed);
- }
- return (byte) System.Byte.Parse(value_Renamed);
+ return System.SByte.Parse(value_Renamed);
}
protected internal virtual System.Object ReadResolve()
{
@@ -392,7 +388,7 @@
/// <returns> The values in the given field for each document.
/// </returns>
/// <throws> IOException If any error occurs. </throws>
- byte[] GetBytes(IndexReader reader, System.String field);
+ sbyte[] GetBytes(IndexReader reader, System.String field);
/// <summary>Checks the internal cache for an appropriate entry, and if none is found,
/// reads the terms in <code>field</code> as bytes and returns an array of
@@ -408,7 +404,7 @@
/// <returns> The values in the given field for each document.
/// </returns>
/// <throws> IOException If any error occurs. </throws>
- byte[] GetBytes(IndexReader reader, System.String field, ByteParser parser);
+ sbyte[] GetBytes(IndexReader reader, System.String field, ByteParser parser);
/// <summary>Checks the internal cache for an appropriate entry, and if none is
/// found, reads the terms in <code>field</code> as shorts and returns an array
@@ -691,7 +687,7 @@
public interface ByteParser:Parser
{
/// <summary>Return a single Byte representation of this field's value. </summary>
- byte ParseByte(System.String string_Renamed);
+ sbyte ParseByte(System.String string_Renamed);
}
/// <summary>Interface to parse shorts from document fields.</summary>
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldCacheImpl.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs Wed Nov 25 06:50:08
2009
@@ -52,7 +52,7 @@
lock (this)
{
caches = new System.Collections.Hashtable(7);
- caches[System.Type.GetType("System.Byte")] = new ByteCache(this);
+ caches[System.Type.GetType("System.SByte")] = new ByteCache(this);
caches[System.Type.GetType("System.Int16")] = new ShortCache(this);
caches[System.Type.GetType("System.Int32")] = new IntCache(this);
caches[System.Type.GetType("System.Single")] = new FloatCache(this);
@@ -357,15 +357,15 @@
}
// inherit javadocs
- public virtual byte[] GetBytes(IndexReader reader, System.String field)
+ public virtual sbyte[] GetBytes(IndexReader reader, System.String field)
{
return GetBytes(reader, field, null);
}
// inherit javadocs
- public virtual byte[] GetBytes(IndexReader reader, System.String field, ByteParser parser)
+ public virtual sbyte[] GetBytes(IndexReader reader, System.String field, ByteParser parser)
{
- return (byte[]) ((Cache) caches[System.Type.GetType("System.Byte")]).Get(reader, new Entry(field,
parser));
+ return (sbyte[]) ((Cache) caches[System.Type.GetType("System.SByte")]).Get(reader, new
Entry(field, parser));
}
internal sealed class ByteCache:Cache
@@ -382,7 +382,7 @@
{
return wrapper.GetBytes(reader, field, Lucene.Net.Search.FieldCache_Fields.DEFAULT_BYTE_PARSER);
}
- byte[] retArray = new byte[reader.MaxDoc()];
+ sbyte[] retArray = new sbyte[reader.MaxDoc()];
TermDocs termDocs = reader.TermDocs();
TermEnum termEnum = reader.Terms(new Term(field));
try
@@ -392,7 +392,7 @@
Term term = termEnum.Term();
if (term == null || (System.Object) term.Field() != (System.Object) field)
break;
- byte termval = parser.ParseByte(term.Text());
+ sbyte termval = parser.ParseByte(term.Text());
termDocs.Seek(termEnum);
while (termDocs.Next())
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldCacheRangeFilter.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheRangeFilter.cs Wed Nov 25
06:50:08 2009
@@ -156,14 +156,14 @@
{
private class AnonymousClassFieldCacheDocIdSet:FieldCacheDocIdSet
{
- private void InitBlock(byte[] values, byte inclusiveLowerPoint, byte inclusiveUpperPoint,
AnonymousClassFieldCacheRangeFilter1 enclosingInstance)
+ private void InitBlock(sbyte[] values, byte inclusiveLowerPoint, byte inclusiveUpperPoint,
AnonymousClassFieldCacheRangeFilter1 enclosingInstance)
{
this.values = values;
this.inclusiveLowerPoint = inclusiveLowerPoint;
this.inclusiveUpperPoint = inclusiveUpperPoint;
this.enclosingInstance = enclosingInstance;
}
- private byte[] values;
+ private sbyte[] values;
private byte inclusiveLowerPoint;
private byte inclusiveUpperPoint;
private AnonymousClassFieldCacheRangeFilter1 enclosingInstance;
@@ -175,7 +175,7 @@
}
}
- internal AnonymousClassFieldCacheDocIdSet(byte[] values, byte inclusiveLowerPoint, byte
inclusiveUpperPoint, AnonymousClassFieldCacheRangeFilter1 enclosingInstance, Lucene.Net.Index.IndexReader
Param1, bool Param2):base(Param1, Param2)
+ internal AnonymousClassFieldCacheDocIdSet(sbyte[] values, byte inclusiveLowerPoint, byte
inclusiveUpperPoint, AnonymousClassFieldCacheRangeFilter1 enclosingInstance, Lucene.Net.Index.IndexReader
Param1, bool Param2):base(Param1, Param2)
{
InitBlock(values, inclusiveLowerPoint, inclusiveUpperPoint, enclosingInstance);
}
@@ -217,7 +217,7 @@
if (inclusiveLowerPoint > inclusiveUpperPoint)
return DocIdSet.EMPTY_DOCIDSET;
- byte[] values = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetBytes(reader, field, (Lucene.Net.Search.ByteParser)
parser);
+ sbyte[] values = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetBytes(reader, field,
(Lucene.Net.Search.ByteParser) parser);
// we only request the usage of termDocs, if the range contains 0
return new AnonymousClassFieldCacheDocIdSet(values, inclusiveLowerPoint, inclusiveUpperPoint,
this, reader, (inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0));
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldComparator.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldComparator.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldComparator.cs Wed Nov 25 06:50:08
2009
@@ -88,15 +88,15 @@
/// </summary>
public sealed class ByteComparator:FieldComparator
{
- private byte[] values;
- private byte[] currentReaderValues;
+ private sbyte[] values;
+ private sbyte[] currentReaderValues;
private System.String field;
private ByteParser parser;
- private byte bottom;
+ private sbyte bottom;
internal ByteComparator(int numHits, System.String field, Lucene.Net.Search.Parser parser)
{
- values = new byte[numHits];
+ values = new sbyte[numHits];
this.field = field;
this.parser = (ByteParser) parser;
}
@@ -128,7 +128,7 @@
public override System.IComparable Value(int slot)
{
- return (byte) values[slot];
+ return (sbyte) values[slot];
}
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldSortedHitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldSortedHitQueue.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldSortedHitQueue.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldSortedHitQueue.cs Wed Nov 25
06:50:08 2009
@@ -112,15 +112,15 @@
}
private class AnonymousClassScoreDocComparator : ScoreDocComparator
{
- public AnonymousClassScoreDocComparator(byte[] fieldOrder)
+ public AnonymousClassScoreDocComparator(sbyte[] fieldOrder)
{
InitBlock(fieldOrder);
}
- private void InitBlock(byte[] fieldOrder)
+ private void InitBlock(sbyte[] fieldOrder)
{
this.fieldOrder = fieldOrder;
}
- private byte[] fieldOrder;
+ private sbyte[] fieldOrder;
public int Compare(ScoreDoc i, ScoreDoc j)
{
@@ -135,7 +135,7 @@
public virtual System.IComparable SortValue(ScoreDoc i)
{
- return (byte) fieldOrder[i.doc];
+ return (sbyte) fieldOrder[i.doc];
}
public virtual int SortType()
@@ -556,7 +556,7 @@
internal static ScoreDocComparator comparatorByte(IndexReader reader, System.String fieldname,
Lucene.Net.Search.ByteParser parser)
{
System.String field = String.Intern(fieldname);
- byte[] fieldOrder = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetBytes(reader, field,
parser);
+ sbyte[] fieldOrder = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetBytes(reader, field,
parser);
return new AnonymousClassScoreDocComparator(fieldOrder);
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/ByteFieldSource.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs Wed Nov
25 06:50:08 2009
@@ -52,16 +52,16 @@
{
private class AnonymousClassDocValues:DocValues
{
- public AnonymousClassDocValues(byte[] arr, ByteFieldSource enclosingInstance)
+ public AnonymousClassDocValues(sbyte[] arr, ByteFieldSource enclosingInstance)
{
InitBlock(arr, enclosingInstance);
}
- private void InitBlock(byte[] arr, ByteFieldSource enclosingInstance)
+ private void InitBlock(sbyte[] arr, ByteFieldSource enclosingInstance)
{
this.arr = arr;
this.enclosingInstance = enclosingInstance;
}
- private byte[] arr;
+ private sbyte[] arr;
private ByteFieldSource enclosingInstance;
public ByteFieldSource Enclosing_Instance
{
@@ -114,7 +114,7 @@
/*(non-Javadoc) @see Lucene.Net.Search.Function.FieldCacheSource#getCachedValues(Lucene.Net.Search.FieldCache,
java.lang.String, Lucene.Net.Index.IndexReader) */
public override DocValues GetCachedFieldValues(FieldCache cache, System.String field, IndexReader
reader)
{
- byte[] arr = cache.GetBytes(reader, field, parser);
+ sbyte[] arr = cache.GetBytes(reader, field, parser);
return new AnonymousClassDocValues(arr, this);
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/AverageGuessMemoryModel.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/AverageGuessMemoryModel.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/AverageGuessMemoryModel.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/AverageGuessMemoryModel.cs Wed Nov 25
06:50:08 2009
@@ -40,6 +40,7 @@
this.enclosingInstance = enclosingInstance;
Add(typeof(bool), 1);
Add(typeof(byte), 1);
+ Add(typeof(sbyte), 1);
Add(typeof(char), 2);
Add(typeof(short), 2);
Add(typeof(int), 4);
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Function/TestFieldScoreQuery.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs Wed Nov
25 06:50:08 2009
@@ -194,7 +194,7 @@
{
// prepare expected array types for comparison
System.Collections.Hashtable expectedArrayTypes = new System.Collections.Hashtable();
- expectedArrayTypes[FieldScoreQuery.Type.BYTE] = new byte[0];
+ expectedArrayTypes[FieldScoreQuery.Type.BYTE] = new sbyte[0];
expectedArrayTypes[FieldScoreQuery.Type.SHORT] = new short[0];
expectedArrayTypes[FieldScoreQuery.Type.INT] = new int[0];
expectedArrayTypes[FieldScoreQuery.Type.FLOAT] = new float[0];
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestFieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestFieldCache.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestFieldCache.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestFieldCache.cs Wed Nov 25 06:50:08 2009
@@ -44,7 +44,7 @@
IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
long theLong = System.Int64.MaxValue;
double theDouble = System.Double.MaxValue;
- byte theByte = (byte) System.SByte.MaxValue;
+ sbyte theByte = (sbyte) System.SByte.MaxValue;
short theShort = System.Int16.MaxValue;
int theInt = System.Int32.MaxValue;
float theFloat = System.Single.MaxValue;
@@ -53,7 +53,7 @@
Document doc = new Document();
doc.Add(new Field("theLong", System.Convert.ToString(theLong--), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.Add(new Field("theDouble", theDouble.ToString("E16"), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.Add(new Field("theByte", System.Convert.ToString((byte) theByte--), Field.Store.NO,
Field.Index.NOT_ANALYZED));
+ doc.Add(new Field("theByte", System.Convert.ToString((sbyte) theByte--), Field.Store.NO,
Field.Index.NOT_ANALYZED));
doc.Add(new Field("theShort", System.Convert.ToString(theShort--), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.Add(new Field("theInt", System.Convert.ToString(theInt--), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.Add(new Field("theFloat", theFloat.ToString("E8"), Field.Store.NO, Field.Index.NOT_ANALYZED));
@@ -110,13 +110,13 @@
Assert.IsTrue(longs[i] == (System.Int64.MaxValue - i), longs[i] + " does not equal: "
+ (System.Int64.MaxValue - i));
}
- byte[] bytes = cache.GetBytes(reader, "theByte");
+ sbyte[] bytes = cache.GetBytes(reader, "theByte");
Assert.AreSame(bytes, cache.GetBytes(reader, "theByte"), "Second request to cache return
same array");
Assert.AreSame(bytes, cache.GetBytes(reader, "theByte", Lucene.Net.Search.FieldCache_Fields.DEFAULT_BYTE_PARSER),
"Second request with explicit parser return same array");
Assert.IsTrue(bytes.Length == NUM_DOCS, "bytes Size: " + bytes.Length + " is not: " +
NUM_DOCS);
for (int i = 0; i < bytes.Length; i++)
{
- Assert.IsTrue(bytes[i] == (byte) ((byte) System.SByte.MaxValue - i), bytes[i] + " does
not equal: " + ((byte) System.SByte.MaxValue - i));
+ Assert.IsTrue(bytes[i] == (sbyte) ((byte) System.SByte.MaxValue - i), bytes[i] + " does
not equal: " + ((byte) System.SByte.MaxValue - i));
}
short[] shorts = cache.GetShorts(reader, "theShort");
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestSort.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs Wed Nov 25 06:50:08 2009
@@ -170,9 +170,9 @@
}
}
- public byte ParseByte(System.String val)
+ public sbyte ParseByte(System.String val)
{
- return (byte) (val[0] - 'A');
+ return (sbyte) (val[0] - 'A');
}
}
[Serializable]
@@ -266,8 +266,8 @@
new string[]{ "A", "x a", "5", "4f", "c",
"A-3", "p\u00EAche", "10", "-4.0",
"3", "126", "J"},//A, x
new string[]{ "B", "y a", "5", "3.4028235E38", "i",
"B-10", "HAT", "1000000000", "40.0",
"24", "1", "I"},//B, y
new string[]{ "C", "x a b c", "2147483647", "1.0", "j",
"A-2", "p\u00E9ch\u00E9", "99999999", "40.00002343",
"125", "15", "H"},//C, x
- new string[]{ "D", "y a b c", "-1", "0.0f", "a",
"C-0", "HUT", long.MaxValue.ToString(), double.MinValue.ToString("E16"),
short.MinValue.ToString(), byte.MinValue.ToString(), "G"},//D, y
- new string[]{ "E", "x a b c d", "5", "2f", "h",
"B-8", "peach", long.MinValue.ToString(), double.MaxValue.ToString("E16"),
short.MaxValue.ToString(), byte.MaxValue.ToString(), "F"},//E,x
+ new string[]{ "D", "y a b c", "-1", "0.0f", "a",
"C-0", "HUT", long.MaxValue.ToString(), double.MinValue.ToString("E16"),
short.MinValue.ToString(), sbyte.MinValue.ToString(), "G"},//D, y
+ new string[]{ "E", "x a b c d", "5", "2f", "h",
"B-8", "peach", long.MinValue.ToString(), double.MaxValue.ToString("E16"),
short.MaxValue.ToString(), sbyte.MaxValue.ToString(), "F"},//E,x
new string[]{ "F", "y a b c d", "2", "3.14159f", "g",
"B-1", "H\u00C5T", "-44", "343.034435444",
"-3", "0", "E"},//F,y
new string[]{ "G", "x a b c d", "3", "-1.0", "f",
"C-100", "sin", "323254543543", "4.043544",
"5", "100", "D"},//G,x
new string[]{ "H", "y a b c d", "0", "1.4E-45", "e",
"C-88", "H\u00D8T", "1023423423005", "4.043545",
"10", "-50", "C"},//H,y
@@ -439,21 +439,21 @@
[Test]
public virtual void TestTypedSort()
{
- sort.SetSort(new SortField[]{new SortField("int", SortField.INT), SortField.FIELD_DOC});
- AssertMatches(full, queryX, sort, "IGAEC");
- AssertMatches(full, queryY, sort, "DHFJB");
-
- sort.SetSort(new SortField[]{new SortField("float", SortField.FLOAT), SortField.FIELD_DOC});
- AssertMatches(full, queryX, sort, "GCIEA");
- AssertMatches(full, queryY, sort, "DHJFB");
-
- sort.SetSort(new SortField[]{new SortField("long", SortField.LONG), SortField.FIELD_DOC});
- AssertMatches(full, queryX, sort, "EACGI");
- AssertMatches(full, queryY, sort, "FBJHD");
-
- sort.SetSort(new SortField[]{new SortField("double", SortField.DOUBLE), SortField.FIELD_DOC});
- AssertMatches(full, queryX, sort, "AGICE");
- AssertMatches(full, queryY, sort, "DJHBF");
+ sort.SetSort(new SortField[] { new SortField("int", SortField.INT), SortField.FIELD_DOC
});
+ AssertMatches(full, queryX, sort, "IGAEC");
+ AssertMatches(full, queryY, sort, "DHFJB");
+
+ sort.SetSort(new SortField[] { new SortField("float", SortField.FLOAT), SortField.FIELD_DOC
});
+ AssertMatches(full, queryX, sort, "GCIEA");
+ AssertMatches(full, queryY, sort, "DHJFB");
+
+ sort.SetSort(new SortField[] { new SortField("long", SortField.LONG), SortField.FIELD_DOC
});
+ AssertMatches(full, queryX, sort, "EACGI");
+ AssertMatches(full, queryY, sort, "FBJHD");
+
+ sort.SetSort(new SortField[] { new SortField("double", SortField.DOUBLE), SortField.FIELD_DOC
});
+ AssertMatches(full, queryX, sort, "AGICE");
+ AssertMatches(full, queryY, sort, "DJHBF");
sort.SetSort(new SortField[]{new SortField("byte", SortField.BYTE), SortField.FIELD_DOC});
AssertMatches(full, queryX, sort, "CIGAE");
Modified: incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Util/TestFieldCacheSanityChecker.cs?rev=883994&r1=883993&r2=883994&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Util/TestFieldCacheSanityChecker.cs Wed Nov 25
06:50:08 2009
@@ -134,7 +134,7 @@
int[] ints;
System.String[] strings;
- byte[] bytes;
+ sbyte[] bytes;
ints = cache.GetInts(readerX, "theInt", Lucene.Net.Search.FieldCache_Fields.DEFAULT_INT_PARSER);
strings = cache.GetStrings(readerX, "theInt");
@@ -161,7 +161,7 @@
cache.PurgeAllCaches();
System.String[] strings;
- byte[] bytes;
+ sbyte[] bytes;
strings = cache.GetStrings(readerA, "theString");
strings = cache.GetStrings(readerB, "theString");
Author: digy
Date: Tue Nov 24 10:21:06 2009
New Revision: 883644
URL: http://svn.apache.org/viewvc?rev=883644&view=rev
Log:
LUCENENET-307 TestSort.TestTypedSort fails. (patch for "double")
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldCache.cs?rev=883644&r1=883643&r2=883644&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs Tue Nov 24 10:21:06
2009
@@ -290,7 +290,7 @@
{
public virtual double ParseDouble(System.String value_Renamed)
{
- return System.Double.Parse(value_Renamed);
+ return SupportClass.Double.Parse(value_Renamed);
}
protected internal virtual System.Object ReadResolve()
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SupportClass.cs?rev=883644&r1=883643&r2=883644&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs Tue Nov 24 10:21:06 2009
@@ -785,6 +785,24 @@
/// <summary>
///
/// </summary>
+ public class Double
+ {
+ public static System.Double Parse(System.String s)
+ {
+ try
+ {
+ return System.Double.Parse(s.Replace(".", System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
+ }
+ catch (OverflowException)
+ {
+ return double.MaxValue;
+ }
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
public class Single
{
/// <summary>
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestSort.cs?rev=883644&r1=883643&r2=883644&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs Tue Nov 24 10:21:06 2009
@@ -262,21 +262,21 @@
// the string field to sort by string
// the i18n field includes accented characters for testing locale-specific sorting
private System.String[][] data = new System.String[][] {
- // tracer contents int float string
custom i18n long double, 'short',
byte, 'custom parser encoding'
- new string[]{ "A", "x a", "5", "4f", "c",
"A-3", "p\u00EAche", "10", "-4.0", "3",
"126", "J"},//A, x
- new string[]{ "B", "y a", "5", "3.4028235E38", "i",
"B-10", "HAT", "1000000000", "40.0", "24",
"1", "I"},//B, y
- new string[]{ "C", "x a b c", "2147483647", "1.0", "j",
"A-2", "p\u00E9ch\u00E9", "99999999", "40.00002343", "125",
"15", "H"},//C, x
- new string[]{ "D", "y a b c", "-1", "0.0f", "a",
"C-0", "HUT", long.MaxValue.ToString(), double.MinValue.ToString(), short.MinValue.ToString(),
byte.MinValue.ToString(), "G"},//D, y
- new string[]{ "E", "x a b c d", "5", "2f", "h",
"B-8", "peach", long.MinValue.ToString(), double.MaxValue.ToString(), short.MaxValue.ToString(),
byte.MaxValue.ToString(), "F"},//E,x
- new string[]{ "F", "y a b c d", "2", "3.14159f", "g",
"B-1", "H\u00C5T", "-44", "343.034435444", "-3",
"0", "E"},//F,y
- new string[]{ "G", "x a b c d", "3", "-1.0", "f",
"C-100", "sin", "323254543543", "4.043544", "5",
"100", "D"},//G,x
- new string[]{ "H", "y a b c d", "0", "1.4E-45", "e",
"C-88", "H\u00D8T", "1023423423005", "4.043545", "10",
"-50", "C"},//H,y
- new string[]{ "I", "x a b c d e f", "-2147483648", "1.0e+0", "d",
"A-10", "s\u00EDn", "332422459999", "4.043546", "-340",
"51", "B"},//I,x
- new string[]{ "J", "y a b c d e f", "4", ".5", "b",
"C-7", "HOT", "34334543543", "4.0000220343", "300",
"2", "A"},//J,y
- new string[]{ "W", "g", "1", null, null,
null, null, null, null, null,
null, null},
- new string[]{ "X", "g", "1", "0.1", null,
null, null, null, null, null,
null, null},
- new string[]{ "Y", "g", "1", "0.2", null,
null, null, null, null, null,
null, null},
- new string[]{ "Z", "f g", null, null, null,
null, null, null, null, null,
null, null}
+ // tracer contents int float string
custom i18n long double,
'short', byte, 'custom parser encoding'
+ new string[]{ "A", "x a", "5", "4f", "c",
"A-3", "p\u00EAche", "10", "-4.0",
"3", "126", "J"},//A, x
+ new string[]{ "B", "y a", "5", "3.4028235E38", "i",
"B-10", "HAT", "1000000000", "40.0",
"24", "1", "I"},//B, y
+ new string[]{ "C", "x a b c", "2147483647", "1.0", "j",
"A-2", "p\u00E9ch\u00E9", "99999999", "40.00002343",
"125", "15", "H"},//C, x
+ new string[]{ "D", "y a b c", "-1", "0.0f", "a",
"C-0", "HUT", long.MaxValue.ToString(), double.MinValue.ToString("E16"),
short.MinValue.ToString(), byte.MinValue.ToString(), "G"},//D, y
+ new string[]{ "E", "x a b c d", "5", "2f", "h",
"B-8", "peach", long.MinValue.ToString(), double.MaxValue.ToString("E16"),
short.MaxValue.ToString(), byte.MaxValue.ToString(), "F"},//E,x
+ new string[]{ "F", "y a b c d", "2", "3.14159f", "g",
"B-1", "H\u00C5T", "-44", "343.034435444",
"-3", "0", "E"},//F,y
+ new string[]{ "G", "x a b c d", "3", "-1.0", "f",
"C-100", "sin", "323254543543", "4.043544",
"5", "100", "D"},//G,x
+ new string[]{ "H", "y a b c d", "0", "1.4E-45", "e",
"C-88", "H\u00D8T", "1023423423005", "4.043545",
"10", "-50", "C"},//H,y
+ new string[]{ "I", "x a b c d e f", "-2147483648", "1.0e+0", "d",
"A-10", "s\u00EDn", "332422459999", "4.043546",
"-340", "51", "B"},//I,x
+ new string[]{ "J", "y a b c d e f", "4", ".5", "b",
"C-7", "HOT", "34334543543", "4.0000220343",
"300", "2", "A"},//J,y
+ new string[]{ "W", "g", "1", null, null,
null, null, null, null,
null, null, null},
+ new string[]{ "X", "g", "1", "0.1", null,
null, null, null, null,
null, null, null},
+ new string[]{ "Y", "g", "1", "0.2", null,
null, null, null, null,
null, null, null},
+ new string[]{ "Z", "f g", null, null, null,
null, null, null, null,
null, null, null}
};
Author: digy
Date: Mon Nov 23 21:30:30 2009
New Revision: 883506
URL: http://svn.apache.org/viewvc?rev=883506&view=rev
Log: (empty)
Modified:
incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestSort.cs?rev=883506&r1=883505&r2=883506&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs Mon Nov 23 21:30:30 2009
@@ -1110,7 +1110,7 @@
{
TopDocsCollector tdc = TopFieldCollector.create(sort[i], 10, tfcOptions[j][0], tfcOptions[j][1],
tfcOptions[j][2], false);
- Assert.IsTrue(tdc.GetType().FullName.EndsWith("$" + actualTFCClasses[j]));
+ Assert.IsTrue(tdc.GetType().FullName.EndsWith("+" + actualTFCClasses[j]));
full.Search(bq, tdc);
Author: digy
Date: Mon Nov 23 20:14:46 2009
New Revision: 883482
URL: http://svn.apache.org/viewvc?rev=883482&view=rev
Log:
LUCENENET-302 TestSort.TestInternationalMultiSearcherSort and TestInternationalSort fails
Modified:
incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestSort.cs?rev=883482&r1=883481&r2=883482&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs Mon Nov 23 20:14:46 2009
@@ -261,7 +261,24 @@
// the float field to sort by float
// the string field to sort by string
// the i18n field includes accented characters for testing locale-specific sorting
- private System.String[][] data = new System.String[][]{new System.String[]{"A", "x a",
"5", "4f", "c", "A-3", "p\u00EAche", "10", "-4.0", "3", "126", "J"}, new System.String[]{"B",
"y a", "5", "3.4028235E38", "i", "B-10", "HAT", "1000000000", "40.0", "24", "1", "I"}, new
System.String[]{"C", "x a b c", "2147483647", "1.0", "j", "A-2", "p\u00E9ch\u00E9", "99999999",
"40.00002343", "125", "15", "H"}, new System.String[]{"D", "y a b c", "-1", "0.0f", "a", "C-0",
"HUT", System.Convert.ToString(System.Int64.MaxValue), System.Convert.ToString(System.Double.MinValue),
System.Convert.ToString(System.Int16.MinValue), System.Convert.ToString((byte) System.Byte.MinValue),
"G"}, new System.String[]{"E", "x a b c d", "5", "2f", "h", "B-8", "peach", System.Convert.ToString(System.Int64.MinValue),
System.Convert.ToString(System.Double.MaxValue), System.Convert.ToString(System.Int16.MaxValue),
System.Convert.ToString((byte) System.SByte.MaxValue), "F"}, new System.String[]{"F", "y a
b c d
", "2", "3.14159f", "g", "B-1", "H\u00C5T", "-44", "343.034435444", "-3", "0", "E"}, new
System.String[]{"G", "x a b c d", "3", "-1.0", "f", "C-100", "sin", "323254543543", "4.043544",
"5", "100", "D"}, new System.String[]{"H", "y a b c d", "0", "1.4E-45", "e", "C-88", "H\u00D8T",
"1023423423005", "4.043545", "10", "-50", "C"}, new System.String[]{"I", "x a b c d e f",
"-2147483648", "1.0e+0", "d", "A-10", "s\u00EDn", "332422459999", "4.043546", "-340", "51",
"B"}, new System.String[]{"J", "y a b c d e f", "4", ".5", "b", "C-7", "HOT", "34334543543",
"4.0000220343", "300", "2", "A"}, new System.String[]{"W", "g", "1", null, null, null, null,
null, null, null, null, null}, new System.String[]{"X", "g", "1", "0.1", null, null, null,
null, null, null, null, null}, new System.String[]{"Y", "g", "1", "0.2", null, null, null,
null, null, null, null, null}, new System.String[]{"Z", "f g", null, null, null, null, null,
null, null, null, null, null}};
+ private System.String[][] data = new System.String[][] {
+ // tracer contents int float string
custom i18n long double, 'short',
byte, 'custom parser encoding'
+ new string[]{ "A", "x a", "5", "4f", "c",
"A-3", "p\u00EAche", "10", "-4.0", "3",
"126", "J"},//A, x
+ new string[]{ "B", "y a", "5", "3.4028235E38", "i",
"B-10", "HAT", "1000000000", "40.0", "24",
"1", "I"},//B, y
+ new string[]{ "C", "x a b c", "2147483647", "1.0", "j",
"A-2", "p\u00E9ch\u00E9", "99999999", "40.00002343", "125",
"15", "H"},//C, x
+ new string[]{ "D", "y a b c", "-1", "0.0f", "a",
"C-0", "HUT", long.MaxValue.ToString(), double.MinValue.ToString(), short.MinValue.ToString(),
byte.MinValue.ToString(), "G"},//D, y
+ new string[]{ "E", "x a b c d", "5", "2f", "h",
"B-8", "peach", long.MinValue.ToString(), double.MaxValue.ToString(), short.MaxValue.ToString(),
byte.MaxValue.ToString(), "F"},//E,x
+ new string[]{ "F", "y a b c d", "2", "3.14159f", "g",
"B-1", "H\u00C5T", "-44", "343.034435444", "-3",
"0", "E"},//F,y
+ new string[]{ "G", "x a b c d", "3", "-1.0", "f",
"C-100", "sin", "323254543543", "4.043544", "5",
"100", "D"},//G,x
+ new string[]{ "H", "y a b c d", "0", "1.4E-45", "e",
"C-88", "H\u00D8T", "1023423423005", "4.043545", "10",
"-50", "C"},//H,y
+ new string[]{ "I", "x a b c d e f", "-2147483648", "1.0e+0", "d",
"A-10", "s\u00EDn", "332422459999", "4.043546", "-340",
"51", "B"},//I,x
+ new string[]{ "J", "y a b c d e f", "4", ".5", "b",
"C-7", "HOT", "34334543543", "4.0000220343", "300",
"2", "A"},//J,y
+ new string[]{ "W", "g", "1", null, null,
null, null, null, null, null,
null, null},
+ new string[]{ "X", "g", "1", "0.1", null,
null, null, null, null, null,
null, null},
+ new string[]{ "Y", "g", "1", "0.2", null,
null, null, null, null, null,
null, null},
+ new string[]{ "Z", "f g", null, null, null,
null, null, null, null, null,
null, null}
+ };
+
// create an index of all the documents, or just the x, or just the y documents
private Searcher GetIndex(bool even, bool odd)
@@ -804,12 +821,12 @@
public virtual void TestInternationalSort()
{
sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("en-US")));
- AssertMatches(full, queryY, sort, "BFJDH");
+ AssertMatches(full, queryY, sort, "BFJHD");
- sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("sv" + "-" + "se")));
+ sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("sv-se")));
AssertMatches(full, queryY, sort, "BJDFH");
- sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("da" + "-" + "dk")));
+ sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("da-dk")));
AssertMatches(full, queryY, sort, "BJDHF");
sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("en-US")));
@@ -830,7 +847,7 @@
AssertMatches(multiSearcher, queryY, sort, "BJDFH");
sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("en-US")));
- AssertMatches(multiSearcher, queryY, sort, "BFJDH");
+ AssertMatches(multiSearcher, queryY, sort, "BFJHD");
sort.SetSort(new SortField("i18n", new System.Globalization.CultureInfo("da" + "-" + "dk")));
AssertMatches(multiSearcher, queryY, sort, "BJDHF");
Author: aroush
Date: Mon Nov 23 19:19:59 2009
New Revision: 883470
URL: http://svn.apache.org/viewvc?rev=883470&view=rev
Log:
LUCENENET-299: Fix for TestStressSort
Modified:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldCache.cs?rev=883470&r1=883469&r2=883470&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs Mon Nov 23 19:19:59
2009
@@ -199,6 +199,10 @@
{
public virtual byte ParseByte(System.String value_Renamed)
{
+ if (value_Renamed[0] == '-')
+ {
+ return (byte) System.SByte.Parse(value_Renamed);
+ }
return (byte) System.Byte.Parse(value_Renamed);
}
protected internal virtual System.Object ReadResolve()
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SupportClass.cs?rev=883470&r1=883469&r2=883470&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs Mon Nov 23 19:19:59 2009
@@ -1718,7 +1718,11 @@
result = true;
for (int index = 0; index < length; index++)
{
- if (!(array1.GetValue(index).Equals(array2.GetValue(index))))
+ System.Object o1 = array1.GetValue(index);
+ System.Object o2 = array2.GetValue(index);
+ if (o1 == null && o2 == null)
+ continue; // they match
+ else if (o1 == null || !o1.Equals(o2))
{
result = false;
break;
Author: digy
Date: Mon Nov 23 18:42:03 2009
New Revision: 883456
URL: http://svn.apache.org/viewvc?rev=883456&view=rev
Log:
LUCENENET-305 TestSubclassConcurrentMergeScheduler in TestMergeSchedulerExternal fails.
Modified:
incubator/lucene.net/trunk/C#/src/Test/TestMergeSchedulerExternal.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/TestMergeSchedulerExternal.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/TestMergeSchedulerExternal.cs?rev=883456&r1=883455&r2=883456&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/TestMergeSchedulerExternal.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/TestMergeSchedulerExternal.cs Mon Nov 23 18:42:03
2009
@@ -139,7 +139,7 @@
for (int i = 0; i < trace.FrameCount; i++)
{
System.Diagnostics.StackFrame sf = trace.GetFrame(i);
- if ("DoMerge".Equals(sf.GetMethod()))
+ if ("DoMerge".Equals(sf.GetMethod().Name))
throw new System.IO.IOException("now failing during merge");
}
}
Author: digy
Date: Mon Nov 23 18:38:14 2009
New Revision: 883453
URL: http://svn.apache.org/viewvc?rev=883453&view=rev
Log:
LUCENENET-304 TestErrorAfterApplyDeletes in TestIndexWriterDelete fails.
Modified:
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexWriterDelete.cs?rev=883453&r1=883452&r2=883453&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs Mon Nov 23 18:38:14
2009
@@ -71,7 +71,7 @@
for (int i = 0; i < trace.FrameCount; i++)
{
System.Diagnostics.StackFrame sf = trace.GetFrame(i);
- if ("ApplyDeletes".Equals(sf.GetMethod()))
+ if ("ApplyDeletes".Equals(sf.GetMethod().Name))
{
seen = true;
break;
@@ -90,7 +90,7 @@
for (int i = 0; i < trace.FrameCount; i++)
{
System.Diagnostics.StackFrame sf = trace.GetFrame(i);
- if ("ApplyDeletes".Equals(sf.GetMethod()))
+ if ("ApplyDeletes".Equals(sf.GetMethod().Name))
{
sawMaybe = true;
break;