http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs index 16dfb54..455d9ef 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs @@ -29,7 +29,7 @@ namespace Lucene.Net.Index.Sorter { private static readonly Sort[] SORT = new Sort[] { - new Sort(new SortField(NUMERIC_DV_FIELD, SortFieldType.LONG)), + new Sort(new SortField(NUMERIC_DV_FIELD, SortFieldType.INT64)), new Sort(new SortField(null, SortFieldType.DOC, true)) }; @@ -58,7 +58,7 @@ namespace Lucene.Net.Index.Sorter values.Sort(); if (Random().nextBoolean()) { - sorter = new Sort(new SortField(NUMERIC_DV_FIELD, SortFieldType.LONG, true)); // descending + sorter = new Sort(new SortField(NUMERIC_DV_FIELD, SortFieldType.INT64, true)); // descending values.Reverse(); } }
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs index 0ea86f8..b296091 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs @@ -30,7 +30,7 @@ namespace Lucene.Net.Index.Sorter { // sort the index by id (as integer, in NUMERIC_DV_FIELD) - Sort sort = new Sort(new SortField(NUMERIC_DV_FIELD, SortFieldType.INT)); + Sort sort = new Sort(new SortField(NUMERIC_DV_FIELD, SortFieldType.INT32)); Sorter.DocMap docMap = new Sorter(sort).Sort(reader); // Sorter.compute also sorts the values http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.Misc/Index/Sorter/TestBlockJoinSorter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestBlockJoinSorter.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestBlockJoinSorter.cs index 8665017..5608827 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestBlockJoinSorter.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestBlockJoinSorter.cs @@ -71,8 +71,8 @@ namespace Lucene.Net.Index.Sorter NumericDocValues childValues = reader.GetNumericDocValues("child_val"); - Sort parentSort = new Sort(new SortField("parent_val", SortFieldType.LONG)); - Sort childSort = new Sort(new SortField("child_val", SortFieldType.LONG)); + Sort parentSort = new Sort(new SortField("parent_val", SortFieldType.INT64)); + Sort childSort = new Sort(new SortField("child_val", SortFieldType.INT64)); Sort sort = new Sort(new SortField("custom", new BlockJoinComparerSource(parentsFilter, parentSort, childSort))); Sorter sorter = new Sorter(sort); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs index 0c1ef35..077d200 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs @@ -39,7 +39,7 @@ namespace Lucene.Net.Index.Sorter public override void SetUp() { base.SetUp(); - sort = new Sort(new SortField("ndv1", SortFieldType.LONG)); + sort = new Sort(new SortField("ndv1", SortFieldType.INT64)); } private Document RandomDocument() @@ -96,7 +96,7 @@ namespace Lucene.Net.Index.Sorter { CreateRandomIndexes(5); int numHits = TestUtil.NextInt(Random(), 1, numDocs / 10); - Sort sort = new Sort(new SortField("ndv1", SortFieldType.LONG, false)); + Sort sort = new Sort(new SortField("ndv1", SortFieldType.INT64, false)); bool fillFields = Random().nextBoolean(); bool trackDocScores = Random().nextBoolean(); bool trackMaxScore = Random().nextBoolean(); @@ -123,7 +123,7 @@ namespace Lucene.Net.Index.Sorter // different sorter than the one specified in the ctor. CreateRandomIndexes(5); int numHits = TestUtil.NextInt(Random(), 1, numDocs / 10); - Sort sort = new Sort(new SortField("ndv2", SortFieldType.LONG, false)); + Sort sort = new Sort(new SortField("ndv2", SortFieldType.INT64, false)); bool fillFields = Random().nextBoolean(); bool trackDocScores = Random().nextBoolean(); bool trackMaxScore = Random().nextBoolean(); @@ -137,7 +137,7 @@ namespace Lucene.Net.Index.Sorter { TermQuery query = new TermQuery(new Term("s", RandomInts.RandomFrom(Random(), terms))); searcher.Search(query, collector1); - Sort different = new Sort(new SortField("ndv2", SortFieldType.LONG)); + Sort different = new Sort(new SortField("ndv2", SortFieldType.INT64)); searcher.Search(query, new EarlyTerminatingSortingCollectorHelper(collector2, different, numHits)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs index c2597f6..f429546 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs @@ -39,7 +39,7 @@ namespace Lucene.Net.Index.Sorter public override void SetUp() { base.SetUp(); - sort = new Sort(new SortField("ndv", SortFieldType.LONG)); + sort = new Sort(new SortField("ndv", SortFieldType.INT64)); CreateRandomIndexes(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs index 779e943..2d48c3e 100644 --- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs +++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs @@ -166,9 +166,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard while ((randomInt = Convert.ToInt32(NormalizeNumber(Math.Abs(Random().nextInt())))) == 0) ; - randomNumberMap.Put(NumericType.LONG.ToString(), randomLong); - randomNumberMap.Put(NumericType.INT.ToString(), randomInt); - randomNumberMap.Put(NumericType.FLOAT.ToString(), randomFloat); + randomNumberMap.Put(NumericType.INT64.ToString(), randomLong); + randomNumberMap.Put(NumericType.INT32.ToString(), randomInt); + randomNumberMap.Put(NumericType.SINGLE.ToString(), randomFloat); randomNumberMap.Put(NumericType.DOUBLE.ToString(), randomDouble); randomNumberMap.Put(DATE_FIELD_NAME, randomDate); @@ -199,13 +199,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard switch (type) { - case NumericType.INT: + case NumericType.INT32: field = new Int32Field(type.ToString(), 0, ft2); break; - case NumericType.FLOAT: + case NumericType.SINGLE: field = new SingleField(type.ToString(), 0.0f, ft2); break; - case NumericType.LONG: + case NumericType.INT64: field = new Int64Field(type.ToString(), 0L, ft2); break; case NumericType.DOUBLE: @@ -221,7 +221,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard } numericConfigMap.Put(DATE_FIELD_NAME, new NumericConfig(PRECISION_STEP, - DATE_FORMAT, NumericType.LONG)); + DATE_FORMAT, NumericType.INT64)); FieldType ft = new FieldType(Int64Field.TYPE_NOT_STORED); ft.IsStored = (true); ft.NumericPrecisionStep = (PRECISION_STEP); @@ -260,7 +260,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard /*Number*/ object number = RANDOM_NUMBER_MAP[fieldName]; - if (NumericType.LONG.ToString().equals(fieldName) + if (NumericType.INT64.ToString().equals(fieldName) || DATE_FIELD_NAME.equals(fieldName)) { number = -Convert.ToInt64(number); @@ -271,12 +271,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard number = -Convert.ToDouble(number); } - else if (NumericType.FLOAT.ToString().equals(fieldName)) + else if (NumericType.SINGLE.ToString().equals(fieldName)) { number = -Convert.ToSingle(number); } - else if (NumericType.INT.ToString().equals(fieldName)) + else if (NumericType.INT32.ToString().equals(fieldName)) { number = -Convert.ToInt32(number); @@ -306,16 +306,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard numericFieldMap[NumericType.DOUBLE.ToString()].SetDoubleValue(Convert.ToDouble( number)); - number = GetNumberType(numberType, NumericType.INT.ToString()); - numericFieldMap[NumericType.INT.ToString()].SetInt32Value(Convert.ToInt32( + number = GetNumberType(numberType, NumericType.INT32.ToString()); + numericFieldMap[NumericType.INT32.ToString()].SetInt32Value(Convert.ToInt32( number)); - number = GetNumberType(numberType, NumericType.LONG.ToString()); - numericFieldMap[NumericType.LONG.ToString()].SetInt64Value(Convert.ToInt64( + number = GetNumberType(numberType, NumericType.INT64.ToString()); + numericFieldMap[NumericType.INT64.ToString()].SetInt64Value(Convert.ToInt64( number)); - number = GetNumberType(numberType, NumericType.FLOAT.ToString()); - numericFieldMap[NumericType.FLOAT.ToString()].SetSingleValue(Convert.ToSingle( + number = GetNumberType(numberType, NumericType.SINGLE.ToString()); + numericFieldMap[NumericType.SINGLE.ToString()].SetSingleValue(Convert.ToSingle( number)); number = GetNumberType(numberType, DATE_FIELD_NAME); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests.Spatial/SpatialExample.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Spatial/SpatialExample.cs b/src/Lucene.Net.Tests.Spatial/SpatialExample.cs index bc1fa67..162c577 100644 --- a/src/Lucene.Net.Tests.Spatial/SpatialExample.cs +++ b/src/Lucene.Net.Tests.Spatial/SpatialExample.cs @@ -133,7 +133,7 @@ namespace Lucene.Net.Spatial { IndexReader indexReader = DirectoryReader.Open(directory); IndexSearcher indexSearcher = new IndexSearcher(indexReader); - Sort idSort = new Sort(new SortField("id", SortFieldType.INT)); + Sort idSort = new Sort(new SortField("id", SortFieldType.INT32)); //--Filter by circle (<= distance from a point) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs index b238062..b8de01b 100644 --- a/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs +++ b/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs @@ -238,7 +238,7 @@ namespace Lucene.Net.Index DeleteSlice slice = updateThread.Slice; queue.UpdateSlice(slice); BufferedUpdates deletes = updateThread.Deletes; - slice.Apply(deletes, BufferedUpdates.MAX_INT); + slice.Apply(deletes, BufferedUpdates.MAX_INT32); assertEquals(uniqueValues, new HashSet<Term>(deletes.terms.Keys)); } queue.TryApplyGlobalSlice(); @@ -294,7 +294,7 @@ namespace Lucene.Net.Index Term term = new Term("id", Ids[i].ToString()); Queue.Add(term, Slice); Assert.IsTrue(Slice.IsTailItem(term)); - Slice.Apply(Deletes, BufferedUpdates.MAX_INT); + Slice.Apply(Deletes, BufferedUpdates.MAX_INT32); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Index/TestIntBlockPool.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Index/TestIntBlockPool.cs b/src/Lucene.Net.Tests/core/Index/TestIntBlockPool.cs index b74d541..98fc2d2 100644 --- a/src/Lucene.Net.Tests/core/Index/TestIntBlockPool.cs +++ b/src/Lucene.Net.Tests/core/Index/TestIntBlockPool.cs @@ -65,7 +65,7 @@ namespace Lucene.Net.Index else { pool.Reset(true, true); - Assert.AreEqual(Int32BlockPool.INT_BLOCK_SIZE * RamUsageEstimator.NUM_BYTES_INT, bytesUsed.Get()); + Assert.AreEqual(Int32BlockPool.INT32_BLOCK_SIZE * RamUsageEstimator.NUM_BYTES_INT32, bytesUsed.Get()); } } } @@ -122,7 +122,7 @@ namespace Lucene.Net.Index else { pool.Reset(true, true); - Assert.AreEqual(Int32BlockPool.INT_BLOCK_SIZE * RamUsageEstimator.NUM_BYTES_INT, bytesUsed.Get()); + Assert.AreEqual(Int32BlockPool.INT32_BLOCK_SIZE * RamUsageEstimator.NUM_BYTES_INT32, bytesUsed.Get()); } } } @@ -132,7 +132,7 @@ namespace Lucene.Net.Index internal readonly Counter BytesUsed; public ByteTrackingAllocator(Counter bytesUsed) - : this(Int32BlockPool.INT_BLOCK_SIZE, bytesUsed) + : this(Int32BlockPool.INT32_BLOCK_SIZE, bytesUsed) { } @@ -144,13 +144,13 @@ namespace Lucene.Net.Index public override int[] GetInt32Block() { - BytesUsed.AddAndGet(m_blockSize * RamUsageEstimator.NUM_BYTES_INT); + BytesUsed.AddAndGet(m_blockSize * RamUsageEstimator.NUM_BYTES_INT32); return new int[m_blockSize]; } public override void RecycleInt32Blocks(int[][] blocks, int start, int end) { - BytesUsed.AddAndGet(-((end - start) * m_blockSize * RamUsageEstimator.NUM_BYTES_INT)); + BytesUsed.AddAndGet(-((end - start) * m_blockSize * RamUsageEstimator.NUM_BYTES_INT32)); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs index 918a693..d98b8b5 100644 --- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs +++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs @@ -211,7 +211,7 @@ namespace Lucene.Net.Search FieldCache.Int64s longs = cache.GetInt64s(Reader, "theLong", Random().NextBoolean()); Assert.AreSame(longs, cache.GetInt64s(Reader, "theLong", Random().NextBoolean()), "Second request to cache return same array"); - Assert.AreSame(longs, cache.GetInt64s(Reader, "theLong", FieldCache.DEFAULT_LONG_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); + Assert.AreSame(longs, cache.GetInt64s(Reader, "theLong", FieldCache.DEFAULT_INT64_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); for (int i = 0; i < NUM_DOCS; i++) { Assert.IsTrue(longs.Get(i) == (long.MaxValue - i), longs.Get(i) + " does not equal: " + (long.MaxValue - i) + " i=" + i); @@ -228,7 +228,7 @@ namespace Lucene.Net.Search FieldCache.Int16s shorts = cache.GetInt16s(Reader, "theShort", Random().NextBoolean()); Assert.AreSame(shorts, cache.GetInt16s(Reader, "theShort", Random().NextBoolean()), "Second request to cache return same array"); - Assert.AreSame(shorts, cache.GetInt16s(Reader, "theShort", FieldCache.DEFAULT_SHORT_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); + Assert.AreSame(shorts, cache.GetInt16s(Reader, "theShort", FieldCache.DEFAULT_INT16_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); for (int i = 0; i < NUM_DOCS; i++) { Assert.IsTrue(shorts.Get(i) == (short)(short.MaxValue - i), shorts.Get(i) + " does not equal: " + (short.MaxValue - i)); @@ -237,7 +237,7 @@ namespace Lucene.Net.Search FieldCache.Int32s ints = cache.GetInt32s(Reader, "theInt", Random().NextBoolean()); Assert.AreSame(ints, cache.GetInt32s(Reader, "theInt", Random().NextBoolean()), "Second request to cache return same array"); - Assert.AreSame(ints, cache.GetInt32s(Reader, "theInt", FieldCache.DEFAULT_INT_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); + Assert.AreSame(ints, cache.GetInt32s(Reader, "theInt", FieldCache.DEFAULT_INT32_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); for (int i = 0; i < NUM_DOCS; i++) { Assert.IsTrue(ints.Get(i) == (int.MaxValue - i), ints.Get(i) + " does not equal: " + (int.MaxValue - i)); @@ -245,7 +245,7 @@ namespace Lucene.Net.Search FieldCache.Singles floats = cache.GetSingles(Reader, "theFloat", Random().NextBoolean()); Assert.AreSame(floats, cache.GetSingles(Reader, "theFloat", Random().NextBoolean()), "Second request to cache return same array"); - Assert.AreSame(floats, cache.GetSingles(Reader, "theFloat", FieldCache.DEFAULT_FLOAT_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); + Assert.AreSame(floats, cache.GetSingles(Reader, "theFloat", FieldCache.DEFAULT_SINGLE_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array"); for (int i = 0; i < NUM_DOCS; i++) { Assert.IsTrue(floats.Get(i) == (float.MaxValue - i), floats.Get(i) + " does not equal: " + (float.MaxValue - i)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs index 5236870..776286a 100644 --- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs +++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs @@ -413,7 +413,7 @@ namespace Lucene.Net.Search lower = upper; upper = a; } - BytesRef lowerBytes = new BytesRef(NumericUtils.BUF_SIZE_INT), upperBytes = new BytesRef(NumericUtils.BUF_SIZE_INT); + BytesRef lowerBytes = new BytesRef(NumericUtils.BUF_SIZE_INT32), upperBytes = new BytesRef(NumericUtils.BUF_SIZE_INT32); NumericUtils.Int32ToPrefixCodedBytes(lower, 0, lowerBytes); NumericUtils.Int32ToPrefixCodedBytes(upper, 0, upperBytes); @@ -644,7 +644,7 @@ namespace Lucene.Net.Search upper = a; } Query tq = NumericRangeQuery.NewInt32Range(field, precisionStep, lower, upper, true, true); - TopDocs topDocs = Searcher.Search(tq, null, NoDocs, new Sort(new SortField(field, SortFieldType.INT, true))); + TopDocs topDocs = Searcher.Search(tq, null, NoDocs, new Sort(new SortField(field, SortFieldType.INT32, true))); if (topDocs.TotalHits == 0) { continue; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs index 97da973..c5c39c9 100644 --- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs +++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs @@ -440,7 +440,7 @@ namespace Lucene.Net.Search lower = upper; upper = a; } - BytesRef lowerBytes = new BytesRef(NumericUtils.BUF_SIZE_LONG), upperBytes = new BytesRef(NumericUtils.BUF_SIZE_LONG); + BytesRef lowerBytes = new BytesRef(NumericUtils.BUF_SIZE_INT64), upperBytes = new BytesRef(NumericUtils.BUF_SIZE_INT64); NumericUtils.Int64ToPrefixCodedBytes(lower, 0, lowerBytes); NumericUtils.Int64ToPrefixCodedBytes(upper, 0, upperBytes); @@ -689,7 +689,7 @@ namespace Lucene.Net.Search upper = a; } Query tq = NumericRangeQuery.NewInt64Range(field, precisionStep, lower, upper, true, true); - TopDocs topDocs = Searcher.Search(tq, null, NoDocs, new Sort(new SortField(field, SortFieldType.LONG, true))); + TopDocs topDocs = Searcher.Search(tq, null, NoDocs, new Sort(new SortField(field, SortFieldType.INT64, true))); if (topDocs.TotalHits == 0) { continue; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs index c4635b1..0ed76bf 100644 --- a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs +++ b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs @@ -70,21 +70,21 @@ namespace Lucene.Net.Search AllSortFields = new List<SortField>(Arrays.AsList(new SortField[] { #pragma warning disable 612,618 new SortField("byte", SortFieldType.BYTE, false), - new SortField("short", SortFieldType.SHORT, false), + new SortField("short", SortFieldType.INT16, false), #pragma warning restore 612,618 - new SortField("int", SortFieldType.INT, false), - new SortField("long", SortFieldType.LONG, false), - new SortField("float", SortFieldType.FLOAT, false), + new SortField("int", SortFieldType.INT32, false), + new SortField("long", SortFieldType.INT64, false), + new SortField("float", SortFieldType.SINGLE, false), new SortField("double", SortFieldType.DOUBLE, false), new SortField("bytes", SortFieldType.STRING, false), new SortField("bytesval", SortFieldType.STRING_VAL, false), #pragma warning disable 612,618 new SortField("byte", SortFieldType.BYTE, true), - new SortField("short", SortFieldType.SHORT, true), + new SortField("short", SortFieldType.INT16, true), #pragma warning restore 612,618 - new SortField("int", SortFieldType.INT, true), - new SortField("long", SortFieldType.LONG, true), - new SortField("float", SortFieldType.FLOAT, true), + new SortField("int", SortFieldType.INT32, true), + new SortField("long", SortFieldType.INT64, true), + new SortField("float", SortFieldType.SINGLE, true), new SortField("double", SortFieldType.DOUBLE, true), new SortField("bytes", SortFieldType.STRING, true), new SortField("bytesval", SortFieldType.STRING_VAL, true), @@ -94,7 +94,7 @@ namespace Lucene.Net.Search if (SupportsDocValues) { - AllSortFields.AddRange(Arrays.AsList(new SortField[] { new SortField("intdocvalues", SortFieldType.INT, false), new SortField("floatdocvalues", SortFieldType.FLOAT, false), new SortField("sortedbytesdocvalues", SortFieldType.STRING, false), new SortField("sortedbytesdocvaluesval", SortFieldType.STRING_VAL, false), new SortField("straightbytesdocvalues", SortFieldType.STRING_VAL, false), new SortField("intdocvalues", SortFieldType.INT, true), new SortField("floatdocvalues", SortFieldType.FLOAT, true), new SortField("sortedbytesdocvalues", SortFieldType.STRING, true), new SortField("sortedbytesdocvaluesval", SortFieldType.STRING_VAL, true), new SortField("straightbytesdocvalues", SortFieldType.STRING_VAL, true) })); + AllSortFields.AddRange(Arrays.AsList(new SortField[] { new SortField("intdocvalues", SortFieldType.INT32, false), new SortField("floatdocvalues", SortFieldType.SINGLE, false), new SortField("sortedbytesdocvalues", SortFieldType.STRING, false), new SortField("sortedbytesdocvaluesval", SortFieldType.STRING_VAL, false), new SortField("straightbytesdocvalues", SortFieldType.STRING_VAL, false), new SortField("intdocvalues", SortFieldType.INT32, true), new SortField("floatdocvalues", SortFieldType.SINGLE, true), new SortField("sortedbytesdocvalues", SortFieldType.STRING, true), new SortField("sortedbytesdocvaluesval", SortFieldType.STRING_VAL, true), new SortField("straightbytesdocvalues", SortFieldType.STRING_VAL, true) })); } // Also test missing first / last for the "string" sorts: @@ -117,21 +117,21 @@ namespace Lucene.Net.Search for (int i = 0; i < limit; i++) { SortField sf = AllSortFields[i]; - if (sf.Type == SortFieldType.INT) + if (sf.Type == SortFieldType.INT32) { - SortField sf2 = new SortField(sf.Field, SortFieldType.INT, sf.IsReverse); + SortField sf2 = new SortField(sf.Field, SortFieldType.INT32, sf.IsReverse); sf2.MissingValue = Random().Next(); AllSortFields.Add(sf2); } - else if (sf.Type == SortFieldType.LONG) + else if (sf.Type == SortFieldType.INT64) { - SortField sf2 = new SortField(sf.Field, SortFieldType.LONG, sf.IsReverse); + SortField sf2 = new SortField(sf.Field, SortFieldType.INT64, sf.IsReverse); sf2.MissingValue = Random().NextLong(); AllSortFields.Add(sf2); } - else if (sf.Type == SortFieldType.FLOAT) + else if (sf.Type == SortFieldType.SINGLE) { - SortField sf2 = new SortField(sf.Field, SortFieldType.FLOAT, sf.IsReverse); + SortField sf2 = new SortField(sf.Field, SortFieldType.SINGLE, sf.IsReverse); sf2.MissingValue = (float)Random().NextDouble(); AllSortFields.Add(sf2); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs b/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs index f59144e..5fb1dc9 100644 --- a/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs +++ b/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs @@ -262,7 +262,7 @@ namespace Lucene.Net.Search } else if (what == 2) { - sort = new Sort(new SortField[] { new SortField("docid", SortFieldType.INT, Random().NextBoolean()) }); + sort = new Sort(new SortField[] { new SortField("docid", SortFieldType.INT32, Random().NextBoolean()) }); } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestSort.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestSort.cs b/src/Lucene.Net.Tests/core/Search/TestSort.cs index 9d09ed2..27e9f25 100644 --- a/src/Lucene.Net.Tests/core/Search/TestSort.cs +++ b/src/Lucene.Net.Tests/core/Search/TestSort.cs @@ -693,7 +693,7 @@ namespace Lucene.Net.Search IndexSearcher searcher = NewSearcher(ir); #pragma warning disable 612, 618 - Sort sort = new Sort(new SortField("value", SortFieldType.SHORT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT16)); #pragma warning restore 612, 618 TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); @@ -727,7 +727,7 @@ namespace Lucene.Net.Search IndexSearcher searcher = NewSearcher(ir); #pragma warning disable 612, 618 - Sort sort = new Sort(new SortField("value", SortFieldType.SHORT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT16)); #pragma warning restore 612, 618 TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); @@ -761,7 +761,7 @@ namespace Lucene.Net.Search IndexSearcher searcher = NewSearcher(ir); #pragma warning disable 612, 618 - SortField sortField = new SortField("value", SortFieldType.SHORT); + SortField sortField = new SortField("value", SortFieldType.INT16); #pragma warning restore 612, 618 sortField.MissingValue = short.MaxValue; Sort sort = new Sort(sortField); @@ -798,7 +798,7 @@ namespace Lucene.Net.Search IndexSearcher searcher = NewSearcher(ir); #pragma warning disable 612, 618 - Sort sort = new Sort(new SortField("value", SortFieldType.SHORT, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT16, true)); #pragma warning restore 612, 618 TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); @@ -832,7 +832,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.INT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT32)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -864,7 +864,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.INT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT32)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -896,7 +896,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - SortField sortField = new SortField("value", SortFieldType.INT); + SortField sortField = new SortField("value", SortFieldType.INT32); sortField.MissingValue = int.MaxValue; Sort sort = new Sort(sortField); @@ -931,7 +931,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.INT, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT32, true)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -964,7 +964,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.LONG)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT64)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -996,7 +996,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.LONG)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT64)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -1028,7 +1028,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - SortField sortField = new SortField("value", SortFieldType.LONG); + SortField sortField = new SortField("value", SortFieldType.INT64); sortField.MissingValue = long.MaxValue; Sort sort = new Sort(sortField); @@ -1063,7 +1063,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.LONG, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT64, true)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -1096,7 +1096,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.FLOAT)); + Sort sort = new Sort(new SortField("value", SortFieldType.SINGLE)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -1128,7 +1128,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.FLOAT)); + Sort sort = new Sort(new SortField("value", SortFieldType.SINGLE)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -1160,7 +1160,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - SortField sortField = new SortField("value", SortFieldType.FLOAT); + SortField sortField = new SortField("value", SortFieldType.SINGLE); sortField.MissingValue = float.MaxValue; Sort sort = new Sort(sortField); @@ -1195,7 +1195,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.FLOAT, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.SINGLE, true)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -1470,8 +1470,8 @@ namespace Lucene.Net.Search float maxScore = s.Search(q, 10).MaxScore; Assert.AreEqual(maxScore, s.Search(q, null, 3, Sort.INDEXORDER, Random().NextBoolean(), true).MaxScore, 0.0); Assert.AreEqual(maxScore, s.Search(q, null, 3, Sort.RELEVANCE, Random().NextBoolean(), true).MaxScore, 0.0); - Assert.AreEqual(maxScore, s.Search(q, null, 3, new Sort(new SortField[] { new SortField("id", SortFieldType.INT, false) }), Random().NextBoolean(), true).MaxScore, 0.0); - Assert.AreEqual(maxScore, s.Search(q, null, 3, new Sort(new SortField[] { new SortField("id", SortFieldType.INT, true) }), Random().NextBoolean(), true).MaxScore, 0.0); + Assert.AreEqual(maxScore, s.Search(q, null, 3, new Sort(new SortField[] { new SortField("id", SortFieldType.INT32, false) }), Random().NextBoolean(), true).MaxScore, 0.0); + Assert.AreEqual(maxScore, s.Search(q, null, 3, new Sort(new SortField[] { new SortField("id", SortFieldType.INT32, true) }), Random().NextBoolean(), true).MaxScore, 0.0); r.Dispose(); d.Dispose(); } @@ -1492,7 +1492,7 @@ namespace Lucene.Net.Search td = empty.Search(query, null, 10, sort, true, true); Assert.AreEqual(0, td.TotalHits); - sort.SetSort(new SortField("int", SortFieldType.INT), SortField.FIELD_DOC); + sort.SetSort(new SortField("int", SortFieldType.INT32), SortField.FIELD_DOC); td = empty.Search(query, null, 10, sort, true, true); Assert.AreEqual(0, td.TotalHits); @@ -1504,7 +1504,7 @@ namespace Lucene.Net.Search td = empty.Search(query, null, 10, sort, true, true); Assert.AreEqual(0, td.TotalHits); - sort.SetSort(new SortField("float", SortFieldType.FLOAT), new SortField("string", SortFieldType.STRING)); + sort.SetSort(new SortField("float", SortFieldType.SINGLE), new SortField("string", SortFieldType.STRING)); td = empty.Search(query, null, 10, sort, true, true); Assert.AreEqual(0, td.TotalHits); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs index 7f58afb..fcf39ae 100644 --- a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs +++ b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs @@ -351,7 +351,7 @@ namespace Lucene.Net.Search IndexSearcher searcher = NewSearcher(ir); #pragma warning disable 612, 618 - Sort sort = new Sort(new SortField("value", SortFieldType.SHORT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT16)); #pragma warning restore 612, 618 TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); @@ -390,7 +390,7 @@ namespace Lucene.Net.Search IndexSearcher searcher = NewSearcher(ir); #pragma warning disable 612, 618 - Sort sort = new Sort(new SortField("value", SortFieldType.SHORT, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT16, true)); #pragma warning restore 612, 618 TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); @@ -428,7 +428,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.INT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT32)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -465,7 +465,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.INT, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT32, true)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -500,7 +500,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.INT)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT32)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -534,7 +534,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - SortField sortField = new SortField("value", SortFieldType.INT); + SortField sortField = new SortField("value", SortFieldType.INT32); sortField.MissingValue = int.MaxValue; Sort sort = new Sort(sortField); @@ -572,7 +572,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.LONG)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT64)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -609,7 +609,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.LONG, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT64, true)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -644,7 +644,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.LONG)); + Sort sort = new Sort(new SortField("value", SortFieldType.INT64)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -678,7 +678,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - SortField sortField = new SortField("value", SortFieldType.LONG); + SortField sortField = new SortField("value", SortFieldType.INT64); sortField.MissingValue = long.MaxValue; Sort sort = new Sort(sortField); @@ -716,7 +716,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.FLOAT)); + Sort sort = new Sort(new SortField("value", SortFieldType.SINGLE)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -753,7 +753,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.FLOAT, true)); + Sort sort = new Sort(new SortField("value", SortFieldType.SINGLE, true)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -788,7 +788,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - Sort sort = new Sort(new SortField("value", SortFieldType.FLOAT)); + Sort sort = new Sort(new SortField("value", SortFieldType.SINGLE)); TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort); Assert.AreEqual(3, td.TotalHits); @@ -822,7 +822,7 @@ namespace Lucene.Net.Search writer.Dispose(); IndexSearcher searcher = NewSearcher(ir); - SortField sortField = new SortField("value", SortFieldType.FLOAT); + SortField sortField = new SortField("value", SortFieldType.SINGLE); sortField.MissingValue = float.MaxValue; Sort sort = new Sort(sortField); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs b/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs index d2a0a33..2ebc16c 100644 --- a/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs +++ b/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs @@ -98,7 +98,7 @@ namespace Lucene.Net.Search Assert.AreEqual("2", r.Document(hits.ScoreDocs[2].Doc).Get("id")); // Now, rescore: - Sort sort = new Sort(new SortField("popularity", SortFieldType.INT, true)); + Sort sort = new Sort(new SortField("popularity", SortFieldType.INT32, true)); Rescorer rescorer = new SortRescorer(sort); hits = rescorer.Rescore(Searcher, hits, 10); Assert.AreEqual(3, hits.TotalHits); @@ -150,7 +150,7 @@ namespace Lucene.Net.Search TopDocs hits = s.Search(new TermQuery(new Term("field", "a")), numHits); - Rescorer rescorer = new SortRescorer(new Sort(new SortField("num", SortFieldType.INT, reverse))); + Rescorer rescorer = new SortRescorer(new Sort(new SortField("num", SortFieldType.INT32, reverse))); TopDocs hits2 = rescorer.Rescore(s, hits, numHits); int[] expected = new int[numHits]; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs index b454cd2..a3391de 100644 --- a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs +++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs @@ -182,10 +182,10 @@ namespace Lucene.Net.Search IList<SortField> sortFields = new List<SortField>(); sortFields.Add(new SortField("string", SortFieldType.STRING, true)); sortFields.Add(new SortField("string", SortFieldType.STRING, false)); - sortFields.Add(new SortField("int", SortFieldType.INT, true)); - sortFields.Add(new SortField("int", SortFieldType.INT, false)); - sortFields.Add(new SortField("float", SortFieldType.FLOAT, true)); - sortFields.Add(new SortField("float", SortFieldType.FLOAT, false)); + sortFields.Add(new SortField("int", SortFieldType.INT32, true)); + sortFields.Add(new SortField("int", SortFieldType.INT32, false)); + sortFields.Add(new SortField("float", SortFieldType.SINGLE, true)); + sortFields.Add(new SortField("float", SortFieldType.SINGLE, false)); sortFields.Add(new SortField(null, SortFieldType.SCORE, true)); sortFields.Add(new SortField(null, SortFieldType.SCORE, false)); sortFields.Add(new SortField(null, SortFieldType.DOC, true)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/TestSearch.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/TestSearch.cs b/src/Lucene.Net.Tests/core/TestSearch.cs index c91c558..262b595 100644 --- a/src/Lucene.Net.Tests/core/TestSearch.cs +++ b/src/Lucene.Net.Tests/core/TestSearch.cs @@ -141,7 +141,7 @@ namespace Lucene.Net ScoreDoc[] hits = null; - Sort sort = new Sort(SortField.FIELD_SCORE, new SortField("id", SortFieldType.INT)); + Sort sort = new Sort(SortField.FIELD_SCORE, new SortField("id", SortFieldType.INT32)); foreach (Query query in BuildQueries()) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/TestSearchForDuplicates.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/TestSearchForDuplicates.cs b/src/Lucene.Net.Tests/core/TestSearchForDuplicates.cs index 5e373b9..6ea65fb 100644 --- a/src/Lucene.Net.Tests/core/TestSearchForDuplicates.cs +++ b/src/Lucene.Net.Tests/core/TestSearchForDuplicates.cs @@ -104,7 +104,7 @@ namespace Lucene.Net Console.WriteLine("TEST: search query=" + query); } - Sort sort = new Sort(SortField.FIELD_SCORE, new SortField(ID_FIELD, SortFieldType.INT)); + Sort sort = new Sort(SortField.FIELD_SCORE, new SortField(ID_FIELD, SortFieldType.INT32)); ScoreDoc[] hits = searcher.Search(query, null, MAX_DOCS, sort).ScoreDocs; PrintHits(@out, hits, searcher); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs b/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs index 8773d2b..25ed72c 100644 --- a/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs +++ b/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs @@ -126,7 +126,7 @@ namespace Lucene.Net.Util cache.GetDoubles(ReaderB, "theDouble", FieldCache.DEFAULT_DOUBLE_PARSER, false); cache.GetInt32s(ReaderX, "theInt", false); - cache.GetInt32s(ReaderX, "theInt", FieldCache.DEFAULT_INT_PARSER, false); + cache.GetInt32s(ReaderX, "theInt", FieldCache.DEFAULT_INT32_PARSER, false); // // // @@ -147,7 +147,7 @@ namespace Lucene.Net.Util IFieldCache cache = FieldCache.DEFAULT; cache.PurgeAllCaches(); - cache.GetInt32s(ReaderX, "theInt", FieldCache.DEFAULT_INT_PARSER, false); + cache.GetInt32s(ReaderX, "theInt", FieldCache.DEFAULT_INT32_PARSER, false); cache.GetTerms(ReaderX, "theInt", false); #pragma warning disable 612, 618 cache.GetBytes(ReaderX, "theByte", false); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Util/TestIntsRef.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Util/TestIntsRef.cs b/src/Lucene.Net.Tests/core/Util/TestIntsRef.cs index 4ed5c73..053a9b4 100644 --- a/src/Lucene.Net.Tests/core/Util/TestIntsRef.cs +++ b/src/Lucene.Net.Tests/core/Util/TestIntsRef.cs @@ -26,7 +26,7 @@ namespace Lucene.Net.Util public virtual void TestEmpty() { Int32sRef i = new Int32sRef(); - Assert.AreEqual(Int32sRef.EMPTY_INTS, i.Int32s); + Assert.AreEqual(Int32sRef.EMPTY_INT32S, i.Int32s); Assert.AreEqual(0, i.Offset); Assert.AreEqual(0, i.Length); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/73cb5b22/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs index 5c3de83..ea13443 100644 --- a/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs +++ b/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs @@ -31,7 +31,7 @@ namespace Lucene.Net.Util public virtual void TestLongConversionAndOrdering() { // generate a series of encoded longs, each numerical one bigger than the one before - BytesRef last = null, act = new BytesRef(NumericUtils.BUF_SIZE_LONG); + BytesRef last = null, act = new BytesRef(NumericUtils.BUF_SIZE_INT64); for (long l = -100000L; l < 100000L; l++) { NumericUtils.Int64ToPrefixCodedBytes(l, 0, act); @@ -45,7 +45,7 @@ namespace Lucene.Net.Util Assert.AreEqual(l, NumericUtils.PrefixCodedToInt64(act), "forward and back conversion should generate same long"); // next step last = act; - act = new BytesRef(NumericUtils.BUF_SIZE_LONG); + act = new BytesRef(NumericUtils.BUF_SIZE_INT64); } } @@ -53,7 +53,7 @@ namespace Lucene.Net.Util public virtual void TestIntConversionAndOrdering() { // generate a series of encoded ints, each numerical one bigger than the one before - BytesRef last = null, act = new BytesRef(NumericUtils.BUF_SIZE_INT); + BytesRef last = null, act = new BytesRef(NumericUtils.BUF_SIZE_INT32); for (int i = -100000; i < 100000; i++) { NumericUtils.Int32ToPrefixCodedBytes(i, 0, act); @@ -67,7 +67,7 @@ namespace Lucene.Net.Util Assert.AreEqual(i, NumericUtils.PrefixCodedToInt32(act), "forward and back conversion should generate same int"); // next step last = act; - act = new BytesRef(NumericUtils.BUF_SIZE_INT); + act = new BytesRef(NumericUtils.BUF_SIZE_INT32); } } @@ -79,7 +79,7 @@ namespace Lucene.Net.Util for (int i = 0; i < vals.Length; i++) { - prefixVals[i] = new BytesRef(NumericUtils.BUF_SIZE_LONG); + prefixVals[i] = new BytesRef(NumericUtils.BUF_SIZE_INT64); NumericUtils.Int64ToPrefixCodedBytes(vals[i], 0, prefixVals[i]); // check forward and back conversion @@ -106,7 +106,7 @@ namespace Lucene.Net.Util } // check the prefix encoding, lower precision should have the difference to original value equal to the lower removed bits - BytesRef @ref = new BytesRef(NumericUtils.BUF_SIZE_LONG); + BytesRef @ref = new BytesRef(NumericUtils.BUF_SIZE_INT64); for (int i = 0; i < vals.Length; i++) { for (int j = 0; j < 64; j++) @@ -127,7 +127,7 @@ namespace Lucene.Net.Util for (int i = 0; i < vals.Length; i++) { - prefixVals[i] = new BytesRef(NumericUtils.BUF_SIZE_INT); + prefixVals[i] = new BytesRef(NumericUtils.BUF_SIZE_INT32); NumericUtils.Int32ToPrefixCodedBytes(vals[i], 0, prefixVals[i]); // check forward and back conversion @@ -154,7 +154,7 @@ namespace Lucene.Net.Util } // check the prefix encoding, lower precision should have the difference to original value equal to the lower removed bits - BytesRef @ref = new BytesRef(NumericUtils.BUF_SIZE_LONG); + BytesRef @ref = new BytesRef(NumericUtils.BUF_SIZE_INT64); for (int i = 0; i < vals.Length; i++) { for (int j = 0; j < 32; j++)
