Index: lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java =================================================================== --- lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java (revision 1488477) +++ lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java (working copy) @@ -44,7 +44,7 @@ try { is = getResource(FST_FILENAME_SUFFIX); is = new BufferedInputStream(is); - fst = new FST(new InputStreamDataInput(is), PositiveIntOutputs.getSingleton(true)); + fst = new FST(new InputStreamDataInput(is), PositiveIntOutputs.getSingleton()); } catch (IOException ioe) { priorE = ioe; } finally { Index: lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java =================================================================== --- lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java (revision 1488477) +++ lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java (working copy) @@ -88,7 +88,7 @@ List data = new ArrayList(featureEntries.size()); List segmentations = new ArrayList(featureEntries.size()); - PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton(true); + PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton(); Builder fstBuilder = new Builder(FST.INPUT_TYPE.BYTE2, fstOutput); IntsRef scratch = new IntsRef(); long ord = 0; Index: lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java =================================================================== --- lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java (revision 1488477) +++ lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java (working copy) @@ -131,7 +131,7 @@ System.out.println(" encode..."); - PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton(true); + PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton(); Builder fstBuilder = new Builder(FST.INPUT_TYPE.BYTE2, 0, 0, true, true, Integer.MAX_VALUE, fstOutput, null, true, PackedInts.DEFAULT, true, 15); IntsRef scratch = new IntsRef(); long ord = -1; // first ord will be 0 Index: lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (revision 1488477) +++ lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (working copy) @@ -44,7 +44,7 @@ * @lucene.experimental */ public class VariableGapTermsIndexReader extends TermsIndexReaderBase { - private final PositiveIntOutputs fstOutputs = PositiveIntOutputs.getSingleton(true); + private final PositiveIntOutputs fstOutputs = PositiveIntOutputs.getSingleton(); private int indexDivisor; // Closed if indexLoaded is true: @@ -199,7 +199,7 @@ if (indexDivisor > 1) { // subsample final IntsRef scratchIntsRef = new IntsRef(); - final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true); + final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(); final Builder builder = new Builder(FST.INPUT_TYPE.BYTE1, outputs); final BytesRefFSTEnum fstEnum = new BytesRefFSTEnum(fst); BytesRefFSTEnum.InputOutput result; Index: lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java (revision 1488477) +++ lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java (working copy) @@ -235,7 +235,7 @@ public FSTFieldWriter(FieldInfo fieldInfo, long termsFilePointer) throws IOException { this.fieldInfo = fieldInfo; - fstOutputs = PositiveIntOutputs.getSingleton(true); + fstOutputs = PositiveIntOutputs.getSingleton(); fstBuilder = new Builder(FST.INPUT_TYPE.BYTE1, fstOutputs); indexStart = out.getFilePointer(); ////System.out.println("VGW: field=" + fieldInfo.name); Index: lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (revision 1488477) +++ lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (working copy) @@ -513,7 +513,7 @@ } private void loadTerms() throws IOException { - PositiveIntOutputs posIntOutputs = PositiveIntOutputs.getSingleton(false); + PositiveIntOutputs posIntOutputs = PositiveIntOutputs.getSingleton(); final Builder>> b; final PairOutputs outputsInner = new PairOutputs(posIntOutputs, posIntOutputs); final PairOutputs> outputs = new PairOutputs>(posIntOutputs, Index: lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java (revision 1488477) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java (working copy) @@ -245,7 +245,7 @@ meta.writeVInt(field.number); meta.writeByte(FST); meta.writeLong(data.getFilePointer()); - PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true); + PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(); Builder builder = new Builder(INPUT_TYPE.BYTE1, outputs); IntsRef scratch = new IntsRef(); long ord = 0; Index: lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java (revision 1488477) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java (working copy) @@ -278,7 +278,7 @@ instance = fstInstances.get(field.number); if (instance == null) { data.seek(entry.offset); - instance = new FST(data, PositiveIntOutputs.getSingleton(true)); + instance = new FST(data, PositiveIntOutputs.getSingleton()); fstInstances.put(field.number, instance); } } @@ -352,7 +352,7 @@ instance = fstInstances.get(field.number); if (instance == null) { data.seek(entry.offset); - instance = new FST(data, PositiveIntOutputs.getSingleton(true)); + instance = new FST(data, PositiveIntOutputs.getSingleton()); fstInstances.put(field.number, instance); } } Index: lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java (revision 1488477) +++ lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java (working copy) @@ -33,42 +33,25 @@ private final static Long NO_OUTPUT = new Long(0); - private final boolean doShare; + private final static PositiveIntOutputs singleton = new PositiveIntOutputs(); - private final static PositiveIntOutputs singletonShare = new PositiveIntOutputs(true); - private final static PositiveIntOutputs singletonNoShare = new PositiveIntOutputs(false); - - private PositiveIntOutputs(boolean doShare) { - this.doShare = doShare; + private PositiveIntOutputs() { } - /** Returns the instance of PositiveIntOutputs. */ public static PositiveIntOutputs getSingleton() { - return getSingleton(true); + return singleton; } - /** Expert: pass doShare=false to disable output sharing. - * In some cases this may result in a smaller FST, - * however it will also break methods like {@link - * Util#getByOutput} and {@link Util#shortestPaths}. */ - public static PositiveIntOutputs getSingleton(boolean doShare) { - return doShare ? singletonShare : singletonNoShare; - } - @Override public Long common(Long output1, Long output2) { assert valid(output1); assert valid(output2); if (output1 == NO_OUTPUT || output2 == NO_OUTPUT) { return NO_OUTPUT; - } else if (doShare) { + } else { assert output1 > 0; assert output2 > 0; return Math.min(output1, output2); - } else if (output1.equals(output2)) { - return output1; - } else { - return NO_OUTPUT; } } @@ -134,6 +117,6 @@ @Override public String toString() { - return "PositiveIntOutputs(doShare=" + doShare + ")"; + return "PositiveIntOutputs"; } } Index: lucene/core/src/java/org/apache/lucene/util/fst/Util.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/fst/Util.java (revision 1488477) +++ lucene/core/src/java/org/apache/lucene/util/fst/Util.java (working copy) @@ -93,9 +93,7 @@ * *

NOTE: this only works with {@code FST}, only * works when the outputs are ascending in order with - * the inputs and only works when you shared - * the outputs (pass doShare=true to {@link - * PositiveIntOutputs#getSingleton}). + * the inputs. * For example, simple ordinals (0, 1, * 2, ...), or file offets (when appending to a file) * fit this. */ @@ -517,11 +515,7 @@ } /** Starting from node, find the top N min cost - * completions to a final node. - * - *

NOTE: you must share the outputs when you build the - * FST (pass doShare=true to {@link - * PositiveIntOutputs#getSingleton}). */ + * completions to a final node. */ public static MinResult[] shortestPaths(FST fst, FST.Arc fromNode, T startOutput, Comparator comparator, int topN, boolean allowEmptyString) throws IOException { Index: lucene/core/src/java/org/apache/lucene/util/fst/package.html =================================================================== --- lucene/core/src/java/org/apache/lucene/util/fst/package.html (revision 1488477) +++ lucene/core/src/java/org/apache/lucene/util/fst/package.html (working copy) @@ -43,7 +43,7 @@ String inputValues[] = {"cat", "dog", "dogs"}; long outputValues[] = {5, 7, 12}; - PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true); + PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(); Builder<Long> builder = new Builder<Long>(INPUT_TYPE.BYTE1, outputs); BytesRef scratchBytes = new BytesRef(); IntsRef scratchInts = new IntsRef(); @@ -60,8 +60,7 @@ Retrieval by value: 

-    // Only works because outputs are also in sorted order, and
-    // we passed 'true' for sharing to PositiveIntOutputs.getSingleton
+    // Only works because outputs are also in sorted order
     IntsRef key = Util.getByOutput(fst, 12);
     System.out.println(Util.toBytesRef(key, scratchBytes).utf8ToString()); // dogs
@@ -77,7 +76,6 @@ N-shortest paths by weight: 
-    // Only works because we passed 'true' for sharing to PositiveIntOutputs.getSingleton
     Comparator<Long> comparator = new Comparator<Long>() {
       public int compare(Long left, Long right) {
         return left.compareTo(right);
Index: lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
===================================================================
--- lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java	(revision 1488477)
+++ lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java	(working copy)
@@ -126,7 +126,7 @@
 
       // FST ord pos int
       {
-        final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+        final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
         final List> pairs = new ArrayList>(terms2.length);
         for(int idx=0;idx(terms2[idx], (long) idx));
@@ -171,7 +171,7 @@
 
     // PositiveIntOutput (ord)
     {
-      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
       final List> pairs = new ArrayList>(terms.length);
       for(int idx=0;idx(terms[idx], (long) idx));
@@ -181,8 +181,8 @@
 
     // PositiveIntOutput (random monotonically increasing positive number)
     {
-      final boolean doShare = random().nextBoolean();
-      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(doShare);
+      final boolean doReverseLookup = random().nextBoolean();
+      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
       final List> pairs = new ArrayList>(terms.length);
       long lastOutput = 0;
       for(int idx=0;idx(terms[idx], value));
       }
-      new FSTTester(random(), dir, inputMode, pairs, outputs, doShare).doTest(true);
+      new FSTTester(random(), dir, inputMode, pairs, outputs, doReverseLookup).doTest(true);
     }
 
     // PositiveIntOutput (random positive number)
     {
-      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(random().nextBoolean());
+      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
       final List> pairs = new ArrayList>(terms.length);
       for(int idx=0;idx(terms[idx], _TestUtil.nextLong(random(), 0, Long.MAX_VALUE)));
@@ -205,8 +205,8 @@
 
     // Pair
     {
-      final PositiveIntOutputs o1 = PositiveIntOutputs.getSingleton(random().nextBoolean());
-      final PositiveIntOutputs o2 = PositiveIntOutputs.getSingleton(random().nextBoolean());
+      final PositiveIntOutputs o1 = PositiveIntOutputs.getSingleton();
+      final PositiveIntOutputs o2 = PositiveIntOutputs.getSingleton();
       final PairOutputs outputs = new PairOutputs(o1, o2);
       final List>> pairs = new ArrayList>>(terms.length);
       long lastOutput = 0;
@@ -306,7 +306,7 @@
     }
     IndexReader r = DirectoryReader.open(writer, true);
     writer.close();
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(random().nextBoolean());
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
 
     final boolean doRewrite = random().nextBoolean();
 
@@ -653,8 +653,8 @@
 
     if (storeOrds && storeDocFreqs) {
       // Store both ord & docFreq:
-      final PositiveIntOutputs o1 = PositiveIntOutputs.getSingleton(true);
-      final PositiveIntOutputs o2 = PositiveIntOutputs.getSingleton(false);
+      final PositiveIntOutputs o1 = PositiveIntOutputs.getSingleton();
+      final PositiveIntOutputs o2 = PositiveIntOutputs.getSingleton();
       final PairOutputs outputs = new PairOutputs(o1, o2);
       new VisitTerms>(dirOut, wordsFileIn, inputMode, prune, outputs, doPack, noArcArrays) {
         Random rand;
@@ -669,7 +669,7 @@
       }.run(limit, verify, false);
     } else if (storeOrds) {
       // Store only ords
-      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
       new VisitTerms(dirOut, wordsFileIn, inputMode, prune, outputs, doPack, noArcArrays) {
         @Override
         public Long getOutput(IntsRef input, int ord) {
@@ -678,7 +678,7 @@
       }.run(limit, verify, true);
     } else if (storeDocFreqs) {
       // Store only docFreq
-      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(false);
+      final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
       new VisitTerms(dirOut, wordsFileIn, inputMode, prune, outputs, doPack, noArcArrays) {
         Random rand;
         @Override
@@ -781,7 +781,7 @@
     // smaller FST if the outputs grow monotonically.  But
     // if numbers are "random", false should give smaller
     // final size:
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
 
     // Build an FST mapping BytesRef -> Long
     final Builder builder = new Builder(FST.INPUT_TYPE.BYTE1, outputs);
@@ -1100,7 +1100,7 @@
   }
 
   public void testFinalOutputOnEndState() throws Exception {
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
 
     final Builder builder = new Builder(FST.INPUT_TYPE.BYTE4, 2, 0, true, true, Integer.MAX_VALUE, outputs, null, random().nextBoolean(), PackedInts.DEFAULT, true, 15);
     builder.add(Util.toUTF32("stat", new IntsRef()), 17L);
@@ -1115,7 +1115,7 @@
   }
 
   public void testInternalFinalState() throws Exception {
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
     final boolean willRewrite = random().nextBoolean();
     final Builder builder = new Builder(FST.INPUT_TYPE.BYTE1, 0, 0, true, true, Integer.MAX_VALUE, outputs, null, willRewrite, PackedInts.DEFAULT, true, 15);
     builder.add(Util.toIntsRef(new BytesRef("stat"), new IntsRef()), outputs.getNoOutput());
@@ -1136,7 +1136,7 @@
   // Make sure raw FST can differentiate between final vs
   // non-final end nodes
   public void testNonFinalStopNode() throws Exception {
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
     final Long nothing = outputs.getNoOutput();
     final Builder b = new Builder(FST.INPUT_TYPE.BYTE1, outputs);
 
@@ -1216,7 +1216,7 @@
   };
 
   public void testShortestPaths() throws Exception {
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
     final Builder builder = new Builder(FST.INPUT_TYPE.BYTE1, outputs);
 
     final IntsRef scratch = new IntsRef();
@@ -1258,8 +1258,8 @@
   public void testShortestPathsWFST() throws Exception {
 
     PairOutputs outputs = new PairOutputs(
-        PositiveIntOutputs.getSingleton(true), // weight
-        PositiveIntOutputs.getSingleton(true)  // output
+        PositiveIntOutputs.getSingleton(), // weight
+        PositiveIntOutputs.getSingleton()  // output
     );
     
     final Builder> builder = new Builder>(FST.INPUT_TYPE.BYTE1, outputs);
@@ -1301,7 +1301,7 @@
     final TreeMap slowCompletor = new TreeMap();
     final TreeSet allPrefixes = new TreeSet();
     
-    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
     final Builder builder = new Builder(FST.INPUT_TYPE.BYTE1, outputs);
     final IntsRef scratch = new IntsRef();
     
@@ -1416,8 +1416,8 @@
     final TreeSet allPrefixes = new TreeSet();
     
     PairOutputs outputs = new PairOutputs(
-        PositiveIntOutputs.getSingleton(true), // weight
-        PositiveIntOutputs.getSingleton(true)  // output
+        PositiveIntOutputs.getSingleton(), // weight
+        PositiveIntOutputs.getSingleton()  // output
     );
     final Builder> builder = new Builder>(FST.INPUT_TYPE.BYTE1, outputs);
     final IntsRef scratch = new IntsRef();
Index: lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
===================================================================
--- lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java	(revision 1488477)
+++ lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java	(working copy)
@@ -512,7 +512,7 @@
 
       reader = new Sort.ByteSequencesReader(tempSorted);
      
-      PairOutputs outputs = new PairOutputs(PositiveIntOutputs.getSingleton(true), ByteSequenceOutputs.getSingleton());
+      PairOutputs outputs = new PairOutputs(PositiveIntOutputs.getSingleton(), ByteSequenceOutputs.getSingleton());
       Builder> builder = new Builder>(FST.INPUT_TYPE.BYTE1, outputs);
 
       // Build FST:
@@ -634,7 +634,7 @@
   public boolean load(InputStream input) throws IOException {
     DataInput dataIn = new InputStreamDataInput(input);
     try {
-      this.fst = new FST>(dataIn, new PairOutputs(PositiveIntOutputs.getSingleton(true), ByteSequenceOutputs.getSingleton()));
+      this.fst = new FST>(dataIn, new PairOutputs(PositiveIntOutputs.getSingleton(), ByteSequenceOutputs.getSingleton()));
       maxAnalyzedPathsForOneInput = dataIn.readVInt();
       hasPayloads = dataIn.readByte() == 1;
     } finally {
Index: lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
===================================================================
--- lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java	(revision 1488477)
+++ lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java	(working copy)
@@ -101,7 +101,7 @@
     TermFreqIterator iter = new WFSTTermFreqIteratorWrapper(iterator);
     IntsRef scratchInts = new IntsRef();
     BytesRef previous = null;
-    PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton(true);
+    PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
     Builder builder = new Builder(FST.INPUT_TYPE.BYTE1, outputs);
     while ((scratch = iter.next()) != null) {
       long cost = iter.weight();
@@ -136,7 +136,7 @@
   @Override
   public boolean load(InputStream input) throws IOException {
     try {
-      this.fst = new FST(new InputStreamDataInput(input), PositiveIntOutputs.getSingleton(true));
+      this.fst = new FST(new InputStreamDataInput(input), PositiveIntOutputs.getSingleton());
     } finally {
       IOUtils.close(input);
     }