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/04/13 04:24:21 UTC
svn commit: r1325590 - in /incubator/lucene.net/trunk:
src/contrib/Highlighter/ src/contrib/Regex/ src/core/ src/core/Document/
src/core/Index/ src/core/QueryParser/ src/core/Search/
src/core/Search/Function/ src/core/Search/Payloads/ src/core/Search/S...
Author: ccurrens
Date: Fri Apr 13 02:24:19 2012
New Revision: 1325590
URL: http://svn.apache.org/viewvc?rev=1325590&view=rev
Log:
[LUCENENET-467] - Changed a few properties back to methods
Modified:
incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs
incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs
incubator/lucene.net/trunk/src/core/Document/AbstractField.cs
incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs
incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
incubator/lucene.net/trunk/src/core/Lucene.Net.csproj
incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs
incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs
incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs
incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs
incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs
incubator/lucene.net/trunk/src/core/Search/SingleTermEnum.cs
incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansOrdered.cs
incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs
incubator/lucene.net/trunk/src/core/Search/Spans/SpanFirstQuery.cs
incubator/lucene.net/trunk/src/core/Search/Spans/SpanNotQuery.cs
incubator/lucene.net/trunk/src/core/Search/Spans/SpanOrQuery.cs
incubator/lucene.net/trunk/src/core/Search/Spans/Spans.cs
incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs
incubator/lucene.net/trunk/src/core/Search/TopDocs.cs
incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs
incubator/lucene.net/trunk/src/core/Store/CheckSumIndexInput.cs
incubator/lucene.net/trunk/src/core/Store/CheckSumIndexOutput.cs
incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs
incubator/lucene.net/trunk/src/core/Store/RAMOutputStream.cs
incubator/lucene.net/trunk/src/core/Support/CRC32.cs
incubator/lucene.net/trunk/src/core/Support/IChecksum.cs
incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs
incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs
incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs
incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs
incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs
incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs
incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs
incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs
incubator/lucene.net/trunk/test/core/Search/TestWildcard.cs
incubator/lucene.net/trunk/test/core/Store/TestHugeRamFile.cs
incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs
incubator/lucene.net/trunk/test/core/Support/TestSupportClass.cs
Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs Fri Apr 13 02:24:19 2012
@@ -136,10 +136,10 @@ namespace Lucene.Net.Search.Highlight
else if (query is MultiTermQuery && expandMultiTermQuery)
{
MultiTermQuery mtq = ((MultiTermQuery) query);
- if (mtq.QueryRewriteMethod != MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE)
+ if (mtq.RewriteMethod != MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE)
{
mtq = (MultiTermQuery) mtq.Clone();
- mtq.QueryRewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
+ mtq.RewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
query = mtq;
}
FakeReader fReader = new FakeReader();
Modified: incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs Fri Apr 13 02:24:19 2012
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search.Regex
orig.SetRegexImplementation(_regexImpl);
// RegexQuery (via MultiTermQuery).Rewrite always returns a BooleanQuery
- orig.QueryRewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE; //@@
+ orig.RewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE; //@@
BooleanQuery bq = (BooleanQuery) orig.Rewrite(reader);
BooleanClause[] clauses = bq.GetClauses();
Modified: incubator/lucene.net/trunk/src/core/Document/AbstractField.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Document/AbstractField.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Document/AbstractField.cs (original)
+++ incubator/lucene.net/trunk/src/core/Document/AbstractField.cs Fri Apr 13 02:24:19 2012
@@ -197,10 +197,7 @@ namespace Lucene.Net.Documents
{
return binaryLength;
}
- else if (fieldsData is byte[])
- return ((byte[]) fieldsData).Length;
- else
- return 0;
+ return fieldsData is byte[] ? ((byte[]) fieldsData).Length : 0;
}
}
Modified: incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs Fri Apr 13 02:24:19 2012
@@ -448,7 +448,7 @@ namespace Lucene.Net.Index
/// loaded.
/// </summary>
[Serializable]
- private class LazyField : AbstractField, IFieldable
+ private sealed class LazyField : AbstractField, IFieldable
{
private void InitBlock(FieldsReader enclosingInstance)
{
Modified: incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs Fri Apr 13 02:24:19 2012
@@ -1483,33 +1483,36 @@ namespace Lucene.Net.Index
return maxFieldLength;
}
- /// Gets or sets the termsIndexDivisor passed to any readers that
- /// IndexWriter opens, for example when applying deletes
- /// or creating a near-real-time reader in
- /// <see cref="GetReader()"/>. Default value is
- /// <see cref="IndexReader.DEFAULT_TERMS_INDEX_DIVISOR"/>.
- public int ReaderTermsIndexDivisor
+ /// Sets the termsIndexDivisor passed to any readers that
+ /// IndexWriter opens, for example when applying deletes
+ /// or creating a near-real-time reader in
+ /// <see cref="GetReader()"/>. Default value is
+ /// <see cref="IndexReader.DEFAULT_TERMS_INDEX_DIVISOR"/>.
+ public void SetReaderTermsIndexDivisor(int value)
{
- get
+ EnsureOpen();
+ if (value <= 0)
{
- EnsureOpen();
- return readerTermsIndexDivisor;
+ throw new System.ArgumentException("divisor must be >= 1 (got " + value + ")");
}
- set
+ readerTermsIndexDivisor = value;
+ if (infoStream != null)
{
- EnsureOpen();
- if (value <= 0)
- {
- throw new System.ArgumentException("divisor must be >= 1 (got " + value + ")");
- }
- readerTermsIndexDivisor = value;
- if (infoStream != null)
- {
- Message("setReaderTermsIndexDivisor " + readerTermsIndexDivisor);
- }
+ Message("setReaderTermsIndexDivisor " + readerTermsIndexDivisor);
}
}
+ /// Gets the termsIndexDivisor passed to any readers that
+ /// IndexWriter opens, for example when applying deletes
+ /// or creating a near-real-time reader in
+ /// <see cref="GetReader()"/>. Default value is
+ /// <see cref="IndexReader.DEFAULT_TERMS_INDEX_DIVISOR"/>.
+ public int GetReaderTermsIndexDivisor()
+ {
+ EnsureOpen();
+ return readerTermsIndexDivisor;
+ }
+
/// <summary>Determines the minimal number of documents required
/// before the buffered in-memory documents are flushed as
/// a new Segment. Large values generally gives faster
Modified: incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs Fri Apr 13 02:24:19 2012
@@ -278,11 +278,5 @@ namespace Lucene.Net.Index
while (target > doc);
return true;
}
-
- public IndexInput freqStream_ForNUnit
- {
- get { return freqStream; }
- set { freqStream = value; }
- }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Lucene.Net.csproj?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Lucene.Net.csproj (original)
+++ incubator/lucene.net/trunk/src/core/Lucene.Net.csproj Fri Apr 13 02:24:19 2012
@@ -87,7 +87,7 @@
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>BasicDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
- <RunCodeAnalysis>true</RunCodeAnalysis>
+ <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\build\bin\core\Release\</OutputPath>
Modified: incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs Fri Apr 13 02:24:19 2012
@@ -151,7 +151,7 @@ namespace Lucene.Net.QueryParsers
private Operator operator_Renamed = OR_OPERATOR;
private bool lowercaseExpandedTerms = true;
- private MultiTermQuery.RewriteMethod multiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
+ private RewriteMethod multiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
private bool allowLeadingWildcard = false;
private bool enablePositionIncrements = true;
@@ -340,7 +340,7 @@ namespace Lucene.Net.QueryParsers
/// points are not relevant then use this to change
/// the rewrite method.
/// </summary>
- public virtual MultiTermQuery.RewriteMethod MultiTermRewriteMethod
+ public virtual RewriteMethod MultiTermRewriteMethod
{
set { multiTermRewriteMethod = value; }
get { return multiTermRewriteMethod; }
@@ -866,7 +866,7 @@ namespace Lucene.Net.QueryParsers
/// </returns>
protected internal virtual Query NewPrefixQuery(Term prefix)
{
- return new PrefixQuery(prefix) { QueryRewriteMethod = multiTermRewriteMethod };
+ return new PrefixQuery(prefix) { RewriteMethod = multiTermRewriteMethod };
}
/// <summary> Builds a new FuzzyQuery instance</summary>
@@ -897,7 +897,7 @@ namespace Lucene.Net.QueryParsers
/// </returns>
protected internal virtual Query NewRangeQuery(String field, String part1, String part2, bool inclusive)
{
- return new TermRangeQuery(field, part1, part2, inclusive, inclusive, rangeCollator) { QueryRewriteMethod = multiTermRewriteMethod };
+ return new TermRangeQuery(field, part1, part2, inclusive, inclusive, rangeCollator) { RewriteMethod = multiTermRewriteMethod };
}
/// <summary> Builds a new MatchAllDocsQuery instance</summary>
@@ -915,7 +915,7 @@ namespace Lucene.Net.QueryParsers
/// </returns>
protected internal virtual Query NewWildcardQuery(Term t)
{
- return new WildcardQuery(t) { QueryRewriteMethod = multiTermRewriteMethod };
+ return new WildcardQuery(t) { RewriteMethod = multiTermRewriteMethod };
}
/// <summary> Factory method for generating query, given a set of clauses.
Modified: incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs Fri Apr 13 02:24:19 2012
@@ -220,26 +220,11 @@ namespace Lucene.Net.Search
return clauses.ToArray();
}
- // TODO: Uncomment and mark GetClauses() obsolete when Clauses() method
- // is removed
- ///// <summary>Returns the set of clauses in this query. </summary>
- //public virtual BooleanClause[] Clauses
- //{
- // get { return clauses.ToArray(); }
- //}
-
/// <summary>Returns the list of clauses in this query. </summary>
- public virtual System.Collections.Generic.List<BooleanClause> ClauseList
+ public virtual System.Collections.Generic.List<BooleanClause> Clauses
{
get { return clauses; }
}
-
- /// <summary>Returns the list of clauses in this query. </summary>
- [Obsolete("Use ClauseList property instead")]
- public virtual System.Collections.Generic.List<BooleanClause> Clauses()
- {
- return clauses;
- }
/// <summary>
/// Returns an iterator on the clauses in this query.
Modified: incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs Fri Apr 13 02:24:19 2012
@@ -231,10 +231,5 @@ namespace Lucene.Net.Search.Function
{
return this.MemberwiseClone();
}
-
- public ValueSource valSrc_ForNUnit
- {
- get { return valSrc; }
- }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs Fri Apr 13 02:24:19 2012
@@ -127,7 +127,7 @@ namespace Lucene.Net.Search
get { return term; }
}
- public override RewriteMethod QueryRewriteMethod
+ public override RewriteMethod RewriteMethod
{
set { throw new System.NotSupportedException("FuzzyQuery cannot change rewrite method"); }
}
Modified: incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs Fri Apr 13 02:24:19 2012
@@ -79,15 +79,8 @@ namespace Lucene.Net.Search
protected internal RewriteMethod rewriteMethod = CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
[NonSerialized]
internal int numberOfTerms = 0;
-
- /// <summary>Abstract class that defines how the query is rewritten. </summary>
- [Serializable]
- public abstract class RewriteMethod
- {
- public abstract Query Rewrite(IndexReader reader, MultiTermQuery query);
- }
-
- [Serializable]
+
+ [Serializable]
private sealed class ConstantScoreFilterRewrite:RewriteMethod
{
public override Query Rewrite(IndexReader reader, MultiTermQuery query)
@@ -420,9 +413,9 @@ namespace Lucene.Net.Search
/// <summary> Sets the rewrite method to be used when executing the
/// query. You can use one of the four core methods, or
- /// implement your own subclass of <see cref="RewriteMethod" />.
+ /// implement your own subclass of <see cref="Search.RewriteMethod" />.
/// </summary>
- public virtual RewriteMethod QueryRewriteMethod
+ public virtual RewriteMethod RewriteMethod
{
get { return rewriteMethod; }
set { rewriteMethod = value; }
@@ -462,4 +455,11 @@ namespace Lucene.Net.Search
CONSTANT_SCORE_AUTO_REWRITE_DEFAULT = new AnonymousClassConstantScoreAutoRewrite();
}
}
+
+ /// <summary>Abstract class that defines how the query is rewritten. </summary>
+ [Serializable]
+ public abstract class RewriteMethod
+ {
+ public abstract Query Rewrite(IndexReader reader, MultiTermQuery query);
+ }
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs Fri Apr 13 02:24:19 2012
@@ -177,11 +177,11 @@ namespace Lucene.Net.Search
{
case 64:
- QueryRewriteMethod = (precisionStep > 6)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
+ RewriteMethod = (precisionStep > 6)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
break;
case 32:
- QueryRewriteMethod = (precisionStep > 8)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
+ RewriteMethod = (precisionStep > 8)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
break;
default:
@@ -193,7 +193,7 @@ namespace Lucene.Net.Search
// shortcut if upper bound == lower bound
if (min != null && min.Equals(max))
{
- QueryRewriteMethod = CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
+ RewriteMethod = CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
}
}
@@ -233,7 +233,6 @@ namespace Lucene.Net.Search
get { return max; }
}
- //@Override
public override System.String ToString(System.String field)
{
System.Text.StringBuilder sb = new System.Text.StringBuilder();
@@ -242,7 +241,6 @@ namespace Lucene.Net.Search
return sb.Append(minInclusive ? '[' : '{').Append((min == null) ? "*" : min.ToString()).Append(" TO ").Append((max == null) ? "*" : max.ToString()).Append(maxInclusive ? ']' : '}').Append(ToStringUtils.Boost(Boost)).ToString();
}
- //@Override
public override bool Equals(System.Object o)
{
if (o == this)
@@ -257,7 +255,6 @@ namespace Lucene.Net.Search
return false;
}
- //@Override
public override int GetHashCode()
{
int hash = base.GetHashCode();
Modified: incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs Fri Apr 13 02:24:19 2012
@@ -205,7 +205,7 @@ namespace Lucene.Net.Search.Payloads
{
if (subSpans[i] is NearSpansOrdered)
{
- if (((NearSpansOrdered) subSpans[i]).IsPayloadAvailable)
+ if (((NearSpansOrdered) subSpans[i]).IsPayloadAvailable())
{
ProcessPayloads(((NearSpansOrdered) subSpans[i]).GetPayload(), subSpans[i].Start(), subSpans[i].End());
}
@@ -213,7 +213,7 @@ namespace Lucene.Net.Search.Payloads
}
else if (subSpans[i] is NearSpansUnordered)
{
- if (((NearSpansUnordered) subSpans[i]).IsPayloadAvailable)
+ if (((NearSpansUnordered) subSpans[i]).IsPayloadAvailable())
{
ProcessPayloads(((NearSpansUnordered) subSpans[i]).GetPayload(), subSpans[i].Start(), subSpans[i].End());
}
Modified: incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs Fri Apr 13 02:24:19 2012
@@ -197,7 +197,7 @@ namespace Lucene.Net.Search.Payloads
while (spans.Next() == true)
{
- if (spans.IsPayloadAvailable)
+ if (spans.IsPayloadAvailable())
{
ICollection<byte[]> payload = spans.GetPayload();
foreach (byte[] bytes in payload)
Modified: incubator/lucene.net/trunk/src/core/Search/SingleTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/SingleTermEnum.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/SingleTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/SingleTermEnum.cs Fri Apr 13 02:24:19 2012
@@ -25,7 +25,7 @@ namespace Lucene.Net.Search
/// <p/>
/// This can be used by <see cref="MultiTermQuery"/>s that need only visit one term,
/// but want to preserve MultiTermQuery semantics such as
- /// <see cref="MultiTermQuery.RewriteMethod"/>.
+ /// <see cref="RewriteMethod"/>.
/// </summary>
public class SingleTermEnum : FilteredTermEnum
{
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansOrdered.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansOrdered.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansOrdered.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansOrdered.cs Fri Apr 13 02:24:19 2012
@@ -153,9 +153,9 @@ namespace Lucene.Net.Search.Spans
// TODO: Remove warning after API has been finalized
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { return (matchPayload.Count == 0) == false; }
+ return (matchPayload.Count == 0) == false;
}
// inherit javadocs
@@ -326,7 +326,7 @@ namespace Lucene.Net.Search.Spans
matchStart = subSpans[subSpans.Length - 1].Start();
matchEnd = subSpans[subSpans.Length - 1].End();
System.Collections.Generic.Dictionary<byte[], byte[]> possibleMatchPayloads = new System.Collections.Generic.Dictionary<byte[], byte[]>();
- if (subSpans[subSpans.Length - 1].IsPayloadAvailable)
+ if (subSpans[subSpans.Length - 1].IsPayloadAvailable())
{
System.Collections.Generic.ICollection<byte[]> payload = subSpans[subSpans.Length - 1].GetPayload();
foreach(byte[] pl in payload)
@@ -346,7 +346,7 @@ namespace Lucene.Net.Search.Spans
for (int i = subSpans.Length - 2; i >= 0; i--)
{
Spans prevSpans = subSpans[i];
- if (collectPayloads && prevSpans.IsPayloadAvailable)
+ if (collectPayloads && prevSpans.IsPayloadAvailable())
{
System.Collections.Generic.ICollection<byte[]> payload = prevSpans.GetPayload();
possiblePayload = new System.Collections.Generic.List<byte[]>(payload.Count);
@@ -382,7 +382,7 @@ namespace Lucene.Net.Search.Spans
// prevSpans still before (lastStart, lastEnd)
prevStart = ppStart;
prevEnd = ppEnd;
- if (collectPayloads && prevSpans.IsPayloadAvailable)
+ if (collectPayloads && prevSpans.IsPayloadAvailable())
{
System.Collections.Generic.ICollection<byte[]> payload = prevSpans.GetPayload();
possiblePayload = new System.Collections.Generic.List<byte[]>(payload.Count);
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs Fri Apr 13 02:24:19 2012
@@ -162,9 +162,9 @@ namespace Lucene.Net.Search.Spans
// TODO: Remove warning after API has been finalized
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { return spans.IsPayloadAvailable; }
+ return spans.IsPayloadAvailable();
}
public override System.String ToString()
@@ -324,7 +324,7 @@ namespace Lucene.Net.Search.Spans
System.Collections.Generic.ISet<byte[]> matchPayload = new System.Collections.Generic.HashSet<byte[]>();
for (SpansCell cell = first; cell != null; cell = cell.next)
{
- if (cell.IsPayloadAvailable)
+ if (cell.IsPayloadAvailable())
{
matchPayload.UnionWith(cell.GetPayload());
}
@@ -333,24 +333,20 @@ namespace Lucene.Net.Search.Spans
}
// TODO: Remove warning after API has been finalized
- public override bool IsPayloadAvailable
+
+ public override bool IsPayloadAvailable()
{
- // this is a lot for a property, but it's the only span of the 5 others
- // that has this much logic.
- get
+ SpansCell pointer = Min();
+ while (pointer != null)
{
- SpansCell pointer = Min();
- while (pointer != null)
+ if (pointer.IsPayloadAvailable())
{
- if (pointer.IsPayloadAvailable)
- {
- return true;
- }
- pointer = pointer.next;
+ return true;
}
-
- return false;
+ pointer = pointer.next;
}
+
+ return false;
}
public override System.String ToString()
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/SpanFirstQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/SpanFirstQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/SpanFirstQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/SpanFirstQuery.cs Fri Apr 13 02:24:19 2012
@@ -91,7 +91,7 @@ namespace Lucene.Net.Search.Spans
public override ICollection<byte[]> GetPayload()
{
System.Collections.Generic.ICollection<byte[]> result = null;
- if (spans.IsPayloadAvailable)
+ if (spans.IsPayloadAvailable())
{
result = spans.GetPayload();
}
@@ -100,9 +100,9 @@ namespace Lucene.Net.Search.Spans
// TODO: Remove warning after API has been finalized
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { return spans.IsPayloadAvailable; }
+ return spans.IsPayloadAvailable();
}
public override System.String ToString()
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/SpanNotQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/SpanNotQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/SpanNotQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/SpanNotQuery.cs Fri Apr 13 02:24:19 2012
@@ -127,7 +127,7 @@ namespace Lucene.Net.Search.Spans
public override ICollection<byte[]> GetPayload()
{
System.Collections.Generic.ICollection<byte[]> result = null;
- if (includeSpans.IsPayloadAvailable)
+ if (includeSpans.IsPayloadAvailable())
{
result = includeSpans.GetPayload();
}
@@ -136,9 +136,9 @@ namespace Lucene.Net.Search.Spans
// TODO: Remove warning after API has been finalized
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { return includeSpans.IsPayloadAvailable; }
+ return includeSpans.IsPayloadAvailable();
}
public override System.String ToString()
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/SpanOrQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/SpanOrQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/SpanOrQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/SpanOrQuery.cs Fri Apr 13 02:24:19 2012
@@ -143,20 +143,17 @@ namespace Lucene.Net.Search.Spans
{
System.Collections.Generic.ICollection<byte[]> result = null;
Spans theTop = Top();
- if (theTop != null && theTop.IsPayloadAvailable)
+ if (theTop != null && theTop.IsPayloadAvailable())
{
result = theTop.GetPayload();
}
return result;
}
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get
- {
- Spans top = Top();
- return top != null && top.IsPayloadAvailable;
- }
+ Spans top = Top();
+ return top != null && top.IsPayloadAvailable();
}
public override System.String ToString()
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/Spans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/Spans.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/Spans.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/Spans.cs Fri Apr 13 02:24:19 2012
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search.Spans
/// <see cref="Next()" />.
///
/// </summary>
- /// <value> true if there is a payload available at this position that can be loaded </value>
- public abstract bool IsPayloadAvailable { get; }
+ /// <returns> true if there is a payload available at this position that can be loaded </returns>
+ public abstract bool IsPayloadAvailable();
}
}
\ No newline at end of file
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=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs Fri Apr 13 02:24:19 2012
@@ -108,9 +108,9 @@ namespace Lucene.Net.Search.Spans
// TODO: Remove warning after API has been finalized
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { return positions.IsPayloadAvailable; }
+ return positions.IsPayloadAvailable;
}
public override System.String ToString()
Modified: incubator/lucene.net/trunk/src/core/Search/TopDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TopDocs.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TopDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TopDocs.cs Fri Apr 13 02:24:19 2012
@@ -31,8 +31,6 @@ namespace Lucene.Net.Search
private float _maxScore;
/// <summary>The total number of hits for the query.</summary>
- /// <seealso cref="Hits.Length()">
- /// </seealso>
public int TotalHits
{
get { return _totalHits; }
@@ -58,7 +56,7 @@ namespace Lucene.Net.Search
}
/// <summary>Constructs a TopDocs with a default maxScore=Float.NaN. </summary>
- internal TopDocs(int totalHits, ScoreDoc[] scoreDocs):this(totalHits, scoreDocs, System.Single.NaN)
+ internal TopDocs(int totalHits, ScoreDoc[] scoreDocs):this(totalHits, scoreDocs, float.NaN)
{
}
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=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs Fri Apr 13 02:24:19 2012
@@ -81,7 +81,7 @@ namespace Lucene.Net.Search
MultiTermQuery rewritten =
new PrefixQuery(term.CreateTerm(term.Text.Substring(0, term.Text.IndexOf('*'))));
rewritten.Boost = Boost;
- rewritten.QueryRewriteMethod = QueryRewriteMethod;
+ rewritten.RewriteMethod = RewriteMethod;
return rewritten;
}
else
Modified: incubator/lucene.net/trunk/src/core/Store/CheckSumIndexInput.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/CheckSumIndexInput.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/CheckSumIndexInput.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/CheckSumIndexInput.cs Fri Apr 13 02:24:19 2012
@@ -55,12 +55,6 @@ namespace Lucene.Net.Store
get { return digest.Value; }
}
- [Obsolete("Use Checksum property instead")]
- public virtual long GetChecksum()
- {
- return Checksum;
- }
-
protected override void Dispose(bool disposing)
{
if (isDisposed) return;
Modified: incubator/lucene.net/trunk/src/core/Store/CheckSumIndexOutput.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/CheckSumIndexOutput.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/CheckSumIndexOutput.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/CheckSumIndexOutput.cs Fri Apr 13 02:24:19 2012
@@ -52,15 +52,9 @@ namespace Lucene.Net.Store
public virtual long Checksum
{
- get { return digest.GetValue(); }
+ get { return digest.Value; }
}
- [Obsolete("Use Checksum property instead")]
- public virtual long GetChecksum()
- {
- return Checksum;
- }
-
public override void Flush()
{
main.Flush();
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=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs Fri Apr 13 02:24:19 2012
@@ -262,7 +262,6 @@ namespace Lucene.Net.Store
get
{
return buffer.Position;
- ;
}
}
Modified: incubator/lucene.net/trunk/src/core/Store/RAMOutputStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/RAMOutputStream.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/RAMOutputStream.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/RAMOutputStream.cs Fri Apr 13 02:24:19 2012
@@ -187,10 +187,5 @@ namespace Lucene.Net.Store
{
return file.NumBuffers() * BUFFER_SIZE;
}
-
- public static int BUFFER_SIZE_ForNUnit
- {
- get { return BUFFER_SIZE; }
- }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/core/Support/CRC32.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Support/CRC32.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Support/CRC32.cs (original)
+++ incubator/lucene.net/trunk/src/core/Support/CRC32.cs Fri Apr 13 02:24:19 2012
@@ -55,11 +55,6 @@ namespace Lucene.Net.Support
}
}
- public Int64 GetValue()
- {
- return Value;
- }
-
public void Reset()
{
crc = 0;
Modified: incubator/lucene.net/trunk/src/core/Support/IChecksum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Support/IChecksum.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Support/IChecksum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Support/IChecksum.cs Fri Apr 13 02:24:19 2012
@@ -27,8 +27,6 @@ namespace Lucene.Net.Support
void Update(int b);
void Update(byte[] b);
void Update(byte[] b, int offset, int length);
- [Obsolete("Use Value property instead")]
- Int64 GetValue();
long Value { get; }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs Fri Apr 13 02:24:19 2012
@@ -700,7 +700,7 @@ namespace Lucene.Net.Search.Highlight.Te
numHighlights = 0;
query = new WildcardQuery(new Term(FIELD_NAME, "ken*"));
- ((WildcardQuery) query).QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ ((WildcardQuery) query).RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
searcher = new IndexSearcher(ramDir, true);
// can't rewrite ConstantScore if you want to highlight it -
// it rewrites to ConstantScoreQuery which cannot be highlighted
Modified: incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs Fri Apr 13 02:24:19 2012
@@ -94,7 +94,7 @@ namespace Lucene.Net.Search.Similar
mlt.SetBoostFactor(boostFactor);
BooleanQuery query = (BooleanQuery)mlt.Like(new System.IO.StringReader("lucene release"));
- IList clauses = query.Clauses();
+ IList clauses = query.Clauses;
Assert.AreEqual(originalValues.Count, clauses.Count,"Expected " + originalValues.Count + " clauses.");
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search.Similar
mlt.SetFieldNames(new String[] { "text" });
mlt.SetBoost(true);
BooleanQuery query = (BooleanQuery)mlt.Like(new System.IO.StringReader("lucene release"));
- IList clauses = query.Clauses();
+ IList clauses = query.Clauses;
for (int i = 0; i < clauses.Count; i++)
{
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs Fri Apr 13 02:24:19 2012
@@ -333,7 +333,7 @@ namespace Lucene.Net.Index
Directory dir1 = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir1, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
- writer.ReaderTermsIndexDivisor = 2;
+ writer.SetReaderTermsIndexDivisor(2);
writer.SetInfoStream(infoStream);
// create the index
CreateIndexNoClose(!optimize, "index1", writer);
Modified: incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs Fri Apr 13 02:24:19 2012
@@ -63,7 +63,7 @@ namespace Lucene.Net.Index
IndexReader reader = SegmentReader.GetOnlySegmentReader(dir);
SegmentTermPositions tp = (SegmentTermPositions) reader.TermPositions();
- tp.freqStream_ForNUnit = new CountingStream(this, tp.freqStream_ForNUnit);
+ tp.freqStream = new CountingStream(this, tp.freqStream);
for (int i = 0; i < 2; i++)
{
Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs Fri Apr 13 02:24:19 2012
@@ -544,11 +544,11 @@ namespace Lucene.Net.QueryParsers
public virtual void TestRange()
{
AssertQueryEquals("[ a TO z]", null, "[a TO z]");
- Assert.AreEqual(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT, ((TermRangeQuery)GetQuery("[ a TO z]", null)).QueryRewriteMethod);
+ Assert.AreEqual(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT, ((TermRangeQuery)GetQuery("[ a TO z]", null)).RewriteMethod);
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field", new SimpleAnalyzer());
qp.MultiTermRewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
- Assert.AreEqual(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE, ((TermRangeQuery)qp.Parse("[ a TO z]")).QueryRewriteMethod);
+ Assert.AreEqual(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE, ((TermRangeQuery)qp.Parse("[ a TO z]")).RewriteMethod);
AssertQueryEquals("[ a TO z ]", null, "[a TO z]");
AssertQueryEquals("{ a TO z}", null, "{a TO z}");
@@ -1061,7 +1061,7 @@ namespace Lucene.Net.QueryParsers
Query result = qp.Parse("a:the OR a:foo");
Assert.IsNotNull(result, "result is null and it shouldn't be");
Assert.IsTrue(result is BooleanQuery, "result is not a BooleanQuery");
- Assert.IsTrue(((BooleanQuery) result).Clauses().Count == 0, ((BooleanQuery) result).Clauses().Count + " does not equal: " + 0);
+ Assert.IsTrue(((BooleanQuery) result).Clauses.Count == 0, ((BooleanQuery) result).Clauses.Count + " does not equal: " + 0);
result = qp.Parse("a:woo OR a:the");
Assert.IsNotNull(result, "result is null and it shouldn't be");
Assert.IsTrue(result is TermQuery, "result is not a TermQuery");
@@ -1069,7 +1069,7 @@ namespace Lucene.Net.QueryParsers
Assert.IsNotNull(result, "result is null and it shouldn't be");
Assert.IsTrue(result is BooleanQuery, "result is not a BooleanQuery");
System.Console.Out.WriteLine("Result: " + result);
- Assert.IsTrue(((BooleanQuery) result).Clauses().Count == 2, ((BooleanQuery) result).Clauses().Count + " does not equal: " + 2);
+ Assert.IsTrue(((BooleanQuery) result).Clauses.Count == 2, ((BooleanQuery) result).Clauses.Count + " does not equal: " + 2);
}
[Test]
Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs Fri Apr 13 02:24:19 2012
@@ -216,14 +216,14 @@ namespace Lucene.Net.Search.Function
{
if (i == 0)
{
- innerArray[j] = q.valSrc_ForNUnit.GetValues(reader).InnerArray;
+ innerArray[j] = q.valSrc.GetValues(reader).InnerArray;
Log(i + ". compare: " + innerArray[j].GetType() + " to " + expectedArrayTypes[tp].GetType());
Assert.AreEqual(innerArray[j].GetType(), expectedArrayTypes[tp].GetType(), "field values should be cached in the correct array type!");
}
else
{
- Log(i + ". compare: " + innerArray[j] + " to " + q.valSrc_ForNUnit.GetValues(reader).InnerArray);
- Assert.AreSame(innerArray[j], q.valSrc_ForNUnit.GetValues(reader).InnerArray, "field values should be cached and reused!");
+ Log(i + ". compare: " + innerArray[j] + " to " + q.valSrc.GetValues(reader).InnerArray);
+ Assert.AreSame(innerArray[j], q.valSrc.GetValues(reader).InnerArray, "field values should be cached and reused!");
}
}
catch (System.NotSupportedException e)
@@ -248,8 +248,8 @@ namespace Lucene.Net.Search.Function
IndexReader reader = readers2[j];
try
{
- Log("compare: " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).InnerArray);
- Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
+ Log("compare: " + innerArray + " to " + q2.valSrc.GetValues(reader).InnerArray);
+ Assert.AreNotSame(innerArray, q2.valSrc.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
}
catch (System.NotSupportedException e)
{
Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs Fri Apr 13 02:24:19 2012
@@ -194,12 +194,12 @@ namespace Lucene.Net.Search.Function
IndexReader reader = readers[j];
if (i == 0)
{
- innerArray = q.valSrc_ForNUnit.GetValues(reader).InnerArray;
+ innerArray = q.valSrc.GetValues(reader).InnerArray;
}
else
{
- Log(i + ". compare: " + innerArray + " to " + q.valSrc_ForNUnit.GetValues(reader).InnerArray);
- Assert.AreSame(innerArray, q.valSrc_ForNUnit.GetValues(reader).InnerArray, "field values should be cached and reused!");
+ Log(i + ". compare: " + innerArray + " to " + q.valSrc.GetValues(reader).InnerArray);
+ Assert.AreSame(innerArray, q.valSrc.GetValues(reader).InnerArray, "field values should be cached and reused!");
}
}
}
@@ -238,8 +238,8 @@ namespace Lucene.Net.Search.Function
IndexReader reader = readers2[j];
try
{
- Log("compare (should differ): " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).InnerArray);
- Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).InnerArray, "different values shuold be loaded for a different field!");
+ Log("compare (should differ): " + innerArray + " to " + q2.valSrc.GetValues(reader).InnerArray);
+ Assert.AreNotSame(innerArray, q2.valSrc.GetValues(reader).InnerArray, "different values shuold be loaded for a different field!");
}
catch (System.NotSupportedException e)
{
@@ -271,8 +271,8 @@ namespace Lucene.Net.Search.Function
IndexReader reader = readers2[j];
try
{
- Log("compare (should differ): " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).InnerArray);
- Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
+ Log("compare (should differ): " + innerArray + " to " + q2.valSrc.GetValues(reader).InnerArray);
+ Assert.AreNotSame(innerArray, q2.valSrc.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
}
catch (System.NotSupportedException e)
{
Modified: incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs Fri Apr 13 02:24:19 2012
@@ -70,9 +70,9 @@ namespace Lucene.Net.Search.Spans
throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
}
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+ throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
}
}
@@ -102,9 +102,9 @@ namespace Lucene.Net.Search.Spans
throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
}
- public override bool IsPayloadAvailable
+ public override bool IsPayloadAvailable()
{
- get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+ throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
}
public override int Doc()
Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs Fri Apr 13 02:24:19 2012
@@ -417,14 +417,14 @@ namespace Lucene.Net.Search.Spans
//if we expect payloads, then isPayloadAvailable should be true
if (expectedNumPayloads > 0)
{
- Assert.IsTrue(spans.IsPayloadAvailable == true, "isPayloadAvailable is not returning the correct value: " + spans.IsPayloadAvailable + " and it should be: " + (expectedNumPayloads > 0));
+ Assert.IsTrue(spans.IsPayloadAvailable() == true, "isPayloadAvailable is not returning the correct value: " + spans.IsPayloadAvailable() + " and it should be: " + (expectedNumPayloads > 0));
}
else
{
- Assert.IsTrue(spans.IsPayloadAvailable == false, "isPayloadAvailable should be false");
+ Assert.IsTrue(spans.IsPayloadAvailable() == false, "isPayloadAvailable should be false");
}
//See payload helper, for the PayloadHelper.FIELD field, there is a single byte payload at every token
- if (spans.IsPayloadAvailable)
+ if (spans.IsPayloadAvailable())
{
System.Collections.Generic.ICollection<byte[]> payload = spans.GetPayload();
Assert.IsTrue(payload.Count == expectedNumPayloads, "payload Size: " + payload.Count + " is not: " + expectedNumPayloads);
@@ -472,7 +472,7 @@ namespace Lucene.Net.Search.Spans
{
if (DEBUG)
System.Console.Out.WriteLine("\nSpans Dump --");
- if (spans.IsPayloadAvailable)
+ if (spans.IsPayloadAvailable())
{
System.Collections.Generic.ICollection<byte[]> payload = spans.GetPayload();
if (DEBUG)
Modified: incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs Fri Apr 13 02:24:19 2012
@@ -128,14 +128,14 @@ namespace Lucene.Net.Search
public static Query Csrq(System.String f, System.String l, System.String h, bool il, bool ih)
{
TermRangeQuery query = new TermRangeQuery(f, l, h, il, ih);
- query.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ query.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
return query;
}
- public static Query Csrq(System.String f, System.String l, System.String h, bool il, bool ih, MultiTermQuery.RewriteMethod method)
+ public static Query Csrq(System.String f, System.String l, System.String h, bool il, bool ih, RewriteMethod method)
{
TermRangeQuery query = new TermRangeQuery(f, l, h, il, ih);
- query.QueryRewriteMethod = method;
+ query.RewriteMethod = method;
return query;
}
@@ -143,7 +143,7 @@ namespace Lucene.Net.Search
public static Query Csrq(System.String f, System.String l, System.String h, bool il, bool ih, System.Globalization.CompareInfo c)
{
TermRangeQuery query = new TermRangeQuery(f, l, h, il, ih, c);
- query.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ query.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
return query;
}
@@ -151,7 +151,7 @@ namespace Lucene.Net.Search
public static Query Cspq(Term prefix)
{
PrefixQuery query = new PrefixQuery(prefix);
- query.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ query.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
return query;
}
@@ -159,7 +159,7 @@ namespace Lucene.Net.Search
public static Query Cswcq(Term wild)
{
WildcardQuery query = new WildcardQuery(wild);
- query.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ query.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
return query;
}
Modified: incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs Fri Apr 13 02:24:19 2012
@@ -70,14 +70,14 @@ namespace Lucene.Net.Search
case 0:
type = " (constant score filter rewrite)";
- q.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ q.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
topDocs = searcher.Search(q, null, noDocs, Sort.INDEXORDER);
terms = q.TotalNumberOfTerms;
break;
case 1:
type = " (constant score boolean rewrite)";
- q.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
+ q.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
topDocs = searcher.Search(q, null, noDocs, Sort.INDEXORDER);
terms = q.TotalNumberOfTerms;
break;
@@ -149,7 +149,7 @@ namespace Lucene.Net.Search
System.Int32 tempAux = 1000;
System.Int32 tempAux2 = 1000;
NumericRangeQuery<int> q = NumericRangeQuery.NewIntRange("ascfield8", 8, tempAux, tempAux2, true, true);
- Assert.AreSame(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE, q.QueryRewriteMethod);
+ Assert.AreSame(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE, q.RewriteMethod);
TopDocs topDocs = searcher.Search(q, noDocs);
ScoreDoc[] sd = topDocs.ScoreDocs;
Assert.IsNotNull(sd);
Modified: incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs Fri Apr 13 02:24:19 2012
@@ -70,14 +70,14 @@ namespace Lucene.Net.Search
case 0:
type = " (constant score filter rewrite)";
- q.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ q.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
topDocs = searcher.Search(q, null, noDocs, Sort.INDEXORDER);
terms = q.TotalNumberOfTerms;
break;
case 1:
type = " (constant score boolean rewrite)";
- q.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
+ q.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
topDocs = searcher.Search(q, null, noDocs, Sort.INDEXORDER);
terms = q.TotalNumberOfTerms;
break;
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search
//UPGRADE_NOTE: ref keyword was added to struct-type parameters. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1303'"
System.Int64 tempAux2 = 1000L;
NumericRangeQuery<long> q = NumericRangeQuery.NewLongRange("ascfield8", 8, tempAux, tempAux2, true, true);
- Assert.AreSame(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE, q.QueryRewriteMethod);
+ Assert.AreSame(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE, q.RewriteMethod);
TopDocs topDocs = searcher.Search(q, noDocs);
ScoreDoc[] sd = topDocs.ScoreDocs;
Assert.IsNotNull(sd);
Modified: incubator/lucene.net/trunk/test/core/Search/TestWildcard.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestWildcard.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestWildcard.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestWildcard.cs Fri Apr 13 02:24:19 2012
@@ -73,25 +73,25 @@ namespace Lucene.Net.Search
MultiTermQuery wq = new WildcardQuery(new Term("field", "nowildcard"));
AssertMatches(searcher, wq, 1);
- wq.QueryRewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
wq.Boost = 0.1f;
Query q = searcher.Rewrite(wq);
Assert.IsTrue(q is TermQuery);
Assert.AreEqual(q.Boost, wq.Boost);
- wq.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
wq.Boost = 0.2f;
q = searcher.Rewrite(wq);
Assert.True(q is ConstantScoreQuery);
Assert.AreEqual(q.Boost, wq.Boost);
- wq.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
+ wq.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
wq.Boost = 0.3F;
q = searcher.Rewrite(wq);
Assert.True(q is ConstantScoreQuery);
Assert.AreEqual(q.Boost, wq.Boost);
- wq.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
wq.Boost = 0.4F;
q = searcher.Rewrite(wq);
Assert.True(q is ConstantScoreQuery);
@@ -108,7 +108,7 @@ namespace Lucene.Net.Search
IndexSearcher searcher = new IndexSearcher(indexStore, true);
MultiTermQuery wq = new WildcardQuery(new Term("field", ""));
- wq.QueryRewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
AssertMatches(searcher, wq, 0);
BooleanQuery expected = new BooleanQuery(true);
Assert.AreEqual(searcher.Rewrite(expected), searcher.Rewrite(wq));
@@ -129,27 +129,27 @@ namespace Lucene.Net.Search
AssertMatches(searcher, wq, 2);
MultiTermQuery expected = new PrefixQuery(new Term("field", "prefix"));
- wq.QueryRewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;
wq.Boost = 0.1F;
- expected.QueryRewriteMethod = wq.QueryRewriteMethod;
+ expected.RewriteMethod = wq.RewriteMethod;
expected.Boost = wq.Boost;
Assert.AreEqual(searcher.Rewrite(expected), searcher.Rewrite(wq));
- wq.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
wq.Boost = 0.2F;
- expected.QueryRewriteMethod = wq.QueryRewriteMethod;
+ expected.RewriteMethod = wq.RewriteMethod;
expected.Boost = wq.Boost;
Assert.AreEqual(searcher.Rewrite(expected), searcher.Rewrite(wq));
- wq.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
+ wq.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
wq.Boost = 0.3F;
- expected.QueryRewriteMethod = wq.QueryRewriteMethod;
+ expected.RewriteMethod = wq.RewriteMethod;
expected.Boost = wq.Boost;
Assert.AreEqual(searcher.Rewrite(expected), searcher.Rewrite(wq));
- wq.QueryRewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
+ wq.RewriteMethod = MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
wq.Boost = 0.4F;
- expected.QueryRewriteMethod = wq.QueryRewriteMethod;
+ expected.RewriteMethod = wq.RewriteMethod;
expected.Boost = wq.Boost;
Assert.AreEqual(searcher.Rewrite(expected), searcher.Rewrite(wq));
}
Modified: incubator/lucene.net/trunk/test/core/Store/TestHugeRamFile.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Store/TestHugeRamFile.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Store/TestHugeRamFile.cs (original)
+++ incubator/lucene.net/trunk/test/core/Store/TestHugeRamFile.cs Fri Apr 13 02:24:19 2012
@@ -66,8 +66,8 @@ namespace Lucene.Net.Store
DenseRAMFile f = new DenseRAMFile();
// output part
RAMOutputStream out_Renamed = new RAMOutputStream(f);
- byte[] b1 = new byte[RAMOutputStream.BUFFER_SIZE_ForNUnit];
- byte[] b2 = new byte[RAMOutputStream.BUFFER_SIZE_ForNUnit / 3];
+ byte[] b1 = new byte[RAMOutputStream.BUFFER_SIZE];
+ byte[] b2 = new byte[RAMOutputStream.BUFFER_SIZE / 3];
for (int i = 0; i < b1.Length; i++)
{
b1[i] = (byte) (i & 0x0007F);
Modified: incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs (original)
+++ incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs Fri Apr 13 02:24:19 2012
@@ -19,6 +19,9 @@
*
*/
+using System;
+using System.Linq;
+using System.Reflection;
using Lucene.Net.Search;
using NUnit.Framework;
@@ -36,6 +39,54 @@ namespace Lucene.Net.Support
Index();
}
+ [Test]
+ public void MyTest()
+ {
+ var assm = Assembly.GetAssembly(typeof (Store.RAMDirectory));
+ var typeProperties = from t in assm.GetTypes()
+ select new
+ {
+ Type = t,
+ Properties = t.GetProperties()
+ };
+ foreach (var typeProp in typeProperties)
+ {
+ foreach (var prop in typeProp.Properties.Where(p => p.Module.Name.StartsWith("Lucene.Net")))
+ {
+ var getSize = -1;
+ var setSize = -1;
+
+ var getMethod = prop.GetGetMethod(true);
+ if (getMethod != null)
+ {
+ var methodBody = getMethod.GetMethodBody();
+ if (methodBody != null)
+ {
+ getSize = methodBody.GetILAsByteArray().Length;
+ }
+ }
+
+ var setMethod = prop.GetSetMethod(true);
+ if (setMethod != null)
+ {
+ var methodBody = setMethod.GetMethodBody();
+ if (methodBody != null)
+ {
+ setSize = methodBody.GetILAsByteArray().Length;
+ }
+ }
+
+ if (getSize > 23 || setSize > 23)
+ {
+ Console.WriteLine(typeProp.Type.FullName + " " + prop.Name);
+ if (getSize > 0) Console.WriteLine("Get " + getSize);
+ if (setSize > 0) Console.WriteLine("Set " + setSize);
+ Console.WriteLine("===================");
+ }
+ }
+ }
+ }
+
void Index()
{
Lucene.Net.Index.IndexWriter wr = new Lucene.Net.Index.IndexWriter(dir, new Lucene.Net.Analysis.WhitespaceAnalyzer(), Lucene.Net.Index.IndexWriter.MaxFieldLength.UNLIMITED);
Modified: incubator/lucene.net/trunk/test/core/Support/TestSupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Support/TestSupportClass.cs?rev=1325590&r1=1325589&r2=1325590&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Support/TestSupportClass.cs (original)
+++ incubator/lucene.net/trunk/test/core/Support/TestSupportClass.cs Fri Apr 13 02:24:19 2012
@@ -80,7 +80,7 @@ namespace Lucene.Net.Support
digest.Update(b, 0, b.Length);
Int64 expected = 688229491;
- Assert.AreEqual(expected, digest.GetValue());
+ Assert.AreEqual(expected, digest.Value);
}
}
}
\ No newline at end of file