slim-attributes 0.1 → 0.2

data/README

@@ -13,10 +13,13 @@ Installation
 
 You're going to need the mysql headers for this to work.
 
-cd vendor/plugins/slim_attributes
-ruby extconf.rb --with-mysql-config
-make
-sudo make install
+Try:
+gem install slim-attributes -- --with-mysql-config
+or:
+gem install slim-attributes
+
+then add this to environment.rb:
+require 'slim_attributes'
 
 
 Description
@@ -32,12 +35,6 @@ So this is an alternative implementation of all_hashes that returns a 'fake hash
 
 The field contents are then instantiated into Ruby strings on demand - ruby strings are only made if you need them.  Note that if you always look at all the columns when you fetch data from the database then this won't necessarily be faster that the unpatched mysql adapter.  But it won't be much slower either, and we do expect that most times not all the columns from a result set are accessed.
 
-Note that the 'fake hash' quacks like a hash in many ways, but not all ways.  So @attributes in an ActiveRecord object may not behave as you are expecting it to, and it particularly won't work if you try to add a key to it that is not a column name in the result set.
-
-@attributes["not a column name"] = "something"
-=> RuntimeError: Key was not a column name from the result set
-
-Hash has many methods that are not supported by the fake hash, but I found that the ones I have implemented have been sufficient for use in our Rails app.  It should be fairly easy to implement most of the missing methods if needed, but I did not wish this patch to be larger than necessary.
 
 ===========
 

data/ext/slim_attrib_ext.c

@@ -25,12 +25,12 @@ static VALUE all_hashes(VALUE obj) {
   MYSQL_RES *res = GetMysqlRes(obj);
   MYSQL_FIELD *fields = mysql_fetch_fields(res);
   MYSQL_ROW row;
-  VALUE all_hashes_ary, col_names_hsh, row_ary;
+  VALUE all_hashes_ary, col_names_hsh, frh;
   my_ulonglong nr = mysql_num_rows(res);
   unsigned int nf = mysql_num_fields(res);
-  unsigned int i, j, s;
+  unsigned int i, j, s, len;
   unsigned long *lengths;
-  char *row_space, *row_info_space, **pointers_space;
+  char *row_info_space, **pointers_space, *p;
 
   /* hash of column names */
   col_names_hsh = rb_hash_new();
@@ -40,64 +40,46 @@ static VALUE all_hashes(VALUE obj) {
 
   /* array of result rows */
   all_hashes_ary = rb_ary_new2(nr);
-  for (i=0; i<nr; i++) {
-    VALUE frh;
-    frh = rb_class_new_instance(0, NULL, cRowHash);
-    rb_iv_set(frh, "@field_indexes", col_names_hsh);
+  for (i=0; i < nr; i++) {
     row = mysql_fetch_row(res);         // get the row
-
-    row_ary = rb_ary_new();
-    rb_iv_set(frh, "@row", row_ary);    // ready to hold fetched fields
-
     lengths = mysql_fetch_lengths(res); // get lengths
     for (s=j=0; j < nf; j++) s += lengths[j];  // s = total of lengths
-    row_space = malloc(s);
-    pointers_space = malloc((nf + 1) * sizeof(char *));
+    pointers_space = malloc((nf + 1) * sizeof(char *) + s);  // storage for pointers to data followed by data
+    p = *pointers_space = (char *)(pointers_space + nf + 1);  // pointer to first data item
     row_info_space = calloc(nf, 1);
-    for (s=j=0; j < nf; j++) {
-      int len = lengths[j];
-      char *p = row_space + s;
-      s += len;
-      pointers_space[j] = p;
+    for (j=0; j < nf; j++) {
+      len = (unsigned int)lengths[j];
       if (!row[j]) row_info_space[j] = SLIM_IS_NULL;
       else memcpy(p, row[j], len); // copy row data in
+      pointers_space[j + 1] = p += len;
     }
-    pointers_space[nf] = row_space + s;
+    frh = rb_class_new_instance(0, NULL, cRowHash);
     rb_iv_set(frh, "@pointers", Data_Wrap_Struct(cClass, 0, free, pointers_space));
     rb_iv_set(frh, "@row_info", Data_Wrap_Struct(cClass, 0, free, row_info_space));
-    rb_iv_set(frh, "@raw_row", Data_Wrap_Struct(cClass, 0, free, row_space));  // @raw_row contains pointer to the the row data
+    rb_iv_set(frh, "@field_indexes", col_names_hsh);
+    rb_iv_set(frh, "@row", rb_ary_new());    // ready to hold fetched fields
     rb_ary_store(all_hashes_ary, i, frh);
   }
   return all_hashes_ary;
 }
 
 static VALUE fetch_by_index(VALUE obj, VALUE index) {
-  VALUE row_ary, row_ary_contents, contents, row_info_obj;
-  char *raw_row, *row_info, **pointers, *start;
-  long col_number;
+  VALUE row_ary, contents;
+  char *row_info, **pointers, *start;
+  long col_number = FIX2LONG(index);
   unsigned int length;
   
-  col_number = FIX2LONG(index);
-  row_info_obj = rb_iv_get(obj, "@row_info");
+  row_info = GetCharPtr(rb_iv_get(obj, "@row_info")) + col_number;
+  if (*row_info == SLIM_IS_NULL) return Qnil;  // return nil if null from db
   row_ary = rb_iv_get(obj, "@row");
-  if (NIL_P(row_info_obj)) return rb_ary_entry(row_ary, col_number);  // was marshalled
-  else {
-    row_info = GetCharPtr(row_info_obj);
-    if (row_info[col_number] == SLIM_IS_SET) return rb_ary_entry(row_ary, col_number);  // was set already, return array entry
-  }
-
-  if (row_info[col_number] == SLIM_IS_NULL) {  // return nil if null from db
-    rb_ary_store(row_ary, col_number, Qnil);
-    row_info[col_number] = SLIM_IS_SET;
-    return Qnil;
-  }
+  if (*row_info == SLIM_IS_SET) return rb_ary_entry(row_ary, col_number);  // was set already, return array entry
   
   pointers = GetCharStarPtr(rb_iv_get(obj, "@pointers"));
   start = pointers[col_number];
   length = pointers[col_number + 1] - start;
   contents = rb_tainted_str_new(start, length);
   rb_ary_store(row_ary, col_number, contents);
-  row_info[col_number] = SLIM_IS_SET;
+  *row_info = SLIM_IS_SET;
   return contents;
 }
 
@@ -112,7 +94,6 @@ static VALUE slim_fetch(VALUE obj, VALUE name) {
 
 static VALUE set_element(VALUE obj, VALUE name, VALUE val) {
   VALUE real_hash, hash_lookup;
-  VALUE row_ary, row_info_obj;
   long col_number;
 
   real_hash = rb_iv_get(obj, "@real_hash");
@@ -120,11 +101,9 @@ static VALUE set_element(VALUE obj, VALUE name, VALUE val) {
   
   hash_lookup = rb_hash_aref(rb_iv_get(obj, "@field_indexes"), name);  
   if (NIL_P(hash_lookup)) return rb_funcall(rb_funcall(obj, rb_intern("to_hash"), 0), rb_intern("[]="), 2, name, val);
-  row_ary = rb_iv_get(obj, "@row");
   col_number = FIX2LONG(hash_lookup);
-  rb_ary_store(row_ary, col_number, val);
-  row_info_obj = rb_iv_get(obj, "@row_info");
-  if (!NIL_P(row_info_obj)) GetCharPtr(row_info_obj)[col_number] = SLIM_IS_SET;
+  rb_ary_store(rb_iv_get(obj, "@row"), col_number, val);
+  GetCharPtr(rb_iv_get(obj, "@row_info"))[col_number] = SLIM_IS_SET;
   return val;
 }
 
@@ -135,7 +114,7 @@ void Init_slim_attrib_ext() {
   rb_define_method(c, "all_hashes", (VALUE(*)(ANYARGS))all_hashes, 0);
   cRowHash = rb_const_get_at(c, rb_intern("RowHash"));
   cClass = rb_define_class("CObjects", cRowHash);
-  rb_define_method(cRowHash, "fetch_by_index", (VALUE(*)(ANYARGS))fetch_by_index, 1);
+  rb_define_private_method(cRowHash, "fetch_by_index", (VALUE(*)(ANYARGS))fetch_by_index, 1);
   rb_define_method(cRowHash, "[]", (VALUE(*)(ANYARGS))slim_fetch, 1);
   rb_define_method(cRowHash, "[]=", (VALUE(*)(ANYARGS))set_element, 2);
 }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: slim-attributes
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2008-04-06 00:00:00 +03:00
+  version: "0.2"
+date: 2008-04-09 00:00:00 +03:00
 summary: Slim attributes boosts speed in Rails/Mysql ActiveRecord Models by avoiding instantiating Hashes for each result row, and lazily instantiating attributes as needed
 require_paths: 
 - lib