You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by pn...@apache.org on 2012/07/21 21:14:59 UTC
svn commit: r1364156 [2/2] - in /incubator/lucene.net/trunk:
src/core/Document/ src/core/Index/ src/core/QueryParser/ src/core/Search/
src/core/Search/Payloads/ src/core/Search/Spans/ src/core/Store/
src/core/Support/ src/core/Util/ test/core/Index/ te...
Modified: incubator/lucene.net/trunk/src/core/Search/SpanQueryFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/SpanQueryFilter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/SpanQueryFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/SpanQueryFilter.cs Sat Jul 21 19:14:57 2012
@@ -40,7 +40,7 @@ namespace Lucene.Net.Search
[Serializable]
public class SpanQueryFilter:SpanFilter
{
- protected internal SpanQuery query;
+ protected internal SpanQuery internalQuery;
protected internal SpanQueryFilter()
{
@@ -53,7 +53,7 @@ namespace Lucene.Net.Search
/// </param>
public SpanQueryFilter(SpanQuery query)
{
- this.query = query;
+ this.internalQuery = query;
}
public override DocIdSet GetDocIdSet(IndexReader reader)
@@ -66,7 +66,7 @@ namespace Lucene.Net.Search
{
OpenBitSet bits = new OpenBitSet(reader.MaxDoc);
- Lucene.Net.Search.Spans.Spans spans = query.GetSpans(reader);
+ Lucene.Net.Search.Spans.Spans spans = internalQuery.GetSpans(reader);
IList<SpanFilterResult.PositionInfo> tmp = new List<SpanFilterResult.PositionInfo>(20);
int currentDoc = - 1;
SpanFilterResult.PositionInfo currentInfo = null;
@@ -88,22 +88,22 @@ namespace Lucene.Net.Search
public virtual SpanQuery Query
{
- get { return query; }
+ get { return internalQuery; }
}
public override System.String ToString()
{
- return "SpanQueryFilter(" + query + ")";
+ return "SpanQueryFilter(" + internalQuery + ")";
}
public override bool Equals(System.Object o)
{
- return o is SpanQueryFilter && this.query.Equals(((SpanQueryFilter) o).query);
+ return o is SpanQueryFilter && this.internalQuery.Equals(((SpanQueryFilter) o).internalQuery);
}
public override int GetHashCode()
{
- return query.GetHashCode() ^ unchecked((int) 0x923F64B9);
+ return internalQuery.GetHashCode() ^ unchecked((int) 0x923F64B9);
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/SpanNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/SpanNearQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/SpanNearQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/SpanNearQuery.cs Sat Jul 21 19:14:57 2012
@@ -34,11 +34,11 @@ namespace Lucene.Net.Search.Spans
public class SpanNearQuery : SpanQuery, System.ICloneable
{
protected internal System.Collections.Generic.IList<SpanQuery> clauses;
- protected internal int slop;
+ protected internal int internalSlop;
protected internal bool inOrder;
- protected internal System.String field;
- private bool collectPayloads;
+ protected internal System.String internalField;
+ private readonly bool collectPayloads;
/// <summary>Construct a SpanNearQuery. Matches spans matching a span from each
/// clause, with up to <c>slop</c> total unmatched positions between
@@ -60,16 +60,16 @@ namespace Lucene.Net.Search.Spans
if (i == 0)
{
// check field
- field = clause.Field;
+ internalField = clause.Field;
}
- else if (!clause.Field.Equals(field))
+ else if (!clause.Field.Equals(internalField))
{
throw new System.ArgumentException("Clauses must have same field.");
}
this.clauses.Add(clause);
}
this.collectPayloads = collectPayloads;
- this.slop = slop;
+ this.internalSlop = slop;
this.inOrder = inOrder;
}
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search.Spans
/// <summary>Return the maximum number of intervening unmatched positions permitted.</summary>
public virtual int Slop
{
- get { return slop; }
+ get { return internalSlop; }
}
/// <summary>Return true if matches are required to be in-order.</summary>
@@ -94,7 +94,7 @@ namespace Lucene.Net.Search.Spans
public override string Field
{
- get { return field; }
+ get { return internalField; }
}
public override void ExtractTerms(System.Collections.Generic.ISet<Term> terms)
@@ -118,7 +118,7 @@ namespace Lucene.Net.Search.Spans
}
if (clauses.Count > 0) buffer.Length -= 2;
buffer.Append("], ");
- buffer.Append(slop);
+ buffer.Append(internalSlop);
buffer.Append(", ");
buffer.Append(inOrder);
buffer.Append(")");
@@ -174,7 +174,7 @@ namespace Lucene.Net.Search.Spans
SpanQuery clause = clauses[i];
newClauses[i] = (SpanQuery) clause.Clone();
}
- SpanNearQuery spanNearQuery = new SpanNearQuery(newClauses, slop, inOrder);
+ SpanNearQuery spanNearQuery = new SpanNearQuery(newClauses, internalSlop, inOrder);
spanNearQuery.Boost = Boost;
return spanNearQuery;
}
@@ -191,7 +191,7 @@ namespace Lucene.Net.Search.Spans
if (inOrder != spanNearQuery.inOrder)
return false;
- if (slop != spanNearQuery.slop)
+ if (internalSlop != spanNearQuery.internalSlop)
return false;
if (clauses.Count != spanNearQuery.clauses.Count)
return false;
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search.Spans
// differentiate SpanNearQuery hashcodes from others.
result ^= ((result << 14) | (Number.URShift(result, 19))); // reversible
result += System.Convert.ToInt32(Boost);
- result += slop;
+ result += internalSlop;
result ^= (inOrder ? (long) 0x99AFD3BD : 0);
return (int) result;
}
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/SpanTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/SpanTermQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/SpanTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/SpanTermQuery.cs Sat Jul 21 19:14:57 2012
@@ -28,38 +28,38 @@ namespace Lucene.Net.Search.Spans
[Serializable]
public class SpanTermQuery:SpanQuery
{
- protected internal Term term;
+ protected internal Term internalTerm;
/// <summary>Construct a SpanTermQuery matching the named term's spans. </summary>
public SpanTermQuery(Term term)
{
- this.term = term;
+ this.internalTerm = term;
}
/// <summary>Return the term whose spans are matched. </summary>
public virtual Term Term
{
- get { return term; }
+ get { return internalTerm; }
}
public override string Field
{
- get { return term.Field; }
+ get { return internalTerm.Field; }
}
public override void ExtractTerms(System.Collections.Generic.ISet<Term> terms)
{
- terms.Add(term);
+ terms.Add(internalTerm);
}
public override System.String ToString(System.String field)
{
System.Text.StringBuilder buffer = new System.Text.StringBuilder();
- if (term.Field.Equals(field))
- buffer.Append(term.Text);
+ if (internalTerm.Field.Equals(field))
+ buffer.Append(internalTerm.Text);
else
{
- buffer.Append(term.ToString());
+ buffer.Append(internalTerm.ToString());
}
buffer.Append(ToStringUtils.Boost(Boost));
return buffer.ToString();
@@ -69,7 +69,7 @@ namespace Lucene.Net.Search.Spans
{
int prime = 31;
int result = base.GetHashCode();
- result = prime * result + ((term == null)?0:term.GetHashCode());
+ result = prime * result + ((internalTerm == null)?0:internalTerm.GetHashCode());
return result;
}
@@ -82,19 +82,19 @@ namespace Lucene.Net.Search.Spans
if (GetType() != obj.GetType())
return false;
SpanTermQuery other = (SpanTermQuery) obj;
- if (term == null)
+ if (internalTerm == null)
{
- if (other.term != null)
+ if (other.internalTerm != null)
return false;
}
- else if (!term.Equals(other.term))
+ else if (!internalTerm.Equals(other.internalTerm))
return false;
return true;
}
public override Spans GetSpans(IndexReader reader)
{
- return new TermSpans(reader.TermPositions(term), term);
+ return new TermSpans(reader.TermPositions(internalTerm), internalTerm);
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs Sat Jul 21 19:14:57 2012
@@ -36,13 +36,13 @@ namespace Lucene.Net.Search.Spans
protected internal float queryWeight;
protected internal ISet<Term> terms;
- protected internal SpanQuery query;
+ protected internal SpanQuery internalQuery;
private IDFExplanation idfExp;
public SpanWeight(SpanQuery query, Searcher searcher)
{
this.similarity = query.GetSimilarity(searcher);
- this.query = query;
+ this.internalQuery = query;
terms = Lucene.Net.Support.Compatibility.SetFactory.GetSet<Term>();
query.ExtractTerms(terms);
@@ -53,7 +53,7 @@ namespace Lucene.Net.Search.Spans
public override Query Query
{
- get { return query; }
+ get { return internalQuery; }
}
public override float Value
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search.Spans
public override float GetSumOfSquaredWeights()
{
- queryWeight = idf*query.Boost; // compute query weight
+ queryWeight = idf*internalQuery.Boost; // compute query weight
return queryWeight*queryWeight; // square it
}
@@ -76,7 +76,7 @@ namespace Lucene.Net.Search.Spans
public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)
{
- return new SpanScorer(query.GetSpans(reader), this, similarity, reader.Norms(query.Field));
+ return new SpanScorer(internalQuery.GetSpans(reader), this, similarity, reader.Norms(internalQuery.Field));
}
public override Explanation Explain(IndexReader reader, int doc)
@@ -106,7 +106,7 @@ namespace Lucene.Net.Search.Spans
// explain field weight
ComplexExplanation fieldExpl = new ComplexExplanation();
- fieldExpl.Description = "fieldWeight(" + field + ":" + query.ToString(field) + " in " + doc + "), product of:";
+ fieldExpl.Description = "fieldWeight(" + field + ":" + internalQuery.ToString(field) + " in " + doc + "), product of:";
Explanation tfExpl = ((SpanScorer)Scorer(reader, true, false)).Explain(doc);
fieldExpl.AddDetail(tfExpl);
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs Sat Jul 21 19:14:57 2012
@@ -28,9 +28,9 @@ namespace Lucene.Net.Search.Spans
/// </summary>
public class TermSpans:Spans
{
- protected internal TermPositions positions;
+ protected internal TermPositions internalPositions;
protected internal Term term;
- protected internal int doc;
+ protected internal int internalDoc;
protected internal int freq;
protected internal int count;
protected internal int position;
@@ -39,42 +39,42 @@ namespace Lucene.Net.Search.Spans
public TermSpans(TermPositions positions, Term term)
{
- this.positions = positions;
+ this.internalPositions = positions;
this.term = term;
- doc = - 1;
+ internalDoc = - 1;
}
public override bool Next()
{
if (count == freq)
{
- if (!positions.Next())
+ if (!internalPositions.Next())
{
- doc = int.MaxValue;
+ internalDoc = int.MaxValue;
return false;
}
- doc = positions.Doc;
- freq = positions.Freq;
+ internalDoc = internalPositions.Doc;
+ freq = internalPositions.Freq;
count = 0;
}
- position = positions.NextPosition();
+ position = internalPositions.NextPosition();
count++;
return true;
}
public override bool SkipTo(int target)
{
- if (!positions.SkipTo(target))
+ if (!internalPositions.SkipTo(target))
{
- doc = int.MaxValue;
+ internalDoc = int.MaxValue;
return false;
}
- doc = positions.Doc;
- freq = positions.Freq;
+ internalDoc = internalPositions.Doc;
+ freq = internalPositions.Freq;
count = 0;
- position = positions.NextPosition();
+ position = internalPositions.NextPosition();
count++;
return true;
@@ -82,7 +82,7 @@ namespace Lucene.Net.Search.Spans
public override int Doc()
{
- return doc;
+ return internalDoc;
}
public override int Start()
@@ -99,8 +99,8 @@ namespace Lucene.Net.Search.Spans
public override ICollection<byte[]> GetPayload()
{
- byte[] bytes = new byte[positions.PayloadLength];
- bytes = positions.GetPayload(bytes, 0);
+ byte[] bytes = new byte[internalPositions.PayloadLength];
+ bytes = internalPositions.GetPayload(bytes, 0);
var val = new System.Collections.Generic.List<byte[]>();
val.Add(bytes);
return val;
@@ -110,17 +110,17 @@ namespace Lucene.Net.Search.Spans
public override bool IsPayloadAvailable()
{
- return positions.IsPayloadAvailable;
+ return internalPositions.IsPayloadAvailable;
}
public override System.String ToString()
{
- return "spans(" + term.ToString() + ")@" + (doc == - 1?"START":((doc == System.Int32.MaxValue)?"END":doc + "-" + position));
+ return "spans(" + term.ToString() + ")@" + (internalDoc == - 1?"START":((internalDoc == System.Int32.MaxValue)?"END":internalDoc + "-" + position));
}
public virtual TermPositions Positions
{
- get { return positions; }
+ get { return internalPositions; }
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Search/TimeLimitingCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TimeLimitingCollector.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TimeLimitingCollector.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TimeLimitingCollector.cs Sat Jul 21 19:14:57 2012
@@ -79,14 +79,8 @@ namespace Lucene.Net.Search
{
// TODO: Use System.nanoTime() when Lucene moves to Java SE 5.
time += Lucene.Net.Search.TimeLimitingCollector.resolution;
- try
- {
- System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * Lucene.Net.Search.TimeLimitingCollector.resolution));
- }
- catch (System.Threading.ThreadInterruptedException ie)
- {
- throw;
- }
+ System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * Lucene.Net.Search.TimeLimitingCollector.resolution));
+
}
}
Modified: incubator/lucene.net/trunk/src/core/Search/TopDocsCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TopDocsCollector.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TopDocsCollector.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TopDocsCollector.cs Sat Jul 21 19:14:57 2012
@@ -42,7 +42,7 @@ namespace Lucene.Net.Search
protected internal PriorityQueue<T> pq;
/// <summary>The total number of documents that the collector encountered. </summary>
- protected internal int totalHits;
+ protected internal int internalTotalHits;
protected internal TopDocsCollector(PriorityQueue<T> pq)
{
@@ -67,13 +67,13 @@ namespace Lucene.Net.Search
/// </summary>
public /*protected internal*/ virtual TopDocs NewTopDocs(ScoreDoc[] results, int start)
{
- return results == null?EMPTY_TOPDOCS:new TopDocs(totalHits, results);
+ return results == null?EMPTY_TOPDOCS:new TopDocs(internalTotalHits, results);
}
/// <summary>The total number of documents that matched this query. </summary>
public virtual int TotalHits
{
- get { return totalHits; }
+ get { return internalTotalHits; }
}
/// <summary>Returns the top docs that were collected by this collector. </summary>
@@ -82,7 +82,7 @@ namespace Lucene.Net.Search
// In case pq was populated with sentinel values, there might be less
// results than pq.size(). Therefore return all results until either
// pq.size() or totalHits.
- return TopDocs(0, totalHits < pq.Size()?totalHits:pq.Size());
+ return TopDocs(0, internalTotalHits < pq.Size()?internalTotalHits:pq.Size());
}
/// <summary> Returns the documents in the rage [start .. pq.size()) that were collected
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search
// In case pq was populated with sentinel values, there might be less
// results than pq.size(). Therefore return all results until either
// pq.size() or totalHits.
- return TopDocs(start, totalHits < pq.Size()?totalHits:pq.Size());
+ return TopDocs(start, internalTotalHits < pq.Size()?internalTotalHits:pq.Size());
}
/// <summary> Returns the documents in the rage [start .. start+howMany) that were
@@ -123,7 +123,7 @@ namespace Lucene.Net.Search
// In case pq was populated with sentinel values, there might be less
// results than pq.size(). Therefore return all results until either
// pq.size() or totalHits.
- int size = totalHits < pq.Size()?totalHits:pq.Size();
+ int size = internalTotalHits < pq.Size()?internalTotalHits:pq.Size();
// Don't bother to throw an exception, just return an empty TopDocs in case
// the parameters are invalid or out of range.
Modified: incubator/lucene.net/trunk/src/core/Search/TopFieldCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TopFieldCollector.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TopFieldCollector.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TopFieldCollector.cs Sat Jul 21 19:14:57 2012
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
if ((reverseMul * comparator.CompareBottom(doc)) <= 0)
@@ -82,7 +82,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
comparator.Copy(slot, doc);
Add(slot, doc, System.Single.NaN);
@@ -119,7 +119,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -137,7 +137,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
comparator.Copy(slot, doc);
Add(slot, doc, System.Single.NaN);
@@ -176,7 +176,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
if ((reverseMul * comparator.CompareBottom(doc)) <= 0)
@@ -201,7 +201,7 @@ namespace Lucene.Net.Search
float score = scorer.Score();
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
comparator.Copy(slot, doc);
Add(slot, doc, score);
@@ -233,7 +233,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -257,7 +257,7 @@ namespace Lucene.Net.Search
float score = scorer.Score();
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
comparator.Copy(slot, doc);
Add(slot, doc, score);
@@ -303,7 +303,7 @@ namespace Lucene.Net.Search
{
maxScore = score;
}
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
if ((reverseMul * comparator.CompareBottom(doc)) <= 0)
@@ -322,7 +322,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
comparator.Copy(slot, doc);
Add(slot, doc, score);
@@ -359,7 +359,7 @@ namespace Lucene.Net.Search
{
maxScore = score;
}
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -377,7 +377,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
comparator.Copy(slot, doc);
Add(slot, doc, score);
@@ -418,7 +418,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -460,7 +460,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
for (int i = 0; i < comparators.Length; i++)
{
@@ -510,7 +510,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -555,7 +555,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
for (int i = 0; i < comparators.Length; i++)
{
@@ -607,7 +607,7 @@ namespace Lucene.Net.Search
{
maxScore = score;
}
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -649,7 +649,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
for (int i = 0; i < comparators.Length; i++)
{
@@ -692,7 +692,7 @@ namespace Lucene.Net.Search
{
maxScore = score;
}
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -737,7 +737,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
for (int i = 0; i < comparators.Length; i++)
{
@@ -782,7 +782,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -826,7 +826,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
for (int i = 0; i < comparators.Length; i++)
{
@@ -867,7 +867,7 @@ namespace Lucene.Net.Search
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
if (queueFull)
{
// Fastmatch: return if this hit is not competitive
@@ -914,7 +914,7 @@ namespace Lucene.Net.Search
else
{
// Startup transient: queue hasn't gathered numHits yet
- int slot = totalHits - 1;
+ int slot = internalTotalHits - 1;
// Copy hit into queue
for (int i = 0; i < comparators.Length; i++)
{
@@ -1087,7 +1087,7 @@ namespace Lucene.Net.Search
internal void Add(int slot, int doc, float score)
{
bottom = pq.Add(new Entry(slot, docBase + doc, score));
- queueFull = totalHits == numHits;
+ queueFull = internalTotalHits == numHits;
}
/*
@@ -1126,7 +1126,7 @@ namespace Lucene.Net.Search
}
// If this is a maxScoring tracking collector and there were no results,
- return new TopFieldDocs(totalHits, results, ((FieldValueHitQueue) pq).GetFields(), maxScore);
+ return new TopFieldDocs(internalTotalHits, results, ((FieldValueHitQueue) pq).GetFields(), maxScore);
}
public override bool AcceptsDocsOutOfOrder
Modified: incubator/lucene.net/trunk/src/core/Search/TopScoreDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TopScoreDocCollector.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TopScoreDocCollector.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TopScoreDocCollector.cs Sat Jul 21 19:14:57 2012
@@ -52,7 +52,7 @@ namespace Lucene.Net.Search
System.Diagnostics.Debug.Assert(score != float.NegativeInfinity);
System.Diagnostics.Debug.Assert(!float.IsNaN(score));
- totalHits++;
+ internalTotalHits++;
if (score <= pqTop.Score)
{
// Since docs are returned in-order (i.e., increasing doc Id), a document
@@ -85,7 +85,7 @@ namespace Lucene.Net.Search
// This collector cannot handle NaN
System.Diagnostics.Debug.Assert(!float.IsNaN(score));
- totalHits++;
+ internalTotalHits++;
doc += docBase;
if (score < pqTop.Score || (score == pqTop.Score && doc > pqTop.Doc))
{
@@ -161,7 +161,7 @@ namespace Lucene.Net.Search
maxScore = pq.Pop().Score;
}
- return new TopDocs(totalHits, results, maxScore);
+ return new TopDocs(internalTotalHits, results, maxScore);
}
public override void SetNextReader(IndexReader reader, int base_Renamed)
Modified: incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs Sat Jul 21 19:14:57 2012
@@ -43,11 +43,11 @@ namespace Lucene.Net.Search
{
private readonly bool _termContainsWildcard;
private readonly bool _termIsPrefix;
- protected internal Term term;
+ protected internal Term internalTerm;
public WildcardQuery(Term term)
{
- this.term = term;
+ this.internalTerm = term;
string text = term.Text;
_termContainsWildcard = (term.Text.IndexOf('*') != -1)
|| (term.Text.IndexOf('?') != -1);
@@ -71,7 +71,7 @@ namespace Lucene.Net.Search
/// <summary> Returns the pattern term.</summary>
public Term Term
{
- get { return term; }
+ get { return internalTerm; }
}
public override Query Rewrite(IndexReader reader)
@@ -79,7 +79,7 @@ namespace Lucene.Net.Search
if (_termIsPrefix)
{
MultiTermQuery rewritten =
- new PrefixQuery(term.CreateTerm(term.Text.Substring(0, term.Text.IndexOf('*'))));
+ new PrefixQuery(internalTerm.CreateTerm(internalTerm.Text.Substring(0, internalTerm.Text.IndexOf('*'))));
rewritten.Boost = Boost;
rewritten.RewriteMethod = RewriteMethod;
return rewritten;
@@ -94,12 +94,12 @@ namespace Lucene.Net.Search
public override System.String ToString(System.String field)
{
System.Text.StringBuilder buffer = new System.Text.StringBuilder();
- if (!term.Field.Equals(field))
+ if (!internalTerm.Field.Equals(field))
{
- buffer.Append(term.Field);
+ buffer.Append(internalTerm.Field);
buffer.Append(":");
}
- buffer.Append(term.Text);
+ buffer.Append(internalTerm.Text);
buffer.Append(ToStringUtils.Boost(Boost));
return buffer.ToString();
}
@@ -109,7 +109,7 @@ namespace Lucene.Net.Search
{
int prime = 31;
int result = base.GetHashCode();
- result = prime * result + ((term == null)?0:term.GetHashCode());
+ result = prime * result + ((internalTerm == null)?0:internalTerm.GetHashCode());
return result;
}
@@ -123,12 +123,12 @@ namespace Lucene.Net.Search
if (GetType() != obj.GetType())
return false;
WildcardQuery other = (WildcardQuery) obj;
- if (term == null)
+ if (internalTerm == null)
{
- if (other.term != null)
+ if (other.internalTerm != null)
return false;
}
- else if (!term.Equals(other.term))
+ else if (!internalTerm.Equals(other.internalTerm))
return false;
return true;
}
Modified: incubator/lucene.net/trunk/src/core/Store/Directory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/Directory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/Directory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/Directory.cs Sat Jul 21 19:14:57 2012
@@ -47,7 +47,7 @@ namespace Lucene.Net.Store
/// this Directory instance).
/// </summary>
[NonSerialized]
- protected internal LockFactory lockFactory;
+ protected internal LockFactory interalLockFactory;
/// <summary>Returns an array of strings, one for each file in the directory.</summary>
/// <exception cref="System.IO.IOException"></exception>
@@ -60,7 +60,7 @@ namespace Lucene.Net.Store
public abstract long FileModified(System.String name);
/// <summary>Set the modified time of an existing file to now. </summary>
- public abstract void TouchFile(System.String name);
+ public abstract void TouchFile(System.String name);
/// <summary>Removes an existing file in the directory. </summary>
public abstract void DeleteFile(System.String name);
@@ -103,7 +103,7 @@ namespace Lucene.Net.Store
/// </param>
public virtual Lock MakeLock(System.String name)
{
- return lockFactory.MakeLock(name);
+ return interalLockFactory.MakeLock(name);
}
/// <summary> Attempt to clear (forcefully unlock and remove) the
/// specified lock. Only call this at a time when you are
@@ -113,9 +113,9 @@ namespace Lucene.Net.Store
/// </param>
public virtual void ClearLock(System.String name)
{
- if (lockFactory != null)
+ if (interalLockFactory != null)
{
- lockFactory.ClearLock(name);
+ interalLockFactory.ClearLock(name);
}
}
@@ -145,7 +145,7 @@ namespace Lucene.Net.Store
public virtual void SetLockFactory(LockFactory lockFactory)
{
System.Diagnostics.Debug.Assert(lockFactory != null);
- this.lockFactory = lockFactory;
+ this.interalLockFactory = lockFactory;
lockFactory.LockPrefix = this.GetLockId();
}
@@ -156,7 +156,7 @@ namespace Lucene.Net.Store
/// </summary>
public virtual LockFactory LockFactory
{
- get { return this.lockFactory; }
+ get { return this.interalLockFactory; }
}
/// <summary> Return a string identifier that uniquely differentiates
Modified: incubator/lucene.net/trunk/src/core/Store/FSDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/FSDirectory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/FSDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/FSDirectory.cs Sat Jul 21 19:14:57 2012
@@ -123,17 +123,17 @@ namespace Lucene.Net.Store
{
if (!checked_Renamed)
{
- if (!this._directory.Exists)
+ if (!this.internalDirectory.Exists)
{
try
{
- this._directory.Create();
+ this.internalDirectory.Create();
}
catch (Exception)
{
- throw new System.IO.IOException("Cannot create directory: " + _directory);
+ throw new System.IO.IOException("Cannot create directory: " + internalDirectory);
}
- this._directory.Refresh(); // need to see the creation
+ this.internalDirectory.Refresh(); // need to see the creation
}
checked_Renamed = true;
@@ -147,7 +147,7 @@ namespace Lucene.Net.Store
{
EnsureOpen();
CreateDir();
- System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
if (file.Exists) // delete existing, if any
{
try
@@ -162,7 +162,7 @@ namespace Lucene.Net.Store
}
/// <summary>The underlying filesystem directory </summary>
- protected internal System.IO.DirectoryInfo _directory = null;
+ protected internal System.IO.DirectoryInfo internalDirectory = null;
/// <summary>Create a new FSDirectory for the named location (ctor for subclasses).</summary>
/// <param name="path">the path of the directory
@@ -183,12 +183,12 @@ namespace Lucene.Net.Store
// system property Lucene.Net.Store.FSDirectoryLockFactoryClass is set,
// instantiate that; else, use SimpleFSLockFactory:
- _directory = path;
+ internalDirectory = path;
// due to differences in how Java & .NET refer to files, the checks are a bit different
- if (!_directory.Exists && System.IO.File.Exists(_directory.FullName))
+ if (!internalDirectory.Exists && System.IO.File.Exists(internalDirectory.FullName))
{
- throw new NoSuchDirectoryException("file '" + _directory.FullName + "' exists but is not a directory");
+ throw new NoSuchDirectoryException("file '" + internalDirectory.FullName + "' exists but is not a directory");
}
SetLockFactory(lockFactory);
@@ -201,10 +201,10 @@ namespace Lucene.Net.Store
// if the lock factory has no lockDir set, use the this directory as lockDir
if (dir == null)
{
- lf.LockDir = this._directory;
+ lf.LockDir = this.internalDirectory;
lf.LockPrefix = null;
}
- else if (dir.FullName.Equals(this._directory.FullName))
+ else if (dir.FullName.Equals(this.internalDirectory.FullName))
{
lf.LockPrefix = null;
}
@@ -328,14 +328,14 @@ namespace Lucene.Net.Store
public override System.String[] ListAll()
{
EnsureOpen();
- return ListAll(_directory);
+ return ListAll(internalDirectory);
}
/// <summary>Returns true iff a file with the given name exists. </summary>
public override bool FileExists(System.String name)
{
EnsureOpen();
- System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
return file.Exists;
}
@@ -343,7 +343,7 @@ namespace Lucene.Net.Store
public override long FileModified(System.String name)
{
EnsureOpen();
- System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
return (long)file.LastWriteTime.ToUniversalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0)).TotalMilliseconds; //{{LUCENENET-353}}
}
@@ -358,7 +358,7 @@ namespace Lucene.Net.Store
public override void TouchFile(System.String name)
{
EnsureOpen();
- System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
file.LastWriteTime = System.DateTime.Now;
}
@@ -366,7 +366,7 @@ namespace Lucene.Net.Store
public override long FileLength(System.String name)
{
EnsureOpen();
- System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
return file.Exists ? file.Length : 0;
}
@@ -374,7 +374,7 @@ namespace Lucene.Net.Store
public override void DeleteFile(System.String name)
{
EnsureOpen();
- System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo file = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
try
{
file.Delete();
@@ -388,7 +388,7 @@ namespace Lucene.Net.Store
public override void Sync(System.String name)
{
EnsureOpen();
- System.IO.FileInfo fullFile = new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name));
+ System.IO.FileInfo fullFile = new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name));
bool success = false;
int retryCount = 0;
System.IO.IOException exc = null;
@@ -414,20 +414,10 @@ namespace Lucene.Net.Store
{
if (exc == null)
exc = ioe;
- try
- {
- // Pause 5 msec
- System.Threading.Thread.Sleep(5);
- }
- catch (System.Threading.ThreadInterruptedException ie)
- {
- // In 3.0 we will change this to throw
- // InterruptedException instead
- // TODO: Change this to throwing a new ThreadInterruptedException when class is build
- // ThreadClass.Current().Interrupt();
- // throw new System.SystemException(ie.ToString(), ie);
- throw;
- }
+
+ // Pause 5 msec
+ System.Threading.Thread.Sleep(5);
+
}
}
@@ -453,7 +443,7 @@ namespace Lucene.Net.Store
System.String dirName; // name to be hashed
try
{
- dirName = _directory.FullName;
+ dirName = internalDirectory.FullName;
}
catch (System.IO.IOException e)
{
@@ -493,14 +483,14 @@ namespace Lucene.Net.Store
get
{
EnsureOpen();
- return _directory;
+ return internalDirectory;
}
}
/// <summary>For debug output. </summary>
public override System.String ToString()
{
- return this.GetType().FullName + "@" + _directory + " lockFactory=" + LockFactory;
+ return this.GetType().FullName + "@" + internalDirectory + " lockFactory=" + LockFactory;
}
/// <summary> Default read chunk size. This is a conditional
Modified: incubator/lucene.net/trunk/src/core/Store/FSLockFactory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/FSLockFactory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/FSLockFactory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/FSLockFactory.cs Sat Jul 21 19:14:57 2012
@@ -27,7 +27,7 @@ namespace Lucene.Net.Store
{
/// <summary> Directory for the lock files.</summary>
- protected internal System.IO.DirectoryInfo _lockDir = null;
+ protected internal System.IO.DirectoryInfo internalLockDir = null;
/// <summary> Gets the lock directory.
/// <para>Subclasses can use this to set the lock directory.
@@ -40,12 +40,12 @@ namespace Lucene.Net.Store
/// </summary>
public virtual DirectoryInfo LockDir
{
- get { return _lockDir; }
+ get { return internalLockDir; }
protected internal set
{
- if (this._lockDir != null)
+ if (this.internalLockDir != null)
throw new System.SystemException("You can set the lock directory for this factory only once.");
- this._lockDir = value;
+ this.internalLockDir = value;
}
}
}
Modified: incubator/lucene.net/trunk/src/core/Store/FileSwitchDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/FileSwitchDirectory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/FileSwitchDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/FileSwitchDirectory.cs Sat Jul 21 19:14:57 2012
@@ -49,7 +49,7 @@ namespace Lucene.Net.Store
this.primaryDir = primaryDir;
this.secondaryDir = secondaryDir;
this.doClose = doClose;
- this.lockFactory = primaryDir.LockFactory;
+ this.interalLockFactory = primaryDir.LockFactory;
}
/// <summary>Return the primary directory </summary>
Modified: incubator/lucene.net/trunk/src/core/Store/LockFactory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/LockFactory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/LockFactory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/LockFactory.cs Sat Jul 21 19:14:57 2012
@@ -38,7 +38,7 @@ namespace Lucene.Net.Store
public abstract class LockFactory
{
- protected internal System.String _lockPrefix = null;
+ protected internal System.String internalLockPrefix = null;
/// <summary> Gets or sets the prefix in use for all locks created in this
/// LockFactory. This is normally called once, when a
@@ -51,8 +51,8 @@ namespace Lucene.Net.Store
/// </summary>
public virtual string LockPrefix
{
- get { return this._lockPrefix; }
- set { this._lockPrefix = value; }
+ get { return this.internalLockPrefix; }
+ set { this.internalLockPrefix = value; }
}
/// <summary> Return a new Lock instance identified by lockName.</summary>
Modified: incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs Sat Jul 21 19:14:57 2012
@@ -97,7 +97,7 @@ namespace Lucene.Net.Store
//System.Diagnostics.Debug.Fail("Port issue:", "sun.misc.Cleaner()"); // {{Aroush-2.9}}
throw new NotImplementedException("Port issue: sun.misc.Cleaner()");
// Aroush-2.9}}
- return null;
+ //return null;
}
}
private void InitBlock()
@@ -506,7 +506,7 @@ namespace Lucene.Net.Store
public override IndexOutput CreateOutput(System.String name)
{
InitOutput(name);
- return new SimpleFSDirectory.SimpleFSIndexOutput(new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name)));
+ return new SimpleFSDirectory.SimpleFSIndexOutput(new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name)));
}
static MMapDirectory()
{
@@ -522,7 +522,7 @@ namespace Lucene.Net.Store
//System.Diagnostics.Debug.Fail("Port issue:", "sun.misc.Cleaner.clean()"); // {{Aroush-2.9}}
throw new NotImplementedException("Port issue: sun.misc.Cleaner.clean()");
// Aroush-2.9}}
- v = true;
+ //v = true;
}
catch (System.Exception)
{
Modified: incubator/lucene.net/trunk/src/core/Store/NativeFSLockFactory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/NativeFSLockFactory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/NativeFSLockFactory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/NativeFSLockFactory.cs Sat Jul 21 19:14:57 2012
@@ -88,9 +88,9 @@ namespace Lucene.Net.Store
{
lock (this)
{
- if (_lockPrefix != null)
- lockName = _lockPrefix + "-" + lockName;
- return new NativeFSLock(_lockDir, lockName);
+ if (internalLockPrefix != null)
+ lockName = internalLockPrefix + "-" + lockName;
+ return new NativeFSLock(internalLockDir, lockName);
}
}
@@ -101,17 +101,17 @@ namespace Lucene.Net.Store
// they are locked, but, still do this in case people
// really want to see the files go away:
bool tmpBool;
- if (System.IO.File.Exists(_lockDir.FullName))
+ if (System.IO.File.Exists(internalLockDir.FullName))
tmpBool = true;
else
- tmpBool = System.IO.Directory.Exists(_lockDir.FullName);
+ tmpBool = System.IO.Directory.Exists(internalLockDir.FullName);
if (tmpBool)
{
- if (_lockPrefix != null)
+ if (internalLockPrefix != null)
{
- lockName = _lockPrefix + "-" + lockName;
+ lockName = internalLockPrefix + "-" + lockName;
}
- System.IO.FileInfo lockFile = new System.IO.FileInfo(System.IO.Path.Combine(_lockDir.FullName, lockName));
+ System.IO.FileInfo lockFile = new System.IO.FileInfo(System.IO.Path.Combine(internalLockDir.FullName, lockName));
bool tmpBool2;
if (System.IO.File.Exists(lockFile.FullName))
tmpBool2 = true;
@@ -421,7 +421,7 @@ namespace Lucene.Net.Store
Release();
return !obtained;
}
- catch (System.IO.IOException ioe)
+ catch (System.IO.IOException)
{
return false;
}
Modified: incubator/lucene.net/trunk/src/core/Store/RAMDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/RAMDirectory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/RAMDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/RAMDirectory.cs Sat Jul 21 19:14:57 2012
@@ -32,7 +32,7 @@ namespace Lucene.Net.Store
private const long serialVersionUID = 1L;
internal protected HashMap<string, RAMFile> fileMap = new HashMap<string, RAMFile>();
- internal protected long _sizeInBytes = 0;
+ internal protected long internalSizeInBytes = 0;
// *****
// Lock acquisition sequence: RAMDirectory, then RAMFile
@@ -74,7 +74,7 @@ namespace Lucene.Net.Store
[System.Runtime.Serialization.OnDeserialized]
void OnDeserialized(System.Runtime.Serialization.StreamingContext context)
{
- if (lockFactory == null)
+ if (interalLockFactory == null)
{
SetLockFactory(new SingleInstanceLockFactory());
}
@@ -186,7 +186,7 @@ namespace Lucene.Net.Store
lock (this)
{
EnsureOpen();
- return _sizeInBytes;
+ return internalSizeInBytes;
}
}
@@ -202,7 +202,7 @@ namespace Lucene.Net.Store
{
fileMap.Remove(name);
file.directory = null;
- _sizeInBytes -= file.sizeInBytes;
+ internalSizeInBytes -= file.sizeInBytes;
}
else
throw new System.IO.FileNotFoundException(name);
@@ -219,7 +219,7 @@ namespace Lucene.Net.Store
RAMFile existing = fileMap[name];
if (existing != null)
{
- _sizeInBytes -= existing.sizeInBytes;
+ internalSizeInBytes -= existing.sizeInBytes;
existing.directory = null;
}
fileMap[name] = file;
Modified: incubator/lucene.net/trunk/src/core/Store/RAMFile.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/RAMFile.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/RAMFile.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/RAMFile.cs Sat Jul 21 19:14:57 2012
@@ -97,7 +97,7 @@ namespace Lucene.Net.Store
{
lock (directory) //{{DIGY}} what if directory gets null in the mean time?
{
- directory._sizeInBytes += size;
+ directory.internalSizeInBytes += size;
}
}
Modified: incubator/lucene.net/trunk/src/core/Store/SimpleFSDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/SimpleFSDirectory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/SimpleFSDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/SimpleFSDirectory.cs Sat Jul 21 19:14:57 2012
@@ -56,7 +56,7 @@ namespace Lucene.Net.Store
public override IndexOutput CreateOutput(System.String name)
{
InitOutput(name);
- return new SimpleFSIndexOutput(new System.IO.FileInfo(System.IO.Path.Combine(_directory.FullName, name)));
+ return new SimpleFSIndexOutput(new System.IO.FileInfo(System.IO.Path.Combine(internalDirectory.FullName, name)));
}
/// <summary>Creates an IndexInput for the file with the given name. </summary>
@@ -70,7 +70,7 @@ namespace Lucene.Net.Store
try
{
return new SimpleFSIndexInput(new System.IO.FileInfo(
- System.IO.Path.Combine(_directory.FullName, name)), bufferSize, ReadChunkSize);
+ System.IO.Path.Combine(internalDirectory.FullName, name)), bufferSize, ReadChunkSize);
}
catch (System.UnauthorizedAccessException ex)
{
@@ -244,9 +244,7 @@ namespace Lucene.Net.Store
// more than once
private volatile bool isOpen;
- private bool isDisposed;
-
- public SimpleFSIndexOutput(System.IO.FileInfo path)
+ public SimpleFSIndexOutput(System.IO.FileInfo path)
{
file = new System.IO.FileStream(path.FullName, System.IO.FileMode.OpenOrCreate, System.IO.FileAccess.ReadWrite);
isOpen = true;
@@ -289,7 +287,7 @@ namespace Lucene.Net.Store
{
file.Dispose();
}
- catch (System.Exception t)
+ catch (System.Exception)
{
// Suppress so we don't mask original exception
}
Modified: incubator/lucene.net/trunk/src/core/Store/SimpleFSLockFactory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/SimpleFSLockFactory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/SimpleFSLockFactory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/SimpleFSLockFactory.cs Sat Jul 21 19:14:57 2012
@@ -81,27 +81,27 @@ namespace Lucene.Net.Store
public override Lock MakeLock(System.String lockName)
{
- if (_lockPrefix != null)
+ if (internalLockPrefix != null)
{
- lockName = _lockPrefix + "-" + lockName;
+ lockName = internalLockPrefix + "-" + lockName;
}
- return new SimpleFSLock(_lockDir, lockName);
+ return new SimpleFSLock(internalLockDir, lockName);
}
public override void ClearLock(System.String lockName)
{
bool tmpBool;
- if (System.IO.File.Exists(_lockDir.FullName))
+ if (System.IO.File.Exists(internalLockDir.FullName))
tmpBool = true;
else
- tmpBool = System.IO.Directory.Exists(_lockDir.FullName);
+ tmpBool = System.IO.Directory.Exists(internalLockDir.FullName);
if (tmpBool)
{
- if (_lockPrefix != null)
+ if (internalLockPrefix != null)
{
- lockName = _lockPrefix + "-" + lockName;
+ lockName = internalLockPrefix + "-" + lockName;
}
- System.IO.FileInfo lockFile = new System.IO.FileInfo(System.IO.Path.Combine(_lockDir.FullName, lockName));
+ System.IO.FileInfo lockFile = new System.IO.FileInfo(System.IO.Path.Combine(internalLockDir.FullName, lockName));
bool tmpBool2;
if (System.IO.File.Exists(lockFile.FullName))
tmpBool2 = true;
Modified: incubator/lucene.net/trunk/src/core/Support/Single.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Support/Single.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Support/Single.cs (original)
+++ incubator/lucene.net/trunk/src/core/Support/Single.cs Sat Jul 21 19:14:57 2012
@@ -38,17 +38,10 @@ namespace Lucene.Net.Support
/// <returns></returns>
public static System.Single Parse(System.String s, System.Globalization.NumberStyles style, System.IFormatProvider provider)
{
- try
- {
- if (s.EndsWith("f") || s.EndsWith("F"))
- return System.Single.Parse(s.Substring(0, s.Length - 1), style, provider);
- else
- return System.Single.Parse(s, style, provider);
- }
- catch (System.FormatException fex)
- {
- throw;
- }
+ if (s.EndsWith("f") || s.EndsWith("F"))
+ return System.Single.Parse(s.Substring(0, s.Length - 1), style, provider);
+ else
+ return System.Single.Parse(s, style, provider);
}
/// <summary>
@@ -59,17 +52,10 @@ namespace Lucene.Net.Support
/// <returns></returns>
public static System.Single Parse(System.String s, System.IFormatProvider provider)
{
- try
- {
- if (s.EndsWith("f") || s.EndsWith("F"))
- return System.Single.Parse(s.Substring(0, s.Length - 1), provider);
- else
- return System.Single.Parse(s, provider);
- }
- catch (System.FormatException fex)
- {
- throw;
- }
+ if (s.EndsWith("f") || s.EndsWith("F"))
+ return System.Single.Parse(s.Substring(0, s.Length - 1), provider);
+ else
+ return System.Single.Parse(s, provider);
}
/// <summary>
@@ -80,17 +66,10 @@ namespace Lucene.Net.Support
/// <returns></returns>
public static System.Single Parse(System.String s, System.Globalization.NumberStyles style)
{
- try
- {
- if (s.EndsWith("f") || s.EndsWith("F"))
- return System.Single.Parse(s.Substring(0, s.Length - 1), style);
- else
- return System.Single.Parse(s, style);
- }
- catch (System.FormatException fex)
- {
- throw;
- }
+ if (s.EndsWith("f") || s.EndsWith("F"))
+ return System.Single.Parse(s.Substring(0, s.Length - 1), style);
+ else
+ return System.Single.Parse(s, style);
}
/// <summary>
@@ -100,17 +79,10 @@ namespace Lucene.Net.Support
/// <returns></returns>
public static System.Single Parse(System.String s)
{
- try
- {
- if (s.EndsWith("f") || s.EndsWith("F"))
- return System.Single.Parse(s.Substring(0, s.Length - 1).Replace(".", CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
- else
- return System.Single.Parse(s.Replace(".", CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
- }
- catch (System.FormatException fex)
- {
- throw;
- }
+ if (s.EndsWith("f") || s.EndsWith("F"))
+ return System.Single.Parse(s.Substring(0, s.Length - 1).Replace(".", CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
+ else
+ return System.Single.Parse(s.Replace(".", CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
}
public static bool TryParse(System.String s, out float f)
Modified: incubator/lucene.net/trunk/src/core/Util/OpenBitSet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Util/OpenBitSet.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Util/OpenBitSet.cs (original)
+++ incubator/lucene.net/trunk/src/core/Util/OpenBitSet.cs Sat Jul 21 19:14:57 2012
@@ -80,7 +80,7 @@ namespace Lucene.Net.Util
[Serializable]
public class OpenBitSet:DocIdSet, System.ICloneable
{
- protected internal long[] bits;
+ protected internal long[] internalbits;
protected internal int wlen; // number of words (elements) used in the array
/// <summary>Constructs an OpenBitSet large enough to hold numBits.
@@ -90,8 +90,8 @@ namespace Lucene.Net.Util
/// </param>
public OpenBitSet(long numBits)
{
- bits = new long[Bits2words(numBits)];
- wlen = bits.Length;
+ internalbits = new long[Bits2words(numBits)];
+ wlen = internalbits.Length;
}
public OpenBitSet():this(64)
@@ -113,13 +113,13 @@ namespace Lucene.Net.Util
/// </summary>
public OpenBitSet(long[] bits, int numWords)
{
- this.bits = bits;
+ this.internalbits = bits;
this.wlen = numWords;
}
public override DocIdSetIterator Iterator()
{
- return new OpenBitSetIterator(bits, wlen);
+ return new OpenBitSetIterator(internalbits, wlen);
}
/// <summary>This DocIdSet implementation is cacheable. </summary>
@@ -131,7 +131,7 @@ namespace Lucene.Net.Util
/// <summary>Returns the current capacity in bits (1 greater than the index of the last bit) </summary>
public virtual long Capacity()
{
- return bits.Length << 6;
+ return internalbits.Length << 6;
}
/// <summary> Returns the current capacity of this set. Included for
@@ -152,8 +152,8 @@ namespace Lucene.Net.Util
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public virtual long[] Bits
{
- set { this.bits = value; }
- get { return bits; }
+ set { this.internalbits = value; }
+ get { return internalbits; }
}
/// <summary>Expert: gets or sets the number of longs in the array that are in use </summary>
@@ -170,12 +170,12 @@ namespace Lucene.Net.Util
int i = index >> 6; // div 64
// signed shift will keep a negative index and force an
// array-index-out-of-bounds-exception, removing the need for an explicit check.
- if (i >= bits.Length)
+ if (i >= internalbits.Length)
return false;
int bit = index & 0x3f; // mod 64
long bitmask = 1L << bit;
- return (bits[i] & bitmask) != 0;
+ return (internalbits[i] & bitmask) != 0;
}
@@ -189,7 +189,7 @@ namespace Lucene.Net.Util
// array-index-out-of-bounds-exception, removing the need for an explicit check.
int bit = index & 0x3f; // mod 64
long bitmask = 1L << bit;
- return (bits[i] & bitmask) != 0;
+ return (internalbits[i] & bitmask) != 0;
}
@@ -198,11 +198,11 @@ namespace Lucene.Net.Util
public virtual bool Get(long index)
{
int i = (int) (index >> 6); // div 64
- if (i >= bits.Length)
+ if (i >= internalbits.Length)
return false;
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- return (bits[i] & bitmask) != 0;
+ return (internalbits[i] & bitmask) != 0;
}
/// <summary>Returns true or false for the specified bit index.
@@ -213,7 +213,7 @@ namespace Lucene.Net.Util
int i = (int) (index >> 6); // div 64
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- return (bits[i] & bitmask) != 0;
+ return (internalbits[i] & bitmask) != 0;
}
/*
@@ -236,7 +236,7 @@ namespace Lucene.Net.Util
{
int i = index >> 6; // div 64
int bit = index & 0x3f; // mod 64
- return ((int )((ulong) (bits[i]) >> bit)) & 0x01;
+ return ((int )((ulong) (internalbits[i]) >> bit)) & 0x01;
}
@@ -255,7 +255,7 @@ namespace Lucene.Net.Util
int wordNum = ExpandingWordNum(index);
int bit = (int) index & 0x3f;
long bitmask = 1L << bit;
- bits[wordNum] |= bitmask;
+ internalbits[wordNum] |= bitmask;
}
@@ -267,7 +267,7 @@ namespace Lucene.Net.Util
int wordNum = index >> 6; // div 64
int bit = index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] |= bitmask;
+ internalbits[wordNum] |= bitmask;
}
/// <summary>Sets the bit at the specified index.
@@ -278,7 +278,7 @@ namespace Lucene.Net.Util
int wordNum = (int) (index >> 6);
int bit = (int) index & 0x3f;
long bitmask = 1L << bit;
- bits[wordNum] |= bitmask;
+ internalbits[wordNum] |= bitmask;
}
/// <summary>Sets a range of bits, expanding the set size if necessary
@@ -304,14 +304,14 @@ namespace Lucene.Net.Util
if (startWord == endWord)
{
- bits[startWord] |= (startmask & endmask);
+ internalbits[startWord] |= (startmask & endmask);
return ;
}
- bits[startWord] |= startmask;
+ internalbits[startWord] |= startmask;
for (int i = startWord + 1; i < endWord; i++)
- bits[i] = -1L;
- bits[endWord] |= endmask;
+ internalbits[i] = -1L;
+ internalbits[endWord] |= endmask;
}
@@ -336,7 +336,7 @@ namespace Lucene.Net.Util
int wordNum = index >> 6;
int bit = index & 0x03f;
long bitmask = 1L << bit;
- bits[wordNum] &= ~ bitmask;
+ internalbits[wordNum] &= ~ bitmask;
// hmmm, it takes one more instruction to clear than it does to set... any
// way to work around this? If there were only 63 bits per word, we could
// use a right shift of 10111111...111 in binary to position the 0 in the
@@ -354,7 +354,7 @@ namespace Lucene.Net.Util
int wordNum = (int) (index >> 6); // div 64
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] &= ~ bitmask;
+ internalbits[wordNum] &= ~ bitmask;
}
/// <summary>clears a bit, allowing access beyond the current set size without changing the size.</summary>
@@ -365,7 +365,7 @@ namespace Lucene.Net.Util
return ;
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] &= ~ bitmask;
+ internalbits[wordNum] &= ~ bitmask;
}
/// <summary>Clears a range of bits. Clearing past the end does not change the size of the set.
@@ -397,18 +397,18 @@ namespace Lucene.Net.Util
if (startWord == endWord)
{
- bits[startWord] &= (startmask | endmask);
+ internalbits[startWord] &= (startmask | endmask);
return ;
}
- bits[startWord] &= startmask;
+ internalbits[startWord] &= startmask;
int middle = System.Math.Min(wlen, endWord);
for (int i = startWord + 1; i < middle; i++)
- bits[i] = 0L;
+ internalbits[i] = 0L;
if (endWord < wlen)
{
- bits[endWord] &= endmask;
+ internalbits[endWord] &= endmask;
}
}
@@ -442,18 +442,18 @@ namespace Lucene.Net.Util
if (startWord == endWord)
{
- bits[startWord] &= (startmask | endmask);
+ internalbits[startWord] &= (startmask | endmask);
return ;
}
- bits[startWord] &= startmask;
+ internalbits[startWord] &= startmask;
int middle = System.Math.Min(wlen, endWord);
for (int i = startWord + 1; i < middle; i++)
- bits[i] = 0L;
+ internalbits[i] = 0L;
if (endWord < wlen)
{
- bits[endWord] &= endmask;
+ internalbits[endWord] &= endmask;
}
}
@@ -467,8 +467,8 @@ namespace Lucene.Net.Util
int wordNum = index >> 6; // div 64
int bit = index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bool val = (bits[wordNum] & bitmask) != 0;
- bits[wordNum] |= bitmask;
+ bool val = (internalbits[wordNum] & bitmask) != 0;
+ internalbits[wordNum] |= bitmask;
return val;
}
@@ -480,8 +480,8 @@ namespace Lucene.Net.Util
int wordNum = (int) (index >> 6); // div 64
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bool val = (bits[wordNum] & bitmask) != 0;
- bits[wordNum] |= bitmask;
+ bool val = (internalbits[wordNum] & bitmask) != 0;
+ internalbits[wordNum] |= bitmask;
return val;
}
@@ -493,7 +493,7 @@ namespace Lucene.Net.Util
int wordNum = index >> 6; // div 64
int bit = index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] ^= bitmask;
+ internalbits[wordNum] ^= bitmask;
}
/// <summary>flips a bit.
@@ -504,7 +504,7 @@ namespace Lucene.Net.Util
int wordNum = (int) (index >> 6); // div 64
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] ^= bitmask;
+ internalbits[wordNum] ^= bitmask;
}
/// <summary>flips a bit, expanding the set size if necessary </summary>
@@ -513,7 +513,7 @@ namespace Lucene.Net.Util
int wordNum = ExpandingWordNum(index);
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] ^= bitmask;
+ internalbits[wordNum] ^= bitmask;
}
/// <summary>flips a bit and returns the resulting bit value.
@@ -524,8 +524,8 @@ namespace Lucene.Net.Util
int wordNum = index >> 6; // div 64
int bit = index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] ^= bitmask;
- return (bits[wordNum] & bitmask) != 0;
+ internalbits[wordNum] ^= bitmask;
+ return (internalbits[wordNum] & bitmask) != 0;
}
/// <summary>flips a bit and returns the resulting bit value.
@@ -536,8 +536,8 @@ namespace Lucene.Net.Util
int wordNum = (int) (index >> 6); // div 64
int bit = (int) index & 0x3f; // mod 64
long bitmask = 1L << bit;
- bits[wordNum] ^= bitmask;
- return (bits[wordNum] & bitmask) != 0;
+ internalbits[wordNum] ^= bitmask;
+ return (internalbits[wordNum] & bitmask) != 0;
}
/// <summary>Flips a range of bits, expanding the set size if necessary
@@ -569,18 +569,18 @@ namespace Lucene.Net.Util
if (startWord == endWord)
{
- bits[startWord] ^= (startmask & endmask);
+ internalbits[startWord] ^= (startmask & endmask);
return ;
}
- bits[startWord] ^= startmask;
+ internalbits[startWord] ^= startmask;
for (int i = startWord + 1; i < endWord; i++)
{
- bits[i] = ~ bits[i];
+ internalbits[i] = ~ internalbits[i];
}
- bits[endWord] ^= endmask;
+ internalbits[endWord] ^= endmask;
}
@@ -611,7 +611,7 @@ namespace Lucene.Net.Util
/// </returns>
public virtual long Cardinality()
{
- return BitUtil.Pop_array(bits, 0, wlen);
+ return BitUtil.Pop_array(internalbits, 0, wlen);
}
/// <summary>Returns the popcount or cardinality of the intersection of the two sets.
@@ -619,7 +619,7 @@ namespace Lucene.Net.Util
/// </summary>
public static long IntersectionCount(OpenBitSet a, OpenBitSet b)
{
- return BitUtil.Pop_intersect(a.bits, b.bits, 0, System.Math.Min(a.wlen, b.wlen));
+ return BitUtil.Pop_intersect(a.internalbits, b.internalbits, 0, System.Math.Min(a.wlen, b.wlen));
}
/// <summary>Returns the popcount or cardinality of the union of the two sets.
@@ -627,14 +627,14 @@ namespace Lucene.Net.Util
/// </summary>
public static long UnionCount(OpenBitSet a, OpenBitSet b)
{
- long tot = BitUtil.Pop_union(a.bits, b.bits, 0, System.Math.Min(a.wlen, b.wlen));
+ long tot = BitUtil.Pop_union(a.internalbits, b.internalbits, 0, System.Math.Min(a.wlen, b.wlen));
if (a.wlen < b.wlen)
{
- tot += BitUtil.Pop_array(b.bits, a.wlen, b.wlen - a.wlen);
+ tot += BitUtil.Pop_array(b.internalbits, a.wlen, b.wlen - a.wlen);
}
else if (a.wlen > b.wlen)
{
- tot += BitUtil.Pop_array(a.bits, b.wlen, a.wlen - b.wlen);
+ tot += BitUtil.Pop_array(a.internalbits, b.wlen, a.wlen - b.wlen);
}
return tot;
}
@@ -645,10 +645,10 @@ namespace Lucene.Net.Util
/// </summary>
public static long AndNotCount(OpenBitSet a, OpenBitSet b)
{
- long tot = BitUtil.Pop_andnot(a.bits, b.bits, 0, System.Math.Min(a.wlen, b.wlen));
+ long tot = BitUtil.Pop_andnot(a.internalbits, b.internalbits, 0, System.Math.Min(a.wlen, b.wlen));
if (a.wlen > b.wlen)
{
- tot += BitUtil.Pop_array(a.bits, b.wlen, a.wlen - b.wlen);
+ tot += BitUtil.Pop_array(a.internalbits, b.wlen, a.wlen - b.wlen);
}
return tot;
}
@@ -658,14 +658,14 @@ namespace Lucene.Net.Util
/// </summary>
public static long XorCount(OpenBitSet a, OpenBitSet b)
{
- long tot = BitUtil.Pop_xor(a.bits, b.bits, 0, System.Math.Min(a.wlen, b.wlen));
+ long tot = BitUtil.Pop_xor(a.internalbits, b.internalbits, 0, System.Math.Min(a.wlen, b.wlen));
if (a.wlen < b.wlen)
{
- tot += BitUtil.Pop_array(b.bits, a.wlen, b.wlen - a.wlen);
+ tot += BitUtil.Pop_array(b.internalbits, a.wlen, b.wlen - a.wlen);
}
else if (a.wlen > b.wlen)
{
- tot += BitUtil.Pop_array(a.bits, b.wlen, a.wlen - b.wlen);
+ tot += BitUtil.Pop_array(a.internalbits, b.wlen, a.wlen - b.wlen);
}
return tot;
}
@@ -680,7 +680,7 @@ namespace Lucene.Net.Util
if (i >= wlen)
return - 1;
int subIndex = index & 0x3f; // index within the word
- long word = bits[i] >> subIndex; // skip all the bits to the right of index
+ long word = internalbits[i] >> subIndex; // skip all the bits to the right of index
if (word != 0)
{
@@ -689,7 +689,7 @@ namespace Lucene.Net.Util
while (++i < wlen)
{
- word = bits[i];
+ word = internalbits[i];
if (word != 0)
return (i << 6) + BitUtil.Ntz(word);
}
@@ -706,7 +706,7 @@ namespace Lucene.Net.Util
if (i >= wlen)
return - 1;
int subIndex = (int) index & 0x3f; // index within the word
- long word = (long) ((ulong) bits[i] >> subIndex); // skip all the bits to the right of index
+ long word = (long) ((ulong) internalbits[i] >> subIndex); // skip all the bits to the right of index
if (word != 0)
{
@@ -715,7 +715,7 @@ namespace Lucene.Net.Util
while (++i < wlen)
{
- word = bits[i];
+ word = internalbits[i];
if (word != 0)
return (((long) i) << 6) + BitUtil.Ntz(word);
}
@@ -730,7 +730,7 @@ namespace Lucene.Net.Util
{
try
{
- OpenBitSet obs = new OpenBitSet((long[]) bits.Clone(), wlen);
+ OpenBitSet obs = new OpenBitSet((long[]) internalbits.Clone(), wlen);
//obs.bits = new long[obs.bits.Length];
//obs.bits.CopyTo(obs.bits, 0); // hopefully an array clone is as fast(er) than arraycopy
return obs;
@@ -745,8 +745,8 @@ namespace Lucene.Net.Util
public virtual void Intersect(OpenBitSet other)
{
int newLen = System.Math.Min(this.wlen, other.wlen);
- long[] thisArr = this.bits;
- long[] otherArr = other.bits;
+ long[] thisArr = this.internalbits;
+ long[] otherArr = other.internalbits;
// testing against zero can be more efficient
int pos = newLen;
while (--pos >= 0)
@@ -757,7 +757,7 @@ namespace Lucene.Net.Util
{
// fill zeros from the new shorter length to the old length
for (int i = newLen; i < this.wlen; i++)
- bits[i] = 0L;
+ internalbits[i] = 0L;
}
this.wlen = newLen;
}
@@ -768,8 +768,8 @@ namespace Lucene.Net.Util
int newLen = System.Math.Max(wlen, other.wlen);
EnsureCapacityWords(newLen);
- long[] thisArr = this.bits;
- long[] otherArr = other.bits;
+ long[] thisArr = this.internalbits;
+ long[] otherArr = other.internalbits;
int pos = System.Math.Min(wlen, other.wlen);
while (--pos >= 0)
{
@@ -787,8 +787,8 @@ namespace Lucene.Net.Util
public virtual void Remove(OpenBitSet other)
{
int idx = System.Math.Min(wlen, other.wlen);
- long[] thisArr = this.bits;
- long[] otherArr = other.bits;
+ long[] thisArr = this.internalbits;
+ long[] otherArr = other.internalbits;
while (--idx >= 0)
{
thisArr[idx] &= ~ otherArr[idx];
@@ -801,8 +801,8 @@ namespace Lucene.Net.Util
int newLen = System.Math.Max(wlen, other.wlen);
EnsureCapacityWords(newLen);
- long[] thisArr = this.bits;
- long[] otherArr = other.bits;
+ long[] thisArr = this.internalbits;
+ long[] otherArr = other.internalbits;
int pos = System.Math.Min(wlen, other.wlen);
while (--pos >= 0)
{
@@ -840,8 +840,8 @@ namespace Lucene.Net.Util
public virtual bool Intersects(OpenBitSet other)
{
int pos = System.Math.Min(this.wlen, other.wlen);
- long[] thisArr = this.bits;
- long[] otherArr = other.bits;
+ long[] thisArr = this.internalbits;
+ long[] otherArr = other.internalbits;
while (--pos >= 0)
{
if ((thisArr[pos] & otherArr[pos]) != 0)
@@ -857,9 +857,9 @@ namespace Lucene.Net.Util
/// </summary>
public virtual void EnsureCapacityWords(int numWords)
{
- if (bits.Length < numWords)
+ if (internalbits.Length < numWords)
{
- bits = ArrayUtil.Grow(bits, numWords);
+ internalbits = ArrayUtil.Grow(internalbits, numWords);
}
}
@@ -877,7 +877,7 @@ namespace Lucene.Net.Util
public virtual void TrimTrailingZeros()
{
int idx = wlen - 1;
- while (idx >= 0 && bits[idx] == 0)
+ while (idx >= 0 && internalbits[idx] == 0)
idx--;
wlen = idx + 1;
}
@@ -911,13 +911,13 @@ namespace Lucene.Net.Util
// check for any set bits out of the range of b
for (int i = a.wlen - 1; i >= b.wlen; i--)
{
- if (a.bits[i] != 0)
+ if (a.internalbits[i] != 0)
return false;
}
for (int i = b.wlen - 1; i >= 0; i--)
{
- if (a.bits[i] != b.bits[i])
+ if (a.internalbits[i] != b.internalbits[i])
return false;
}
@@ -929,9 +929,9 @@ namespace Lucene.Net.Util
// Start with a zero hash and use a mix that results in zero if the input is zero.
// This effectively truncates trailing zeros without an explicit check.
long h = 0;
- for (int i = bits.Length; --i >= 0; )
+ for (int i = internalbits.Length; --i >= 0; )
{
- h ^= bits[i];
+ h ^= internalbits[i];
h = (h << 1) | (Number.URShift(h, 63)); // rotate left
}
// fold leftmost bits into right and add a constant to prevent
Modified: incubator/lucene.net/trunk/src/core/Util/RamUsageEstimator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Util/RamUsageEstimator.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Util/RamUsageEstimator.cs (original)
+++ incubator/lucene.net/trunk/src/core/Util/RamUsageEstimator.cs Sat Jul 21 19:14:57 2012
@@ -152,7 +152,7 @@ namespace Lucene.Net.Util
size += Size(value_Renamed);
}
}
- catch (System.UnauthorizedAccessException ex)
+ catch (System.UnauthorizedAccessException)
{
// ignore for now?
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestFieldsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestFieldsReader.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestFieldsReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestFieldsReader.cs Sat Jul 21 19:14:57 2012
@@ -355,7 +355,7 @@ namespace Lucene.Net.Index
public FaultyFSDirectory(System.IO.DirectoryInfo dir)
{
fsDir = FSDirectory.Open(dir);
- lockFactory = fsDir.LockFactory;
+ interalLockFactory = fsDir.LockFactory;
}
public override IndexInput OpenInput(System.String name)
{
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Sat Jul 21 19:14:57 2012
@@ -84,7 +84,7 @@ namespace Lucene.Net.Index
internal MyRAMDirectory(TestIndexWriter enclosingInstance)
{
InitBlock(enclosingInstance);
- lockFactory = null;
+ interalLockFactory = null;
myLockFactory = new SingleInstanceLockFactory();
}
public override Lock MakeLock(System.String name)
Modified: incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs Sat Jul 21 19:14:57 2012
@@ -153,7 +153,7 @@ namespace Lucene.Net.Search
searcher.Search(query2, null, collector);
ScoreDoc[] hits2 = collector.TopDocs().ScoreDocs;
- Assert.AreEqual(mulFactor*collector.totalHits, bigSearcher.Search(query1, 1).TotalHits);
+ Assert.AreEqual(mulFactor*collector.internalTotalHits, bigSearcher.Search(query1, 1).TotalHits);
CheckHits.CheckHitsQuery(query2, hits1, hits2, expDocNrs);
}
@@ -278,7 +278,7 @@ namespace Lucene.Net.Search
q3.Add(q1, Occur.SHOULD);
q3.Add(new PrefixQuery(new Term("field2", "b")), Occur.SHOULD);
TopDocs hits4 = bigSearcher.Search(q3, 1);
- Assert.AreEqual(mulFactor*collector.totalHits + NUM_EXTRA_DOCS/2, hits4.TotalHits);
+ Assert.AreEqual(mulFactor*collector.internalTotalHits + NUM_EXTRA_DOCS/2, hits4.TotalHits);
}
}
catch (System.Exception e)
Modified: incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs Sat Jul 21 19:14:57 2012
@@ -66,12 +66,12 @@ namespace Lucene.Net.Search
maxScore = pq.Pop().Score;
}
- return new TopDocs(totalHits, results, maxScore);
+ return new TopDocs(internalTotalHits, results, maxScore);
}
public override void Collect(int doc)
{
- ++totalHits;
+ ++internalTotalHits;
pq.InsertWithOverflow(new ScoreDoc(doc + base_Renamed, Lucene.Net.Search.TestTopDocsCollector.scores[idx++]));
}
Modified: incubator/lucene.net/trunk/test/core/Store/MockRAMDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Store/MockRAMDirectory.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Store/MockRAMDirectory.cs (original)
+++ incubator/lucene.net/trunk/test/core/Store/MockRAMDirectory.cs Sat Jul 21 19:14:57 2012
@@ -276,7 +276,7 @@ namespace Lucene.Net.Store
{
if (existing != null)
{
- _sizeInBytes -= existing.sizeInBytes;
+ internalSizeInBytes -= existing.sizeInBytes;
existing.directory = null;
}
Modified: incubator/lucene.net/trunk/test/core/Store/TestBufferedIndexInput.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Store/TestBufferedIndexInput.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Store/TestBufferedIndexInput.cs (original)
+++ incubator/lucene.net/trunk/test/core/Store/TestBufferedIndexInput.cs Sat Jul 21 19:14:57 2012
@@ -328,7 +328,7 @@ namespace Lucene.Net.Store
public MockFSDirectory(System.IO.DirectoryInfo path, System.Random rand)
{
this.rand = rand;
- lockFactory = new NoLockFactory();
+ interalLockFactory = new NoLockFactory();
dir = new SimpleFSDirectory(path, null);
}