Changeset 32619 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.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/GS2MGPPSearch.java (modified) (4 diffs)

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

@@ -43 +43 @@
 public class GS2MGPPSearch extends AbstractGS2FieldSearch
 {
-    private static MGPPSearchWrapper mgpp_src = null;
+    private static MGPPSearchWrapper mgpp_src = null; // STATIC!
 
     private String physical_index_name = "idx";
@@ -65 +65 @@
         mgpp_src.reset(); // reset stored settings to defaults
     }
-
+    
     /** process a query */
     protected Element processAnyQuery(Element request, int query_type)
     {
+        // don't know that the static (class variable) mgpp_src is "multi-threaded re-entrant" allowing multiple users
+        // to search the same index at the same time. So leave code as-is: to synchronize on mgpp_src when running query
         synchronized (mgpp_src)
         {
@@ -102 +104 @@
     }
 
-    protected boolean setUpQueryer(HashMap<String, Serializable> params)
+    protected Object setUpQueryer(HashMap<String, Serializable> params)
     {
 
@@ -199 +201 @@
         mgpp_src.loadIndexData(indexdir);
 
-        return true;
-    }
-
-    protected Object runQuery(String query)
-    {
+        return mgpp_src; //return the query object
+    }
+
+    protected Object runQuery(Object queryObject, String query)
+    {
+        // queryObject is mgpp_src, so use mgpp_src reference directly:
+        
         mgpp_src.runQuery(query);
         MGPPQueryResult mqr = mgpp_src.getQueryResult();