From ca2f1ab4a37f0d590d5c116cd1fa7c341c77fad3 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Mon, 30 Dec 2019 22:16:46 +0100 Subject: Implement modular getZoneSet --- .../java/pl/edu/mimuw/cloudatlas/agent/Agent.java | 31 +++- .../pl/edu/mimuw/cloudatlas/agent/EventBus.java | 4 + .../cloudatlas/agent/NewApiImplementation.java | 178 +++++++++++++++++++++ .../cloudatlas/agent/messages/RMIMessage.java | 14 -- .../cloudatlas/agent/messages/RemikMessage.java | 25 +++ .../agent/messages/RequestStateMessage.java | 16 ++ .../edu/mimuw/cloudatlas/agent/modules/Module.java | 6 +- .../pl/edu/mimuw/cloudatlas/agent/modules/RMI.java | 37 ----- .../edu/mimuw/cloudatlas/agent/modules/Remik.java | 54 +++++++ .../java/pl/edu/mimuw/cloudatlas/model/ZMI.java | 8 +- 10 files changed, 314 insertions(+), 59 deletions(-) create mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java delete mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RMIMessage.java create mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemikMessage.java create mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RequestStateMessage.java delete mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/RMI.java create mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Remik.java (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java index 392e0a1..52bd395 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java @@ -1,22 +1,45 @@ package pl.edu.mimuw.cloudatlas.agent; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; +import java.rmi.server.UnicastRemoteObject; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import pl.edu.mimuw.cloudatlas.agent.ApiImplementation; import pl.edu.mimuw.cloudatlas.agent.modules.Module; import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType; import pl.edu.mimuw.cloudatlas.agent.modules.Qurnik; -import pl.edu.mimuw.cloudatlas.agent.modules.RMI; +import pl.edu.mimuw.cloudatlas.agent.modules.Remik; import pl.edu.mimuw.cloudatlas.agent.modules.Stanik; import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduler; +import pl.edu.mimuw.cloudatlas.api.Api; +import pl.edu.mimuw.cloudatlas.interpreter.Main; +import pl.edu.mimuw.cloudatlas.model.ZMI; public class Agent { + private static EventBus eventBus; + + public static void runRegistry() { + try { + ZMI root = Main.createTestHierarchy2(); + ApiImplementation api = new ApiImplementation(root); + Api apiStub = + (Api) UnicastRemoteObject.exportObject(api, 0); + Registry registry = LocateRegistry.getRegistry(); + registry.rebind("Api", apiStub); + System.out.println("Agent: api bound"); + } catch (Exception e) { + System.err.println("Agent registry initialization exception:"); + e.printStackTrace(); + } + } public static HashMap initializeModules() { HashMap modules = new HashMap(); modules.put(ModuleType.TIMER_SCHEDULER, new TimerScheduler(ModuleType.TIMER_SCHEDULER)); - modules.put(ModuleType.RMI, new RMI(ModuleType.RMI)); + modules.put(ModuleType.RMI, new Remik()); modules.put(ModuleType.STATE, new Stanik()); modules.put(ModuleType.QUERY, new Qurnik()); // TODO add modules as we implement them @@ -61,7 +84,8 @@ public class Agent { HashMap executors = initializeExecutors(modules); ArrayList executorThreads = initializeExecutorThreads(executors); - Thread eventBusThread = new Thread(new EventBus(executors)); + eventBus = new EventBus(executors); + Thread eventBusThread = new Thread(eventBus); System.out.println("Initializing event bus"); eventBusThread.start(); @@ -71,5 +95,6 @@ public class Agent { public static void main(String[] args) { runModulesAsThreads(); + runRegistry(); } } diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/EventBus.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/EventBus.java index 5b09253..a6d3b2d 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/EventBus.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/EventBus.java @@ -20,6 +20,10 @@ public class EventBus implements Runnable { } } + // Allows for testing with a mock EventBus + protected EventBus() { + } + EventBus(HashMap executors) { this.executors = executors; setEventBusReference(); diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java new file mode 100644 index 0000000..4aa5148 --- /dev/null +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java @@ -0,0 +1,178 @@ +package pl.edu.mimuw.cloudatlas.agent; + +import java.io.PrintStream; + +import java.rmi.RemoteException; + +import java.util.concurrent.CompletableFuture; +import java.util.List; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; +import java.util.regex.Matcher; + + +import pl.edu.mimuw.cloudatlas.agent.messages.RequestStateMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.StateMessage; +import pl.edu.mimuw.cloudatlas.interpreter.Interpreter; +import pl.edu.mimuw.cloudatlas.interpreter.InterpreterException; +import pl.edu.mimuw.cloudatlas.interpreter.Main; +import pl.edu.mimuw.cloudatlas.interpreter.QueryResult; +import pl.edu.mimuw.cloudatlas.model.Attribute; +import pl.edu.mimuw.cloudatlas.model.AttributesMap; +import pl.edu.mimuw.cloudatlas.model.PathName; +import pl.edu.mimuw.cloudatlas.model.ValueContact; +import pl.edu.mimuw.cloudatlas.model.Value; +import pl.edu.mimuw.cloudatlas.model.ValueQuery; +import pl.edu.mimuw.cloudatlas.model.ValueSet; +import pl.edu.mimuw.cloudatlas.model.ValueNull; +import pl.edu.mimuw.cloudatlas.model.Type; +import pl.edu.mimuw.cloudatlas.model.TypePrimitive; +import pl.edu.mimuw.cloudatlas.model.ZMI; +import pl.edu.mimuw.cloudatlas.api.Api; + +public class NewApiImplementation implements Api { + private EventBus eventBus; + + public NewApiImplementation(EventBus eventBus) { + this.eventBus = eventBus; + } + + public Set getZoneSet() throws RemoteException { + CompletableFuture responseFuture = new CompletableFuture(); + RequestStateMessage message = new RequestStateMessage("", 0, responseFuture); + try { + eventBus.addMessage(message); + ResponseMessage response = responseFuture.get(); + + if (response.getType() == ResponseMessage.Type.STATE) { + StateMessage stateMessage = (StateMessage) response; + Set zones = new HashSet(); + collectZoneNames(stateMessage.getZMI(), zones); + return zones; + } else { + System.out.println("ERROR: getZoneSet didn't receive a StateMessage"); + throw new Exception("Failed to retrieve zone set"); + } + } catch (Exception e) { + System.out.println("ERROR: exception caught in getZoneSet"); + throw new RemoteException(e.getMessage()); + } + } + + private void collectZoneNames(ZMI zone, Set names) { + names.add(zone.getPathName().toString()); + for (ZMI son : zone.getSons()) { + collectZoneNames(son, names); + } + } + + public AttributesMap getZoneAttributeValues(String zoneName) throws RemoteException { + /* + try { + ZMI zmi = root.findDescendant(new PathName(zoneName)); + return zmi.getAttributes(); + } catch (ZMI.NoSuchZoneException e) { + throw new RemoteException("Zone not found", e); + } + */ + + // placeholder + return new AttributesMap(); + } + + public void installQuery(String name, String queryCode) throws RemoteException { + /* + Pattern queryNamePattern = Pattern.compile("&[a-zA-Z][\\w_]*"); + Matcher matcher = queryNamePattern.matcher(name); + if (!matcher.matches()) { + throw new RemoteException("Invalid query identifier"); + } + try { + ValueQuery query = new ValueQuery(queryCode); + Attribute attributeName = new Attribute(name); + installQueryInHierarchy(root, attributeName, query); + executeAllQueries(root); + } catch (Exception e) { + throw new RemoteException("Failed to install query", e); + } + */ + } + + private void installQueryInHierarchy(ZMI zmi, Attribute queryName, ValueQuery query) { + /* + if (!zmi.getSons().isEmpty()) { + zmi.getAttributes().addOrChange(queryName, query); + for (ZMI son : zmi.getSons()) { + installQueryInHierarchy(son, queryName, query); + } + } + */ + } + + public void uninstallQuery(String queryName) throws RemoteException { + // uninstallQueryInHierarchy(root, new Attribute(queryName)); + } + + private void uninstallQueryInHierarchy(ZMI zmi, Attribute queryName) { + /* + if (!zmi.getSons().isEmpty()) { + zmi.getAttributes().remove(queryName); + for (ZMI son : zmi.getSons()) { + uninstallQueryInHierarchy(son, queryName); + } + } + */ + } + + public void setAttributeValue(String zoneName, String attributeName, Value value) throws RemoteException { + /* + try { + ZMI zmi = root.findDescendant(new PathName(zoneName)); + zmi.getAttributes().addOrChange(new Attribute(attributeName), value); + executeAllQueries(root); + } catch (ZMI.NoSuchZoneException e) { + throw new RemoteException("Zone not found", e); + } + */ + } + + private void executeAllQueries(ZMI zmi) { + /* + if(!zmi.getSons().isEmpty()) { + for(ZMI son : zmi.getSons()) { + executeAllQueries(son); + } + + Interpreter interpreter = new Interpreter(zmi); + for (ValueQuery query : getQueries(zmi)) { + try { + List result = interpreter.interpretProgram(query.getQuery()); + for(QueryResult r : result) { + zmi.getAttributes().addOrChange(r.getName(), r.getValue()); + } + } catch(InterpreterException exception) {} + } + } + */ + } + + private Set getQueries(ZMI zmi) { + Set querySet = new HashSet(); + /* + for (Map.Entry attribute : zmi.getAttributes()) { + if (attribute.getValue().getType().getPrimaryType() == Type.PrimaryType.QUERY) { + querySet.add((ValueQuery) attribute.getValue()); + } + } + */ + + return querySet; + } + + public void setFallbackContacts(Set contacts) throws RemoteException { + // this.contacts = contacts; + } +} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RMIMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RMIMessage.java deleted file mode 100644 index a8e3afb..0000000 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RMIMessage.java +++ /dev/null @@ -1,14 +0,0 @@ -package pl.edu.mimuw.cloudatlas.agent.messages; - -import pl.edu.mimuw.cloudatlas.agent.modules.Module; -import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType; - -public class RMIMessage extends AgentMessage { - public RMIMessage(String messageId, long timestamp) { - super(messageId, ModuleType.RMI, timestamp); - } - - public void callMe(Module module) throws InterruptedException, Module.InvalidMessageType { - module.handleTyped(this); - } -} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemikMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemikMessage.java new file mode 100644 index 0000000..b0300cb --- /dev/null +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemikMessage.java @@ -0,0 +1,25 @@ +package pl.edu.mimuw.cloudatlas.agent.messages; + +import pl.edu.mimuw.cloudatlas.agent.modules.Module; +import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType; + +public abstract class RemikMessage extends AgentMessage { + public enum Type { + REQUEST_STATE + } + + private Type type; + + public RemikMessage(String messageId, long timestamp, Type type) { + super(messageId, ModuleType.RMI, timestamp); + this.type = type; + } + + public Type getType() { + return type; + } + + public void callMe(Module module) throws InterruptedException, Module.InvalidMessageType { + module.handleTyped(this); + } +} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RequestStateMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RequestStateMessage.java new file mode 100644 index 0000000..698aac7 --- /dev/null +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RequestStateMessage.java @@ -0,0 +1,16 @@ +package pl.edu.mimuw.cloudatlas.agent.messages; + +import java.util.concurrent.CompletableFuture; + +public class RequestStateMessage extends RemikMessage { + CompletableFuture responseFuture; + + public RequestStateMessage(String messageId, long timestamp, CompletableFuture responseFuture) { + super(messageId, timestamp, Type.REQUEST_STATE); + this.responseFuture = responseFuture; + } + + public CompletableFuture getFuture() { + return responseFuture; + } +} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Module.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Module.java index ba5e1d1..0a934cb 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Module.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Module.java @@ -4,8 +4,8 @@ import pl.edu.mimuw.cloudatlas.agent.Executor; import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage; import pl.edu.mimuw.cloudatlas.agent.messages.TimerSchedulerMessage; import pl.edu.mimuw.cloudatlas.agent.messages.QurnikMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.RemikMessage; import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage; -import pl.edu.mimuw.cloudatlas.agent.messages.RMIMessage; import pl.edu.mimuw.cloudatlas.agent.messages.StanikMessage; /* @@ -37,8 +37,8 @@ public abstract class Module { throw new InvalidMessageType("Got a QurnikMessage in module " + moduleType.toString()); } - public void handleTyped(RMIMessage message) throws InterruptedException, InvalidMessageType { - throw new InvalidMessageType("Got an RMIMessage in module " + moduleType.toString()); + public void handleTyped(RemikMessage message) throws InterruptedException, InvalidMessageType { + throw new InvalidMessageType("Got a RemikMessage in module " + moduleType.toString()); } public void handleTyped(StanikMessage message) throws InterruptedException, InvalidMessageType { diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/RMI.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/RMI.java deleted file mode 100644 index 1a86fc7..0000000 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/RMI.java +++ /dev/null @@ -1,37 +0,0 @@ -package pl.edu.mimuw.cloudatlas.agent.modules; - -import pl.edu.mimuw.cloudatlas.agent.ApiImplementation; -import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage; -import pl.edu.mimuw.cloudatlas.agent.messages.RMIMessage; -import pl.edu.mimuw.cloudatlas.api.Api; -import pl.edu.mimuw.cloudatlas.interpreter.Main; -import pl.edu.mimuw.cloudatlas.model.ZMI; - -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.UnicastRemoteObject; - -public class RMI extends Module { - public RMI(ModuleType moduleType) { - super(moduleType); - runRegistry(); - } - - public void runRegistry() { - try { - ZMI root = Main.createTestHierarchy2(); - ApiImplementation api = new ApiImplementation(root); - Api apiStub = - (Api) UnicastRemoteObject.exportObject(api, 0); - Registry registry = LocateRegistry.getRegistry(); - registry.rebind("Api", apiStub); - System.out.println("Agent: api bound"); - } catch (Exception e) { - System.err.println("Agent registry initialization exception:"); - e.printStackTrace(); - } - } - - public void handleTyped(RMIMessage event) throws InterruptedException { - } -} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Remik.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Remik.java new file mode 100644 index 0000000..9645d71 --- /dev/null +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Remik.java @@ -0,0 +1,54 @@ +package pl.edu.mimuw.cloudatlas.agent.modules; + +import java.util.concurrent.CompletableFuture; +import java.util.HashMap; +import java.util.Map; + + +import pl.edu.mimuw.cloudatlas.agent.messages.GetStateMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.RemikMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.RequestStateMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage; + +/* + * Remik is a cute little module that allows RMI functions to interface with + * agent's asynchronous modules. + */ +public class Remik extends Module { + private Map> awaitingRequests; + private long nextRequestId = 0; + + public Remik() { + super(ModuleType.RMI); + awaitingRequests = new HashMap(); + } + + public void handleTyped(RemikMessage message) throws InvalidMessageType, InterruptedException { + switch (message.getType()) { + case REQUEST_STATE: + handleRequestState((RequestStateMessage) message); + break; + default: + throw new InvalidMessageType("This type of message cannot be handled by Remik"); + } + } + + public void handleTyped(ResponseMessage message) { + CompletableFuture responseFuture = awaitingRequests.get(message.getRequestId()); + + if (responseFuture == null) { + System.out.println("ERROR: Remik got response for nonexistent/finished request"); + } else { + responseFuture.complete(message); + } + } + + private void handleRequestState(RequestStateMessage message) throws InterruptedException { + awaitingRequests.put(nextRequestId, message.getFuture()); + + GetStateMessage getStateMessage = new GetStateMessage("", 0, ModuleType.RMI, nextRequestId); + nextRequestId++; + + sendMessage(getStateMessage); + } +} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/model/ZMI.java b/src/main/java/pl/edu/mimuw/cloudatlas/model/ZMI.java index 54fbf43..cda0296 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/model/ZMI.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/model/ZMI.java @@ -219,8 +219,12 @@ public class ZMI implements Cloneable, Serializable { * @return a PathName object representing this zone */ public PathName getPathName() { - String name = ((ValueString)getAttributes().get("name")).getValue(); - return getFather() == null? PathName.ROOT : getFather().getPathName().levelDown(name); + if (getFather() == null) { + return PathName.ROOT; + } else { + String name = ((ValueString)getAttributes().get("name")).getValue(); + return getFather().getPathName().levelDown(name); + } } public static ZMI deserialize(InputStream in) { -- cgit v1.2.3 From c515a2e3d673c565a7b5c406cd3ab4a7b33e8f4e Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 31 Dec 2019 14:16:03 +0100 Subject: Implement getting attributes in new API --- .../cloudatlas/agent/NewApiImplementation.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java index 4aa5148..c0b313d 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java @@ -70,17 +70,23 @@ public class NewApiImplementation implements Api { } public AttributesMap getZoneAttributeValues(String zoneName) throws RemoteException { - /* + CompletableFuture responseFuture = new CompletableFuture(); + RequestStateMessage message = new RequestStateMessage("", 0, responseFuture); try { - ZMI zmi = root.findDescendant(new PathName(zoneName)); - return zmi.getAttributes(); - } catch (ZMI.NoSuchZoneException e) { - throw new RemoteException("Zone not found", e); - } - */ + eventBus.addMessage(message); + ResponseMessage response = responseFuture.get(); - // placeholder - return new AttributesMap(); + if (response.getType() == ResponseMessage.Type.STATE) { + StateMessage stateMessage = (StateMessage) response; + return stateMessage.getZMI().findDescendant(zoneName).getAttributes(); + } else { + System.out.println("ERROR: getZoneSet didn't receive a StateMessage"); + throw new Exception("Failed to retrieve zone set"); + } + } catch (Exception e) { + System.out.println("ERROR: exception caught in getZoneSet"); + throw new RemoteException(e.getMessage()); + } } public void installQuery(String name, String queryCode) throws RemoteException { -- cgit v1.2.3 From cc3c39501d22a7901e3f6d164d040a08c7d897a7 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 31 Dec 2019 14:44:11 +0100 Subject: Implement new query installation --- .../cloudatlas/agent/NewApiImplementation.java | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java index c0b313d..3bedd90 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java @@ -6,8 +6,11 @@ import java.rmi.RemoteException; import java.util.concurrent.CompletableFuture; import java.util.List; +import java.util.AbstractMap.SimpleImmutableEntry; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.regex.Pattern; import java.util.regex.Matcher; @@ -16,6 +19,7 @@ import java.util.regex.Matcher; import pl.edu.mimuw.cloudatlas.agent.messages.RequestStateMessage; import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage; import pl.edu.mimuw.cloudatlas.agent.messages.StateMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.UpdateQueriesMessage; import pl.edu.mimuw.cloudatlas.interpreter.Interpreter; import pl.edu.mimuw.cloudatlas.interpreter.InterpreterException; import pl.edu.mimuw.cloudatlas.interpreter.Main; @@ -25,9 +29,10 @@ import pl.edu.mimuw.cloudatlas.model.AttributesMap; import pl.edu.mimuw.cloudatlas.model.PathName; import pl.edu.mimuw.cloudatlas.model.ValueContact; import pl.edu.mimuw.cloudatlas.model.Value; +import pl.edu.mimuw.cloudatlas.model.ValueNull; import pl.edu.mimuw.cloudatlas.model.ValueQuery; import pl.edu.mimuw.cloudatlas.model.ValueSet; -import pl.edu.mimuw.cloudatlas.model.ValueNull; +import pl.edu.mimuw.cloudatlas.model.ValueTime; import pl.edu.mimuw.cloudatlas.model.Type; import pl.edu.mimuw.cloudatlas.model.TypePrimitive; import pl.edu.mimuw.cloudatlas.model.ZMI; @@ -90,7 +95,6 @@ public class NewApiImplementation implements Api { } public void installQuery(String name, String queryCode) throws RemoteException { - /* Pattern queryNamePattern = Pattern.compile("&[a-zA-Z][\\w_]*"); Matcher matcher = queryNamePattern.matcher(name); if (!matcher.matches()) { @@ -99,23 +103,14 @@ public class NewApiImplementation implements Api { try { ValueQuery query = new ValueQuery(queryCode); Attribute attributeName = new Attribute(name); - installQueryInHierarchy(root, attributeName, query); - executeAllQueries(root); + ValueTime timestamp = new ValueTime(System.currentTimeMillis()); + Map> queries = new HashMap(); + queries.put(attributeName, new SimpleImmutableEntry(query, timestamp)); + UpdateQueriesMessage message = new UpdateQueriesMessage("", 0, queries); + eventBus.addMessage(message); } catch (Exception e) { throw new RemoteException("Failed to install query", e); } - */ - } - - private void installQueryInHierarchy(ZMI zmi, Attribute queryName, ValueQuery query) { - /* - if (!zmi.getSons().isEmpty()) { - zmi.getAttributes().addOrChange(queryName, query); - for (ZMI son : zmi.getSons()) { - installQueryInHierarchy(son, queryName, query); - } - } - */ } public void uninstallQuery(String queryName) throws RemoteException { -- cgit v1.2.3 From 393f087e7e3d2e3a636ae0ffeb075c2354ff0966 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 31 Dec 2019 14:54:02 +0100 Subject: Handle removed queries in Qurnik --- .../java/pl/edu/mimuw/cloudatlas/agent/modules/Qurnik.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Qurnik.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Qurnik.java index 9b7268a..1ab8a16 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Qurnik.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Qurnik.java @@ -80,13 +80,15 @@ public class Qurnik extends Module { Interpreter interpreter = new Interpreter(zmi); AttributesMap newAttributes = new AttributesMap(); for (ValueQuery query : queries) { - try { - List result = interpreter.interpretProgram(query.getQuery()); - for(QueryResult r : result) { - newAttributes.addOrChange(r.getName(), r.getValue()); + if (query != null) { + try { + List result = interpreter.interpretProgram(query.getQuery()); + for(QueryResult r : result) { + newAttributes.addOrChange(r.getName(), r.getValue()); + } + } catch(InterpreterException exception) { + System.out.println("ERROR: thrown while running interpreter: " + exception.getMessage()); } - } catch(InterpreterException exception) { - System.out.println("ERROR: thrown while running interpreter: " + exception.getMessage()); } } -- cgit v1.2.3 From 17d87268246d32a75407590f8fef118148b87ccd Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 31 Dec 2019 15:00:10 +0100 Subject: Implement query removal in new API --- .../cloudatlas/agent/NewApiImplementation.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java index 3bedd90..52d6321 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java @@ -114,18 +114,17 @@ public class NewApiImplementation implements Api { } public void uninstallQuery(String queryName) throws RemoteException { - // uninstallQueryInHierarchy(root, new Attribute(queryName)); - } - - private void uninstallQueryInHierarchy(ZMI zmi, Attribute queryName) { - /* - if (!zmi.getSons().isEmpty()) { - zmi.getAttributes().remove(queryName); - for (ZMI son : zmi.getSons()) { - uninstallQueryInHierarchy(son, queryName); - } + try { + Attribute attributeName = new Attribute(queryName); + ValueTime timestamp = new ValueTime(System.currentTimeMillis()); + Map> queries = new HashMap(); + queries.put(attributeName, new SimpleImmutableEntry(null, timestamp)); + UpdateQueriesMessage message = new UpdateQueriesMessage("", 0, queries); + eventBus.addMessage(message); + } catch (Exception e) { + System.out.println("ERROR: failed to remove query"); + throw new RemoteException("Failed to uninstall query", e); } - */ } public void setAttributeValue(String zoneName, String attributeName, Value value) throws RemoteException { -- cgit v1.2.3 From eb7fbbd08bb003a47d9788a9f6476695ab46b271 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 31 Dec 2019 17:31:38 +0100 Subject: Add message to set a single attribute --- .../agent/messages/SetAttributeMessage.java | 37 ++++++++++++++++++++++ .../cloudatlas/agent/messages/StanikMessage.java | 1 + .../edu/mimuw/cloudatlas/agent/modules/Stanik.java | 25 +++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/SetAttributeMessage.java (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/SetAttributeMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/SetAttributeMessage.java new file mode 100644 index 0000000..4888484 --- /dev/null +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/SetAttributeMessage.java @@ -0,0 +1,37 @@ +package pl.edu.mimuw.cloudatlas.agent.messages; + +import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType; +import pl.edu.mimuw.cloudatlas.model.Attribute; +import pl.edu.mimuw.cloudatlas.model.Value; +import pl.edu.mimuw.cloudatlas.model.ValueTime; + +public class SetAttributeMessage extends StanikMessage { + private String pathName; + private Attribute attribute; + private Value value; + private ValueTime updateTimestamp; + + public SetAttributeMessage(String messageId, long timestamp, String pathName, Attribute attribute, Value value, ValueTime updateTimestamp) { + super(messageId, timestamp, Type.SET_ATTRIBUTE); + this.pathName = pathName; + this.attribute = attribute; + this.value = value; + this.updateTimestamp = updateTimestamp; + } + + public String getPathName() { + return pathName; + } + + public Attribute getAttribute() { + return attribute; + } + + public Value getValue() { + return value; + } + + public ValueTime getUpdateTimestamp() { + return updateTimestamp; + } +} diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StanikMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StanikMessage.java index d86de4a..844f31c 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StanikMessage.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StanikMessage.java @@ -7,6 +7,7 @@ public abstract class StanikMessage extends AgentMessage { public enum Type { GET_STATE, REMOVE_ZMI, + SET_ATTRIBUTE, UPDATE_ATTRIBUTES, UPDATE_QUERIES } diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java index b030901..3e5b790 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java @@ -6,6 +6,7 @@ import java.util.Map.Entry; import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage; import pl.edu.mimuw.cloudatlas.agent.messages.GetStateMessage; import pl.edu.mimuw.cloudatlas.agent.messages.RemoveZMIMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.SetAttributeMessage; import pl.edu.mimuw.cloudatlas.agent.messages.StateMessage; import pl.edu.mimuw.cloudatlas.agent.messages.StanikMessage; import pl.edu.mimuw.cloudatlas.agent.messages.UpdateAttributesMessage; @@ -49,6 +50,9 @@ public class Stanik extends Module { case REMOVE_ZMI: handleRemoveZMI((RemoveZMIMessage) message); break; + case SET_ATTRIBUTE: + handleSetAttribte((SetAttributeMessage) message); + break; case UPDATE_ATTRIBUTES: handleUpdateAttributes((UpdateAttributesMessage) message); break; @@ -85,6 +89,27 @@ public class Stanik extends Module { } } + /* + * Always adds the new attribute. + * The zone must already exist. + * The zone's timestamp will be the maximum of its current timestamp or the + * timestamp provided with the new value. + */ + public void handleSetAttribte(SetAttributeMessage message) { + try { + ZMI zmi = hierarchy.findDescendant(new PathName(message.getPathName())); + ValueTime updateTimestamp = message.getUpdateTimestamp(); + ValueTime currentTimestamp = (ValueTime) zmi.getAttributes().getOrNull("timestamp"); + if (ValueUtils.valueLower(currentTimestamp, updateTimestamp)) { + zmi.getAttributes().addOrChange("timestamp", updateTimestamp); + } + + zmi.getAttributes().addOrChange(message.getAttribute(), message.getValue()); + } catch (ZMI.NoSuchZoneException e) { + System.out.println("DEBUG: trying to set attribute in zone that doesn't exist"); + } + } + public void handleUpdateAttributes(UpdateAttributesMessage message) { try { validateUpdateAttributesMessage(message); -- cgit v1.2.3 From 75e7e152a728c2c462e53ad7c8a1946b49100b87 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 31 Dec 2019 17:42:24 +0100 Subject: Set attributes from new API --- .../cloudatlas/agent/NewApiImplementation.java | 46 +++------------------- 1 file changed, 6 insertions(+), 40 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java index 52d6321..a146eb6 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java @@ -18,6 +18,7 @@ import java.util.regex.Matcher; import pl.edu.mimuw.cloudatlas.agent.messages.RequestStateMessage; import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage; +import pl.edu.mimuw.cloudatlas.agent.messages.SetAttributeMessage; import pl.edu.mimuw.cloudatlas.agent.messages.StateMessage; import pl.edu.mimuw.cloudatlas.agent.messages.UpdateQueriesMessage; import pl.edu.mimuw.cloudatlas.interpreter.Interpreter; @@ -128,48 +129,13 @@ public class NewApiImplementation implements Api { } public void setAttributeValue(String zoneName, String attributeName, Value value) throws RemoteException { - /* try { - ZMI zmi = root.findDescendant(new PathName(zoneName)); - zmi.getAttributes().addOrChange(new Attribute(attributeName), value); - executeAllQueries(root); - } catch (ZMI.NoSuchZoneException e) { - throw new RemoteException("Zone not found", e); - } - */ - } - - private void executeAllQueries(ZMI zmi) { - /* - if(!zmi.getSons().isEmpty()) { - for(ZMI son : zmi.getSons()) { - executeAllQueries(son); - } - - Interpreter interpreter = new Interpreter(zmi); - for (ValueQuery query : getQueries(zmi)) { - try { - List result = interpreter.interpretProgram(query.getQuery()); - for(QueryResult r : result) { - zmi.getAttributes().addOrChange(r.getName(), r.getValue()); - } - } catch(InterpreterException exception) {} - } - } - */ - } - - private Set getQueries(ZMI zmi) { - Set querySet = new HashSet(); - /* - for (Map.Entry attribute : zmi.getAttributes()) { - if (attribute.getValue().getType().getPrimaryType() == Type.PrimaryType.QUERY) { - querySet.add((ValueQuery) attribute.getValue()); - } + SetAttributeMessage message = new SetAttributeMessage("", 0, zoneName, new Attribute(attributeName), value, new ValueTime(System.currentTimeMillis())); + eventBus.addMessage(message); + } catch (Exception e) { + System.out.println("ERROR: failed to set attribute"); + throw new RemoteException("Failed to set attribute", e); } - */ - - return querySet; } public void setFallbackContacts(Set contacts) throws RemoteException { -- cgit v1.2.3 From 2b480eed536c61a5188bf671641971211269e949 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Fri, 3 Jan 2020 16:49:08 +0100 Subject: Use new API implementation in Agent --- .../java/pl/edu/mimuw/cloudatlas/agent/Agent.java | 36 +++++++++++++++++++--- .../pl/edu/mimuw/cloudatlas/interpreter/Main.java | 3 ++ 2 files changed, 34 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java index 52bd395..429346c 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java @@ -7,7 +7,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import pl.edu.mimuw.cloudatlas.agent.ApiImplementation; +import pl.edu.mimuw.cloudatlas.agent.NewApiImplementation; +import pl.edu.mimuw.cloudatlas.agent.messages.UpdateAttributesMessage; import pl.edu.mimuw.cloudatlas.agent.modules.Module; import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType; import pl.edu.mimuw.cloudatlas.agent.modules.Qurnik; @@ -16,6 +17,7 @@ import pl.edu.mimuw.cloudatlas.agent.modules.Stanik; import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduler; import pl.edu.mimuw.cloudatlas.api.Api; import pl.edu.mimuw.cloudatlas.interpreter.Main; +import pl.edu.mimuw.cloudatlas.model.PathName; import pl.edu.mimuw.cloudatlas.model.ZMI; public class Agent { @@ -23,8 +25,7 @@ public class Agent { public static void runRegistry() { try { - ZMI root = Main.createTestHierarchy2(); - ApiImplementation api = new ApiImplementation(root); + NewApiImplementation api = new NewApiImplementation(eventBus); Api apiStub = (Api) UnicastRemoteObject.exportObject(api, 0); Registry registry = LocateRegistry.getRegistry(); @@ -89,12 +90,37 @@ public class Agent { System.out.println("Initializing event bus"); eventBusThread.start(); - System.out.println("Closing executors"); - closeExecutors(executorThreads); + // System.out.println("Closing executors"); + // closeExecutors(executorThreads); + } + + private static void initZones() { + try { + ZMI root = Main.createTestHierarchy2(); + addZoneAndChildren(root, new PathName("")); + System.out.println("Initialized with test hierarchy"); + } catch (Exception e) { + System.out.println("ERROR: failed to create test hierarchy"); + } + } + + private static void addZoneAndChildren(ZMI zmi, PathName pathName) { + try { + System.out.println("trying to add " + pathName.toString()); + UpdateAttributesMessage message = new UpdateAttributesMessage("", 0, pathName.toString(), zmi.getAttributes()); + System.out.println("added it!"); + eventBus.addMessage(message); + for (ZMI son : zmi.getSons()) { + addZoneAndChildren(son, pathName.levelDown(son.getAttributes().getOrNull("name").toString())); + } + } catch (Exception e) { + System.out.println("ERROR: failed to add zone"); + } } public static void main(String[] args) { runModulesAsThreads(); runRegistry(); + initZones(); } } diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java b/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java index f91f25e..288087d 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java @@ -277,16 +277,19 @@ public class Main { ZMI root = new ZMI(); root.getAttributes().add("level", new ValueInt(0l)); root.getAttributes().add("name", new ValueString(null)); + root.getAttributes().add("timestamp", new ValueTime(0l)); ZMI uw = new ZMI(root); root.addSon(uw); uw.getAttributes().add("level", new ValueInt(1l)); uw.getAttributes().add("name", new ValueString("uw")); + uw.getAttributes().add("timestamp", new ValueTime(0l)); ZMI pjwstk = new ZMI(root); root.addSon(pjwstk); pjwstk.getAttributes().add("level", new ValueInt(1l)); pjwstk.getAttributes().add("name", new ValueString("pjwstk")); + pjwstk.getAttributes().add("timestamp", new ValueTime(0l)); ZMI violet07 = new ZMI(uw); uw.addSon(violet07); -- cgit v1.2.3 From 6a4ac32a2bb28fb0a5781d6756fe2be3ccc3a41c Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Fri, 3 Jan 2020 16:51:37 +0100 Subject: Cleanup --- src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java | 3 --- src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java | 1 - 2 files changed, 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java index 429346c..70da4af 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/Agent.java @@ -89,9 +89,6 @@ public class Agent { Thread eventBusThread = new Thread(eventBus); System.out.println("Initializing event bus"); eventBusThread.start(); - - // System.out.println("Closing executors"); - // closeExecutors(executorThreads); } private static void initZones() { diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java index a146eb6..def1d72 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/NewApiImplementation.java @@ -15,7 +15,6 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.regex.Matcher; - import pl.edu.mimuw.cloudatlas.agent.messages.RequestStateMessage; import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage; import pl.edu.mimuw.cloudatlas.agent.messages.SetAttributeMessage; -- cgit v1.2.3 From ec2da92e9636e219f5ad7caa73c9334dae12e5b1 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Fri, 3 Jan 2020 18:01:53 +0100 Subject: Make tests pass with new API --- src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java b/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java index 288087d..1e0bb4f 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java @@ -277,19 +277,19 @@ public class Main { ZMI root = new ZMI(); root.getAttributes().add("level", new ValueInt(0l)); root.getAttributes().add("name", new ValueString(null)); - root.getAttributes().add("timestamp", new ValueTime(0l)); + root.getAttributes().add("timestamp", new ValueTime(10l)); ZMI uw = new ZMI(root); root.addSon(uw); uw.getAttributes().add("level", new ValueInt(1l)); uw.getAttributes().add("name", new ValueString("uw")); - uw.getAttributes().add("timestamp", new ValueTime(0l)); + uw.getAttributes().add("timestamp", new ValueTime(10l)); ZMI pjwstk = new ZMI(root); root.addSon(pjwstk); pjwstk.getAttributes().add("level", new ValueInt(1l)); pjwstk.getAttributes().add("name", new ValueString("pjwstk")); - pjwstk.getAttributes().add("timestamp", new ValueTime(0l)); + pjwstk.getAttributes().add("timestamp", new ValueTime(10l)); ZMI violet07 = new ZMI(uw); uw.addSon(violet07); -- cgit v1.2.3