Changeset 128

Timestamp:

11/20/08 12:49:27 (7 weeks ago)

Author:

bmalkow

Message:

improve cache (IAffiliations)

Location:

trunk/src/main/java/tigase/pubsub/repository

Files:

• NodeAffiliations.java (modified) (4 diffs)
• NodeSubscriptions.java (modified) (1 diff)
• cached/CachedPubSubRepository.java (modified) (2 diffs)
• cached/NodeAffiliations.java (modified) (3 diffs)

trunk/src/main/java/tigase/pubsub/repository/NodeAffiliations.java

@@ -24 +24 @@
         protected final Map<String, UsersAffiliation> affs = new HashMap<String, UsersAffiliation>();
 
-        protected boolean changed = false;
+        private boolean changed = false;
 
         protected NodeAffiliations() {
@@ -40 +40 @@
         public void changeAffiliation(String jid, Affiliation affiliation) {
                 final String bareJid = JIDUtils.getNodeID(jid);
-                UsersAffiliation a = this.affs.get(bareJid);
+                UsersAffiliation a = this.get(bareJid);
                 if (a != null) {
                         a.setAffiliation(affiliation);
@@ -61 +61 @@
         }
 
+        protected UsersAffiliation get(final String jid) {
+                final String bareJid = JIDUtils.getNodeID(jid);
+                UsersAffiliation s = this.affs.get(bareJid);
+                return s;
+        }
+
         @Override
         public UsersAffiliation[] getAffiliations() {
@@ -73 +79 @@
         public UsersAffiliation getSubscriberAffiliation(String jid) {
                 final String bareJid = JIDUtils.getNodeID(jid);
-                UsersAffiliation a = this.affs.get(bareJid);
+                UsersAffiliation a = this.get(bareJid);
                 if (a == null) {
                         a = new UsersAffiliation(bareJid, Affiliation.none);

trunk/src/main/java/tigase/pubsub/repository/NodeSubscriptions.java

@@ -60 +60 @@
         protected UsersSubscription get(final String jid) {
                 final String bareJid = JIDUtils.getNodeID(jid);
-                UsersSubscription s = get(bareJid);
+                UsersSubscription s = this.subs.get(bareJid);
                 return s;
         }

trunk/src/main/java/tigase/pubsub/repository/cached/CachedPubSubRepository.java

@@ -121 +121 @@
         public IAffiliations getNodeAffiliations(String nodeName) throws RepositoryException {
                 Node node = getNode(nodeName);
-                try {
-                        return node == null ? null : node.getNodeAffiliations().clone();
-                } catch (CloneNotSupportedException e) {
-                        e.printStackTrace();
-                        return null;
-                }
+                return node == null ? null : node.getNodeAffiliations();
         }
 
@@ -196 +191 @@
 
         @Override
-        public void update(String nodeName, IAffiliations affiliations) throws RepositoryException {
-                Node node = getNode(nodeName);
-                if (node != null) {
-                        node.getNodeAffiliations().replaceBy(affiliations);
-                        ((NodeAffiliations) affiliations).resetChangedFlag();
-                        node.setNodeAffiliationsChangeTimestamp();
-                        synchronized (mutex) {
-                                this.nodesToSave.add(node);
-                        }
+        public void update(String nodeName, IAffiliations nodeAffiliations) throws RepositoryException {
+                if (nodeAffiliations instanceof NodeAffiliations) {
+                        NodeAffiliations affiliations = (NodeAffiliations) nodeAffiliations;
+
+                        Node node = getNode(nodeName);
+                        if (node != null) {
+                                if (node.getNodeAffiliations() != nodeAffiliations) {
+                                        throw new RuntimeException("INCORRECT");
+                                }
+                                affiliations.merge();
+                                node.setNodeAffiliationsChangeTimestamp();
+                                synchronized (mutex) {
+                                        this.nodesToSave.add(node);
+                                }
+                        }
+                } else {
+                        throw new RuntimeException("Wrong class");
                 }
         }

trunk/src/main/java/tigase/pubsub/repository/cached/NodeAffiliations.java

@@ -2 +2 @@
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import tigase.pubsub.Affiliation;
-import tigase.pubsub.repository.IAffiliations;
 import tigase.pubsub.repository.stateless.UsersAffiliation;
+import tigase.util.JIDUtils;
 
 class NodeAffiliations extends tigase.pubsub.repository.NodeAffiliations {
@@ -21 +23 @@
         @Override
         public void addAffiliation(String jid, Affiliation affiliation) {
-                // TODO Auto-generated method stub
-                super.addAffiliation(jid, affiliation);
+                final String bareJid = JIDUtils.getNodeID(jid);
+                UsersAffiliation a = new UsersAffiliation(bareJid, affiliation);
+                changedAffs.put(bareJid, a);
         }
 
         @Override
         public void changeAffiliation(String jid, Affiliation affiliation) {
-                // TODO Auto-generated method stub
-                super.changeAffiliation(jid, affiliation);
+                final String bareJid = JIDUtils.getNodeID(jid);
+                UsersAffiliation a = this.get(bareJid);
+                if (a != null) {
+                        a.setAffiliation(affiliation);
+                        changedAffs.put(bareJid, a);
+                } else {
+                        a = new UsersAffiliation(bareJid, affiliation);
+                        changedAffs.put(bareJid, a);
+                }
         }
 
@@ -37 +47 @@
                         clone.affs.put(a.getJid(), a.clone());
                 }
-                clone.changed = changed;
+                for (UsersAffiliation a : this.changedAffs.values()) {
+                        clone.changedAffs.put(a.getJid(), a.clone());
+                }
                 return clone;
         }
 
         @Override
-        public UsersAffiliation[] getAffiliations() {
-                // TODO Auto-generated method stub
-                return super.getAffiliations();
+        protected UsersAffiliation get(String bareJid) {
+                UsersAffiliation us = changedAffs.get(bareJid);
+                if (us == null) {
+                        us = affs.get(bareJid);
+                        if (us != null)
+                                try {
+                                        return us.clone();
+                                } catch (Exception e) {
+                                        e.printStackTrace();
+                                        return null;
+                                }
+                }
+                return us;
         }
 
         @Override
-        public Map<String, UsersAffiliation> getAffiliationsMap() {
-                // TODO Auto-generated method stub
-                return super.getAffiliationsMap();
-        }
-
-        @Override
-        public UsersAffiliation getSubscriberAffiliation(String jid) {
-                // TODO Auto-generated method stub
-                return super.getSubscriberAffiliation(jid);
+        public UsersAffiliation[] getAffiliations() {
+                final Set<UsersAffiliation> result = new HashSet<UsersAffiliation>();
+                result.addAll(this.affs.values());
+                result.addAll(this.changedAffs.values());
+                return result.toArray(new UsersAffiliation[] {});
         }
 
         @Override
         public boolean isChanged() {
-                // TODO Auto-generated method stub
-                return super.isChanged();
+                return changedAffs.size() > 0;
         }
 
-        @Override
-        public void parse(String data) {
-                // TODO Auto-generated method stub
-                super.parse(data);
-        }
-
-        @Override
-        public void replaceBy(IAffiliations nodeAffiliations) {
-                // TODO Auto-generated method stub
-                super.replaceBy(nodeAffiliations);
+        public void merge() {
+                affs.putAll(changedAffs);
+                changedAffs.clear();
         }
 
         @Override
         public void resetChangedFlag() {
-                // TODO Auto-generated method stub
-                super.resetChangedFlag();
-        }
-
-        @Override
-        public String serialize() {
-                // TODO Auto-generated method stub
-                return super.serialize();
+                changedAffs.clear();
         }