Changeset 794:ff94810e0e84

Timestamp:

01/19/12 18:12:11 (4 months ago)

Author:

delmitz@delmitz-PC.office.nchovy.net

Branch:

default

Message:

increase adds, updates, removes speed.
modified removeOrgUnit default value.

Location:

kraken-dom/src/main/java/org/krakenapps/dom/api/impl

Files:

• ConfigManagerImpl.java (modified) (4 diffs)
• OrganizationUnitApiImpl.java (modified) (2 diffs)
• UserApiImpl.java (modified) (2 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/ConfigManagerImpl.java

@@ -17 +17 @@
 import org.krakenapps.confdb.Config;
 import org.krakenapps.confdb.ConfigDatabase;
+import org.krakenapps.confdb.ConfigIterator;
 import org.krakenapps.confdb.ConfigService;
 import org.krakenapps.confdb.ConfigTransaction;
@@ -100 +101 @@
 
                 ConfigDatabase db = getDatabase(domain);
+
+                Predicate pred = Predicates.or(preds.toArray(new Predicate[0]));
+                if (db.findOne(cls, pred) != null)
+                        throw new DOMException(alreadyExistMessage);
+
                 ConfigTransaction xact = db.beginTransaction();
-
-                Iterator<Predicate> predIterator = preds.iterator();
                 Iterator<T> docIterator = docs.iterator();
                 try {
-                        while (docIterator.hasNext()) {
-                                Predicate pred = predIterator.next();
-                                T doc = docIterator.next();
-
-                                if (db.findOne(cls, pred) != null)
-                                        throw new DOMException(alreadyExistMessage);
-
-                                db.add(xact, doc);
-                        }
-
+                        while (docIterator.hasNext())
+                                db.add(xact, docIterator.next());
                         xact.commit(COMMITER, "added " + docs.size() + " " + cls.getSimpleName() + "(s)");
                 } catch (Throwable e) {
                         xact.rollback();
-                        if (e instanceof DOMException)
-                                throw (DOMException) e;
                         throw new RuntimeException(e);
                 }
@@ -162 +156 @@
 
                 ConfigDatabase db = getDatabase(domain);
+
+                Predicate pred = Predicates.or(preds.toArray(new Predicate[0]));
+                if (db.findOne(cls, pred) == null)
+                        throw new DOMException(notFoundMessage);
+
                 ConfigTransaction xact = db.beginTransaction();
-
-                Iterator<Predicate> predIterator = preds.iterator();
                 Iterator<T> docIterator = docs.iterator();
                 try {
                         while (docIterator.hasNext()) {
-                                Predicate pred = predIterator.next();
-                                T doc = docIterator.next();
-
                                 Config c = db.findOne(cls, pred);
-                                if (c == null)
-                                        throw new DOMException(notFoundMessage);
-
-                                db.update(xact, c, doc, CHECK_CONFLICT);
+                                db.update(xact, c, docIterator.next(), CHECK_CONFLICT);
                         }
 
@@ -221 +212 @@
 
                 ConfigDatabase db = getDatabase(domain);
+
+                Predicate pred = Predicates.or(preds.toArray(new Predicate[0]));
+                if (db.findOne(cls, pred) == null)
+                        throw new DOMException(notFoundMessage);
+
                 ConfigTransaction xact = db.beginTransaction();
-
-                Iterator<Predicate> predIterator = preds.iterator();
                 Collection<T> docs = new ArrayList<T>();
                 try {
-                        while (predIterator.hasNext()) {
-                                Predicate pred = predIterator.next();
-
-                                Config c = db.findOne(cls, pred);
-                                if (c == null)
-                                        throw new DOMException(notFoundMessage);
-
+                        ConfigIterator it = db.find(cls, pred);
+                        while (it.hasNext()) {
+                                Config c = it.next();
                                 T doc = c.getDocument(cls, getCallback(domain));
                                 if (provider != null)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/OrganizationUnitApiImpl.java

@@ -142 +142 @@
 
         @Override
-        public void removeOrganizationUnits(String domain, Collection<String> guids, boolean removeUser) {
+        public void removeOrganizationUnits(String domain, Collection<String> guids, boolean moveUser) {
                 Set<String> orgUnitGuids = new HashSet<String>();
                 List<Predicate> preds = new ArrayList<Predicate>();
@@ -155 +155 @@
                 }
 
-                cfg.removes(domain, cls, preds, NOT_FOUND, this, removeUser, null);
+                cfg.removes(domain, cls, preds, NOT_FOUND, this, moveUser, null);
         }
 
         @Override
-        public void removeOrganizationUnit(String domain, String guid, boolean removeUser) {
+        public void removeOrganizationUnit(String domain, String guid, boolean moveUser) {
                 List<OrganizationUnit> orgUnits = getOrganizationUnitTree(getOrganizationUnit(domain, guid));
-                cfg.removes(domain, cls, getPreds(orgUnits), NOT_FOUND, this, removeUser, null);
+                cfg.removes(domain, cls, getPreds(orgUnits), NOT_FOUND, this, moveUser, null);
         }
 

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java

@@ -30 +30 @@
 import org.apache.felix.ipojo.annotations.Validate;
 import org.krakenapps.confdb.Config;
+import org.krakenapps.confdb.ConfigIterator;
 import org.krakenapps.confdb.ConfigTransaction;
 import org.krakenapps.confdb.Predicate;
@@ -264 +265 @@
         @Override
         public void entityRemoving(String domain, OrganizationUnit orgUnit, ConfigTransaction xact, Object state) {
-                boolean remove = (state != null) && (state instanceof Boolean) && ((Boolean) state);
-
-                for (User user : getUsers(domain, orgUnit.getGuid(), false)) {
-                        Config c = xact.getDatabase().findOne(cls, getPred(user.getLoginName()));
-
-                        if (remove) {
-                                xact.getDatabase().remove(xact, c, true);
-                        } else {
+                boolean move = (state != null) && (state instanceof Boolean) && ((Boolean) state);
+
+                List<Predicate> preds = new ArrayList<Predicate>();
+                for (User user : getUsers(domain, orgUnit.getGuid(), false))
+                        preds.add(getPred(user.getLoginName()));
+
+                ConfigIterator it = xact.getDatabase().find(cls, Predicates.or(preds.toArray(new Predicate[0])));
+                while (it.hasNext()) {
+                        Config c = it.next();
+                        User user = c.getDocument(User.class);
+
+                        if (move) {
                                 user.setOrgUnit(null);
                                 xact.getDatabase().update(xact, c, user, true);
+                        } else {
+                                xact.getDatabase().remove(xact, c, true);
                         }
                 }