X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FUpdateOperations.java;h=c8f4f1d6727fcc2e46f3a9ea6c97a52245d9cb8a;hb=refs%2Fchanges%2F03%2F4903%2F1;hp=9c929c59cc4f267d14d1cc5f867d05fce23c00d6;hpb=2a37041c6da8864656e7217dbcc3d6dae8cd65be;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
index 9c929c5..c8f4f1d 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
@@ -6,10 +6,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
 import org.simantics.db.Statement;
+import org.simantics.db.VirtualGraph;
 import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.ReadRequest;
+import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.test.GraphChanges;
 
@@ -21,27 +26,118 @@ import org.simantics.interop.test.GraphChanges;
 public abstract  class UpdateOperations {
 	
 	private List<UpdateOp> operations = new ArrayList<UpdateOp>();
-	private Map<Resource, UpdateOp> opMap = new HashMap<Resource, UpdateOp>();
+	private Map<Resource, UpdateOp> resourceMap = new HashMap<Resource, UpdateOp>();
+	private Map<Statement, UpdateOp> statementMap = new HashMap<Statement, UpdateOp>();
 	private GraphChanges changes;
+	private int chunkSize = -1;
 	
 	public UpdateOperations(GraphChanges changes) {
 		this.changes = changes;	
 	}
 	
 	public UpdateOp getUpdateOp(Resource r) {
-		return opMap.get(r);
+		return resourceMap.get(r);
 	}
 	
-	public void applyAll(WriteGraph g) throws DatabaseException {
+	public UpdateOp getUpdateOp(Statement s) {
+		return statementMap.get(s);
+	}
+	
+	public int getChunkSize() {
+		return chunkSize;
+	}
+	
+	public void setChunkSize(int chunkSize) {
+		this.chunkSize = chunkSize;
+	}
+	
+	/**
+	 * Applies all changes.
+	 * 
+	 * @param graph
+	 * @throws DatabaseException
+	 */
+	public void applyAll(WriteGraph graph) throws DatabaseException {
+		List<UpdateOp> list = operations;
+		apply(graph, list);
+	}
+
+	/**
+	 * Applies selected changes.
+	 * @param graph
+	 * @throws DatabaseException
+	 */
+	public void applySelected(WriteGraph graph) throws DatabaseException {
+		List<UpdateOp> list = new ArrayList<UpdateOp>();
 		for (UpdateOp op : operations) {
-			apply(g, op);
+			if (op.selected())
+				list.add(op);
 		}
+		apply(graph, list);
+	}
+	
+	/**
+	 * Applies all changes with chunked DB writes.
+	 * 
+	 * @param session
+	 * @throws DatabaseException
+	 */
+	public void applyAll(Session session, VirtualGraph vg) throws DatabaseException {
+		List<UpdateOp> list = operations;
+		apply(session, list, vg);
 	}
 
-	public void applySelected(WriteGraph g) throws DatabaseException {
+	/**
+	 * Applies selected changes with chunked DB writes.
+	 * 
+	 * @param session
+	 * @throws DatabaseException
+	 */
+	public void applySelected(Session session, VirtualGraph vg) throws DatabaseException {
+		List<UpdateOp> list = new ArrayList<UpdateOp>();
 		for (UpdateOp op : operations) {
 			if (op.selected())
-				apply(g, op);
+				list.add(op);
+		}
+		apply(session, list, vg);
+	}
+	
+	protected void apply(WriteGraph graph, List<UpdateOp> list) throws DatabaseException {
+		for (UpdateOp op : list) {
+			apply(graph, op);
+		}
+	}
+	
+	protected void apply(Session session, List<UpdateOp> list, VirtualGraph vg) throws DatabaseException {
+		if (getChunkSize() > 0) {
+			for (int s = 0; s < list.size(); ) {
+				int e = s + getChunkSize();
+				if (e > list.size())
+					e = list.size();
+				List<UpdateOp> subList = list.subList(s, e);
+				session.syncRequest(new WriteRequest(vg) {
+					
+					@Override
+					public void perform(WriteGraph graph) throws DatabaseException {
+						
+						for (UpdateOp op : subList) {
+							apply(graph, op);
+						}
+					}
+				});
+				s = e;
+			}
+		} else {
+			session.syncRequest(new WriteRequest(vg) {
+				
+				@Override
+				public void perform(WriteGraph graph) throws DatabaseException {
+					
+					for (UpdateOp op : list) {
+						apply(graph, op);
+					}
+				}
+			});
 		}
 	}
 	
@@ -52,6 +148,14 @@ public abstract  class UpdateOperations {
 	public GraphChanges getChanges() {
 		return changes;
 	}
+	
+	public Map<Resource, UpdateOp> getResourceMap() {
+		return resourceMap;
+	}
+	
+	public Map<Statement, UpdateOp> getStatementMap() {
+		return statementMap;
+	}
 
 	private void apply(WriteGraph g, UpdateOp op) throws DatabaseException {
 		Stack<UpdateOp> stack = new Stack<UpdateOp>();
@@ -61,19 +165,21 @@ public abstract  class UpdateOperations {
 	private void _apply(WriteGraph g, Stack<UpdateOp> stack, UpdateOp op) throws DatabaseException {
 		if (op.applied())
 			return;
-		if (stack.contains(op))
+		if (stack.contains(op)) {
+			op.apply(g);
 			return;
-		stack.push(op);
-		if (op.requiresParentOps()) {
-			for (UpdateOp pop : op.getParentOps())
-				if (!pop.applied())
-					_apply(g, stack, pop);
-		} 
-		if (op.requiresSubOps()) {
-			for (UpdateOp sop : op.getSubOps())
-				if (!sop.applied())
-					_apply(g, stack, sop);
 		}
+		stack.push(op);
+		for (UpdateOp pop : op.getParentOps())
+		    if (op.requiresOp(pop)) {
+                if (!pop.applied())
+                    _apply(g, stack, pop);
+        } 
+		for (UpdateOp sop : op.getSubOps())
+		    if (op.requiresOp(sop)) {
+                if (!sop.applied())
+                    _apply(g, stack, sop);
+        }
 		stack.pop();
 		op.apply(g);
 	}
@@ -85,25 +191,49 @@ public abstract  class UpdateOperations {
 	}
 	
 	protected void addOp(Resource r, UpdateOp op) {
-		opMap.put(r, op);
+		resourceMap.put(r, op);
+		operations.add(op);
+	}
+	
+	protected void addOp(Statement s, UpdateOp op) {
+		statementMap.put(s, op);
 		operations.add(op);
 	}
 	
 	protected void replaceOp(Resource r, UpdateOp op) {
-		UpdateOp oldOp = opMap.remove(r);
+		UpdateOp oldOp = resourceMap.remove(r);
 		if (oldOp != null) {
 			operations.remove(oldOp);
 		}
-		opMap.put(r, op);
+		resourceMap.put(r, op);
 		operations.add(op);
 	}
 	
 	protected UpdateOp getOP(Resource r) {
-		return opMap.get(r);
+		return resourceMap.get(r);
+	}
+	
+	protected UpdateOp getOP(Statement r) {
+		return statementMap.get(r);
 	}
 
 	public abstract void populate(ReadGraph g) throws DatabaseException;
 	
+	/**
+	 * Secondary populate method. Override this for chunked DB operations.  
+	 * @param session
+	 * @throws DatabaseException
+	 */
+	public void populate(Session session, IProgressMonitor monitor) throws DatabaseException {
+		session.syncRequest(new ReadRequest() {
+			
+			@Override
+			public void run(ReadGraph graph) throws DatabaseException {
+				populate(graph);
+			}
+		});
+	}
+	
 	protected boolean compares(Resource r1, Resource r2) {
 		if (r1.equals(r2))
 			return true;