From: Vyacheslav Tyutyunkov Date: Wed, 24 Jul 2013 08:52:37 +0000 (+0700) Subject: #82 X-Git-Tag: v1.2.12~250 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2a5ff77ae9045f58218a0b1c1e2c3fe1f9ca476;p=platform%2Fupstream%2Fejdb.git #82 --- diff --git a/jejdb/doc/allclasses-frame.html b/jejdb/doc/allclasses-frame.html index e5bab06..ae29b88 100644 --- a/jejdb/doc/allclasses-frame.html +++ b/jejdb/doc/allclasses-frame.html @@ -2,13 +2,13 @@ - + All Classes (JEJDB Doc) - + diff --git a/jejdb/doc/allclasses-noframe.html b/jejdb/doc/allclasses-noframe.html index c1798a3..43dd0e1 100644 --- a/jejdb/doc/allclasses-noframe.html +++ b/jejdb/doc/allclasses-noframe.html @@ -2,13 +2,13 @@ - + All Classes (JEJDB Doc) - + diff --git a/jejdb/doc/constant-values.html b/jejdb/doc/constant-values.html index 42a535e..80faf8c 100644 --- a/jejdb/doc/constant-values.html +++ b/jejdb/doc/constant-values.html @@ -2,13 +2,13 @@ - + Constant Field Values (JEJDB Doc) - + @@ -227,7 +227,7 @@ org.ejdb.* public static final int JBO_DEFAULT -70 +6 diff --git a/jejdb/doc/deprecated-list.html b/jejdb/doc/deprecated-list.html index 2725831..7a52a84 100644 --- a/jejdb/doc/deprecated-list.html +++ b/jejdb/doc/deprecated-list.html @@ -2,13 +2,13 @@ - + Deprecated List (JEJDB Doc) - + diff --git a/jejdb/doc/help-doc.html b/jejdb/doc/help-doc.html index 2f2cfb7..1f54706 100644 --- a/jejdb/doc/help-doc.html +++ b/jejdb/doc/help-doc.html @@ -2,13 +2,13 @@ - + API Help (JEJDB Doc) - + diff --git a/jejdb/doc/index-all.html b/jejdb/doc/index-all.html index 8bba8a9..411031f 100644 --- a/jejdb/doc/index-all.html +++ b/jejdb/doc/index-all.html @@ -2,13 +2,13 @@ - + Index (JEJDB Doc) - + @@ -79,7 +79,7 @@ function windowTitle() -A B C D E F G H I J L N O P R S T U V W
+A B C D E F G H I J L N O P R S T U V W _

A

@@ -200,7 +200,7 @@ Method in class org.ejdb.driver.close() - Method in class org.ejdb.driver.EJDBResultSet -
Close result set +
commitTransaction() - Method in class org.ejdb.driver.EJDBCollection
Commit collection transaction. @@ -388,6 +388,9 @@ Method in class org.ejdb.driver.execute(BSONObject, BSONObject[], BSONObject, int, OutputStream) - Method in class org.ejdb.driver.EJDBQuery
  +
executeCommand(BSONObject) - +Method in class org.ejdb.driver.EJDB +
Executes ejdb database command.
exists() - Method in class org.ejdb.driver.EJDBQueryBuilder.Constraint
Field existence matching EJDBQueryBuilder.Constraint.exists(boolean) @@ -998,7 +1001,15 @@ Method in class org.ejdb.bson.io.Writes String to buffer as c-style string (null-terminated)
-A B C D E F G H I J L N O P R S T U V W +

+_

+
+
_get(int) - +Method in class org.ejdb.driver.EJDBResultSet +
Returns object by position +
+
+A B C D E F G H I J L N O P R S T U V W _ diff --git a/jejdb/doc/index.html b/jejdb/doc/index.html index becf466..ef62f4e 100644 --- a/jejdb/doc/index.html +++ b/jejdb/doc/index.html @@ -2,7 +2,7 @@ - + JEJDB Doc diff --git a/jejdb/doc/org/ejdb/bson/BSON.html b/jejdb/doc/org/ejdb/bson/BSON.html index 614f22b..af27be4 100644 --- a/jejdb/doc/org/ejdb/bson/BSON.html +++ b/jejdb/doc/org/ejdb/bson/BSON.html @@ -2,13 +2,13 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.6.0_43) on Mon Apr 01 13:12:05 NOVT 2013 --> +<!-- Generated by javadoc (build 1.6.0_43) on Wed Jul 24 15:31:18 NOVT 2013 --> <META http-equiv="Content-Type" content="text/html; charset=utf-8"> <TITLE> BSON (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/BSONException.html b/jejdb/doc/org/ejdb/bson/BSONException.html index 5f2d355..ad4d55e 100644 --- a/jejdb/doc/org/ejdb/bson/BSONException.html +++ b/jejdb/doc/org/ejdb/bson/BSONException.html @@ -2,13 +2,13 @@ - + BSONException (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/BSONObject.html b/jejdb/doc/org/ejdb/bson/BSONObject.html index 7b3eb43..3207381 100644 --- a/jejdb/doc/org/ejdb/bson/BSONObject.html +++ b/jejdb/doc/org/ejdb/bson/BSONObject.html @@ -2,13 +2,13 @@ - + BSONObject (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/class-use/BSON.html b/jejdb/doc/org/ejdb/bson/class-use/BSON.html index f566749..ac586b6 100644 --- a/jejdb/doc/org/ejdb/bson/class-use/BSON.html +++ b/jejdb/doc/org/ejdb/bson/class-use/BSON.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.BSON (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/class-use/BSONException.html b/jejdb/doc/org/ejdb/bson/class-use/BSONException.html index 9246091..a71e654 100644 --- a/jejdb/doc/org/ejdb/bson/class-use/BSONException.html +++ b/jejdb/doc/org/ejdb/bson/class-use/BSONException.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.BSONException (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/class-use/BSONObject.html b/jejdb/doc/org/ejdb/bson/class-use/BSONObject.html index 6372848..9fe29bc 100644 --- a/jejdb/doc/org/ejdb/bson/class-use/BSONObject.html +++ b/jejdb/doc/org/ejdb/bson/class-use/BSONObject.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.BSONObject (JEJDB Doc) - + @@ -205,6 +205,22 @@ Uses of +protected  BSONObject +EJDBResultSet._get(int position) + +
+          Returns object by position + + + + BSONObject +EJDB.executeCommand(BSONObject command) + +
+          Executes ejdb database command. + + +  BSONObject EJDBQuery.findOne() @@ -392,6 +408,14 @@ Uses of + BSONObject +EJDB.executeCommand(BSONObject command) + +
+          Executes ejdb database command. + + +  ObjectId EJDBCollection.save(BSONObject object) diff --git a/jejdb/doc/org/ejdb/bson/io/InputBuffer.html b/jejdb/doc/org/ejdb/bson/io/InputBuffer.html index 572e420..1795121 100644 --- a/jejdb/doc/org/ejdb/bson/io/InputBuffer.html +++ b/jejdb/doc/org/ejdb/bson/io/InputBuffer.html @@ -2,13 +2,13 @@ - + InputBuffer (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/OutputBuffer.html b/jejdb/doc/org/ejdb/bson/io/OutputBuffer.html index 2d718a7..175b008 100644 --- a/jejdb/doc/org/ejdb/bson/io/OutputBuffer.html +++ b/jejdb/doc/org/ejdb/bson/io/OutputBuffer.html @@ -2,13 +2,13 @@ - + OutputBuffer (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/class-use/InputBuffer.html b/jejdb/doc/org/ejdb/bson/io/class-use/InputBuffer.html index 32bf0aa..56ff261 100644 --- a/jejdb/doc/org/ejdb/bson/io/class-use/InputBuffer.html +++ b/jejdb/doc/org/ejdb/bson/io/class-use/InputBuffer.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.io.InputBuffer (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/class-use/OutputBuffer.html b/jejdb/doc/org/ejdb/bson/io/class-use/OutputBuffer.html index 720f299..3e7b346 100644 --- a/jejdb/doc/org/ejdb/bson/io/class-use/OutputBuffer.html +++ b/jejdb/doc/org/ejdb/bson/io/class-use/OutputBuffer.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.io.OutputBuffer (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/package-frame.html b/jejdb/doc/org/ejdb/bson/io/package-frame.html index de1ac1e..b51e2cc 100644 --- a/jejdb/doc/org/ejdb/bson/io/package-frame.html +++ b/jejdb/doc/org/ejdb/bson/io/package-frame.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.io (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/package-summary.html b/jejdb/doc/org/ejdb/bson/io/package-summary.html index 5f148f9..a36882a 100644 --- a/jejdb/doc/org/ejdb/bson/io/package-summary.html +++ b/jejdb/doc/org/ejdb/bson/io/package-summary.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.io (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/package-tree.html b/jejdb/doc/org/ejdb/bson/io/package-tree.html index 44d62cc..3ad42f0 100644 --- a/jejdb/doc/org/ejdb/bson/io/package-tree.html +++ b/jejdb/doc/org/ejdb/bson/io/package-tree.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.io Class Hierarchy (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/io/package-use.html b/jejdb/doc/org/ejdb/bson/io/package-use.html index f2fff0e..059895b 100644 --- a/jejdb/doc/org/ejdb/bson/io/package-use.html +++ b/jejdb/doc/org/ejdb/bson/io/package-use.html @@ -2,13 +2,13 @@ - + Uses of Package org.ejdb.bson.io (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/package-frame.html b/jejdb/doc/org/ejdb/bson/package-frame.html index fa574e7..4908a07 100644 --- a/jejdb/doc/org/ejdb/bson/package-frame.html +++ b/jejdb/doc/org/ejdb/bson/package-frame.html @@ -2,13 +2,13 @@ - + org.ejdb.bson (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/package-summary.html b/jejdb/doc/org/ejdb/bson/package-summary.html index 1213fe1..45225a7 100644 --- a/jejdb/doc/org/ejdb/bson/package-summary.html +++ b/jejdb/doc/org/ejdb/bson/package-summary.html @@ -2,13 +2,13 @@ - + org.ejdb.bson (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/package-tree.html b/jejdb/doc/org/ejdb/bson/package-tree.html index 6bc7fce..100ca8b 100644 --- a/jejdb/doc/org/ejdb/bson/package-tree.html +++ b/jejdb/doc/org/ejdb/bson/package-tree.html @@ -2,13 +2,13 @@ - + org.ejdb.bson Class Hierarchy (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/package-use.html b/jejdb/doc/org/ejdb/bson/package-use.html index b035af8..a3dcd2a 100644 --- a/jejdb/doc/org/ejdb/bson/package-use.html +++ b/jejdb/doc/org/ejdb/bson/package-use.html @@ -2,13 +2,13 @@ - + Uses of Package org.ejdb.bson (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/types/ObjectId.html b/jejdb/doc/org/ejdb/bson/types/ObjectId.html index 678873f..ec0d470 100644 --- a/jejdb/doc/org/ejdb/bson/types/ObjectId.html +++ b/jejdb/doc/org/ejdb/bson/types/ObjectId.html @@ -2,13 +2,13 @@ - + ObjectId (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/types/class-use/ObjectId.html b/jejdb/doc/org/ejdb/bson/types/class-use/ObjectId.html index 779d256..ab8b92d 100644 --- a/jejdb/doc/org/ejdb/bson/types/class-use/ObjectId.html +++ b/jejdb/doc/org/ejdb/bson/types/class-use/ObjectId.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.types.ObjectId (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/types/package-frame.html b/jejdb/doc/org/ejdb/bson/types/package-frame.html index 6373b65..3b729da 100644 --- a/jejdb/doc/org/ejdb/bson/types/package-frame.html +++ b/jejdb/doc/org/ejdb/bson/types/package-frame.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.types (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/types/package-summary.html b/jejdb/doc/org/ejdb/bson/types/package-summary.html index b3e4c80..620346a 100644 --- a/jejdb/doc/org/ejdb/bson/types/package-summary.html +++ b/jejdb/doc/org/ejdb/bson/types/package-summary.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.types (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/types/package-tree.html b/jejdb/doc/org/ejdb/bson/types/package-tree.html index 3731fb9..c777ec2 100644 --- a/jejdb/doc/org/ejdb/bson/types/package-tree.html +++ b/jejdb/doc/org/ejdb/bson/types/package-tree.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.types Class Hierarchy (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/types/package-use.html b/jejdb/doc/org/ejdb/bson/types/package-use.html index 9c02175..11aa9a8 100644 --- a/jejdb/doc/org/ejdb/bson/types/package-use.html +++ b/jejdb/doc/org/ejdb/bson/types/package-use.html @@ -2,13 +2,13 @@ - + Uses of Package org.ejdb.bson.types (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/util/RegexFlag.html b/jejdb/doc/org/ejdb/bson/util/RegexFlag.html index a540b75..80b73ed 100644 --- a/jejdb/doc/org/ejdb/bson/util/RegexFlag.html +++ b/jejdb/doc/org/ejdb/bson/util/RegexFlag.html @@ -2,13 +2,13 @@ - + RegexFlag (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/util/class-use/RegexFlag.html b/jejdb/doc/org/ejdb/bson/util/class-use/RegexFlag.html index 1e01692..a929270 100644 --- a/jejdb/doc/org/ejdb/bson/util/class-use/RegexFlag.html +++ b/jejdb/doc/org/ejdb/bson/util/class-use/RegexFlag.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.bson.util.RegexFlag (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/util/package-frame.html b/jejdb/doc/org/ejdb/bson/util/package-frame.html index e698661..ac2956c 100644 --- a/jejdb/doc/org/ejdb/bson/util/package-frame.html +++ b/jejdb/doc/org/ejdb/bson/util/package-frame.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.util (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/util/package-summary.html b/jejdb/doc/org/ejdb/bson/util/package-summary.html index daf09ba..64c37e8 100644 --- a/jejdb/doc/org/ejdb/bson/util/package-summary.html +++ b/jejdb/doc/org/ejdb/bson/util/package-summary.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.util (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/util/package-tree.html b/jejdb/doc/org/ejdb/bson/util/package-tree.html index 5c59f71..6e9a5b8 100644 --- a/jejdb/doc/org/ejdb/bson/util/package-tree.html +++ b/jejdb/doc/org/ejdb/bson/util/package-tree.html @@ -2,13 +2,13 @@ - + org.ejdb.bson.util Class Hierarchy (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/bson/util/package-use.html b/jejdb/doc/org/ejdb/bson/util/package-use.html index 51efd49..6a39f5e 100644 --- a/jejdb/doc/org/ejdb/bson/util/package-use.html +++ b/jejdb/doc/org/ejdb/bson/util/package-use.html @@ -2,13 +2,13 @@ - + Uses of Package org.ejdb.bson.util (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/BSONQueryObject.html b/jejdb/doc/org/ejdb/driver/BSONQueryObject.html index af1beb7..6ca8909 100644 --- a/jejdb/doc/org/ejdb/driver/BSONQueryObject.html +++ b/jejdb/doc/org/ejdb/driver/BSONQueryObject.html @@ -2,13 +2,13 @@ - + BSONQueryObject (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/EJDB.html b/jejdb/doc/org/ejdb/driver/EJDB.html index ed330e4..5eaa80f 100644 --- a/jejdb/doc/org/ejdb/driver/EJDB.html +++ b/jejdb/doc/org/ejdb/driver/EJDB.html @@ -2,13 +2,13 @@ - + EJDB (JEJDB Doc) - + @@ -253,6 +253,14 @@ java.lang.Object + BSONObject +executeCommand(BSONObject command) + +
+          Executes ejdb database command. + + + protected  void finalize() @@ -526,7 +534,7 @@ public void open(java.lang.String path)
Open database using default open mode.

- Default open mode: JBOWRITER | JBOCREAT | JBOTSYNC + Default open mode: JBOWRITER | JBOCREAT

Parameters:
path - EJDB path @@ -545,7 +553,7 @@ public void open(java.lang.String path,
Open database.

- Default open mode: JBOWRITER | JBOCREAT | JBOTSYNC + Default open mode: JBOWRITER | JBOCREAT

Parameters:
path - EJDB path
mode - Open mode @@ -739,6 +747,52 @@ public

+executeCommand

+
+public BSONObject executeCommand(BSONObject command)
+                          throws EJDBException
+
+
Executes ejdb database command. + + Supported commands: + 1) Exports database collections data. See ejdbexport() method. + "export" : { + "path" : string, //Exports database collections data + "cnames" : [string array]|null, //List of collection names to export + "mode" : int|null //Values: null|`JBJSONEXPORT` See ejdb.h#ejdbexport() method + } + + Command response: + { + "log" : string, //Diagnostic log about executing this command + "error" : string|null, //ejdb error message + "errorCode" : int|0, //ejdb error code + } + + 2) Imports previously exported collections data into ejdb. + "import" : { + "path" : string //The directory path in which data resides + "cnames" : [string array]|null, //List of collection names to import + "mode" : int|null //Values: null| JBIMPORTUPDATE`|`JBIMPORTREPLACE` See ejdb.h#ejdbimport() method + } + + Command response: + { + "log" : string, //Diagnostic log about executing this command + "error" : string|null, //ejdb error message + "errorCode" : int|0, //ejdb error code + } +

+

+
Parameters:
command - Command BSON object +
Returns:
command response BSON object +
Throws: +
EJDBException
+
+
+
+

getCollectionNames

diff --git a/jejdb/doc/org/ejdb/driver/EJDBCollection.Index.html b/jejdb/doc/org/ejdb/driver/EJDBCollection.Index.html
index 564220f..8427b97 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBCollection.Index.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBCollection.Index.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBCollection.Index (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBCollection.IndexType.html b/jejdb/doc/org/ejdb/driver/EJDBCollection.IndexType.html
index 3ff4d19..6db808e 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBCollection.IndexType.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBCollection.IndexType.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBCollection.IndexType (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBCollection.Options.html b/jejdb/doc/org/ejdb/driver/EJDBCollection.Options.html
index 0248ac0..63978dc 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBCollection.Options.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBCollection.Options.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBCollection.Options (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBCollection.html b/jejdb/doc/org/ejdb/driver/EJDBCollection.html
index bf05c24..9441242 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBCollection.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBCollection.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBCollection (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBException.html b/jejdb/doc/org/ejdb/driver/EJDBException.html
index c3a56c4..9115c73 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBException.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBException.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBException (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBQuery.html b/jejdb/doc/org/ejdb/driver/EJDBQuery.html
index 9f8e33b..4cc1175 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBQuery.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBQuery.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBQuery (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.Constraint.html b/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.Constraint.html
index 1b79b4e..52457c3 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.Constraint.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.Constraint.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBQueryBuilder.Constraint (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.OrderBy.html b/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.OrderBy.html
index b9d1b44..9436275 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.OrderBy.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.OrderBy.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBQueryBuilder.OrderBy (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.html b/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.html
index fe09174..380e321 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBQueryBuilder.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBQueryBuilder (JEJDB Doc)
 
 
-
+
 
 
 
diff --git a/jejdb/doc/org/ejdb/driver/EJDBResultSet.html b/jejdb/doc/org/ejdb/driver/EJDBResultSet.html
index 831cd47..1ec4115 100644
--- a/jejdb/doc/org/ejdb/driver/EJDBResultSet.html
+++ b/jejdb/doc/org/ejdb/driver/EJDBResultSet.html
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
 EJDBResultSet (JEJDB Doc)
 
 
-
+
 
 
 
@@ -97,11 +97,11 @@ java.lang.Object
   extended by org.ejdb.driver.EJDBResultSet
-
All Implemented Interfaces:
java.lang.Iterable<BSONObject>, java.util.Iterator<BSONObject>
+
All Implemented Interfaces:
java.io.Closeable, java.lang.Iterable<BSONObject>, java.util.Iterator<BSONObject>
-
public class EJDBResultSet
extends java.lang.Object
implements java.lang.Iterable<BSONObject>, java.util.Iterator<BSONObject>
+
public class EJDBResultSet
extends java.lang.Object
implements java.lang.Iterable<BSONObject>, java.util.Iterator<BSONObject>, java.io.Closeable

@@ -125,11 +125,19 @@ java.lang.Object +protected  BSONObject +_get(int position) + +
+          Returns object by position + + +  void close()
-          Close result set +           @@ -210,6 +218,25 @@ java.lang.Object +

+_get

+
+protected BSONObject _get(int position)
+                   throws EJDBException
+
+
Returns object by position +

+

+
+
+
+ +
Throws: +
EJDBException
+
+
+
+

get

@@ -318,10 +345,10 @@ close
 public void close()
            throws EJDBException
-
Close result set +

-
+
Specified by:
close in interface java.io.Closeable
diff --git a/jejdb/doc/org/ejdb/driver/class-use/BSONQueryObject.html b/jejdb/doc/org/ejdb/driver/class-use/BSONQueryObject.html index ed4064e..f08b82e 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/BSONQueryObject.html +++ b/jejdb/doc/org/ejdb/driver/class-use/BSONQueryObject.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.BSONQueryObject (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDB.html b/jejdb/doc/org/ejdb/driver/class-use/EJDB.html index 6aeedde..e56c4e2 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDB.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDB.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDB (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Index.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Index.html index a19aac5..dfa7251 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Index.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Index.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBCollection.Index (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.IndexType.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.IndexType.html index b0ed577..f38cf5a 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.IndexType.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.IndexType.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBCollection.IndexType (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Options.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Options.html index 3072589..d8382bf 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Options.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.Options.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBCollection.Options (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.html index f132774..830aedb 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBCollection.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBCollection (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBException.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBException.html index 3d23e7b..86d1e29 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBException.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBException.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBException (JEJDB Doc) - + @@ -113,6 +113,14 @@ Uses of +protected  BSONObject +EJDBResultSet._get(int position) + +
+          Returns object by position + + + protected  EJDBQueryBuilder EJDBQueryBuilder.addHint(java.lang.String name, java.lang.Object value) @@ -150,7 +158,7 @@ Uses of close()
-          Close result set +           @@ -338,6 +346,14 @@ Uses of + BSONObject +EJDB.executeCommand(BSONObject command) + +
+          Executes ejdb database command. + + +  EJDBResultSet EJDBQuery.find() diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBQuery.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBQuery.html index 9b1b68c..a049261 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBQuery.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBQuery.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBQuery (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.Constraint.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.Constraint.html index 0b99c8c..1c5276e 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.Constraint.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.Constraint.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBQueryBuilder.Constraint (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.OrderBy.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.OrderBy.html index 94a16c7..fd8f3d4 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.OrderBy.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.OrderBy.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBQueryBuilder.OrderBy (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.html index 7a0ad52..d80ab92 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBQueryBuilder.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBQueryBuilder (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/class-use/EJDBResultSet.html b/jejdb/doc/org/ejdb/driver/class-use/EJDBResultSet.html index 90fd66f..d8fe273 100644 --- a/jejdb/doc/org/ejdb/driver/class-use/EJDBResultSet.html +++ b/jejdb/doc/org/ejdb/driver/class-use/EJDBResultSet.html @@ -2,13 +2,13 @@ - + Uses of Class org.ejdb.driver.EJDBResultSet (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/package-frame.html b/jejdb/doc/org/ejdb/driver/package-frame.html index 9805256..173e3af 100644 --- a/jejdb/doc/org/ejdb/driver/package-frame.html +++ b/jejdb/doc/org/ejdb/driver/package-frame.html @@ -2,13 +2,13 @@ - + org.ejdb.driver (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/package-summary.html b/jejdb/doc/org/ejdb/driver/package-summary.html index f6e292e..dd10575 100644 --- a/jejdb/doc/org/ejdb/driver/package-summary.html +++ b/jejdb/doc/org/ejdb/driver/package-summary.html @@ -2,13 +2,13 @@ - + org.ejdb.driver (JEJDB Doc) - + diff --git a/jejdb/doc/org/ejdb/driver/package-tree.html b/jejdb/doc/org/ejdb/driver/package-tree.html index b002581..eed3855 100644 --- a/jejdb/doc/org/ejdb/driver/package-tree.html +++ b/jejdb/doc/org/ejdb/driver/package-tree.html @@ -2,13 +2,13 @@ - + org.ejdb.driver Class Hierarchy (JEJDB Doc) - + @@ -95,7 +95,7 @@ Class Hierarchy
  • java.lang.Object
    • org.ejdb.bson.BSONObject -
    • org.ejdb.driver.EJDB
    • org.ejdb.driver.EJDBCollection
    • org.ejdb.driver.EJDBCollection.Index
    • org.ejdb.driver.EJDBCollection.Options
    • org.ejdb.driver.EJDBQuery
    • org.ejdb.driver.EJDBQueryBuilder
    • org.ejdb.driver.EJDBQueryBuilder.Constraint
    • org.ejdb.driver.EJDBQueryBuilder.OrderBy
    • org.ejdb.driver.EJDBResultSet (implements java.lang.Iterable<T>, java.util.Iterator<E>) +
    • org.ejdb.driver.EJDB
    • org.ejdb.driver.EJDBCollection
    • org.ejdb.driver.EJDBCollection.Index
    • org.ejdb.driver.EJDBCollection.Options
    • org.ejdb.driver.EJDBQuery
    • org.ejdb.driver.EJDBQueryBuilder
    • org.ejdb.driver.EJDBQueryBuilder.Constraint
    • org.ejdb.driver.EJDBQueryBuilder.OrderBy
    • org.ejdb.driver.EJDBResultSet (implements java.io.Closeable, java.lang.Iterable<T>, java.util.Iterator<E>)
    • java.lang.Throwable (implements java.io.Serializable)
      • java.lang.Exception
          diff --git a/jejdb/doc/org/ejdb/driver/package-use.html b/jejdb/doc/org/ejdb/driver/package-use.html index ee69d67..a642f9b 100644 --- a/jejdb/doc/org/ejdb/driver/package-use.html +++ b/jejdb/doc/org/ejdb/driver/package-use.html @@ -2,13 +2,13 @@ - + Uses of Package org.ejdb.driver (JEJDB Doc) - + diff --git a/jejdb/doc/overview-frame.html b/jejdb/doc/overview-frame.html index bae4db7..63db52f 100644 --- a/jejdb/doc/overview-frame.html +++ b/jejdb/doc/overview-frame.html @@ -2,13 +2,13 @@ - + Overview List (JEJDB Doc) - + diff --git a/jejdb/doc/overview-summary.html b/jejdb/doc/overview-summary.html index f6966bf..4081250 100644 --- a/jejdb/doc/overview-summary.html +++ b/jejdb/doc/overview-summary.html @@ -2,13 +2,13 @@ - + Overview (JEJDB Doc) - + diff --git a/jejdb/doc/overview-tree.html b/jejdb/doc/overview-tree.html index 19d6cf5..2b5da28 100644 --- a/jejdb/doc/overview-tree.html +++ b/jejdb/doc/overview-tree.html @@ -2,13 +2,13 @@ - + Class Hierarchy (JEJDB Doc) - + @@ -94,7 +94,7 @@ Class Hierarchy
        • java.lang.Object
          • org.ejdb.bson.BSON
          • org.ejdb.bson.BSONObject -
          • org.ejdb.driver.EJDB
          • org.ejdb.driver.EJDBCollection
          • org.ejdb.driver.EJDBCollection.Index
          • org.ejdb.driver.EJDBCollection.Options
          • org.ejdb.driver.EJDBQuery
          • org.ejdb.driver.EJDBQueryBuilder
          • org.ejdb.driver.EJDBQueryBuilder.Constraint
          • org.ejdb.driver.EJDBQueryBuilder.OrderBy
          • org.ejdb.driver.EJDBResultSet (implements java.lang.Iterable<T>, java.util.Iterator<E>) +
          • org.ejdb.driver.EJDB
          • org.ejdb.driver.EJDBCollection
          • org.ejdb.driver.EJDBCollection.Index
          • org.ejdb.driver.EJDBCollection.Options
          • org.ejdb.driver.EJDBQuery
          • org.ejdb.driver.EJDBQueryBuilder
          • org.ejdb.driver.EJDBQueryBuilder.Constraint
          • org.ejdb.driver.EJDBQueryBuilder.OrderBy
          • org.ejdb.driver.EJDBResultSet (implements java.io.Closeable, java.lang.Iterable<T>, java.util.Iterator<E>)
          • org.ejdb.bson.io.InputBuffer
          • org.ejdb.bson.types.ObjectId
          • org.ejdb.bson.io.OutputBuffer
          • org.ejdb.bson.util.RegexFlag
          • java.lang.Throwable (implements java.io.Serializable)
            • java.lang.Exception
                diff --git a/jejdb/doc/serialized-form.html b/jejdb/doc/serialized-form.html index c9f7866..bcde732 100644 --- a/jejdb/doc/serialized-form.html +++ b/jejdb/doc/serialized-form.html @@ -2,13 +2,13 @@ - + Serialized Form (JEJDB Doc) - + diff --git a/jejdb/src/cpp/jejdb.c b/jejdb/src/cpp/jejdb.c index 7a7f769..90d5649 100644 --- a/jejdb/src/cpp/jejdb.c +++ b/jejdb/src/cpp/jejdb.c @@ -1,4 +1,5 @@ #include +#include #include "jejdb.h" static void set_error(JNIEnv * env, int code, const char *message) { @@ -365,6 +366,33 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDB_updateMeta (JNIEnv *env, jobjec }; /* + * Class: org_ejdb_driver_EJDB + * Method: executeCommand + * Signature: (Lorg/ejdb/bson/BSONObject;)Lorg/ejdb/bson/BSONObject; + */ +JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDB_executeCommand + (JNIEnv *env, jobject obj, jobject jcommand) { + EJDB* db = get_ejdb_from_object(env, obj); + if (!ejdbisopen(db)) { + set_error(env, 0, "EJDB not opened"); + return NULL; + } + + bson *cmdret = NULL; + + bson *cmd = encode_bson(env, jcommand, NULL); + cmdret = ejdbcommand(db, cmd); + bson_del(cmd); + + jobject result = decode_bson(env, cmdret); + bson_del(cmdret); + + return result; +}; + + + +/* * Class: org_ejdb_driver_EJDBCollection * Method: ensureExists * Signature: (Lorg/ejdb/driver/EJDBCollection$Options;)V diff --git a/jejdb/src/cpp/org_ejdb_driver_EJDB.h b/jejdb/src/cpp/org_ejdb_driver_EJDB.h index 325cfec..7eb0661 100644 --- a/jejdb/src/cpp/org_ejdb_driver_EJDB.h +++ b/jejdb/src/cpp/org_ejdb_driver_EJDB.h @@ -22,7 +22,8 @@ extern "C" { #undef org_ejdb_driver_EJDB_JBOTSYNC #define org_ejdb_driver_EJDB_JBOTSYNC 64L #undef org_ejdb_driver_EJDB_JBO_DEFAULT -#define org_ejdb_driver_EJDB_JBO_DEFAULT 70L +#define org_ejdb_driver_EJDB_JBO_DEFAULT 6L + /* * Class: org_ejdb_driver_EJDB * Method: open @@ -63,6 +64,14 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDB_sync JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDB_updateMeta (JNIEnv *, jobject); +/* + * Class: org_ejdb_driver_EJDB + * Method: executeCommand + * Signature: (Lorg/ejdb/bson/BSONObject;)Lorg/ejdb/bson/BSONObject; + */ +JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDB_executeCommand + (JNIEnv *, jobject, jobject); + #ifdef __cplusplus } #endif diff --git a/jejdb/src/java/org/ejdb/driver/EJDB.java b/jejdb/src/java/org/ejdb/driver/EJDB.java index 4b300a0..8acb810 100644 --- a/jejdb/src/java/org/ejdb/driver/EJDB.java +++ b/jejdb/src/java/org/ejdb/driver/EJDB.java @@ -1,5 +1,7 @@ package org.ejdb.driver; +import org.ejdb.bson.BSONObject; + import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -221,6 +223,44 @@ public class EJDB { } /** + * Executes ejdb database command. + * + * Supported commands: + * 1) Exports database collections data. See ejdbexport() method. + * "export" : { + * "path" : string, //Exports database collections data + * "cnames" : [string array]|null, //List of collection names to export + * "mode" : int|null //Values: null|`JBJSONEXPORT` See ejdb.h#ejdbexport() method + * } + * + * Command response: + * { + * "log" : string, //Diagnostic log about executing this command + * "error" : string|null, //ejdb error message + * "errorCode" : int|0, //ejdb error code + * } + * + * 2) Imports previously exported collections data into ejdb. + * "import" : { + * "path" : string //The directory path in which data resides + * "cnames" : [string array]|null, //List of collection names to import + * "mode" : int|null //Values: null| JBIMPORTUPDATE`|`JBIMPORTREPLACE` See ejdb.h#ejdbimport() method + * } + * + * Command response: + * { + * "log" : string, //Diagnostic log about executing this command + * "error" : string|null, //ejdb error message + * "errorCode" : int|0, //ejdb error code + * } + * + * @param command Command BSON object + * @return command response BSON object + * @throws EJDBException + */ + public native BSONObject executeCommand(BSONObject command) throws EJDBException; + + /** * Returns names of existed collections */ public Collection getCollectionNames() { diff --git a/jejdb/src/test/org/ejdb/driver/test/EJDBTest.java b/jejdb/src/test/org/ejdb/driver/test/EJDBTest.java index ee7dfe2..51e0cfc 100644 --- a/jejdb/src/test/org/ejdb/driver/test/EJDBTest.java +++ b/jejdb/src/test/org/ejdb/driver/test/EJDBTest.java @@ -2,6 +2,7 @@ package org.ejdb.driver.test; import junit.framework.TestCase; +import org.ejdb.bson.BSON; import org.ejdb.bson.BSONObject; import org.ejdb.bson.types.ObjectId; import org.ejdb.driver.EJDB; @@ -233,4 +234,15 @@ public class EJDBTest extends TestCase { assertEquals(bar2.getId(), boid); assertEquals(bar2, bar); } + + public void testCommand() throws Exception { + assertTrue(db.isOpen()); + + BSONObject cmd = new BSONObject("ping", new BSONObject()); + + BSONObject cmdret = db.executeCommand(cmd); + + assertNotNull(cmdret); + assertEquals(cmdret.get("log"), "pong"); + } }