Author: synhershko
Date: Mon Aug 20 21:51:16 2012
New Revision: 1375257
URL: http://svn.apache.org/viewvc?rev=1375257&view=rev
Log:
Rely on base class to hold fieldName
Modified:
incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs
incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/RecursivePrefixTreeStrategy.cs
incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/TermQueryPrefixTreeStrategy.cs
incubator/lucene.net/trunk/src/contrib/Spatial/SpatialStrategy.cs
Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs?rev=1375257&r1=1375256&r2=1375257&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs Mon Aug 20
21:51:16 2012
@@ -37,7 +37,6 @@ namespace Lucene.Net.Spatial.Prefix
public abstract class PrefixTreeStrategy : SpatialStrategy
{
protected readonly SpatialPrefixTree grid;
- private readonly string fieldName;
private readonly IDictionary<String, PointPrefixTreeFieldCacheProvider> provider
= new ConcurrentDictionary<string, PointPrefixTreeFieldCacheProvider>();
protected int defaultFieldValuesArrayLen = 2;
protected double distErrPct = SpatialArgs.DEFAULT_DIST_PRECISION;
@@ -46,7 +45,6 @@ namespace Lucene.Net.Spatial.Prefix
: base(grid.GetSpatialContext(), fieldName)
{
this.grid = grid;
- this.fieldName = fieldName;
}
/** Used in the in-memory ValueSource as a default ArrayList length for this field's array
of values, per doc. */
Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/RecursivePrefixTreeStrategy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/RecursivePrefixTreeStrategy.cs?rev=1375257&r1=1375256&r2=1375257&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/RecursivePrefixTreeStrategy.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/RecursivePrefixTreeStrategy.cs Mon
Aug 20 21:51:16 2012
@@ -27,13 +27,11 @@ namespace Lucene.Net.Spatial.Prefix
/// </summary>
public class RecursivePrefixTreeStrategy : PrefixTreeStrategy
{
- private readonly string fieldName;
private int prefixGridScanLevel;
public RecursivePrefixTreeStrategy(SpatialPrefixTree grid, string fieldName)
: base(grid, fieldName)
{
- this.fieldName = fieldName;
prefixGridScanLevel = grid.GetMaxLevels() - 4;//TODO this default constant is dependent
on the prefix grid size
}
Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/TermQueryPrefixTreeStrategy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/TermQueryPrefixTreeStrategy.cs?rev=1375257&r1=1375256&r2=1375257&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/TermQueryPrefixTreeStrategy.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/TermQueryPrefixTreeStrategy.cs Mon
Aug 20 21:51:16 2012
@@ -31,12 +31,9 @@ namespace Lucene.Net.Spatial.Prefix
/// </summary>
public class TermQueryPrefixTreeStrategy : PrefixTreeStrategy
{
- private readonly string fieldName;
-
public TermQueryPrefixTreeStrategy(SpatialPrefixTree grid, string fieldName)
: base(grid, fieldName)
{
- this.fieldName = fieldName;
}
public override Filter MakeFilter(SpatialArgs args)
Modified: incubator/lucene.net/trunk/src/contrib/Spatial/SpatialStrategy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/SpatialStrategy.cs?rev=1375257&r1=1375256&r2=1375257&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/SpatialStrategy.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/SpatialStrategy.cs Mon Aug 20 21:51:16
2012
@@ -38,7 +38,7 @@ namespace Lucene.Net.Spatial
{
protected bool ignoreIncompatibleGeometry;
protected readonly SpatialContext ctx;
- private readonly string fieldName;
+ protected readonly string fieldName;
/// <summary>
/// Constructs the spatial strategy with its mandatory arguments.
|