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 2016/10/04 20:01:45 UTC
[15/46] lucenenet git commit: .NETify Facet: Interfaces should begin
with an "I"
.NETify Facet: Interfaces should begin with an "I"
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2e5bae05
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2e5bae05
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2e5bae05
Branch: refs/heads/master
Commit: 2e5bae058f8842dd01e01287473ad1c8783e7b6e
Parents: ae225b9
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Sep 25 01:20:50 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Oct 3 23:31:06 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.Facet/FacetsConfig.cs | 12 +++++-----
.../DefaultSortedSetDocValuesReaderState.cs | 2 +-
.../Directory/DirectoryTaxonomyWriter.cs | 24 ++++++++++----------
src/Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs | 4 ++--
.../WriterCache/Cl2oTaxonomyWriterCache.cs | 2 +-
.../WriterCache/LruTaxonomyWriterCache.cs | 2 +-
.../Taxonomy/WriterCache/TaxonomyWriterCache.cs | 6 ++---
.../Taxonomy/Directory/TestAddTaxonomy.cs | 16 ++++++-------
.../Directory/TestConcurrentFacetedIndexing.cs | 10 ++++----
.../Directory/TestDirectoryTaxonomyReader.cs | 2 +-
.../Directory/TestDirectoryTaxonomyWriter.cs | 10 ++++----
.../Taxonomy/TestSearcherTaxonomyManager.cs | 4 ++--
.../Taxonomy/TestTaxonomyCombined.cs | 20 ++++++++--------
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 6 ++---
.../Taxonomy/TestTaxonomyFacetCounts.cs | 6 ++---
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 8 +++----
.../TestDrillDownQuery.cs | 4 ++--
.../TestMultipleIndexFields.cs | 6 ++---
18 files changed, 72 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/FacetsConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/FacetsConfig.cs b/src/Lucene.Net.Facet/FacetsConfig.cs
index a62d625..99aaf6c 100644
--- a/src/Lucene.Net.Facet/FacetsConfig.cs
+++ b/src/Lucene.Net.Facet/FacetsConfig.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Facet
using SortedSetDocValuesFacetField = Lucene.Net.Facet.SortedSet.SortedSetDocValuesFacetField;
using SortedSetDocValuesField = Lucene.Net.Documents.SortedSetDocValuesField;
using StringField = Lucene.Net.Documents.StringField;
- using TaxonomyWriter = Lucene.Net.Facet.Taxonomy.TaxonomyWriter;
+ using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter;
/// <summary>
/// Records per-dimension configuration. By default a
@@ -270,7 +270,7 @@ namespace Lucene.Net.Facet
/// input one!
/// </para>
/// </summary>
- public virtual Document Build(TaxonomyWriter taxoWriter, Document doc)
+ public virtual Document Build(ITaxonomyWriter taxoWriter, Document doc)
{
// Find all FacetFields, collated by the actual field:
IDictionary<string, IList<FacetField>> byField = new Dictionary<string, IList<FacetField>>();
@@ -395,7 +395,7 @@ namespace Lucene.Net.Facet
return result;
}
- private void ProcessFacetFields(TaxonomyWriter taxoWriter, IDictionary<string, IList<FacetField>> byField, Document doc)
+ private void ProcessFacetFields(ITaxonomyWriter taxoWriter, IDictionary<string, IList<FacetField>> byField, Document doc)
{
foreach (KeyValuePair<string, IList<FacetField>> ent in byField)
@@ -486,7 +486,7 @@ namespace Lucene.Net.Facet
}
}
- private void ProcessAssocFacetFields(TaxonomyWriter taxoWriter, IDictionary<string, IList<AssociationFacetField>> byField, Document doc)
+ private void ProcessAssocFacetFields(ITaxonomyWriter taxoWriter, IDictionary<string, IList<AssociationFacetField>> byField, Document doc)
{
foreach (KeyValuePair<string, IList<AssociationFacetField>> ent in byField)
{
@@ -592,11 +592,11 @@ namespace Lucene.Net.Facet
return new BytesRef(bytes, 0, upto);
}
- private void checkTaxoWriter(TaxonomyWriter taxoWriter)
+ private void checkTaxoWriter(ITaxonomyWriter taxoWriter)
{
if (taxoWriter == null)
{
- throw new ThreadStateException("a non-null TaxonomyWriter must be provided when indexing FacetField or AssociationFacetField");
+ throw new ThreadStateException("a non-null ITaxonomyWriter must be provided when indexing FacetField or AssociationFacetField");
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs b/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
index 649135c..10983d8 100644
--- a/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
+++ b/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Facet.SortedSet
valueCount = (int)dv.ValueCount;
// TODO: we can make this more efficient if eg we can be
- // "involved" when OrdinalMap is being created? Ie see
+ // "involved" when IOrdinalMap is being created? Ie see
// each term/ord it's assigning as it goes...
string lastDim = null;
int startOrd = -1;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
index c93d0e7..a1c1939 100644
--- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
using ReaderManager = Lucene.Net.Index.ReaderManager;
using SegmentInfos = Lucene.Net.Index.SegmentInfos;
using StringField = Lucene.Net.Documents.StringField;
- using TaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.TaxonomyWriterCache;
+ using ITaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.ITaxonomyWriterCache;
using Terms = Lucene.Net.Index.Terms;
using TermsEnum = Lucene.Net.Index.TermsEnum;
using TextField = Lucene.Net.Documents.TextField;
@@ -72,7 +72,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// @lucene.experimental
/// </para>
/// </summary>
- public class DirectoryTaxonomyWriter : TaxonomyWriter
+ public class DirectoryTaxonomyWriter : ITaxonomyWriter
{
/// <summary>
/// Property name of user commit data that contains the index epoch. The epoch
@@ -87,7 +87,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
private readonly Directory dir;
private readonly IndexWriter indexWriter;
- private readonly TaxonomyWriterCache cache;
+ private readonly ITaxonomyWriterCache cache;
private readonly AtomicInteger cacheMisses = new AtomicInteger(0);
// Records the taxonomy index epoch, updated on replaceTaxonomy as well.
@@ -175,7 +175,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// <exception cref="IOException">
/// if another error occurred. </exception>
public DirectoryTaxonomyWriter(Directory directory, OpenMode openMode,
- TaxonomyWriterCache cache)
+ ITaxonomyWriterCache cache)
{
dir = directory;
IndexWriterConfig config = CreateIndexWriterConfig(openMode);
@@ -332,7 +332,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// with the parameters (1024, 0.15f, 3), i.e., the entire taxonomy is
/// cached in memory while building it.
/// </summary>
- public static TaxonomyWriterCache DefaultTaxonomyWriterCache()
+ public static ITaxonomyWriterCache DefaultTaxonomyWriterCache()
{
return new Cl2oTaxonomyWriterCache(1024, 0.15f, 3);
}
@@ -897,14 +897,14 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// <seealso cref="OrdinalMap"/> with a mapping from the original ordinal to the new
/// ordinal.
/// </summary>
- public virtual void AddTaxonomy(Directory taxoDir, OrdinalMap map)
+ public virtual void AddTaxonomy(Directory taxoDir, IOrdinalMap map)
{
EnsureOpen();
DirectoryReader r = DirectoryReader.Open(taxoDir);
try
{
int size = r.NumDocs;
- OrdinalMap ordinalMap = map;
+ IOrdinalMap ordinalMap = map;
ordinalMap.Size = size;
int @base = 0;
TermsEnum te = null;
@@ -936,11 +936,11 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// wit separate taxonomies.
/// <para>
/// addToTaxonomies() merges one or more taxonomies into the given taxonomy
- /// (this). An OrdinalMap is filled for each of the added taxonomies,
+ /// (this). An IOrdinalMap is filled for each of the added taxonomies,
/// containing the new ordinal (in the merged taxonomy) of each of the
/// categories in the old taxonomy.
/// <P>
- /// There exist two implementations of OrdinalMap: MemoryOrdinalMap and
+ /// There exist two implementations of IOrdinalMap: MemoryOrdinalMap and
/// DiskOrdinalMap. As their names suggest, the former keeps the map in
/// memory and the latter in a temporary disk file. Because these maps will
/// later be needed one by one (to remap the counting lists), not all at the
@@ -949,7 +949,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// by one, when needed).
/// </para>
/// </summary>
- public interface OrdinalMap
+ public interface IOrdinalMap
{
/// <summary>
/// Set the size of the map. This MUST be called before addMapping().
@@ -983,7 +983,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// <summary>
/// <seealso cref="OrdinalMap"/> maintained in memory
/// </summary>
- public sealed class MemoryOrdinalMap : OrdinalMap
+ public sealed class MemoryOrdinalMap : IOrdinalMap
{
internal int[] map;
@@ -1027,7 +1027,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
/// <summary>
/// <seealso cref="OrdinalMap"/> maintained on file system
/// </summary>
- public sealed class DiskOrdinalMap : OrdinalMap
+ public sealed class DiskOrdinalMap : IOrdinalMap
{
internal string tmpfile;
internal OutputStreamDataOutput @out;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs
index 0487cbf..6358dc1 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Facet.Taxonomy
using TwoPhaseCommit = Lucene.Net.Index.TwoPhaseCommit;
/// <summary>
- /// TaxonomyWriter is the interface which the faceted-search library uses
+ /// ITaxonomyWriter is the interface which the faceted-search library uses
/// to dynamically build the taxonomy at indexing time.
/// <P>
/// Notes about concurrent access to the taxonomy:
@@ -51,7 +51,7 @@ namespace Lucene.Net.Facet.Taxonomy
///
/// @lucene.experimental
/// </summary>
- public interface TaxonomyWriter : IDisposable, TwoPhaseCommit
+ public interface ITaxonomyWriter : IDisposable, TwoPhaseCommit
{
/// <summary>
/// addCategory() adds a category with a given path name to the taxonomy,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/Taxonomy/WriterCache/Cl2oTaxonomyWriterCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/Cl2oTaxonomyWriterCache.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/Cl2oTaxonomyWriterCache.cs
index 8e6ca98..9a40f16 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/Cl2oTaxonomyWriterCache.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/Cl2oTaxonomyWriterCache.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
///
/// @lucene.experimental
/// </summary>
- public class Cl2oTaxonomyWriterCache : TaxonomyWriterCache
+ public class Cl2oTaxonomyWriterCache : ITaxonomyWriterCache
{
private const int LockTimeOut = 1000;
private readonly ReaderWriterLock @lock = new ReaderWriterLock();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/Taxonomy/WriterCache/LruTaxonomyWriterCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/LruTaxonomyWriterCache.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/LruTaxonomyWriterCache.cs
index d74891b..8727893 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/LruTaxonomyWriterCache.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/LruTaxonomyWriterCache.cs
@@ -22,7 +22,7 @@
///
/// @lucene.experimental
/// </summary>
- public class LruTaxonomyWriterCache : TaxonomyWriterCache
+ public class LruTaxonomyWriterCache : ITaxonomyWriterCache
{
/// <summary>
/// Determines cache type.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Facet/Taxonomy/WriterCache/TaxonomyWriterCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/TaxonomyWriterCache.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/TaxonomyWriterCache.cs
index b0d32b9..bbe82ec 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/TaxonomyWriterCache.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/TaxonomyWriterCache.cs
@@ -20,8 +20,8 @@
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
/// <summary>
- /// TaxonomyWriterCache is a relatively simple interface for a cache of
- /// category->ordinal mappings, used in TaxonomyWriter implementations (such as
+ /// ITaxonomyWriterCache is a relatively simple interface for a cache of
+ /// category->ordinal mappings, used in ITaxonomyWriter implementations (such as
/// <seealso cref="DirectoryTaxonomyWriter"/>).
/// <para>
/// It basically has put() methods for adding a mapping, and get() for looking a
@@ -46,7 +46,7 @@
/// @lucene.experimental
/// </para>
/// </summary>
- public interface TaxonomyWriterCache
+ public interface ITaxonomyWriterCache
{
/// <summary>
/// Let go of whatever resources the cache is holding. After a close(),
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
index df4f491..9482407 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
@@ -13,7 +13,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
using DiskOrdinalMap = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter.DiskOrdinalMap;
using MemoryOrdinalMap = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter.MemoryOrdinalMap;
- using OrdinalMap = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter.OrdinalMap;
+ using IOrdinalMap = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter.IOrdinalMap;
using Directory = Lucene.Net.Store.Directory;
using IOUtils = Lucene.Net.Util.IOUtils;
using TestUtil = Lucene.Net.Util.TestUtil;
@@ -64,7 +64,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
var tw1 = new DirectoryTaxonomyWriter(dirs[0]);
- OrdinalMap map = randomOrdinalMap();
+ IOrdinalMap map = randomOrdinalMap();
tw1.AddTaxonomy(dirs[1], map);
tw1.Dispose();
@@ -108,7 +108,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
- private OrdinalMap randomOrdinalMap()
+ private IOrdinalMap randomOrdinalMap()
{
if (Random().NextBoolean())
{
@@ -120,7 +120,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
}
- private void validate(Directory dest, Directory src, OrdinalMap ordMap)
+ private void validate(Directory dest, Directory src, IOrdinalMap ordMap)
{
var destTr = new DirectoryTaxonomyReader(dest);
try
@@ -168,7 +168,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
Directory src = NewDirectory();
(new DirectoryTaxonomyWriter(src)).Dispose(); // create an empty taxonomy
- OrdinalMap map = randomOrdinalMap();
+ IOrdinalMap map = randomOrdinalMap();
destTW.AddTaxonomy(src, map);
destTW.Dispose();
@@ -189,7 +189,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
srcTW.Dispose();
DirectoryTaxonomyWriter destTW = new DirectoryTaxonomyWriter(dest);
- OrdinalMap map = randomOrdinalMap();
+ IOrdinalMap map = randomOrdinalMap();
destTW.AddTaxonomy(src, map);
destTW.Dispose();
@@ -234,7 +234,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
tw2.AddCategory(new FacetLabel("Aardvarks", "Bob"));
tw2.Dispose();
- OrdinalMap map = randomOrdinalMap();
+ IOrdinalMap map = randomOrdinalMap();
tw1.AddTaxonomy(src, map);
tw1.Dispose();
@@ -266,7 +266,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
ThreadClass t = new ThreadAnonymousInnerClassHelper2(this, numCategories, destTw);
t.Start();
- OrdinalMap map = new MemoryOrdinalMap();
+ IOrdinalMap map = new MemoryOrdinalMap();
destTw.AddTaxonomy(src, map);
t.Join();
destTw.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
index 5ee17a6..f2c0fe7 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
@@ -10,7 +10,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
using Document = Lucene.Net.Documents.Document;
- using TaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.TaxonomyWriterCache;
+ using ITaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.ITaxonomyWriterCache;
using Cl2oTaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.Cl2oTaxonomyWriterCache;
using LruTaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.LruTaxonomyWriterCache;
using IndexWriter = Lucene.Net.Index.IndexWriter;
@@ -38,11 +38,11 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
public class TestConcurrentFacetedIndexing : FacetTestCase
{
- // A No-Op TaxonomyWriterCache which always discards all given categories, and
+ // A No-Op ITaxonomyWriterCache which always discards all given categories, and
// always returns true in put(), to indicate some cache entries were cleared.
- private static TaxonomyWriterCache NO_OP_CACHE = new TaxonomyWriterCacheAnonymousInnerClassHelper();
+ private static ITaxonomyWriterCache NO_OP_CACHE = new TaxonomyWriterCacheAnonymousInnerClassHelper();
- private class TaxonomyWriterCacheAnonymousInnerClassHelper : TaxonomyWriterCache
+ private class TaxonomyWriterCacheAnonymousInnerClassHelper : ITaxonomyWriterCache
{
public TaxonomyWriterCacheAnonymousInnerClassHelper()
{
@@ -82,7 +82,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
return new FacetField(l1, l2, l3);
}
- internal static TaxonomyWriterCache NewTaxoWriterCache(int ndocs)
+ internal static ITaxonomyWriterCache NewTaxoWriterCache(int ndocs)
{
double d = Random().NextDouble();
if (d < 0.7)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
index 74ba8fe..d0801dd 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
@@ -146,7 +146,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
private void doTestReadRecreatedTaxonomy(Random random, bool closeReader)
{
Directory dir = null;
- TaxonomyWriter tw = null;
+ ITaxonomyWriter tw = null;
TaxonomyReader tr = null;
// prepare a few categories
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
index 60e90c2..8924f56 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
@@ -13,7 +13,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using Document = Lucene.Net.Documents.Document;
using MemoryOrdinalMap = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter.MemoryOrdinalMap;
- using TaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.TaxonomyWriterCache;
+ using ITaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.ITaxonomyWriterCache;
using Cl2oTaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.Cl2oTaxonomyWriterCache;
using LruTaxonomyWriterCache = Lucene.Net.Facet.Taxonomy.WriterCache.LruTaxonomyWriterCache;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
@@ -48,11 +48,11 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
public class TestDirectoryTaxonomyWriter : FacetTestCase
{
- // A No-Op TaxonomyWriterCache which always discards all given categories, and
+ // A No-Op ITaxonomyWriterCache which always discards all given categories, and
// always returns true in put(), to indicate some cache entries were cleared.
- private static TaxonomyWriterCache NO_OP_CACHE = new TaxonomyWriterCacheAnonymousInnerClassHelper();
+ private static ITaxonomyWriterCache NO_OP_CACHE = new TaxonomyWriterCacheAnonymousInnerClassHelper();
- private class TaxonomyWriterCacheAnonymousInnerClassHelper : TaxonomyWriterCache
+ private class TaxonomyWriterCacheAnonymousInnerClassHelper : ITaxonomyWriterCache
{
public virtual void Close()
{
@@ -272,7 +272,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
Directory dir = NewDirectory();
var values = new ConcurrentDictionary<string, string>();
double d = Random().NextDouble();
- TaxonomyWriterCache cache;
+ ITaxonomyWriterCache cache;
if (d < 0.7)
{
// this is the fastest, yet most memory consuming
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
index b0a1277..0d02696 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
@@ -47,12 +47,12 @@ namespace Lucene.Net.Facet.Taxonomy
internal IndexWriter w;
internal FacetsConfig config;
- internal TaxonomyWriter tw;
+ internal ITaxonomyWriter tw;
internal ReferenceManager<SearcherAndTaxonomy> mgr;
internal int ordLimit;
internal AtomicBoolean stop;
- public IndexerThread(IndexWriter w, FacetsConfig config, TaxonomyWriter tw, ReferenceManager<SearcherAndTaxonomy> mgr, int ordLimit, AtomicBoolean stop)
+ public IndexerThread(IndexWriter w, FacetsConfig config, ITaxonomyWriter tw, ReferenceManager<SearcherAndTaxonomy> mgr, int ordLimit, AtomicBoolean stop)
{
this.w = w;
this.config = config;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
index caf1f09..9290ec2 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Facet.Taxonomy
};
/// <summary>
- /// When adding the above categories with TaxonomyWriter.AddCategory(),
+ /// When adding the above categories with ITaxonomyWriter.AddCategory(),
/// the following paths are expected to be returned:
/// (note that currently the full path is not returned, and therefore
/// not tested - rather, just the last component, the ordinal, is returned
@@ -99,7 +99,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// index will surely have this method fail.
/// </summary>
- public static void FillTaxonomy(TaxonomyWriter tw)
+ public static void FillTaxonomy(ITaxonomyWriter tw)
{
for (int i = 0; i < categories.Length; i++)
{
@@ -149,7 +149,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
/// <summary>
- /// Basic tests for TaxonomyWriter. Basically, we test that
+ /// Basic tests for ITaxonomyWriter. Basically, we test that
/// IndexWriter.AddCategory works, i.e. returns the expected ordinals
/// (this is tested by calling the fillTaxonomy() method above).
/// We do not test here that after writing the index can be read -
@@ -161,7 +161,7 @@ namespace Lucene.Net.Facet.Taxonomy
var indexDir = NewDirectory();
var tw = new DirectoryTaxonomyWriter(indexDir);
FillTaxonomy(tw);
- // Also check TaxonomyWriter.getSize() - see that the taxonomy's size
+ // Also check ITaxonomyWriter.getSize() - see that the taxonomy's size
// is what we expect it to be.
Assert.AreEqual(ExpectedCategories.Length, tw.Size);
tw.Dispose();
@@ -445,7 +445,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
/// <summary>
- /// Tests for TaxonomyWriter's getParent() method. We check it by comparing
+ /// Tests for ITaxonomyWriter's getParent() method. We check it by comparing
/// its results to those we could have gotten by looking at the category
/// string paths using a TaxonomyReader (where the parentage is obvious).
/// Note that after testReaderBasic(), we already know we can trust the
@@ -490,7 +490,7 @@ namespace Lucene.Net.Facet.Taxonomy
indexDir.Dispose();
}
- private void CheckWriterParent(TaxonomyReader tr, TaxonomyWriter tw)
+ private void CheckWriterParent(TaxonomyReader tr, ITaxonomyWriter tw)
{
// check that the parent of the root ordinal is the invalid ordinal:
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tw.GetParent(0));
@@ -1068,7 +1068,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// taxonomy index. Calling it after something else was already added to the
/// taxonomy index will surely have this method fail.
/// </summary>
- public static void FillTaxonomyCheckPaths(TaxonomyWriter tw)
+ public static void FillTaxonomyCheckPaths(ITaxonomyWriter tw)
{
for (int i = 0; i < categories.Length; i++)
{
@@ -1092,7 +1092,7 @@ namespace Lucene.Net.Facet.Taxonomy
// After fillTaxonomy returned successfully, checkPaths() checks that
// the getParent() calls return as expected, from the table
- public static void CheckPaths(TaxonomyWriter tw)
+ public static void CheckPaths(ITaxonomyWriter tw)
{
for (int i = 0; i < categories.Length; i++)
{
@@ -1112,7 +1112,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
/// <summary>
- /// Basic test for TaxonomyWriter.getParent(). This is similar to testWriter
+ /// Basic test for ITaxonomyWriter.getParent(). This is similar to testWriter
/// above, except we also check the parents of the added categories, not just
/// the categories themselves.
/// </summary>
@@ -1122,7 +1122,7 @@ namespace Lucene.Net.Facet.Taxonomy
var indexDir = NewDirectory();
var tw = new DirectoryTaxonomyWriter(indexDir);
FillTaxonomyCheckPaths(tw);
- // Also check TaxonomyWriter.getSize() - see that the taxonomy's size
+ // Also check ITaxonomyWriter.getSize() - see that the taxonomy's size
// is what we expect it to be.
Assert.AreEqual(ExpectedCategories.Length, tw.Size);
tw.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index b4bc17b..8cdd14d 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -191,7 +191,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
@@ -216,7 +216,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("a", true);
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
@@ -241,7 +241,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
config.SetRequireDimCount("a", true);
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index 51d0794..263a1d2 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -287,7 +287,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory taxoDir = NewDirectory();
IndexWriterConfig iwc = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
iwc.SetSimilarity(new PerFieldSimilarityWrapperAnonymousInnerClassHelper(this));
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, iwc);
FacetsConfig config = new FacetsConfig();
@@ -543,7 +543,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -686,7 +686,7 @@ namespace Lucene.Net.Facet.Taxonomy
IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
}
- private void indexTwoDocs(TaxonomyWriter taxoWriter, IndexWriter indexWriter, FacetsConfig config, bool withContent)
+ private void indexTwoDocs(ITaxonomyWriter taxoWriter, IndexWriter indexWriter, FacetsConfig config, bool withContent)
{
for (int i = 0; i < 2; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index 6cc8314..6f4cb8b 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -170,7 +170,7 @@ namespace Lucene.Net.Facet.Taxonomy
indexWriter.Commit(); // flush a segment
}
- private static void IndexDocsWithFacetsNoTerms(IndexWriter indexWriter, TaxonomyWriter taxoWriter, IDictionary<string, int?> expectedCounts)
+ private static void IndexDocsWithFacetsNoTerms(IndexWriter indexWriter, ITaxonomyWriter taxoWriter, IDictionary<string, int?> expectedCounts)
{
Random random = Random();
int numDocs = AtLeast(random, 2);
@@ -184,7 +184,7 @@ namespace Lucene.Net.Facet.Taxonomy
indexWriter.Commit(); // flush a segment
}
- private static void IndexDocsWithFacetsAndTerms(IndexWriter indexWriter, TaxonomyWriter taxoWriter, IDictionary<string, int?> expectedCounts)
+ private static void IndexDocsWithFacetsAndTerms(IndexWriter indexWriter, ITaxonomyWriter taxoWriter, IDictionary<string, int?> expectedCounts)
{
Random random = Random();
int numDocs = AtLeast(random, 2);
@@ -199,7 +199,7 @@ namespace Lucene.Net.Facet.Taxonomy
indexWriter.Commit(); // flush a segment
}
- private static void IndexDocsWithFacetsAndSomeTerms(IndexWriter indexWriter, TaxonomyWriter taxoWriter, IDictionary<string, int?> expectedCounts)
+ private static void IndexDocsWithFacetsAndSomeTerms(IndexWriter indexWriter, ITaxonomyWriter taxoWriter, IDictionary<string, int?> expectedCounts)
{
Random random = Random();
int numDocs = AtLeast(random, 2);
@@ -260,7 +260,7 @@ namespace Lucene.Net.Facet.Taxonomy
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
//conf.MergePolicy = NoMergePolicy.INSTANCE; // prevent merges, so we can control the index segments
IndexWriter indexWriter = new IndexWriter(indexDir, conf);
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
allExpectedCounts = newCounts();
termExpectedCounts = newCounts();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 3ceb005..01f7fe5 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Facet
using Document = Lucene.Net.Documents.Document;
using Field = Lucene.Net.Documents.Field;
using TextField = Lucene.Net.Documents.TextField;
- using TaxonomyWriter = Lucene.Net.Facet.Taxonomy.TaxonomyWriter;
+ using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter;
using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
using IndexReader = Lucene.Net.Index.IndexReader;
@@ -75,7 +75,7 @@ namespace Lucene.Net.Facet
RandomIndexWriter writer = new RandomIndexWriter(r, dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(r, MockTokenizer.KEYWORD, false)));
taxoDir = NewDirectory();
- TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
+ ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
config = new FacetsConfig();
// Randomize the per-dim config:
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2e5bae05/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
index 086e608..3d229fe 100644
--- a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
+++ b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Facet
using Field = Lucene.Net.Documents.Field;
using TextField = Lucene.Net.Documents.TextField;
using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader;
- using TaxonomyWriter = Lucene.Net.Facet.Taxonomy.TaxonomyWriter;
+ using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter;
using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
using AtomicReader = Lucene.Net.Index.AtomicReader;
@@ -234,7 +234,7 @@ namespace Lucene.Net.Facet
// create and open an index writer
RandomIndexWriter iw = new RandomIndexWriter(Random(), indexDir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, false)));
// create and open a taxonomy writer
- TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
+ ITaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
FacetsConfig config = Config;
config.SetIndexFieldName("Band", "$music");
@@ -286,7 +286,7 @@ namespace Lucene.Net.Facet
return fc;
}
- private static void seedIndex(TaxonomyWriter tw, RandomIndexWriter iw, FacetsConfig config)
+ private static void seedIndex(ITaxonomyWriter tw, RandomIndexWriter iw, FacetsConfig config)
{
foreach (FacetField ff in CATEGORIES)
{