A few bugfixes from the port
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3f74ffc9 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3f74ffc9 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3f74ffc9 Branch: refs/heads/branch_4x Commit: 3f74ffc97108fb2c6df22884b68868513596dd54 Parents: 0f492ac Author: Paul Irwin <[email protected]> Authored: Wed Nov 6 14:19:46 2013 -0500 Committer: Paul Irwin <[email protected]> Committed: Wed Nov 6 14:19:46 2013 -0500 ---------------------------------------------------------------------- src/contrib/Facet/Taxonomy/Directory/Consts.cs | 2 +- src/contrib/Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs | 4 ++-- src/contrib/Facet/Taxonomy/WriterCache/Cl2o/CharBlockArray.cs | 2 +- src/core/Document/StringField.cs | 2 +- src/core/Support/Arrays.cs | 4 ++-- src/core/Support/LRUCache.cs | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3f74ffc9/src/contrib/Facet/Taxonomy/Directory/Consts.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Facet/Taxonomy/Directory/Consts.cs b/src/contrib/Facet/Taxonomy/Directory/Consts.cs index fbdb97e..ba36d74 100644 --- a/src/contrib/Facet/Taxonomy/Directory/Consts.cs +++ b/src/contrib/Facet/Taxonomy/Directory/Consts.cs @@ -12,6 +12,6 @@ namespace Lucene.Net.Facet.Taxonomy.Directory internal const string FIELD_PAYLOADS = @"$payloads$"; internal const string PAYLOAD_PARENT = @"p"; internal static readonly BytesRef PAYLOAD_PARENT_BYTES_REF = new BytesRef(PAYLOAD_PARENT); - internal const char DEFAULT_DELIMITER = ' '; + internal const char DEFAULT_DELIMITER = (char)31; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3f74ffc9/src/contrib/Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs b/src/contrib/Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs index f8c32e9..193ad50 100644 --- a/src/contrib/Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs +++ b/src/contrib/Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs @@ -16,7 +16,7 @@ using Version = Lucene.Net.Util.Version; namespace Lucene.Net.Facet.Taxonomy.Directory { - public class DirectoryTaxonomyWriter : ITaxonomyWriter + public class DirectoryTaxonomyWriter : ITaxonomyWriter, IDisposable { public static readonly string INDEX_EPOCH = "index.epoch"; private readonly Lucene.Net.Store.Directory dir; @@ -148,7 +148,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory { } - public void Close() + public void Dispose() { lock (this) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3f74ffc9/src/contrib/Facet/Taxonomy/WriterCache/Cl2o/CharBlockArray.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Facet/Taxonomy/WriterCache/Cl2o/CharBlockArray.cs b/src/contrib/Facet/Taxonomy/WriterCache/Cl2o/CharBlockArray.cs index a99f8c6..152f867 100644 --- a/src/contrib/Facet/Taxonomy/WriterCache/Cl2o/CharBlockArray.cs +++ b/src/contrib/Facet/Taxonomy/WriterCache/Cl2o/CharBlockArray.cs @@ -141,7 +141,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache.Cl2o toCopy = remainingInBlock; } - s.CopyTo(offset, this.current.chars, offset + toCopy, this.current.length); + s.CopyTo(offset, this.current.chars, this.current.length, offset + toCopy); offset += toCopy; remain -= toCopy; this.current.length += toCopy; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3f74ffc9/src/core/Document/StringField.cs ---------------------------------------------------------------------- diff --git a/src/core/Document/StringField.cs b/src/core/Document/StringField.cs index ebe8683..2656370 100644 --- a/src/core/Document/StringField.cs +++ b/src/core/Document/StringField.cs @@ -23,7 +23,7 @@ namespace Lucene.Net.Documents TYPE_STORED.OmitNorms = true; TYPE_STORED.IndexOptions = FieldInfo.IndexOptions.DOCS_ONLY; TYPE_STORED.Stored = true; - TYPE_STORED.Tokenized = true; + TYPE_STORED.Tokenized = false; TYPE_STORED.Freeze(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3f74ffc9/src/core/Support/Arrays.cs ---------------------------------------------------------------------- diff --git a/src/core/Support/Arrays.cs b/src/core/Support/Arrays.cs index 1232bd7..99c6b24 100644 --- a/src/core/Support/Arrays.cs +++ b/src/core/Support/Arrays.cs @@ -37,10 +37,10 @@ namespace Lucene.Net.Support if (fromIndex < 0 || fromIndex >= a.Length) throw new ArgumentOutOfRangeException("fromIndex"); - if (toIndex < 0 || toIndex >= a.Length || toIndex < fromIndex) + if (toIndex < 0 || toIndex > a.Length || toIndex < fromIndex) throw new ArgumentOutOfRangeException("toIndex"); - for (int i = fromIndex; i <= toIndex; i++) + for (int i = fromIndex; i < toIndex; i++) { a[i] = val; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3f74ffc9/src/core/Support/LRUCache.cs ---------------------------------------------------------------------- diff --git a/src/core/Support/LRUCache.cs b/src/core/Support/LRUCache.cs index 52d9cd1..cc1ab92 100644 --- a/src/core/Support/LRUCache.cs +++ b/src/core/Support/LRUCache.cs @@ -8,7 +8,7 @@ namespace Lucene.Net.Support public class LRUCache<TKey, TValue> : IDictionary<TKey, TValue> { object sync = new object(); - Dictionary<TKey, TValue> data; + HashMap<TKey, TValue> data; IndexedLinkedList<TKey> lruList = new IndexedLinkedList<TKey>(); ICollection<KeyValuePair<TKey, TValue>> dataAsCollection; int capacity; @@ -21,7 +21,7 @@ namespace Lucene.Net.Support throw new ArgumentException("capacity should always be bigger than 0"); } - data = new Dictionary<TKey, TValue>(capacity); + data = new HashMap<TKey, TValue>(capacity); dataAsCollection = data; this.capacity = capacity; }
