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/15 23:50:20 UTC
[38/50] [abbrv] lucenenet git commit:
Lucene.Net.Facet.Taxonomy.WriterCache.CharBlockArray: Removed CharAt() and
updated all references to use the indexer this[index]
Lucene.Net.Facet.Taxonomy.WriterCache.CharBlockArray: Removed CharAt() and updated all references to use the indexer this[index]
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/83192396
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/83192396
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/83192396
Branch: refs/heads/api-work
Commit: 83192396e0cd3e102efc3388d8c2c4ecb5ba6264
Parents: 7e7b44e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Mar 15 21:56:03 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Mar 15 21:56:03 2017 +0700
----------------------------------------------------------------------
.../Taxonomy/WriterCache/CategoryPathUtils.cs | 8 ++++----
.../Taxonomy/WriterCache/CharBlockArray.cs | 12 +++++++-----
.../Taxonomy/WriterCache/CompactLabelToOrdinal.cs | 4 ++--
.../Taxonomy/WriterCache/TestCharBlockArray.cs | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/83192396/src/Lucene.Net.Facet/Taxonomy/WriterCache/CategoryPathUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CategoryPathUtils.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CategoryPathUtils.cs
index c2714c6..2be7eda 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CategoryPathUtils.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CategoryPathUtils.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
/// </summary>
public static int HashCodeOfSerialized(CharBlockArray charBlockArray, int offset)
{
- int length = charBlockArray.CharAt(offset++);
+ int length = charBlockArray[offset++];
if (length == 0)
{
return 0;
@@ -56,7 +56,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
int hash = length;
for (int i = 0; i < length; i++)
{
- int len = charBlockArray.CharAt(offset++);
+ int len = charBlockArray[offset++];
hash = hash * 31 + charBlockArray.SubSequence(offset, offset + len).GetHashCode();
offset += len;
}
@@ -69,7 +69,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
/// </summary>
public static bool EqualsToSerialized(FacetLabel cp, CharBlockArray charBlockArray, int offset)
{
- int n = charBlockArray.CharAt(offset++);
+ int n = charBlockArray[offset++];
if (cp.Length != n)
{
return false;
@@ -81,7 +81,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
for (int i = 0; i < cp.Length; i++)
{
- int len = charBlockArray.CharAt(offset++);
+ int len = charBlockArray[offset++];
if (len != cp.Components[i].Length)
{
return false;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/83192396/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
index 821b4d3..374ecf0 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
@@ -181,11 +181,13 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
this.length_Renamed += s.Length;
return this;
}
- public virtual char CharAt(int index)
- {
- Block b = blocks[BlockIndex(index)];
- return b.chars[IndexInBlock(index)];
- }
+
+ // LUCENENET specific - replaced with this[index]
+ //public virtual char CharAt(int index)
+ //{
+ // Block b = blocks[BlockIndex(index)];
+ // return b.chars[IndexInBlock(index)];
+ //}
// LUCENENET specific - added to .NETify
public virtual char this[int index]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/83192396/src/Lucene.Net.Facet/Taxonomy/WriterCache/CompactLabelToOrdinal.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CompactLabelToOrdinal.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CompactLabelToOrdinal.cs
index 0387063..dd68485 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CompactLabelToOrdinal.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CompactLabelToOrdinal.cs
@@ -438,13 +438,13 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
// identical code to CategoryPath.hashFromSerialized. since we need to
// advance offset, we cannot call the method directly. perhaps if we
// could pass a mutable Integer or something...
- int length = (ushort)l2o.labelRepository.CharAt(offset++);
+ int length = (ushort)l2o.labelRepository[offset++];
int hash = length;
if (length != 0)
{
for (int i = 0; i < length; i++)
{
- int len = (ushort)l2o.labelRepository.CharAt(offset++);
+ int len = (ushort)l2o.labelRepository[offset++];
hash = hash * 31 + l2o.labelRepository.SubSequence(offset, offset + len).GetHashCode();
offset += len;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/83192396/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
index a763f80..1249ff6 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
@@ -95,7 +95,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
Assert.AreEqual(expected.Length, actual.Length, msg);
for (int i = 0; i < expected.Length; i++)
{
- Assert.AreEqual(expected[i], actual.CharAt(i), msg);
+ Assert.AreEqual(expected[i], actual[i], msg);
}
}
}