You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/03/17 22:28:56 UTC
[26/33] lucenenet git commit: Lucene.Net.Codecs (BlockTerms + Sep):
Reviewed again and fixed formatting issues
Lucene.Net.Codecs (BlockTerms + Sep): Reviewed again and fixed formatting issues
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7a14f42d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7a14f42d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7a14f42d
Branch: refs/heads/api-work
Commit: 7a14f42dd118f27fe1bbbb37112e67e3d63f4564
Parents: af9535f
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Mar 18 03:18:47 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Mar 18 03:21:49 2017 +0700
----------------------------------------------------------------------
.../BlockTerms/BlockTermsReader.cs | 2 +-
src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 27 ++++++++++++++------
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7a14f42d/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
index f798258..e59c61a 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
@@ -485,6 +485,7 @@ namespace Lucene.Net.Codecs.BlockTerms
// same term block we are now in; skip seeking
// (but do scanning):
doSeek = false;
+ //System.out.println(" skip seek: nextIndexTerm=" + (nextIndexTerm == null ? "null" : nextIndexTerm.utf8ToString()));
}
}
}
@@ -579,7 +580,6 @@ namespace Lucene.Net.Codecs.BlockTerms
return SeekStatus.END;
}
common = 0;
-
}
else if (cmp > 0)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7a14f42d/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
index d7c7047..bee4943 100644
--- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
@@ -253,8 +253,7 @@ namespace Lucene.Net.Codecs.Sep
public override DocsEnum Docs(FieldInfo fieldInfo, BlockTermState bTermState, IBits liveDocs, DocsEnum reuse,
DocsFlags flags)
{
- var termState = (SepTermState)bTermState;
-
+ SepTermState termState = (SepTermState)bTermState;
SepDocsEnum docsEnum;
if (reuse == null || !(reuse is SepDocsEnum))
{
@@ -310,6 +309,7 @@ namespace Lucene.Net.Codecs.Sep
private int _accum;
private int _count;
private int _freq;
+ //private long freqStart; // LUCENENET: not used
// TODO: -- should we do omitTF with 2 different enum classes?
private bool _omitTf;
@@ -333,6 +333,8 @@ namespace Lucene.Net.Codecs.Sep
internal SepDocsEnum(SepPostingsReader outerInstance)
{
_outerInstance = outerInstance;
+
+ startDocIn = outerInstance._docIn;
_docReader = outerInstance._docIn.GetReader();
_docIndex = outerInstance._docIn.GetIndex();
if (outerInstance._freqIn != null)
@@ -345,11 +347,14 @@ namespace Lucene.Net.Codecs.Sep
_freqReader = null;
_freqIndex = null;
}
- _posIndex = outerInstance._posIn != null
- ? outerInstance._posIn.GetIndex() // only init this so skipper can read it
- : null;
-
- startDocIn = outerInstance._docIn;
+ if (outerInstance._posIn != null)
+ {
+ _posIndex = outerInstance._posIn.GetIndex(); // only init this so skipper can read it
+ }
+ else
+ {
+ _posIndex = null;
+ }
}
internal virtual SepDocsEnum Init(FieldInfo fieldInfo, SepTermState termState, IBits liveDocs)
@@ -443,7 +448,13 @@ namespace Lucene.Net.Codecs.Sep
if (!_skipped)
{
// We haven't yet skipped for this posting
- _skipper.Init(_skipFp, _docIndex, _freqIndex, _posIndex, 0, _docFreq, _storePayloads);
+ _skipper.Init(_skipFp,
+ _docIndex,
+ _freqIndex,
+ _posIndex,
+ 0,
+ _docFreq,
+ _storePayloads);
_skipper.SetIndexOptions(_indexOptions);
_skipped = true;