You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/08/23 19:15:02 UTC
svn commit: r1376597 - in /incubator/lucene.net/branches/3.0.3:
src/contrib/Core/Properties/ src/contrib/FastVectorHighlighter/Properties/
src/contrib/Queries/Properties/ src/contrib/Regex/Properties/
src/contrib/SimpleFacetedSearch/Properties/ src/con...
Author: ccurrens
Date: Thu Aug 23 17:15:02 2012
New Revision: 1376597
URL: http://svn.apache.org/viewvc?rev=1376597&view=rev
Log:
Updated all AssemblyInfo.cs files to version 3.0.3
Modified:
incubator/lucene.net/branches/3.0.3/src/contrib/Core/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/src/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/src/contrib/Queries/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/src/contrib/Regex/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Util/FixedBitSet.cs
incubator/lucene.net/branches/3.0.3/src/contrib/SpellChecker/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/Core/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/Queries/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/Regex/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/Spatial/Properties/AssemblyInfo.cs
incubator/lucene.net/branches/3.0.3/test/contrib/SpellChecker/AssemblyInfo.cs
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/Core/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/Core/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/Core/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/Core/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/Queries/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/Queries/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/Queries/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/Queries/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/Regex/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/Regex/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/Regex/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/Regex/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -49,5 +49,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -52,8 +52,8 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -49,10 +49,10 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersionAttribute("2.9.9")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
-[assembly: AssemblyVersion("2.9.9.0")]
-[assembly: AssemblyFileVersion("2.9.9.0")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
[assembly: AssemblyDelaySign(false)]
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Util/FixedBitSet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Util/FixedBitSet.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Util/FixedBitSet.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/Spatial/Util/FixedBitSet.cs Thu Aug 23 17:15:02 2012
@@ -410,13 +410,45 @@ namespace Lucene.Net.Spatial.Util
public override DocIdSetIterator Iterator()
{
- // TODO: avoid copying, create a FixedBitSetIterator instead
- var a = new OpenBitSet();
- for (var i = 0; i < bits.Count; i++)
+ return new FixedBitSetIterator(this);
+ }
+
+ /// <summary>
+ /// A FixedBitSet Iterator implementation
+ /// </summary>
+ public class FixedBitSetIterator : DocIdSetIterator
+ {
+ private int curDocId = -1;
+ private readonly IEnumerator enumerator;
+
+ public FixedBitSetIterator(FixedBitSet bitset)
+ {
+ enumerator = bitset.bits.GetEnumerator();
+ }
+
+ public override int DocID()
+ {
+ return curDocId;
+ }
+
+ public override int NextDoc()
+ {
+ while (enumerator.MoveNext())
+ {
+ ++curDocId;
+ if ((bool)enumerator.Current) return curDocId;
+ }
+ return curDocId = NO_MORE_DOCS;
+ }
+
+ public override int Advance(int target)
{
- if (bits[i]) a.Set(i);
+ int doc;
+ while ((doc = NextDoc()) < target)
+ {
+ }
+ return doc;
}
- return a.Iterator();
}
}
}
Modified: incubator/lucene.net/branches/3.0.3/src/contrib/SpellChecker/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/src/contrib/SpellChecker/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/src/contrib/SpellChecker/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/src/contrib/SpellChecker/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -35,7 +35,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDefaultAlias("Lucene.Net.SpellChecker")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.9")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
// Version information for an assembly consists of the following four values:
//
@@ -47,7 +47,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2.1")]
+[assembly: AssemblyVersion("3.0.3")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/Core/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/Core/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/Core/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/Core/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/Queries/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/Queries/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/Queries/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/Queries/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/Regex/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/Regex/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/Regex/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/Regex/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -51,5 +51,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/Spatial/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/Spatial/Properties/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/Spatial/Properties/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/Spatial/Properties/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -48,10 +48,10 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersionAttribute("2.9.0")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
-[assembly: AssemblyVersion("2.9.1.002")]
-[assembly: AssemblyFileVersion("2.9.1.002")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
[assembly: AssemblyDelaySign(false)]
Modified: incubator/lucene.net/branches/3.0.3/test/contrib/SpellChecker/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/3.0.3/test/contrib/SpellChecker/AssemblyInfo.cs?rev=1376597&r1=1376596&r2=1376597&view=diff
==============================================================================
--- incubator/lucene.net/branches/3.0.3/test/contrib/SpellChecker/AssemblyInfo.cs (original)
+++ incubator/lucene.net/branches/3.0.3/test/contrib/SpellChecker/AssemblyInfo.cs Thu Aug 23 17:15:02 2012
@@ -38,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDefaultAlias("Lucene.Net.SpellChecker")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.9")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
//
// Version information for an assembly consists of the following four values:
@@ -51,7 +51,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2.1")]
+[assembly: AssemblyVersion("3.0.3")]
//
// In order to sign your assembly you must specify a key to use. Refer to the