[Bigdata-commit] SF.net SVN: bigdata:[8075] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/search/ReadIndexTask.java

[<tho...@us...>]

Revision: 8075
          http://sourceforge.net/p/bigdata/code/8075
Author:   thompsonbry
Date:     2014-04-07 20:22:03 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Worked through ReadIndexTask interrupt handling with Mike.  Treatment is the same as for query (normal cancellation).

See #871 (code review of interrupt handling)

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/search/ReadIndexTask.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/search/ReadIndexTask.java	2014-04-07 19:08:00 UTC (rev 8074)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/search/ReadIndexTask.java	2014-04-07 20:22:03 UTC (rev 8075)
@@ -10,8 +10,6 @@
 import com.bigdata.btree.ISimpleSplitHandler;
 import com.bigdata.btree.ITuple;
 import com.bigdata.btree.ITupleIterator;
-import com.bigdata.btree.keys.IKeyBuilder;
-import com.bigdata.btree.keys.SuccessorUtil;
 
 /**
  * Procedure reads on the terms index, aggregating data on a per-{@link Hit}
@@ -131,12 +129,12 @@
             log.debug("queryTerm=" + queryTerm + ", termWeight="
                     + queryTermWeight);
 
-        final Thread t = Thread.currentThread();
+//        final Thread t = Thread.currentThread();
         
         while (itr.hasNext()) {
 
             // don't test for interrupted on each result -- too much work.
-            if (nhits % 1000 == 0 && t.isInterrupted()) {
+            if (nhits % 1000 == 0 && Thread.interrupted()) {
 
 //                if (log.isInfoEnabled())
                 log.warn("Interrupted: queryTerm=" + queryTerm + ", nhits="

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.