You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/02/09 23:00:03 UTC

svn commit: r1729472 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java

Author: schor
Date: Tue Feb  9 22:00:03 2016
New Revision: 1729472

URL: http://svn.apache.org/viewvc?rev=1729472&view=rev
Log:
[UIMA-4669] use more specific class TOP instead of FeatureStructure, add Java 8 style walker used by serializers (plain binary and form4 compressed) to get all (not-gc'd) FSs in creation order.

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java?rev=1729472&r1=1729471&r2=1729472&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java Tue Feb  9 22:00:03 2016
@@ -21,9 +21,11 @@ package org.apache.uima.cas.impl;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.function.Consumer;
 
 import org.apache.uima.cas.CASRuntimeException;
 import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.jcas.cas.TOP;
 
 /**
  * A map from ints representing FS id's (or "addresses") to those FSs
@@ -36,10 +38,12 @@ import org.apache.uima.cas.FeatureStruct
  * Removes not supported; the weak refs allow garbage collection to reclaim the feature structure space.
  * 
  * Searching is by simple index lookup in an ArrayList
+ * 
+ * Alternative: a map based on sorted arrays, searched by binary search
  */
 public class Id2FS {
    
-  final private ArrayList<WeakReference<FeatureStructureImplC>> id2fsw;
+  final private ArrayList<WeakReference<TOP>> id2fsw;
   
   public Id2FS() {  
     id2fsw = new ArrayList<>();
@@ -49,11 +53,11 @@ public class Id2FS {
   /**
    * @param fs -
    */
-  public void add(FeatureStructureImplC fs) {
-    id2fsw.add(new WeakReference<FeatureStructureImplC>(fs));
+  public void add(TOP fs) {
+    id2fsw.add(new WeakReference<TOP>(fs));
   }
  
-  public <T extends FeatureStructure> T get(int id) {
+  public <T extends TOP> T get(int id) {
     if (id < 1 || id >= id2fsw.size()) {
       /** The Feature Structure ID {0} is invalid.*/
       throw new CASRuntimeException(CASRuntimeException.INVALID_FS_ID, id);
@@ -61,7 +65,7 @@ public class Id2FS {
     return (T) id2fsw.get(id).get();  // could return null if fs is gc'd
   }
   
-  public <T extends FeatureStructure> T getWithMissingIsNull(int id) {
+  public <T extends TOP> T getWithMissingIsNull(int id) {
     if (id < 1 || id >= id2fsw.size()) {
       return null;
     }    
@@ -77,4 +81,17 @@ public class Id2FS {
     id2fsw.add(null); // so that ids start at 1
     id2fsw.trimToSize();
   }
+  
+  /**
+   * plus means all reachable, plus maybe others not reachable but not yet gc'd
+   * @param action
+   */
+  void walkReachablePlusFSsSorted(Consumer<TOP> action) {
+    for (WeakReference<TOP> wr : id2fsw.subList(1, id2fsw.size())) {
+      TOP fs = wr.get();
+      if (null != fs) {
+        action.accept(fs);
+      }
+    }
+  }
 }