#21

diff --git a/jejdb/src/cpp/jejdb.c b/jejdb/src/cpp/jejdb.c
index 1cc1a2a..379109f 100755 (executable)
--- a/jejdb/src/cpp/jejdb.c
+++ b/jejdb/src/cpp/jejdb.c
@@ -59,6 +59,31 @@ static jstring get_coll_name(JNIEnv *env, jobject obj) {
        return NULL;
 };
 
+static void fill_ejdb_collopts(JNIEnv *env, jobject obj, EJCOLLOPTS *ejcopts) {
+       memset(ejcopts, 0, sizeof (*ejcopts));
+
+       if (NULL == obj) {
+               return;
+       }
+
+       jclass clazz = (*env)->GetObjectClass(env, obj);
+
+       jfieldID recordsFID = (*env)->GetFieldID(env, clazz, "records", "J");
+       jfieldID cachedrecordsFID = (*env)->GetFieldID(env, clazz, "cachedrecords", "I");
+       jfieldID largeFID = (*env)->GetFieldID(env, clazz, "large", "Z");
+       jfieldID compressedFID = (*env)->GetFieldID(env, clazz, "compressed", "Z");
+
+       jlong records = (*env)->GetLongField(env, obj, recordsFID);
+       jint cachedrecords = (*env)->GetIntField(env, obj, cachedrecordsFID);
+       jboolean large = (*env)->GetBooleanField(env, obj, largeFID);
+       jboolean compressed = (*env)->GetBooleanField(env, obj, compressedFID);
+
+       ejcopts->records = records > 0 ? records : 0;
+       ejcopts->cachedrecords = cachedrecords > 0 ? cachedrecords : 0;
+       ejcopts->large = (JNI_TRUE == large);
+       ejcopts->compressed = (JNI_TRUE == compressed);
+};
+
 static bson *encode_bson(JNIEnv *env, jobject jbson, bson *out) {
        jclass jBSONClazz = (*env)->FindClass(env, "org/bson/BSON");
        jmethodID encodeMethodID = (*env)->GetStaticMethodID(env, jBSONClazz, "encode", "(Lorg/bson/BSONObject;)[B");
@@ -182,7 +207,7 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDB_syncDB (JNIEnv *env, jobject ob
 /*
 * Class:     org_ejdb_driver_EJDBCollection
 * Method:    ensureDB
-* Signature: (Ljava/lang/Object;)V
+* Signature: (Lorg/ejdb/driver/EJDBCollection$Options;)V
 */
 JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_ensureDB (JNIEnv *env, jobject obj, jobject opts) {
        EJDB* db = get_ejdb_from_object(env, obj);
@@ -193,12 +218,11 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_ensureDB (JNIEnv *env
 
        jstring colname = get_coll_name(env, obj);
 
-       EJCOLLOPTS jcopts;
-       memset(&jcopts, 0, sizeof (jcopts));
-       // todo: open options
+       EJCOLLOPTS ejcopts;
+       fill_ejdb_collopts(env, opts, &ejcopts);
 
        const char *cname = (*env)->GetStringUTFChars(env, colname, NULL);
-       EJCOLL *coll = ejdbcreatecoll(db, cname, &jcopts);
+       EJCOLL *coll = ejdbcreatecoll(db, cname, &ejcopts);
        (*env)->ReleaseStringUTFChars(env, colname, cname);
 
        if (!coll) {
@@ -261,11 +285,11 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_syncDB (JNIEnv *env,
 };
 
 /*
-* Class:     org_ejdb_driver_EJDBCollection
-* Method:    loadDB
-* Signature: ([B)Ljava/lang/Object;
-*/
-JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_loadDB (JNIEnv *env, jobject obj, jbyteArray oidArray) {
+ * Class:     org_ejdb_driver_EJDBCollection
+ * Method:    loadDB
+ * Signature: (Lorg/bson/types/ObjectId;)Lorg/bson/BSONObject;
+ */
+JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_loadDB (JNIEnv *env, jobject obj, jobject joid) {
        EJDB* db = get_ejdb_from_object(env, obj);              
        if (!ejdbisopen(db)) {
                set_error(env, 0, "EJDB not opened");
@@ -282,9 +306,13 @@ JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_loadDB (JNIEnv *en
                return NULL;
        }
 
-       bson_oid_t *oid = (void*)(*env)->GetByteArrayElements(env, oidArray, NULL);
+       jclass jObjectIdClazz = (*env)->FindClass(env, "org/bson/types/ObjectId");
+       jmethodID encodeMethodID = (*env)->GetMethodID(env, jObjectIdClazz, "toByteArray", "()[B");
+       jbyteArray joiddata = (*env)->CallObjectMethod(env, joid, encodeMethodID);
+       bson_oid_t *oid = (bson_oid_t*)(*env)->GetByteArrayElements(env, joiddata, NULL);
        bson* bson = ejdbloadbson(coll, oid);
-       (*env)->ReleaseByteArrayElements(env, oidArray, (jbyte*)oid, 0);
+       (*env)->ReleaseByteArrayElements(env, joiddata, (jbyte*)oid, 0);
+       (*env)->DeleteLocalRef(env, joiddata);
 
        if (!bson) {
                return NULL;
@@ -297,11 +325,11 @@ JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_loadDB (JNIEnv *en
 }
 
 /*
-* Class:     org_ejdb_driver_EJDBCollection
-* Method:    saveDB
-* Signature: ([B)Ljava/lang/Object;
-*/
-JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_saveDB (JNIEnv *env, jobject obj, jbyteArray objdata) {
+ * Class:     org_ejdb_driver_EJDBCollection
+ * Method:    saveDB
+ * Signature: (Lorg/bson/BSONObject;)Lorg/bson/types/ObjectId;
+ */
+JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_saveDB (JNIEnv *env, jobject obj, jobject jdata) {
        EJDB* db = get_ejdb_from_object(env, obj);
        if (!ejdbisopen(db)) {
                set_error(env, 0, "EJDB not opened");
@@ -322,12 +350,9 @@ JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_saveDB (JNIEnv *en
 
        bson_oid_t oid;
 
-       jbyte *bdata = (*env)->GetByteArrayElements(env, objdata, NULL);
-       jsize blength = (*env)->GetArrayLength(env, objdata);
-       bson *bson = bson_create_from_buffer(bdata, blength);
+       bson *bson = encode_bson(env, jdata, NULL);
        bool status = ejdbsavebson(coll, bson, &oid);
        bson_del(bson);
-       (*env)->ReleaseByteArrayElements(env, objdata, bdata, 0);
 
        if (!status) {
                set_ejdb_error(env, db);
@@ -347,11 +372,11 @@ JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_saveDB (JNIEnv *en
 }
 
 /*
-* Class:     org_ejdb_driver_EJDBCollection
-* Method:    removeDB
-* Signature: ([B)V
-*/
-JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_removeDB (JNIEnv *env, jobject obj, jbyteArray oidArray) {
+ * Class:     org_ejdb_driver_EJDBCollection
+ * Method:    removeDB
+ * Signature: (Lorg/bson/types/ObjectId;)V
+ */
+JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_removeDB (JNIEnv *env, jobject obj, jobject joid) {
        EJDB* db = get_ejdb_from_object(env, obj);
        if (!ejdbisopen(db)) {
                set_error(env, 0, "EJDB not opened");
@@ -367,10 +392,13 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_removeDB (JNIEnv *env
                return;
        }
 
-       // TODO:
-       bson_oid_t *oid = (void*)(*env)->GetByteArrayElements(env, oidArray, NULL);
+       jclass jObjectIdClazz = (*env)->FindClass(env, "org/bson/types/ObjectId");
+       jmethodID encodeMethodID = (*env)->GetMethodID(env, jObjectIdClazz, "toByteArray", "()[B");
+       jbyteArray joiddata = (*env)->CallObjectMethod(env, joid, encodeMethodID);
+       bson_oid_t *oid = (bson_oid_t*)(*env)->GetByteArrayElements(env, joiddata, NULL);
        bool status = ejdbrmbson(coll, oid);
-       (*env)->ReleaseByteArrayElements(env, oidArray, (jbyte*)oid, 0);
+       (*env)->ReleaseByteArrayElements(env, joiddata, (jbyte*)oid, 0);
+       (*env)->DeleteLocalRef(env, joiddata);
 
        if (!status) {
                set_ejdb_error(env, db);

diff --git a/jejdb/src/cpp/org_ejdb_driver_EJDBCollection.h b/jejdb/src/cpp/org_ejdb_driver_EJDBCollection.h
old mode 100644 (file)
new mode 100755 (executable)
index 940593b..0ee6a34
--- a/jejdb/src/cpp/org_ejdb_driver_EJDBCollection.h
+++ b/jejdb/src/cpp/org_ejdb_driver_EJDBCollection.h
@@ -26,7 +26,7 @@ extern "C" {
 /*
  * Class:     org_ejdb_driver_EJDBCollection
  * Method:    ensureDB
- * Signature: (Ljava/lang/Object;)V
+ * Signature: (Lorg/ejdb/driver/EJDBCollection/Options;)V
  */
 JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_ensureDB
   (JNIEnv *, jobject, jobject);
@@ -50,26 +50,26 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_syncDB
 /*
  * Class:     org_ejdb_driver_EJDBCollection
  * Method:    loadDB
- * Signature: ([B)Ljava/lang/Object;
+ * Signature: (Lorg/bson/types/ObjectId;)Lorg/bson/BSONObject;
  */
 JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_loadDB
-  (JNIEnv *, jobject, jbyteArray);
+  (JNIEnv *, jobject, jobject);
 
 /*
  * Class:     org_ejdb_driver_EJDBCollection
  * Method:    saveDB
- * Signature: ([B)Ljava/lang/Object;
+ * Signature: (Lorg/bson/BSONObject;)Lorg/bson/types/ObjectId;
  */
 JNIEXPORT jobject JNICALL Java_org_ejdb_driver_EJDBCollection_saveDB
-  (JNIEnv *, jobject, jbyteArray);
+  (JNIEnv *, jobject, jobject);
 
 /*
  * Class:     org_ejdb_driver_EJDBCollection
  * Method:    removeDB
- * Signature: ([B)V
+ * Signature: (Lorg/bson/types/ObjectId;)V
  */
 JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_removeDB
-  (JNIEnv *, jobject, jbyteArray);
+  (JNIEnv *, jobject, jobject);
 
 /*
  * Class:     org_ejdb_driver_EJDBCollection
@@ -79,6 +79,14 @@ JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_removeDB
 JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_setIndexDB
   (JNIEnv *, jobject, jstring, jint);
 
+/*
+ * Class:     org_ejdb_driver_EJDBCollection
+ * Method:    txControlDB
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_ejdb_driver_EJDBCollection_txControlDB
+  (JNIEnv *, jobject, jint);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/jejdb/src/cpp/org_ejdb_driver_EJDBCollection_Options.h b/jejdb/src/cpp/org_ejdb_driver_EJDBCollection_Options.h
new file mode 100644 (file)
index 0000000..c9114d3
--- /dev/null
+++ b/jejdb/src/cpp/org_ejdb_driver_EJDBCollection_Options.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_ejdb_driver_EJDBCollection_Options */
+
+#ifndef _Included_org_ejdb_driver_EJDBCollection_Options
+#define _Included_org_ejdb_driver_EJDBCollection_Options
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif

diff --git a/jejdb/src/java/org/ejdb/driver/EJDB.java b/jejdb/src/java/org/ejdb/driver/EJDB.java
index 78b5bce..5a8f514 100644 (file)
--- a/jejdb/src/java/org/ejdb/driver/EJDB.java
+++ b/jejdb/src/java/org/ejdb/driver/EJDB.java
@@ -54,7 +54,7 @@ public class EJDB {
         return this.ensureCollection(cname, null);
     }
 
-    public EJDBCollection ensureCollection(String cname, Object opts) {
+    public EJDBCollection ensureCollection(String cname, EJDBCollection.Options opts) {
         if (!this.isOpen()) {
 //            todo
             throw new RuntimeException("Connection does not exists");
@@ -89,8 +89,8 @@ public class EJDB {
         return this.getCollection(cname, ecreate, null);
     }
 
-    public EJDBCollection getCollection(String cname, boolean ecreate, Object opts) {
-        EJDBCollection collection = new EJDBCollection(this/*dbPointer*/, cname);
+    public EJDBCollection getCollection(String cname, boolean ecreate, EJDBCollection.Options opts) {
+        EJDBCollection collection = new EJDBCollection(this, cname);
 
         if (ecreate) {
             collection.ensureExists(opts);

diff --git a/jejdb/src/java/org/ejdb/driver/EJDBCollection.java b/jejdb/src/java/org/ejdb/driver/EJDBCollection.java
index 34e38af..f805c6d 100644 (file)
--- a/jejdb/src/java/org/ejdb/driver/EJDBCollection.java
+++ b/jejdb/src/java/org/ejdb/driver/EJDBCollection.java
@@ -24,7 +24,6 @@ public class EJDBCollection {
     public final static int JBIDXARR = 1 << 6; /**< Array token index. */
     public final static int JBIDXISTR = 1 << 7; /**< Case insensitive string index */
 
-    // todo: get dbPointer from db object
     private EJDB db;
     private String cname;
 
@@ -33,14 +32,13 @@ public class EJDBCollection {
         this.cname = cname;
     }
 
-    // todo: bson object for options
-    protected native void ensureDB(Object opts);
+    protected native void ensureDB(Options opts);
     protected native void dropDB(boolean prune);
     protected native void syncDB();
 
-    protected native Object loadDB(byte[] oid);
-    protected native Object saveDB(byte[] objdata);
-    protected native void removeDB(byte[] objdata);
+    protected native BSONObject loadDB(ObjectId oid);
+    protected native ObjectId saveDB(BSONObject obj);
+    protected native void removeDB(ObjectId oid);
 
     protected native void setIndexDB(String path, int flags);
     protected native void txControlDB(int mode);
@@ -49,7 +47,7 @@ public class EJDBCollection {
         this.ensureExists(null);
     }
 
-    public void ensureExists(Object opts) {
+    public void ensureExists(Options opts) {
         this.ensureDB(opts);
     }
 
@@ -66,11 +64,11 @@ public class EJDBCollection {
     }
 
     public BSONObject load(ObjectId oid) {
-        return (BSONObject) this.loadDB(oid.toByteArray());
+        return this.loadDB(oid);
     }
 
     public ObjectId save(BSONObject object) {
-        return (ObjectId) this.saveDB(BSON.encode(object));
+        return this.saveDB(object);
     }
 
     public List<ObjectId> save(List<BSONObject> objects) {
@@ -84,7 +82,7 @@ public class EJDBCollection {
     }
 
     public void remove(ObjectId oid) {
-        this.removeDB(oid.toByteArray());
+        this.removeDB(oid);
     }
 
     public void setIndex(String path, int flags) {
@@ -94,4 +92,53 @@ public class EJDBCollection {
     public EJDBQuery createQuery(BSONObject query, BSONObject[] qors, BSONObject hints, int flags) {
         return new EJDBQuery(this, query, qors, hints, flags);
     }
+
+    public static class Options {
+        private boolean compressed;
+        private boolean large;
+        private long records;
+        private int cachedrecords;
+
+        public Options() {
+        }
+
+        public Options(boolean compressed, boolean large, long records, int cachedrecords) {
+            this.compressed = compressed;
+            this.large = large;
+            this.records = records;
+            this.cachedrecords = cachedrecords;
+        }
+
+        public boolean isCompressed() {
+            return compressed;
+        }
+
+        public void setCompressed(boolean compressed) {
+            this.compressed = compressed;
+        }
+
+        public boolean isLarge() {
+            return large;
+        }
+
+        public void setLarge(boolean large) {
+            this.large = large;
+        }
+
+        public long getRecords() {
+            return records;
+        }
+
+        public void setRecords(long records) {
+            this.records = records;
+        }
+
+        public int getCachedrecords() {
+            return cachedrecords;
+        }
+
+        public void setCachedrecords(int cachedrecords) {
+            this.cachedrecords = cachedrecords;
+        }
+    }
 }