You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/01/26 09:33:27 UTC
lucenenet git commit: values iterator should not be used here
Repository: lucenenet
Updated Branches:
refs/heads/master 8520cba87 -> 3ce9d4c6c
values iterator should not be used here
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3ce9d4c6
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3ce9d4c6
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3ce9d4c6
Branch: refs/heads/master
Commit: 3ce9d4c6cca26e065a91dd57963619f0da41abd8
Parents: 8520cba
Author: Laimonas Simutis <la...@gmail.com>
Authored: Sun Jan 25 17:00:40 2015 -0500
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Sun Jan 25 17:00:40 2015 -0500
----------------------------------------------------------------------
.../Codecs/lucene42/Lucene42DocValuesConsumer.cs | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3ce9d4c6/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42DocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42DocValuesConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42DocValuesConsumer.cs
index d1d5fd9..a479571 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42DocValuesConsumer.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42DocValuesConsumer.cs
@@ -352,7 +352,7 @@ namespace Lucene.Net.Codecs.Lucene42
public override void AddSortedSetField(FieldInfo field, IEnumerable<BytesRef> values, IEnumerable<long?> docToOrdCount, IEnumerable<long?> ords)
{
// write the ordinals as a binary field
- AddBinaryField(field, new IterableAnonymousInnerClassHelper(this, values, docToOrdCount, ords));
+ AddBinaryField(field, new IterableAnonymousInnerClassHelper(this, docToOrdCount, ords));
// write the values as FST
WriteFST(field, values);
@@ -364,19 +364,17 @@ namespace Lucene.Net.Codecs.Lucene42
private IEnumerable<long?> DocToOrdCount;
private IEnumerable<long?> Ords;
- private IEnumerable<BytesRef> Values;
- public IterableAnonymousInnerClassHelper(Lucene42DocValuesConsumer outerInstance, IEnumerable<BytesRef> values, IEnumerable<long?> docToOrdCount, IEnumerable<long?> ords)
+ public IterableAnonymousInnerClassHelper(Lucene42DocValuesConsumer outerInstance, IEnumerable<long?> docToOrdCount, IEnumerable<long?> ords)
{
this.OuterInstance = outerInstance;
- this.Values = values;
this.DocToOrdCount = docToOrdCount;
this.Ords = ords;
}
public IEnumerator<BytesRef> GetEnumerator()
{
- return new SortedSetIterator(Values.GetEnumerator(), DocToOrdCount.GetEnumerator(), Ords.GetEnumerator());
+ return new SortedSetIterator(DocToOrdCount.GetEnumerator(), Ords.GetEnumerator());
}
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
@@ -392,13 +390,11 @@ namespace Lucene.Net.Codecs.Lucene42
internal ByteArrayDataOutput @out = new ByteArrayDataOutput();
internal BytesRef @ref = new BytesRef();
- internal readonly IEnumerator<BytesRef> Values;
internal readonly IEnumerator<long?> Counts;
internal readonly IEnumerator<long?> Ords;
- internal SortedSetIterator(IEnumerator<BytesRef> values, IEnumerator<long?> counts, IEnumerator<long?> ords)
+ internal SortedSetIterator(IEnumerator<long?> counts, IEnumerator<long?> ords)
{
- this.Values = values;
this.Counts = counts;
this.Ords = ords;
}
@@ -430,14 +426,12 @@ namespace Lucene.Net.Codecs.Lucene42
@ref.Offset = 0;
@ref.Length = @out.Position;
- Values.MoveNext();
-
return true;
}
public BytesRef Current
{
- get { return Values.Current; }
+ get { return @ref; }
}
object System.Collections.IEnumerator.Current
@@ -448,7 +442,7 @@ namespace Lucene.Net.Codecs.Lucene42
// encodes count values to buffer
internal virtual void EncodeValues(int count)
{
- @out.Reset((byte[])(Array)Buffer);
+ @out.Reset(Buffer);
long lastOrd = 0;
for (int i = 0; i < count; i++)
{