X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.indexing%2Fsrc%2Forg%2Fsimantics%2Fdb%2Findexing%2FIndexedRelationsSearcher.java;fp=bundles%2Forg.simantics.db.indexing%2Fsrc%2Forg%2Fsimantics%2Fdb%2Findexing%2FIndexedRelationsSearcher.java;h=115e54595585bafe2b3b5ca88a9e0c2f2bee4c03;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=8d30d0b2756da96e3c8a1716f696c8139f78a08e;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java
index 8d30d0b27..115e54595 100644
--- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java
+++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java
@@ -1,292 +1,292 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.db.indexing;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.simantics.db.RequestProcessor;
-import org.simantics.db.Resource;
-import org.simantics.db.Session;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.adapter.GenericRelation;
-import org.simantics.utils.datastructures.Pair;
-
-/**
- * @author Tuukka Lehtonen
- * @author Antti Villberg
- */
-public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase {
-    
-    IndexedRelationsMemorySearcher cache;
-
-    IndexedRelationsSearcher(RequestProcessor session, Resource relation, Resource input, GenericRelation r) throws DatabaseException {
-        super(session, relation, input);
-        this.cache = new IndexedRelationsMemorySearcher(session, this, relation, input, r);
-    }
-
-    @Override
-    String getDescriptor() {
-        return "DISK: ";
-    }
-
-    @Override
-    public void setProblem(Throwable t) {
-    	super.setProblem(t);
-    	cache.setProblem(t);
-    }
-    
-    @Override
-    boolean startAccess(IProgressMonitor monitor, Session session, boolean forWriting) {
-    	boolean success = super.startAccess(monitor, session, false);
-    	if(!success) return false;
-    	success = cache.startAccess(monitor, session, forWriting);
-        if(!success) {
-        	setProblem(cache.getException());
-        	return false;
-        } else return true;
-    }
-    
-    @Override
-    void insertIndex(IProgressMonitor monitor, GenericRelation r, int boundLength, Collection<Object[]> documentsData)
-            throws CorruptIndexException, IOException, DatabaseException {
-
-        Collection<Object> keyValues = new ArrayList<Object>();
-        for(Object[] data : documentsData) {
-            keyValues.add(data[1]);
-        }
-        
-        cache.replaceIndex(monitor, "Resource", keyValues, r, boundLength, documentsData);
-        //cache.commit();
-        
-    }
-    
-    @Override
-    void removeIndex(IProgressMonitor monitor, GenericRelation r, RequestProcessor processor, String key, Collection<Object> keyValues) throws DatabaseException,CorruptIndexException, IOException {
-        
-        Collection<Object[]> documentsData = new ArrayList<Object[]>();
-
-        Pair<String,String>[] fields = r.getFields(); 
-
-        for(Object keyValue : keyValues) {
-            Object[] data = new Object[fields.length-1];
-            int index = 0;
-            for(int i=1;i<fields.length;i++) {
-                String fieldName = fields[i].first;
-                if(key.equals(fieldName)) {
-                    data[index++] = keyValue;
-                } else {
-                    String fieldClass = fields[i].second;
-                    if ("Long".equals(fieldClass)) {
-                        data[index++] = 0L;
-                    } else if ("String".equals(fieldClass) || "Text".equals(fieldClass)) {
-                        data[index++] = "";
-                    } else {
-                        throw new DatabaseException("Can only index Long and String fields, encountered class " + fieldClass);
-                    }
-                }
-            }
-            documentsData.add(data);
-        }
-
-        cache.replaceIndex(monitor, key, keyValues, r, 1, documentsData);
-//        cache.commit();
-        
-    }
-    
-    @Override
-    boolean replaceIndex(IProgressMonitor monitor, String key, Collection<Object> keyValues, GenericRelation r,
-            int boundLength, Collection<Object[]> documentsData) throws CorruptIndexException, IOException,
-            DatabaseException {
-
-        boolean result = cache.replaceIndex(monitor, key, keyValues, r, boundLength, documentsData);
-//        cache.commit();
-        return result; 
-        
-    }
-    
-    List<Map<String, Object>> persistentCachedSearch(IProgressMonitor monitor, RequestProcessor processor, String search,
-            int maxResultCount) throws ParseException, IOException, DatabaseException {
-        
-    	MemoryIndexing mem = MemoryIndexing.getInstance(session.getSession());
-    	
-        String key = indexPath.getAbsolutePath();
-        
-        Map<String,List<Map<String, Object>>> cache = mem.persistentCache.get(key);
-        if(cache != null) {
-            List<Map<String,Object>> result = cache.get(search);
-            if(result != null) return result;
-        }
-
-        startAccess(monitor, processor.getSession(), false);
-
-        List<Map<String, Object>> results = super.doSearch(monitor, processor, search, maxResultCount);
-        if(cache == null) {
-            cache = new HashMap<String,List<Map<String,Object>>>();
-            mem.persistentCache.put(key, cache);
-        }
-
-        if(results.size() < 500)
-            cache.put(search, results);
-        
-        return results;
-        
-    }
-
-    List<Resource> persistentCachedSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search,
-            int maxResultCount) throws ParseException, IOException, DatabaseException {
-        
-    	MemoryIndexing mem = MemoryIndexing.getInstance(session.getSession());
-    	
-        String key = indexPath.getAbsolutePath();
-        
-        Map<String,List<Resource>> cache = mem.persistentCacheResources.get(key);
-        if(cache != null) {
-            List<Resource> result = cache.get(search);
-            if(result != null) return result;
-        }
-
-        startAccess(monitor, processor.getSession(), false);
-
-        List<Resource> results = super.doSearchResources(monitor, processor, search, maxResultCount);
-        if(cache == null) {
-            cache = new HashMap<String,List<Resource>>();
-            mem.persistentCacheResources.put(key, cache);
-        }
-
-        if(results.size() < 500)
-            cache.put(search, results);
-        
-        return results;
-        
-    }
-    
-    List<Object> persistentCachedList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, DatabaseException {
-        
-        startAccess(monitor, processor.getSession(), false);
-
-        List<Object> results = super.doList(monitor, processor);
-        
-        return results;
-        
-    }
-    
-    @Override
-    List<Map<String, Object>> doSearch(IProgressMonitor monitor, RequestProcessor processor, String search,
-            int maxResultCount) throws ParseException, IOException, DatabaseException {
-        
-        List<Map<String,Object>> persistent = persistentCachedSearch(monitor, processor, search, maxResultCount);
-        List<Map<String,Object>> cached = cache.doSearch(monitor, processor, search, maxResultCount);
-
-        ArrayList<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
-
-        for(Map<String,Object> m : persistent) {
-            Resource r = (Resource)m.get("Resource");
-            if(!cache.changed.contains(r.getResourceId())) {
-                result.add(m);
-            }
-        }
-        result.addAll(cached);
-        return result;
-        
-    }
-    
-    @Override
-    List<Resource> doSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search,
-    		int maxResultCount) throws ParseException, IOException, DatabaseException {
-
-        List<Resource> persistent = persistentCachedSearchResources(monitor, processor, search, maxResultCount);
-        List<Resource> cached = cache.doSearchResources(monitor, processor, search, maxResultCount);
-
-        ArrayList<Resource> result = new ArrayList<Resource>();
-        for(Resource r : persistent) {
-            if(!cache.changed.contains(r.getResourceId())) {
-                result.add(r);
-            }
-        }
-        result.addAll(cached);
-        return result;
-    	
-    }
-    
-    List<Object> doList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, DatabaseException {
-
-        List<Object> persistent = persistentCachedList(monitor, processor);
-        
-        // TODO: check that caches have been properly flushed
-        //List<Object> cached = cache.doList(monitor, processor);
-        //if(!cached.isEmpty()) throw new DatabaseException("doList does not support caching");
-
-        return persistent;
-    	
-    }
-
-    void applyChanges(IProgressMonitor monitor, Session session, GenericRelation r, Collection<Object[]> os) throws Exception {
-    	
-    	if(!os.isEmpty()) {
-    	
-	        ArrayList<Object> replaceKeys = new ArrayList<Object>();
-	        ArrayList<Object[]> replaceValues = new ArrayList<Object[]>();
-	        ArrayList<Object> removeKeys = new ArrayList<Object>();
-	        for(Object[] o : os) {
-	            Long parent = (Long)o[0];
-	            Long key = (Long)o[1];
-	            if(parent != 0) {
-	                replaceKeys.add(key);
-	                replaceValues.add(o);
-	            } else {
-	                removeKeys.add(key);
-	            }
-	        }
-	        
-	        changeState(monitor, session, State.READY);
-	        
-	        super.startAccess(null, session, true);
-	        
-	        super.replaceIndex(null, "Resource", replaceKeys, r, 1, replaceValues);
-	        super.removeIndex(null, r, null, "Resource", removeKeys);
-	        
-    	}
-        
-        changeState(monitor, session, State.READY);
-        
-    }
-    
-    @Override
-    Throwable bestEffortClear(IProgressMonitor monitor, Session session) {
-
-    	// Free the index
-    	changeState(monitor, session, State.NONE);
-    	
-        Throwable t = clearDirectory(monitor, session);
-        if(t != null) return t;
-
-        t = cache.bestEffortClear(monitor, session);
-        if(t != null) return t;
-        
-        String key = indexPath.getAbsolutePath();
-        MemoryIndexing mem = MemoryIndexing.getInstance(session);
-        mem.persistentCache.remove(key);
-        mem.persistentCacheResources.remove(key);
-        
-        return null;
-        
-    }
-    
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.indexing;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
+import org.simantics.db.Session;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.adapter.GenericRelation;
+import org.simantics.utils.datastructures.Pair;
+
+/**
+ * @author Tuukka Lehtonen
+ * @author Antti Villberg
+ */
+public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase {
+    
+    IndexedRelationsMemorySearcher cache;
+
+    IndexedRelationsSearcher(RequestProcessor session, Resource relation, Resource input, GenericRelation r) throws DatabaseException {
+        super(session, relation, input);
+        this.cache = new IndexedRelationsMemorySearcher(session, this, relation, input, r);
+    }
+
+    @Override
+    String getDescriptor() {
+        return "DISK: ";
+    }
+
+    @Override
+    public void setProblem(Throwable t) {
+    	super.setProblem(t);
+    	cache.setProblem(t);
+    }
+    
+    @Override
+    boolean startAccess(IProgressMonitor monitor, Session session, boolean forWriting) {
+    	boolean success = super.startAccess(monitor, session, false);
+    	if(!success) return false;
+    	success = cache.startAccess(monitor, session, forWriting);
+        if(!success) {
+        	setProblem(cache.getException());
+        	return false;
+        } else return true;
+    }
+    
+    @Override
+    void insertIndex(IProgressMonitor monitor, GenericRelation r, int boundLength, Collection<Object[]> documentsData)
+            throws CorruptIndexException, IOException, DatabaseException {
+
+        Collection<Object> keyValues = new ArrayList<Object>();
+        for(Object[] data : documentsData) {
+            keyValues.add(data[1]);
+        }
+        
+        cache.replaceIndex(monitor, "Resource", keyValues, r, boundLength, documentsData);
+        //cache.commit();
+        
+    }
+    
+    @Override
+    void removeIndex(IProgressMonitor monitor, GenericRelation r, RequestProcessor processor, String key, Collection<Object> keyValues) throws DatabaseException,CorruptIndexException, IOException {
+        
+        Collection<Object[]> documentsData = new ArrayList<Object[]>();
+
+        Pair<String,String>[] fields = r.getFields(); 
+
+        for(Object keyValue : keyValues) {
+            Object[] data = new Object[fields.length-1];
+            int index = 0;
+            for(int i=1;i<fields.length;i++) {
+                String fieldName = fields[i].first;
+                if(key.equals(fieldName)) {
+                    data[index++] = keyValue;
+                } else {
+                    String fieldClass = fields[i].second;
+                    if ("Long".equals(fieldClass)) {
+                        data[index++] = 0L;
+                    } else if ("String".equals(fieldClass) || "Text".equals(fieldClass)) {
+                        data[index++] = "";
+                    } else {
+                        throw new DatabaseException("Can only index Long and String fields, encountered class " + fieldClass);
+                    }
+                }
+            }
+            documentsData.add(data);
+        }
+
+        cache.replaceIndex(monitor, key, keyValues, r, 1, documentsData);
+//        cache.commit();
+        
+    }
+    
+    @Override
+    boolean replaceIndex(IProgressMonitor monitor, String key, Collection<Object> keyValues, GenericRelation r,
+            int boundLength, Collection<Object[]> documentsData) throws CorruptIndexException, IOException,
+            DatabaseException {
+
+        boolean result = cache.replaceIndex(monitor, key, keyValues, r, boundLength, documentsData);
+//        cache.commit();
+        return result; 
+        
+    }
+    
+    List<Map<String, Object>> persistentCachedSearch(IProgressMonitor monitor, RequestProcessor processor, String search,
+            int maxResultCount) throws ParseException, IOException, DatabaseException {
+        
+    	MemoryIndexing mem = MemoryIndexing.getInstance(session.getSession());
+    	
+        String key = indexPath.getAbsolutePath();
+        
+        Map<String,List<Map<String, Object>>> cache = mem.persistentCache.get(key);
+        if(cache != null) {
+            List<Map<String,Object>> result = cache.get(search);
+            if(result != null) return result;
+        }
+
+        startAccess(monitor, processor.getSession(), false);
+
+        List<Map<String, Object>> results = super.doSearch(monitor, processor, search, maxResultCount);
+        if(cache == null) {
+            cache = new HashMap<String,List<Map<String,Object>>>();
+            mem.persistentCache.put(key, cache);
+        }
+
+        if(results.size() < 500)
+            cache.put(search, results);
+        
+        return results;
+        
+    }
+
+    List<Resource> persistentCachedSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search,
+            int maxResultCount) throws ParseException, IOException, DatabaseException {
+        
+    	MemoryIndexing mem = MemoryIndexing.getInstance(session.getSession());
+    	
+        String key = indexPath.getAbsolutePath();
+        
+        Map<String,List<Resource>> cache = mem.persistentCacheResources.get(key);
+        if(cache != null) {
+            List<Resource> result = cache.get(search);
+            if(result != null) return result;
+        }
+
+        startAccess(monitor, processor.getSession(), false);
+
+        List<Resource> results = super.doSearchResources(monitor, processor, search, maxResultCount);
+        if(cache == null) {
+            cache = new HashMap<String,List<Resource>>();
+            mem.persistentCacheResources.put(key, cache);
+        }
+
+        if(results.size() < 500)
+            cache.put(search, results);
+        
+        return results;
+        
+    }
+    
+    List<Object> persistentCachedList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, DatabaseException {
+        
+        startAccess(monitor, processor.getSession(), false);
+
+        List<Object> results = super.doList(monitor, processor);
+        
+        return results;
+        
+    }
+    
+    @Override
+    List<Map<String, Object>> doSearch(IProgressMonitor monitor, RequestProcessor processor, String search,
+            int maxResultCount) throws ParseException, IOException, DatabaseException {
+        
+        List<Map<String,Object>> persistent = persistentCachedSearch(monitor, processor, search, maxResultCount);
+        List<Map<String,Object>> cached = cache.doSearch(monitor, processor, search, maxResultCount);
+
+        ArrayList<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
+
+        for(Map<String,Object> m : persistent) {
+            Resource r = (Resource)m.get("Resource");
+            if(!cache.changed.contains(r.getResourceId())) {
+                result.add(m);
+            }
+        }
+        result.addAll(cached);
+        return result;
+        
+    }
+    
+    @Override
+    List<Resource> doSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search,
+    		int maxResultCount) throws ParseException, IOException, DatabaseException {
+
+        List<Resource> persistent = persistentCachedSearchResources(monitor, processor, search, maxResultCount);
+        List<Resource> cached = cache.doSearchResources(monitor, processor, search, maxResultCount);
+
+        ArrayList<Resource> result = new ArrayList<Resource>();
+        for(Resource r : persistent) {
+            if(!cache.changed.contains(r.getResourceId())) {
+                result.add(r);
+            }
+        }
+        result.addAll(cached);
+        return result;
+    	
+    }
+    
+    List<Object> doList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, DatabaseException {
+
+        List<Object> persistent = persistentCachedList(monitor, processor);
+        
+        // TODO: check that caches have been properly flushed
+        //List<Object> cached = cache.doList(monitor, processor);
+        //if(!cached.isEmpty()) throw new DatabaseException("doList does not support caching");
+
+        return persistent;
+    	
+    }
+
+    void applyChanges(IProgressMonitor monitor, Session session, GenericRelation r, Collection<Object[]> os) throws Exception {
+    	
+    	if(!os.isEmpty()) {
+    	
+	        ArrayList<Object> replaceKeys = new ArrayList<Object>();
+	        ArrayList<Object[]> replaceValues = new ArrayList<Object[]>();
+	        ArrayList<Object> removeKeys = new ArrayList<Object>();
+	        for(Object[] o : os) {
+	            Long parent = (Long)o[0];
+	            Long key = (Long)o[1];
+	            if(parent != 0) {
+	                replaceKeys.add(key);
+	                replaceValues.add(o);
+	            } else {
+	                removeKeys.add(key);
+	            }
+	        }
+	        
+	        changeState(monitor, session, State.READY);
+	        
+	        super.startAccess(null, session, true);
+	        
+	        super.replaceIndex(null, "Resource", replaceKeys, r, 1, replaceValues);
+	        super.removeIndex(null, r, null, "Resource", removeKeys);
+	        
+    	}
+        
+        changeState(monitor, session, State.READY);
+        
+    }
+    
+    @Override
+    Throwable bestEffortClear(IProgressMonitor monitor, Session session) {
+
+    	// Free the index
+    	changeState(monitor, session, State.NONE);
+    	
+        Throwable t = clearDirectory(monitor, session);
+        if(t != null) return t;
+
+        t = cache.bestEffortClear(monitor, session);
+        if(t != null) return t;
+        
+        String key = indexPath.getAbsolutePath();
+        MemoryIndexing mem = MemoryIndexing.getInstance(session);
+        mem.persistentCache.remove(key);
+        mem.persistentCacheResources.remove(key);
+        
+        return null;
+        
+    }
+    
+}