Changeset 32619 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

Timestamp:

2018-11-20T21:34:48+13:00 (5 years ago)

Author:

ak19

Message:

3 significant changes in 1 commit particularly impacting Lucene queries: 1. Instead if GS2LuceneSearch havinga GS2LuceneQuery object member variable for doing each and every search, each query now instantiates its own local GS2LuceneQuery object, configures it for that specific search, runs the search and then the GS2LuceneQuery object expires. This fixes a bug by preventing multiple concurrent searches getting the search configurations of other searches run at the same time. 2. Though GS2LuceneQuery objects need to be instantiated 1 per query over a collection, we don't want to keep reopening a collection's sidx and didx index folders with IndexReader objects for every query. Since IndexReaders support concurrent access, we'd like to use one IndexReader per collection index (one for didx, one for sidx) with the IndexReaders existing for the life of a collection. This meant moving the maintaining of IndexReader objects from GS2LuceneQuery into the GS2LuceneSearch service and turning them into singletons by using a HashMap to maintain index-dir, reader pairs. GS3 Services, e.g. GS2LuceneSearch, are loaded and unloaded on collection activate and deactivate respectively. On deactivate, cleanUp() is called on services and other GS3 modules. When GS2LuceneSearch.cleanUp() is called, we now finally close the singleton IndexReader objects/resources that a collection's GS2LuceneSearch object maintains. 3. Redid previous bugfix (then committed to GS2LuceneQuery): Point 2 again solves the filelocking problem of multiple handles to the index being opened and not all being closed on deactivate, but it's solved in a different and better/more optimal way than in the previous commit.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -672 +672 @@
         indexField = field;
         // set up the appropriate query system
-        if (!setUpQueryer(params))
-        {
+        Object queryObject = setUpQueryer(params);
+        if (queryObject == null)
+        {           
             return result;
         }
@@ -689 +690 @@
             query = parseAdvancedFieldQueryParams(params);
             break;
-        }
+        }       
         
-        // run the query
-        Object query_result = runQuery(query);
+        // run the query        
+        Object query_result = runQuery(queryObject, query);
+        
         
         // We want highlighted text to be returned right now!
@@ -817 +819 @@
             }
         }
-
         
+        queryObject = null;
         return result;
 
@@ -824 +826 @@
 
     /** methods to handle actually doing the query */
-    /** do any initialisation of the query object */
-    abstract protected boolean setUpQueryer(HashMap<String, Serializable> params);
-
-    /** do the query */
-    abstract protected Object runQuery(String query);
+    /** do any initialisation of the query object. Call before runQuery()
+      * @return the queryObject (e.g. GS2LuceneQuery)
+    */  
+    abstract protected Object setUpQueryer(HashMap<String, Serializable> params);
+
+    /** do the query 
+      * The queryObject parameter is the return value of setUpQueryer.
+    */
+    abstract protected Object runQuery(Object queryObject, String query);
 
     /** get the total number of docs that match */