small perf tweaks

orlandov · Mar 17, 2010 · eb58de5 · eb58de5
1 parent 05c56d8
commit eb58de5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/sqlite3_bindings.cc b/sqlite3_bindings.cc
@@ -81,8 +81,8 @@ class Sqlite3Db : public EventEmitter {
 
     NODE_SET_PROTOTYPE_METHOD(t, "open", Open);
     NODE_SET_PROTOTYPE_METHOD(t, "close", Close);
-    NODE_SET_PROTOTYPE_METHOD(t, "changes", Changes);
-    NODE_SET_PROTOTYPE_METHOD(t, "lastInsertRowid", LastInsertRowid);
+//     NODE_SET_PROTOTYPE_METHOD(t, "changes", Changes);
+//     NODE_SET_PROTOTYPE_METHOD(t, "lastInsertRowid", LastInsertRowid);
     NODE_SET_PROTOTYPE_METHOD(t, "prepare", Prepare);
 
     target->Set(v8::String::NewSymbol("Database"), t->GetFunction());
@@ -420,10 +420,10 @@ class Sqlite3Db : public EventEmitter {
       t->InstanceTemplate()->SetInternalFieldCount(1);
 
       NODE_SET_PROTOTYPE_METHOD(t, "bind", Bind);
-      NODE_SET_PROTOTYPE_METHOD(t, "clearBindings", ClearBindings);
+//       NODE_SET_PROTOTYPE_METHOD(t, "clearBindings", ClearBindings);
       NODE_SET_PROTOTYPE_METHOD(t, "finalize", Finalize);
-      NODE_SET_PROTOTYPE_METHOD(t, "bindParameterCount", BindParameterCount);
-      NODE_SET_PROTOTYPE_METHOD(t, "reset", Reset);
+//       NODE_SET_PROTOTYPE_METHOD(t, "bindParameterCount", BindParameterCount);
+//       NODE_SET_PROTOTYPE_METHOD(t, "reset", Reset);
       NODE_SET_PROTOTYPE_METHOD(t, "step", Step);
 
       //target->Set(v8::String::NewSymbol("SQLStatement"), t->GetFunction());
@@ -434,14 +434,14 @@ class Sqlite3Db : public EventEmitter {
       int I = 0;
       REQ_EXT_ARG(0, stmt);
       (new Statement((sqlite3_stmt*)stmt->Value()))->Wrap(args.This());
+
       return args.This();
     }
 
   protected:
     Statement(sqlite3_stmt* stmt) : stmt_(stmt) {}
 
-    ~Statement() { if (stmt_) sqlite3_finalize(stmt_); }
-
+    ~Statement() { if (stmt_) { sqlite3_finalize(stmt_); } } 
     sqlite3_stmt* stmt_;
 
     operator sqlite3_stmt* () const { return stmt_; }
@@ -804,9 +804,12 @@ class Sqlite3Db : public EventEmitter {
       }
 
       step_req->cb.Dispose();
-      free(step_req->column_data);
-      free(step_req->column_types);
-      free(step_req->column_names);
+
+      if (step_req->column_count) {
+        free(step_req->column_data);
+        free(step_req->column_types);
+        free(step_req->column_names);
+      }
 
       free(step_req);
 
@@ -823,13 +826,14 @@ class Sqlite3Db : public EventEmitter {
 
       if (rc == SQLITE_ROW) {
         // would be nice to cache the column names and type data somewhere
-        step_req->column_count = sqlite3_column_count(stmt);
-        step_req->column_types =
-          (int *) calloc(step_req->column_count, sizeof(int));
-        step_req->column_data =
-          (void **) calloc(step_req->column_count, sizeof(void *));
-        step_req->column_names =
-          (char **) calloc(step_req->column_count, sizeof(char *));
+        if (step_req->column_count = sqlite3_column_count(stmt)) {
+          step_req->column_types =
+            (int *) calloc(step_req->column_count, sizeof(int));
+          step_req->column_data =
+            (void **) calloc(step_req->column_count, sizeof(void *));
+          step_req->column_names =
+            (char **) calloc(step_req->column_count, sizeof(char *));
+        }
 
         for (int i = 0; i < step_req->column_count; i++) {
           int type = step_req->column_types[i] = sqlite3_column_type(stmt, i);

diff --git a/test3.js b/test3.js
@@ -28,7 +28,7 @@ function writeTest(db, callback) {
 
   function innerFunction () {
     db.query("INSERT INTO t1 VALUES (1)", function (row) {
-      if (!i-- && !row) {
+      if (!i--) {
         // end of results
         var dt = ((new Date)-t0)/1000;
         puts("**** " + count + " insertions in " + dt + "s (" + (count/dt) + "/s)");