You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by di...@apache.org on 2011/05/31 18:55:27 UTC
[Lucene.Net] svn commit: r1129798 - in /incubator/lucene.net/branches/Lucene.Net_2_9_4g:
src/core/Index/ src/core/Search/ src/core/Search/Function/ test/core/Search/
Author: digy
Date: Tue May 31 16:55:27 2011
New Revision: 1129798
URL: http://svn.apache.org/viewvc?rev=1129798&view=rev
Log:
[LUCENENET-412] renamed public fields: StringIndex.lookup StringIndex.order
Modified:
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ReusableStringReader.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCache.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheRangeFilter.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheTermsFilter.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldComparator.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/OrdFieldSource.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/ReverseOrdFieldSource.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs Tue May 31 16:55:27 2011
@@ -1020,7 +1020,7 @@ namespace Lucene.Net.Index
{
IndexReader reader = subReaders[i];
ICollection<string> names = reader.GetFieldNames(fieldNames);
- Support.CollectionsHelper.AddAllIfNotContains(fieldSet, names);
+ Support.CollectionsHelper.AddAllIfNotContains(fieldSet, names); //DIGY fix:2.9.4g
}
return fieldSet.Keys;
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ReusableStringReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ReusableStringReader.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ReusableStringReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ReusableStringReader.cs Tue May 31 16:55:27 2011
@@ -69,22 +69,22 @@ namespace Lucene.Net.Index
public override int Read()
{
- throw new NotImplementedException("This method is not implemented");
+ throw new NotImplementedException("ReusableStringReader: This method is not implemented");
}
public override int ReadBlock(char[] buffer, int index, int count)
{
- throw new NotImplementedException("This method is not implemented");
+ throw new NotImplementedException("ReusableStringReader: This method is not implemented");
}
public override string ReadLine()
{
- throw new NotImplementedException("This method is not implemented");
+ throw new NotImplementedException("ReusableStringReader: This method is not implemented");
}
public override int Peek()
{
- throw new NotImplementedException("This method is not implemented");
+ throw new NotImplementedException("ReusableStringReader: This method is not implemented");
}
public override string ReadToEnd()
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCache.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCache.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCache.cs Tue May 31 16:55:27 2011
@@ -52,12 +52,12 @@ namespace Lucene.Net.Search
return 0;
int low = 1;
- int high = lookup.Length - 1;
+ int high = Lookup.Length - 1;
while (low <= high)
{
int mid = Support.Number.URShift((low + high), 1);
- int cmp = String.CompareOrdinal(lookup[mid], key);
+ int cmp = String.CompareOrdinal(Lookup[mid], key);
if (cmp < 0)
low = mid + 1;
@@ -70,16 +70,16 @@ namespace Lucene.Net.Search
}
/// <summary>All the term values, in natural order. </summary>
- public System.String[] lookup;
+ public System.String[] Lookup;
/// <summary>For each document, an index into the lookup array. </summary>
- public int[] order;
+ public int[] Order;
/// <summary>Creates one of these objects </summary>
public StringIndex(int[] values, System.String[] lookup)
{
- this.order = values;
- this.lookup = lookup;
+ this.Order = values;
+ this.Lookup = lookup;
}
}
/// <summary> EXPERT: A unique Identifier/Description for each item in the FieldCache.
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheRangeFilter.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheRangeFilter.cs Tue May 31 16:55:27 2011
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search
}
internal override bool MatchDoc(int doc)
{
- return fcsi.order[doc] >= inclusiveLowerPoint && fcsi.order[doc] <= inclusiveUpperPoint;
+ return fcsi.Order[doc] >= inclusiveLowerPoint && fcsi.Order[doc] <= inclusiveUpperPoint;
}
}
internal AnonymousClassFieldCacheRangeFilter(System.String Param1, Lucene.Net.Search.Parser Param2, System.Object Param3, System.Object Param4, bool Param5, bool Param6):base(Param1, Param2, Param3, Param4, Param5, Param6)
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheTermsFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheTermsFilter.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheTermsFilter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldCacheTermsFilter.cs Tue May 31 16:55:27 2011
@@ -138,7 +138,7 @@ namespace Lucene.Net.Search
{
InitBlock(enclosingInstance);
this.fcsi = fcsi;
- openBitSet = new OpenBitSet(this.fcsi.lookup.Length);
+ openBitSet = new OpenBitSet(this.fcsi.Lookup.Length);
for (int i = 0; i < Enclosing_Instance.terms.Length; i++)
{
int termNumber = this.fcsi.BinarySearchLookup(Enclosing_Instance.terms[i]);
@@ -206,7 +206,7 @@ namespace Lucene.Net.Search
{
try
{
- while (!Enclosing_Instance.openBitSet.FastGet(Enclosing_Instance.fcsi.order[++doc]))
+ while (!Enclosing_Instance.openBitSet.FastGet(Enclosing_Instance.fcsi.Order[++doc]))
{
}
}
@@ -230,7 +230,7 @@ namespace Lucene.Net.Search
try
{
doc = target;
- while (!Enclosing_Instance.openBitSet.FastGet(Enclosing_Instance.fcsi.order[doc]))
+ while (!Enclosing_Instance.openBitSet.FastGet(Enclosing_Instance.fcsi.Order[doc]))
{
doc++;
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldComparator.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldComparator.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldComparator.cs Tue May 31 16:55:27 2011
@@ -821,8 +821,8 @@ namespace Lucene.Net.Search
{
StringIndex currentReaderValues = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetStringIndex(reader, field);
currentReaderGen++;
- order = currentReaderValues.order;
- lookup = currentReaderValues.lookup;
+ order = currentReaderValues.Order;
+ lookup = currentReaderValues.Lookup;
System.Diagnostics.Debug.Assert(lookup.Length > 0);
if (bottomSlot != - 1)
{
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs Tue May 31 16:55:27 2011
@@ -323,8 +323,8 @@ namespace Lucene.Net.Search
public int Compare(ScoreDoc i, ScoreDoc j)
{
- int fi = index.order[i.doc];
- int fj = index.order[j.doc];
+ int fi = index.Order[i.doc];
+ int fj = index.Order[j.doc];
if (fi < fj)
return - 1;
if (fi > fj)
@@ -334,7 +334,7 @@ namespace Lucene.Net.Search
public virtual System.IComparable SortValue(ScoreDoc i)
{
- return index.lookup[index.order[i.doc]];
+ return index.Lookup[index.Order[i.doc]];
}
public virtual int SortType()
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/OrdFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/OrdFieldSource.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/OrdFieldSource.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/OrdFieldSource.cs Tue May 31 16:55:27 2011
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search.Function
/*(non-Javadoc) @see Lucene.Net.Search.Function.ValueSource#getValues(Lucene.Net.Index.IndexReader) */
public override DocValues GetValues(IndexReader reader)
{
- int[] arr = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetStringIndex(reader, field).order;
+ int[] arr = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetStringIndex(reader, field).Order;
return new AnonymousClassDocValues(arr, this);
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/ReverseOrdFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/ReverseOrdFieldSource.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/ReverseOrdFieldSource.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Function/ReverseOrdFieldSource.cs Tue May 31 16:55:27 2011
@@ -130,8 +130,8 @@ namespace Lucene.Net.Search.Function
{
Lucene.Net.Search.StringIndex sindex = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetStringIndex(reader, field);
- int[] arr = sindex.order;
- int end = sindex.lookup.Length;
+ int[] arr = sindex.Order;
+ int end = sindex.Lookup.Length;
return new AnonymousClassDocValues(end, arr, this);
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs?rev=1129798&r1=1129797&r2=1129798&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs Tue May 31 16:55:27 2011
@@ -179,7 +179,7 @@ namespace Lucene.Net.Search
private int DocVal(int doc)
{
- System.String id = idIndex.lookup[idIndex.order[doc]];
+ System.String id = idIndex.Lookup[idIndex.Order[doc]];
object prio = Enclosing_Instance.priority[id];
return prio == null ? 0 : (int)prio;
}