lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject [26/26] lucenenet git commit: Merge remote-tracking branch 'eladmarg/master'
Date Fri, 14 Nov 2014 11:59:41 GMT
Merge remote-tracking branch 'eladmarg/master'

Conflicts:
	src/Lucene.Net.Core/Search/Query.cs
	src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/31a6e4fe
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/31a6e4fe
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/31a6e4fe

Branch: refs/heads/master
Commit: 31a6e4fe5369c7701ad59db293104e3a6f442b33
Parents: 712ea2e eabf7f2
Author: Itamar Syn-Hershko <itamar@code972.com>
Authored: Fri Nov 14 13:56:17 2014 +0200
Committer: Itamar Syn-Hershko <itamar@code972.com>
Committed: Fri Nov 14 13:56:17 2014 +0200

----------------------------------------------------------------------
 Lucene.Net.Facet/DrillDownQuery.cs              |  388 +++++
 Lucene.Net.Facet/DrillSideways.cs               |  295 ++++
 Lucene.Net.Facet/DrillSidewaysQuery.cs          |  316 +++++
 Lucene.Net.Facet/DrillSidewaysScorer.cs         |  826 +++++++++++
 Lucene.Net.Facet/FacetField.cs                  |   91 ++
 Lucene.Net.Facet/FacetResult.cs                 |  104 ++
 Lucene.Net.Facet/Facets.cs                      |   64 +
 Lucene.Net.Facet/FacetsCollector.cs             |  372 +++++
 Lucene.Net.Facet/FacetsConfig.cs                |  712 ++++++++++
 Lucene.Net.Facet/LabelAndValue.cs               |   66 +
 Lucene.Net.Facet/Lucene.Net.Facet.csproj        |  123 ++
 Lucene.Net.Facet/MultiFacets.cs                 |  103 ++
 Lucene.Net.Facet/Properties/AssemblyInfo.cs     |   36 +
 .../RandomSamplingFacetsCollector.cs            |  323 +++++
 Lucene.Net.Facet/Range/DoubleRange.cs           |  243 ++++
 .../Range/DoubleRangeFacetCounts.cs             |  160 +++
 Lucene.Net.Facet/Range/LongRange.cs             |  239 ++++
 Lucene.Net.Facet/Range/LongRangeCounter.cs      |  385 +++++
 Lucene.Net.Facet/Range/LongRangeFacetCounts.cs  |  143 ++
 Lucene.Net.Facet/Range/Range.cs                 |   90 ++
 Lucene.Net.Facet/Range/RangeFacetCounts.cs      |   99 ++
 .../DefaultSortedSetDocValuesReaderState.cs     |  158 +++
 .../SortedSet/SortedSetDocValuesFacetCounts.cs  |  350 +++++
 .../SortedSet/SortedSetDocValuesFacetField.cs   |   65 +
 .../SortedSet/SortedSetDocValuesReaderState.cs  |  103 ++
 .../Taxonomy/AssociationFacetField.cs           |   91 ++
 .../Taxonomy/CachedOrdinalsReader.cs            |  208 +++
 Lucene.Net.Facet/Taxonomy/CategoryPath.cs       |  316 +++++
 Lucene.Net.Facet/Taxonomy/Directory/Consts.cs   |   34 +
 .../Directory/DirectoryTaxonomyReader.cs        |  450 ++++++
 .../Directory/DirectoryTaxonomyWriter.cs        | 1202 ++++++++++++++++
 .../Taxonomy/Directory/TaxonomyIndexArrays.cs   |  252 ++++
 .../Taxonomy/DocValuesOrdinalsReader.cs         |  130 ++
 Lucene.Net.Facet/Taxonomy/FacetLabel.cs         |  219 +++
 .../Taxonomy/FastTaxonomyFacetCounts.cs         |  105 ++
 .../Taxonomy/FloatAssociationFacetField.cs      |   65 +
 .../Taxonomy/FloatTaxonomyFacets.cs             |  183 +++
 .../Taxonomy/IntAssociationFacetField.cs        |   75 +
 Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs  |  189 +++
 Lucene.Net.Facet/Taxonomy/LRUHashMap.cs         |  154 ++
 Lucene.Net.Facet/Taxonomy/OrdinalsReader.cs     |   68 +
 .../Taxonomy/ParallelTaxonomyArrays.cs          |   74 +
 Lucene.Net.Facet/Taxonomy/PrintTaxonomyStats.cs |  121 ++
 .../Taxonomy/SearcherTaxonomyManager.cs         |  179 +++
 .../Taxonomy/TaxonomyFacetCounts.cs             |   77 +
 .../TaxonomyFacetSumFloatAssociations.cs        |   98 ++
 .../Taxonomy/TaxonomyFacetSumIntAssociations.cs |   96 ++
 .../Taxonomy/TaxonomyFacetSumValueSource.cs     |  247 ++++
 Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs     |  137 ++
 Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs     |  316 +++++
 Lucene.Net.Facet/Taxonomy/TaxonomyWriter.cs     |  125 ++
 .../Taxonomy/WriterCache/CategoryPathUtils.cs   |   99 ++
 .../Taxonomy/WriterCache/CharBlockArray.cs      |  234 +++
 .../WriterCache/Cl2oTaxonomyWriterCache.cs      |  123 ++
 .../Taxonomy/WriterCache/CollisionMap.cs        |  311 ++++
 .../WriterCache/CompactLabelToOrdinal.cs        |  522 +++++++
 .../Taxonomy/WriterCache/LabelToOrdinal.cs      |   83 ++
 .../WriterCache/LruTaxonomyWriterCache.cs       |  149 ++
 .../Taxonomy/WriterCache/NameHashIntCacheLRU.cs |   49 +
 .../Taxonomy/WriterCache/NameIntCacheLRU.cs     |  167 +++
 .../Taxonomy/WriterCache/TaxonomyWriterCache.cs |  105 ++
 Lucene.Net.Facet/TopOrdAndFloatQueue.cs         |   73 +
 Lucene.Net.Facet/TopOrdAndIntQueue.cs           |   76 +
 Lucene.Net.sln                                  |   14 +-
 src/Lucene.Net.Core/Analysis/AnalyzerWrapper.cs |    6 +-
 .../Index/BinaryDocValuesFieldUpdates.cs        |    4 +-
 .../Index/NumericDocValuesFieldUpdates.cs       |    4 +-
 src/Lucene.Net.Core/Index/ReaderManager.cs      |    8 +-
 src/Lucene.Net.Core/Lucene.Net.csproj           |    2 +
 .../Search/CachingWrapperFilter.cs              |    2 +-
 src/Lucene.Net.Core/Search/ReferenceManager.cs  |    8 +-
 src/Lucene.Net.Core/Search/SearcherManager.cs   |    8 +-
 .../Search/Spans/NearSpansOrdered.cs            |    4 +-
 src/Lucene.Net.Core/Support/StreamUtils.cs      |   40 +
 src/Lucene.Net.Core/Util/Accountable.cs         |   36 +
 .../Util/ArrayInPlaceMergeSorter.cs             |    4 +-
 src/Lucene.Net.Core/Util/ArrayIntroSorter.cs    |    4 +-
 src/Lucene.Net.Core/Util/ArrayTimSorter.cs      |    4 +-
 src/Lucene.Net.Core/Util/BytesRefArray.cs       |    4 +-
 src/Lucene.Net.Core/Util/BytesRefHash.cs        |    4 +-
 src/Lucene.Net.Core/Util/CollectionUtil.cs      |    8 +-
 src/Lucene.Net.Core/Util/IOUtils.cs             |    2 +-
 src/Lucene.Net.Core/Util/Sorter.cs              |    4 +-
 .../Index/BaseIndexFileFormatTestCase.cs        |    8 +-
 src/Lucene.Net.Tests/Lucene.Net.Tests.csproj    |   33 +
 .../Facet/AssertingSubDocsAtOnceCollector.cs    |   85 ++
 .../core/Facet/FacetTestCase.cs                 |  293 ++++
 .../core/Facet/Range/TestRangeFacetCounts.cs    | 1174 +++++++++++++++
 .../core/Facet/SlowRAMDirectory.cs              |  261 ++++
 .../SortedSet/TestSortedSetDocValuesFacets.cs   |  394 ++++++
 .../Facet/Taxonomy/Directory/TestAddTaxonomy.cs |  323 +++++
 .../Directory/TestConcurrentFacetedIndexing.cs  |  228 +++
 .../Directory/TestDirectoryTaxonomyReader.cs    |  624 ++++++++
 .../Directory/TestDirectoryTaxonomyWriter.cs    |  588 ++++++++
 .../Facet/Taxonomy/TestCachedOrdinalsReader.cs  |  116 ++
 .../core/Facet/Taxonomy/TestFacetLabel.cs       |  360 +++++
 .../core/Facet/Taxonomy/TestLRUHashMap.cs       |   65 +
 .../Taxonomy/TestSearcherTaxonomyManager.cs     |  398 ++++++
 .../core/Facet/Taxonomy/TestTaxonomyCombined.cs | 1185 ++++++++++++++++
 .../Taxonomy/TestTaxonomyFacetAssociations.cs   |  278 ++++
 .../Facet/Taxonomy/TestTaxonomyFacetCounts.cs   |  851 +++++++++++
 .../Facet/Taxonomy/TestTaxonomyFacetCounts2.cs  |  403 ++++++
 .../Taxonomy/TestTaxonomyFacetSumValueSource.cs |  610 ++++++++
 .../Taxonomy/WriterCache/TestCharBlockArray.cs  |  110 ++
 .../WriterCache/TestCompactLabelToOrdinal.cs    |  151 ++
 .../core/Facet/TestDrillDownQuery.cs            |  282 ++++
 .../core/Facet/TestDrillSideways.cs             | 1332 ++++++++++++++++++
 .../core/Facet/TestFacetsConfig.cs              |  131 ++
 .../core/Facet/TestMultipleIndexFields.cs       |  300 ++++
 .../Facet/TestRandomSamplingFacetsCollector.cs  |  154 ++
 110 files changed, 23920 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/31a6e4fe/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
----------------------------------------------------------------------
diff --cc src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
index 95cb4e1,264d1ef..67e606c
--- a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
@@@ -64,13 -64,21 +64,13 @@@ namespace Lucene.Net.Inde
              IDictionary<string, long> bytesUsedByExtension = new Dictionary<string,
long>();
              foreach (string file in d.ListAll())
              {
- 								string ext = IndexFileNames.GetExtension(file) ?? string.Empty;
 -                string ext = IndexFileNames.GetExtension(file);
 -                if (!string.IsNullOrWhiteSpace(ext))
 -                {
 -                    long previousLength = bytesUsedByExtension.ContainsKey(ext) ? bytesUsedByExtension[ext]
: 0;
 -                    bytesUsedByExtension[ext] = previousLength + d.FileLength(file);
 -                }
 -            }
 -
 -            foreach (var elm in ExcludedExtensionsFromByteCounts())
 -            {
 -                if (bytesUsedByExtension.Keys.Contains(elm))
 -                {
 -                    bytesUsedByExtension.Remove(elm);
 -                }
++				string ext = IndexFileNames.GetExtension(file) ?? string.Empty;
 +                long previousLength = bytesUsedByExtension.ContainsKey(ext) ? bytesUsedByExtension[ext]
: 0;
 +                bytesUsedByExtension[ext] = previousLength + d.FileLength(file);
              }
- 						foreach (string item in ExcludedExtensionsFromByteCounts()) {
- 							bytesUsedByExtension.Remove(item);							
- 						}
++			foreach (string item in ExcludedExtensionsFromByteCounts()) {
++				bytesUsedByExtension.Remove(item);							
++			}
              return bytesUsedByExtension;
          }
  


Mime
View raw message