You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ar...@apache.org on 2006/09/30 05:14:43 UTC

svn commit: r451523 - in /incubator/lucene.net/tags/Lucene.Net_1_9_1/src: HISTORY.txt Lucene.Net/AssemblyInfo.cs Lucene.Net/Search/MultiSearcher.cs Lucene.Net/Search/Query.cs Lucene.Net/SharpZipLibAdapter.cs Lucene.Net/Store/FSDirectory.cs

Author: aroush
Date: Fri Sep 29 20:14:42 2006
New Revision: 451523

URL: http://svn.apache.org/viewvc?view=rev&rev=451523
Log:
Lucene.Net.Store.FSDirectory.RenameFile() -- added a missing while loop
Lucene.Net.Store.MultiSearcher.CreateWeight() -- wasn't iterating over the term keys correctly
Lucene.Net.Search.Query.Combine() -- wasn't checking for the right key before adding
Lucene.Net.Index.Compression.SharpZipLibAdapter -- provide full name-space to ICompressionAdapter

Modified:
    incubator/lucene.net/tags/Lucene.Net_1_9_1/src/HISTORY.txt
    incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/AssemblyInfo.cs
    incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/MultiSearcher.cs
    incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/Query.cs
    incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/SharpZipLibAdapter.cs
    incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Store/FSDirectory.cs

Modified: incubator/lucene.net/tags/Lucene.Net_1_9_1/src/HISTORY.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/tags/Lucene.Net_1_9_1/src/HISTORY.txt?view=diff&rev=451523&r1=451522&r2=451523
==============================================================================
--- incubator/lucene.net/tags/Lucene.Net_1_9_1/src/HISTORY.txt (original)
+++ incubator/lucene.net/tags/Lucene.Net_1_9_1/src/HISTORY.txt Fri Sep 29 20:14:42 2006
@@ -2,6 +2,14 @@
 ------------------
 
 
+29Sep06:
+	- Release:  Lucene.Net.1.9.1 build 002
+	- Fix: Lucene.Net.Index.SegmentReader.cs and Lucene.Net.Index.SegmentReader.TermInfosReader,cs -- fixed memory leak by removing unused finalizer.
+	- Fix: Lucene.Net.Index.Compression.SharpZipLibAdapter -- provide full name-space to ICompressionAdapter
+	- Fix: Lucene.Net.Store.FSDirectory.RenameFile() -- added a missing while loop
+	- Fix: Lucene.Net.Store.MultiSearcher.CreateWeight() -- wasn't iterating over the term keys correctly
+	- Fix: Lucene.Net.Search.Query.Combine() -- wasn't checking for the right key before adding
+
 13Jul06:
 	- Release:  Lucene.Net.1.9.1 build 001
 	- Port: Lucene.Net.Documents.TimeToString() -- re-based with the Java version

Modified: incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/AssemblyInfo.cs?view=diff&rev=451523&r1=451522&r2=451523
==============================================================================
--- incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/AssemblyInfo.cs (original)
+++ incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/AssemblyInfo.cs Fri Sep 29 20:14:42 2006
@@ -26,7 +26,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.1.001")]
+[assembly: AssemblyVersion("1.9.1.002")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/MultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/MultiSearcher.cs?view=diff&rev=451523&r1=451522&r2=451523
==============================================================================
--- incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/MultiSearcher.cs (original)
+++ incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/MultiSearcher.cs Fri Sep 29 20:14:42 2006
@@ -368,7 +368,7 @@
 			// step3
 			Term[] allTermsArray = new Term[terms.Count];
             int index = 0;
-            System.Collections.IEnumerator e = terms.GetEnumerator();
+            System.Collections.IEnumerator e = terms.Keys.GetEnumerator();
             while (e.MoveNext())
                 allTermsArray[index++] = e.Current as Term;
 			int[] aggregatedDfs = new int[terms.Count];

Modified: incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/Query.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/Query.cs?view=diff&rev=451523&r1=451522&r2=451523
==============================================================================
--- incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/Query.cs (original)
+++ incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Search/Query.cs Fri Sep 29 20:14:42 2006
@@ -147,8 +147,11 @@
 					for (int j = 0; j < clauses.Length; j++)
 					{
                         Query tmp = clauses[j].GetQuery();
-						uniques.Add(tmp, tmp);
-					}
+                        if (uniques.Contains(tmp) == false)
+                        {
+                            uniques.Add(tmp, tmp);
+                        }
+                    }
 				}
 				else
 				{

Modified: incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/SharpZipLibAdapter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/SharpZipLibAdapter.cs?view=diff&rev=451523&r1=451522&r2=451523
==============================================================================
--- incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/SharpZipLibAdapter.cs (original)
+++ incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/SharpZipLibAdapter.cs Fri Sep 29 20:14:42 2006
@@ -33,7 +33,7 @@
 
 namespace Lucene.Net.Index.Compression
 {
-    public class SharpZipLibAdapter : ICompressionAdapter
+    public class SharpZipLibAdapter : SupportClass.CompressionSupport.ICompressionAdapter
     {
         public byte[] Compress(byte[] input)
         {

Modified: incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Store/FSDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Store/FSDirectory.cs?view=diff&rev=451523&r1=451522&r2=451523
==============================================================================
--- incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Store/FSDirectory.cs (original)
+++ incubator/lucene.net/tags/Lucene.Net_1_9_1/src/Lucene.Net/Store/FSDirectory.cs Fri Sep 29 20:14:42 2006
@@ -481,11 +481,13 @@
 						{
 							buffer = new byte[1024];
 						}
-						int len;
-                        len = in_Renamed.Read(buffer, 0, buffer.Length);
-                        out_Renamed.Write(buffer, 0, len);
+                        int len; 
+                        while ((len = in_Renamed.Read(buffer, 0, buffer.Length)) > 0) 
+                        { 
+                            out_Renamed.Write(buffer, 0, len); 
+                        }
 						
-						// delete the old file.
+                        // delete the old file.
 						bool tmpBool3;
 						if (System.IO.File.Exists(old.FullName))
 						{