Additional fixes for PG::Result#values and #column_values.

ged · ged · commit 490bbb55e56a · 2012-08-10T14:30:11.000-07:00
- Revert the row-building loop of Result#values to use the heap, too.
- Use the heap for building #column_values, too.

Props to Lars Kanis for figuring out the problem.

Refs #135, #136, #138.
diff --git a/ext/pg_result.c b/ext/pg_result.c
@@ -729,12 +729,12 @@ pgresult_values(VALUE self)
 	VALUE ary = rb_ary_new2(num_rows);
 
 	for ( row = 0; row < num_rows; row++ ) {
-		VALUE new_row[ num_fields ];
+		VALUE new_row = rb_ary_new2(num_fields);
 
 		/* populate the row */
 		for ( field = 0; field < num_fields; field++ ) {
 			if ( PQgetisnull(result, row, field) ) {
-				new_row[ field ] = Qnil;
+				rb_ary_store( new_row, field, Qnil );
 			}
 			else {
 				VALUE val = rb_tainted_str_new( PQgetvalue(result, row, field), 
@@ -748,11 +748,11 @@ pgresult_values(VALUE self)
 					rb_enc_associate( val, rb_ascii8bit_encoding() );
 				}
 #endif
-				new_row[ field ] = val;
+				rb_ary_store( new_row, field, val );
 			}
 		}
 
-		rb_ary_store( ary, row, rb_ary_new4(num_fields, new_row) );
+		rb_ary_store( ary, row, new_row );
 	}
 
 	return ary;
@@ -770,7 +770,7 @@ make_column_result_array( VALUE self, int col )
 	int rows = PQntuples( result );
 	int i;
 	VALUE val = Qnil;
-	VALUE results[ rows ];
+	VALUE results = rb_ary_new2( rows );
 
 	if ( col >= PQnfields(result) )
 		rb_raise( rb_eIndexError, "no column %d in result", col );
@@ -788,10 +788,10 @@ make_column_result_array( VALUE self, int col )
 		}
 #endif
 
-		results[ i ] = val;
+		rb_ary_store( results, i, val );
 	}
 
-	return rb_ary_new4( rows, results );
+	return results;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -729,12 +729,12 @@ pgresult_values(VALUE self)`
`729`	`729`	`VALUE ary = rb_ary_new2(num_rows);`
`730`	`730`
`731`	`731`	`for ( row = 0; row < num_rows; row++ ) {`
`732`		`- VALUE new_row[ num_fields ];`
	`732`	`+ VALUE new_row = rb_ary_new2(num_fields);`
`733`	`733`
`734`	`734`	`/* populate the row */`
`735`	`735`	`for ( field = 0; field < num_fields; field++ ) {`
`736`	`736`	`if ( PQgetisnull(result, row, field) ) {`
`737`		`- new_row[ field ] = Qnil;`
	`737`	`+ rb_ary_store( new_row, field, Qnil );`
`738`	`738`	`}`
`739`	`739`	`else {`
`740`	`740`	`VALUE val = rb_tainted_str_new( PQgetvalue(result, row, field),`
`@@ -748,11 +748,11 @@ pgresult_values(VALUE self)`
`748`	`748`	`rb_enc_associate( val, rb_ascii8bit_encoding() );`
`749`	`749`	`}`
`750`	`750`	`#endif`
`751`		`- new_row[ field ] = val;`
	`751`	`+ rb_ary_store( new_row, fi 8000 eld, val );`
`752`	`752`	`}`
`753`	`753`	`}`
`754`	`754`
`755`		`- rb_ary_store( ary, row, rb_ary_new4(num_fields, new_row) );`
	`755`	`+ rb_ary_store( ary, row, new_row );`
`756`	`756`	`}`
`757`	`757`
`758`	`758`	`return ary;`
`@@ -770,7 +770,7 @@ make_column_result_array( VALUE self, int col )`
`770`	`770`	`int rows = PQntuples( result );`
`771`	`771`	`int i;`
`772`	`772`	`VALUE val = Qnil;`
`773`		`- VALUE results[ rows ];`
	`773`	`+ VALUE results = rb_ary_new2( rows );`
`774`	`774`
`775`	`775`	`if ( col >= PQnfields(result) )`
`776`	`776`	`rb_raise( rb_eIndexError, "no column %d in result", col );`
`@@ -788,10 +788,10 @@ make_column_result_array( VALUE self, int col )`
`788`	`788`	`}`
`789`	`789`	`#endif`
`790`	`790`
`791`		`- results[ i ] = val;`
	`791`	`+ rb_ary_store( results, i, val );`
`792`	`792`	`}`
`793`	`793`
`794`		`- return rb_ary_new4( rows, results );`
	`794`	`+ return results;`
`795`	`795`	`}`
`796`	`796`
`797`	`797`