Changeset 32609 for main/trunk/greenstone2

Timestamp:

2018-11-16T17:19:53+13:00 (5 years ago)

Author:

ak19

Message:

Preliminary stage before tackling a different bug. This commit is a bugfix to the index folder file locking problem that occurs on Windows when coll deactivate doesn't close all file handles to the coll index folder after doing some lucene searches. Inspecting the code revealed the possibility of another different bug, for which Kathy devised a test to confirm its existence. After testing, found the bug is real: multiple queries configure the same query object (and its internal reader object) but the last configuration is always used to run a search. For example, one user wants to search a lucene collection at doc level and a second user wants to search the same collection at section level. The 2nd user's configuration wins if they configure between the first person's query object being configured and its query being run. So the first person now ends up seeing search results that are at section level.

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java

@@ -105 +105 @@
         }
 
-        try {
+        try {   
+        
+            if(reader != null) {
+                    reader.close();
+                    searcher = null;
+            }   
+            
         Directory full_indexdir_dir = FSDirectory.open(new File(full_indexdir));
 
         reader = DirectoryReader.open(full_indexdir_dir); // Returns a IndexReader reading the index in the given Directory. now readOnly=true by default, and therefore also for searcher
         searcher = new IndexSearcher(reader); // during searcher.search() will get it to compute ranks when sorting by fields
-        
+        
         this.sorter = new Sort(new SortField(this.sort_field, this.sort_type, this.reverse_sort));
     }
@@ -351 +357 @@
         // No other methods should be called after this has been called. 
         }
+        
     } catch (IOException exception) {
         exception.printStackTrace();
@@ -661 +668 @@
         
         if (!queryer.initialise()) {
+            queryer.cleanUp(); // will close reader object IF reader was instantiated
         return;
         }
@@ -683 +691 @@
         }
         }
-        queryer.cleanUp();
+        queryer.cleanUp();
     }
     catch (IOException exception) {