Mercurial > forge

diff main/database/src/converters_arr_comp.cc @ 11480:d14a23884d9c octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cache map lookups of converters for composite type elements.
author i7tiol
date Mon, 25 Feb 2013 18:52:54 +0000
parents 4fd39d36eff5
children eb48ca3b21a1
line wrap: on
line diff
--- a/main/database/src/converters_arr_comp.cc	Mon Feb 25 16:50:26 2013 +0000
+++ b/main/database/src/converters_arr_comp.cc	Mon Feb 25 18:52:54 2013 +0000
@@ -233,7 +233,9 @@
           oct_pq_conv_t *el_conv;
           oct_type_t oct_type;
 
-          if (! (el_conv = pgtype_from_spec (conv->el_oids[i], oct_type)))
+          if (! (el_conv = pgtype_from_spec (conv->el_oids[i],
+                                             conv->conv_cache[i],
+                                             oct_type)))
             return 1;
 
           switch (oct_type)
@@ -343,7 +345,7 @@
 
           if (conv->is_composite)
             {
-              if (to_octave_bin_composite (p, ov_el, nb_el))
+              if (to_octave_bin_composite (p, ov_el, nb_el, conv))
                 return 1;
             }
           else
@@ -368,7 +370,8 @@
   return 0;
 }
 
-int command::to_octave_bin_composite (char *v, octave_value &ov, int nb)
+int command::to_octave_bin_composite (char *v, octave_value &ov, int nb,
+                                      oct_pq_conv_t *conv)
 {
   char *p = v;
 
@@ -394,7 +397,8 @@
           oct_pq_conv_t *el_conv;
           oct_type_t oct_type;
 
-          if (! (el_conv = pgtype_from_spec (oid, oct_type)))
+          if (! (el_conv = pgtype_from_spec (oid, conv->conv_cache[i],
+                                             oct_type)))
             return 1;
 
           octave_value el;
@@ -411,7 +415,7 @@
               break;
 
             case composite:
-              if (to_octave_bin_composite (p, el, nb_el))
+              if (to_octave_bin_composite (p, el, nb_el, el_conv))
                 return 1;
               break;
 
@@ -444,7 +448,8 @@
   return 0;
 }
 
-int command::to_octave_str_composite (char *v, octave_value &ov, int nb)
+int command::to_octave_str_composite (char *v, octave_value &ov, int nb,
+                                      oct_pq_conv_t *conv)
 {
   // not implemented
   error ("not implemented");