Merge pull request LinkedInAttic#7 from jhartman/master

Fixing reference counting issues Dmytro and Rahul reported.
jhartman · Jul 23, 2013 · b6b7ba7 · b6b7ba7
2 parents a503bc1 + 6f61697
commit b6b7ba7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/zoie-core/src/main/java/proj/zoie/api/ZoieMultiReader.java b/zoie-core/src/main/java/proj/zoie/api/ZoieMultiReader.java
@@ -45,7 +45,7 @@ public class ZoieMultiReader<R extends IndexReader> extends ZoieIndexReader<R>
 	private int[] _starts;
 	private List<R> _decoratedReaders;
 
-	public ZoieMultiReader(IndexReader in,IndexReaderDecorator<R> decorator) throws IOException
+	public ZoieMultiReader(IndexReader in, IndexReaderDecorator<R> decorator) throws IOException
 	{
 	  super(in,decorator);
 	  _readerMap = new HashMap<String,ZoieSegmentReader<R>>();
@@ -54,7 +54,7 @@ public ZoieMultiReader(IndexReader in,IndexReaderDecorator<R> decorator) throws
 	  init(subReaders);
 	}
 
-	public ZoieMultiReader(IndexReader in,IndexReader[] subReaders,IndexReaderDecorator<R> decorator) throws IOException {
+	public ZoieMultiReader(IndexReader in,IndexReader[] subReaders, IndexReaderDecorator<R> decorator) throws IOException {
 		super(in,decorator);
 		_readerMap = new HashMap<String,ZoieSegmentReader<R>>();
 		_decoratedReaders = null; 
@@ -109,7 +109,7 @@ else if (subReader instanceof SegmentReader){
     	for (ZoieSegmentReader<R> subReader : _subZoieReaders){
     		R decoratedReader = subReader.getDecoratedReader();
     		decoratedList.add(decoratedReader);
-    		subReader.incSegmentRef();
+    		subReader.incZoieRef();
     	}
     	_decoratedReaders = decoratedList;
 	}
@@ -262,8 +262,7 @@ protected void doClose() throws IOException {
 	  }
 	  finally{
 	    for (ZoieSegmentReader<R> r : _subZoieReaders){
-	     // r.decRef();
-	      r.decSegmentRef();
+	      r.decZoieRef();
 	    }
 	  }
 	}

diff --git a/zoie-core/src/main/java/proj/zoie/api/ZoieSegmentReader.java b/zoie-core/src/main/java/proj/zoie/api/ZoieSegmentReader.java
@@ -340,6 +340,7 @@ protected synchronized void doClose() throws IOException {
 	public void decRef() throws IOException {
 		// not synchronized, since it doesn't do anything anyway
 	}
+
    @Override
   public int numDocs() {
      if (_currentDelDocIds != null) {
@@ -360,24 +361,5 @@ public ZoieSegmentReader<R> copy() throws IOException
   {
     return new ZoieSegmentReader<R>(this, this.in);
   }
-  private AtomicLong zoieRefSegmentCounter = new AtomicLong(1);
-
-  public void incSegmentRef() {
-    zoieRefSegmentCounter.incrementAndGet();
-  }
 
-  public void decSegmentRef() {
-    long refCount = zoieRefSegmentCounter.decrementAndGet();
-    if (refCount < 0) {
-      throw new IllegalStateException("The segment ref count shouldn't be less than zero");
-    }
-    if (refCount == 0) {
-      try {
-        doClose();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
 }
diff --git a/zoie-core/src/test/java/proj/zoie/test/ZoieTest.java b/zoie-core/src/test/java/proj/zoie/test/ZoieTest.java
@@ -582,7 +582,7 @@ public void testPurgeFilter() throws Exception {
 
       log.info("new numdocs: "+numDocs);
       //TODO for some reasons numdocs might be 6. I've put a temporary fix to avoid sporadical failures
-      TestCase.assertTrue("numdDocs should be 5" + numDocs, (numDocs == 5 || numDocs == 6));
+      TestCase.assertTrue("numdDocs should be 5 but is " + numDocs, (numDocs == 5 || numDocs == 6));
 
       idxSystem.returnIndexReaders(readers);