svn commit: r1607782 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/facet/ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ lucene/facet/src/test/org/apache/lucene/facet/taxonomy/

[sh...@apache.org]

Author: shaie
Date: Fri Jul  4 03:35:46 2014
New Revision: 1607782

URL: http://svn.apache.org/r1607782
Log:
LUCENE-5801: rename test vars, class and add missing ctor

Added:
    lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingAtomicReader.java
      - copied unchanged from r1607781, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingAtomicReader.java
Removed:
    lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/OrdinalMappingReaderTest.java
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/facet/   (props changed)
    lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingAtomicReader.java
    lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java

Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingAtomicReader.java?rev=1607782&r1=1607781&r2=1607782&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingAtomicReader.java Fri Jul  4 03:35:46 2014
@@ -141,4 +141,3 @@ public class OrdinalMappingAtomicReader 
   }
   
 }
-

Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java?rev=1607782&r1=1607781&r2=1607782&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java Fri Jul  4 03:35:46 2014
@@ -33,30 +33,32 @@ import org.apache.lucene.store.Directory
  * Utility methods for merging index and taxonomy directories.
  * @lucene.experimental
  */
-public class TaxonomyMergeUtils {
+public abstract class TaxonomyMergeUtils {
+  
+  private TaxonomyMergeUtils() {}
   
   /**
    * Merges the given taxonomy and index directories and commits the changes to
    * the given writers.
    */
-  public static void merge(Directory srcIndexDir, Directory srcTaxDir, OrdinalMap map, IndexWriter destIndexWriter, 
-      DirectoryTaxonomyWriter destTaxWriter) throws IOException {
+  public static void merge(Directory srcIndexDir, Directory srcTaxoDir, OrdinalMap map, IndexWriter destIndexWriter,
+      DirectoryTaxonomyWriter destTaxoWriter) throws IOException {
     
     // merge the taxonomies
-    destTaxWriter.addTaxonomy(srcTaxDir, map);
+    destTaxoWriter.addTaxonomy(srcTaxoDir, map);
     int ordinalMap[] = map.getMap();
     DirectoryReader reader = DirectoryReader.open(srcIndexDir);
-    List<AtomicReaderContext> leaves = reader.leaves();
-    int numReaders = leaves.size();
-    AtomicReader wrappedLeaves[] = new AtomicReader[numReaders];
-    for (int i = 0; i < numReaders; i++) {
-      wrappedLeaves[i] = new OrdinalMappingAtomicReader(leaves.get(i).reader(), ordinalMap);
-    }
     try {
+      List<AtomicReaderContext> leaves = reader.leaves();
+      int numReaders = leaves.size();
+      AtomicReader wrappedLeaves[] = new AtomicReader[numReaders];
+      for (int i = 0; i < numReaders; i++) {
+        wrappedLeaves[i] = new OrdinalMappingAtomicReader(leaves.get(i).reader(), ordinalMap);
+      }
       destIndexWriter.addIndexes(new MultiReader(wrappedLeaves));
       
       // commit changes to taxonomy and index respectively.
-      destTaxWriter.commit();
+      destTaxoWriter.commit();
       destIndexWriter.commit();
     } finally {
       reader.close();