Changeset 780:42edd44a9760

Timestamp:

01/17/12 10:35:49 (4 months ago)

Author:

delmitz@delmitz-PC.office.nchovy.net

Branch:

default

Message:

added drop collection routine.
added rollback script.

Files:

• kraken-confdb/pom.xml (modified) (1 diff)
• kraken-confdb/src/main/java/org/krakenapps/confdb/file/FileConfigDatabase.java (modified) (1 diff)
• kraken-core/pom.xml (modified) (2 diffs)
• kraken-core/src/main/java/org/krakenapps/script/ConfScript.java (modified) (4 diffs)

kraken-confdb/pom.xml

@@ -11 +11 @@
         <groupId>org.krakenapps</groupId>
         <artifactId>kraken-confdb</artifactId>
-        <version>0.6.0</version>
+        <version>0.6.1</version>
         <packaging>bundle</packaging>
         <name>Kraken Config Database</name>

kraken-confdb/src/main/java/org/krakenapps/confdb/file/FileConfigDatabase.java

@@ -289 +289 @@
         @Override
         public void dropCollection(String name) {
-                try {
-                        lock();
-                } finally {
-                        unlock();
+                ConfigTransaction xact = beginTransaction();
+                try {
+                        xact.getManifest();
+                        xact.log(CommitOp.DropCol, name, 0, 0);
+                        xact.commit(null, null);
+                } catch (Throwable e) {
+                        xact.rollback();
+                        throw new RollbackException(e);
                 }
         }

kraken-core/pom.xml

@@ -9 +9 @@
         </parent>
         <artifactId>kraken-core</artifactId>
-        <version>1.13.0</version>
+        <version>1.13.1</version>
         <name>Kraken Core</name>
         <packaging>jar</packaging>
@@ -41 +41 @@
                         <groupId>org.krakenapps</groupId>
                         <artifactId>kraken-confdb</artifactId>
-                        <version>0.6.0</version>
+                        <version>0.6.1</version>
                 </dependency>
                 <dependency>

kraken-core/src/main/java/org/krakenapps/script/ConfScript.java

@@ -15 +15 @@
  */
 package org.krakenapps.script;
+
+import java.util.List;
 
 import org.krakenapps.api.Primitive;
@@ -86 +88 @@
         }
 
-        @ScriptUsage(description = "show revision logs", arguments = { @ScriptArgument(name = "name", type = "string", description = "database name") })
+        @ScriptUsage(description = "show revision logs", arguments = {
+                        @ScriptArgument(name = "name", type = "string", description = "database name"),
+                        @ScriptArgument(name = "offset", type = "integer", optional = true, description = "log offset"),
+                        @ScriptArgument(name = "limit", type = "integer", optional = true, description = "log count limit") })
         public void logs(String[] args) {
                 ConfigDatabase db = conf.getDatabase(args[0]);
@@ -94 +99 @@
                 }
 
-                for (CommitLog log : db.getCommitLogs())
+                long offset = 0;
+                long limit = 10;
+
+                if (args.length > 1)
+                        offset = Long.parseLong(args[1]);
+                if (args.length > 2)
+                        limit = Long.parseLong(args[2]);
+
+                List<CommitLog> logs = db.getCommitLogs(offset, limit);
+                for (CommitLog log : logs)
                         context.println(log);
         }
@@ -141 +155 @@
                 }
         }
+
+        @ScriptUsage(description = "print documents", arguments = {
+                        @ScriptArgument(name = "database name", type = "string", description = "database name"),
+                        @ScriptArgument(name = "rollback revision", type = "integer", description = "rollback revision id") })
+        public void rollback(String[] args) {
+                ConfigDatabase db = conf.getDatabase(args[0]);
+                if (db == null) {
+                        context.println("database not found");
+                        return;
+                }
+
+                db.rollback(Integer.parseInt(args[1]));
+                context.println("complete");
+        }
 }