From: yudanov <fedwiz@academ.org>
Date: Fri, 19 Jul 2013 13:29:25 +0000 (+0700)
Subject: #50 - memory tuning
X-Git-Tag: v1.2.12~253
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b34bd64e369a8f0b03becf402937337cba2c75dc;p=platform%2Fupstream%2Fejdb.git

#50 - memory tuning
---

diff --git a/rbejdb/src/rbbson.c b/rbejdb/src/rbbson.c
index 65fe8e6..3945c7c 100644
--- a/rbejdb/src/rbbson.c
+++ b/rbejdb/src/rbbson.c
@@ -23,6 +23,7 @@
 
 typedef struct {
     bson* bsonval;
+    int owns_bsonval;
 
     VALUE obj;
     int arrayIndex;
@@ -71,6 +72,9 @@ void rbbson_context_mark(RBBSON_CONTEXT* rbbsctx) {
 }
 
 void rbbson_context_free(RBBSON_CONTEXT* rbbsctx) {
+    if (rbbsctx->bsonval && rbbsctx->owns_bsonval) {
+        bson_del(rbbsctx->bsonval);
+    }
     ruby_xfree(rbbsctx);
 }
 
@@ -79,8 +83,11 @@ void rbbson_free(RBBSON* rbbson) {
 }
 
 
-VALUE createBsonContextWrap(bson* bsonval, VALUE rbobj, VALUE traverse, int flags) {
+VALUE createBsonContextWrap(bson* bsonval, int owns_bsonval, VALUE rbobj, VALUE traverse, int flags) {
     if (NIL_P(bsonContextClass)) {
+        if (owns_bsonval) {
+            bson_del(bsonval);
+        }
         rb_raise(rb_eRuntimeError, "Ruby to BSON library must be initialized");
     }
     VALUE bsonContextWrap = Data_Wrap_Struct(bsonContextClass, rbbson_context_mark, rbbson_context_free, ruby_xmalloc(sizeof(RBBSON_CONTEXT)));
@@ -88,6 +95,7 @@ VALUE createBsonContextWrap(bson* bsonval, VALUE rbobj, VALUE traverse, int flag
     RBBSON_CONTEXT* rbbsctx;
     Data_Get_Struct(bsonContextWrap, RBBSON_CONTEXT, rbbsctx);
     rbbsctx->bsonval = bsonval;
+    rbbsctx->owns_bsonval = owns_bsonval;
     rbbsctx->obj = rbobj;
     rbbsctx->arrayIndex = 0;
     rbbsctx->flags= flags;
@@ -158,7 +166,7 @@ int iterate_key_values_callback(VALUE key, VALUE val, VALUE bsonContextWrap) {
         case T_ARRAY:
             add_ruby_to_traverse(val, rbbsctx->traverse_hash);
             bson_append_start_array(b, attrName);
-            rb_iterate(rb_each, val, iterate_array_callback, createBsonContextWrap(b, rbbsctx->obj, rbbsctx->traverse_hash, rbbsctx->flags));
+            rb_iterate(rb_each, val, iterate_array_callback, createBsonContextWrap(b, 0, rbbsctx->obj, rbbsctx->traverse_hash, rbbsctx->flags));
             bson_append_finish_array(b);
             break;
         case T_STRING:
@@ -256,18 +264,21 @@ void ruby_hash_to_bson_internal(VALUE rbhash, VALUE bsonContextWrap) {
 
 
 void ruby_to_bson_internal(VALUE rbobj, bson** bsonresp, VALUE traverse, int flags) {
-    VALUE bsonContextWrap = createBsonContextWrap(bson_create(), rbobj, traverse, flags);
-    RBBSON_CONTEXT* rbbsctx;
-    Data_Get_Struct(bsonContextWrap, RBBSON_CONTEXT, rbbsctx);
 
-    add_ruby_to_traverse(rbobj, rbbsctx->traverse_hash);
+    bson* bsonval = bson_create();
 
     if (flags & RUBY_TO_BSON_AS_QUERY) {
-        bson_init_as_query(rbbsctx->bsonval);
+        bson_init_as_query(bsonval);
     } else {
-        bson_init(rbbsctx->bsonval);
+        bson_init(bsonval);
     }
 
+    VALUE bsonContextWrap = createBsonContextWrap(bsonval, 1, rbobj, traverse, flags);
+    RBBSON_CONTEXT* rbbsctx;
+    Data_Get_Struct(bsonContextWrap, RBBSON_CONTEXT, rbbsctx);
+
+    add_ruby_to_traverse(rbobj, rbbsctx->traverse_hash);
+
     switch (TYPE(rbobj)) {
         case T_OBJECT:
         case T_DATA:
@@ -284,7 +295,8 @@ void ruby_to_bson_internal(VALUE rbobj, bson** bsonresp, VALUE traverse, int fla
 
     bson_finish(rbbsctx->bsonval);
 
-    *bsonresp = rbbsctx->bsonval;
+    *bsonresp = bson_create();
+    bson_copy(*bsonresp, rbbsctx->bsonval);
 }
 
 void ruby_to_bson(VALUE rbobj, bson** bsonresp, int flags) {
diff --git a/rbejdb/src/rbejdb.c b/rbejdb/src/rbejdb.c
index d0be216..be45b14 100644
--- a/rbejdb/src/rbejdb.c
+++ b/rbejdb/src/rbejdb.c
@@ -482,6 +482,9 @@ VALUE EJDB_find_internal(VALUE self, VALUE collName, VALUE queryWrap, VALUE q, V
     }
 
     EJQ *ejq = ejdbcreatequery(ejdb, rbquery->qbson, rbquery->orarrbson, NUM2INT(orarrlng), rbquery->hintsbson);
+    if (!ejq) {
+        raise_ejdb_error(ejdb);
+    }
 
     uint32_t count;
     int qflags = onlycount ? EJQONLYCOUNT : 0;
@@ -489,6 +492,8 @@ VALUE EJDB_find_internal(VALUE self, VALUE collName, VALUE queryWrap, VALUE q, V
 
     TCLIST* qres = ejdbqryexecute(coll, ejq, &count, qflags, log);
 
+    ejdbquerydel(ejq);
+
     return !onlycount || explain ? create_EJDB_query_results(qres, count, log) : UINT2NUM(count);
 }