[open-ils-commits] r12302 - trunk/Open-ILS/src/c-apps (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2009-02-25 15:48:15 -0500 (Wed, 25 Feb 2009)
New Revision: 12302

Modified:
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
In SELECT(): Use a more efficient algorithm for keeping track
of the "aggregate" tag.  Instead of making an extra pass using
jsonObjectFindPath(), look for the tag as we examine each
field in the SELECT list.  Build a GROUP BY list every time,
but only use it later if "aggregate" was found (or if the
DISTINCT flag is set).


Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2009-02-25 18:13:25 UTC (rev 12301)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2009-02-25 20:48:15 UTC (rev 12302)
@@ -2584,6 +2584,8 @@
 	growing_buffer* group_buf = buffer_init(128);
 	growing_buffer* having_buf = buffer_init(128);
 
+	int aggregate_found = 0;     // boolean
+
 	// Build a select list
 	if(from_function)   // From a function we select everything
 		OSRF_BUFFER_ADD_CHAR( select_buf, '*' );
@@ -2608,7 +2610,7 @@
 
 		// Now build the actual select list
 	    int sel_pos = 1;
-	    jsonObject* is_agg = jsonObjectFindPath(selhash, "//aggregate");
+	    //jsonObject* is_agg = jsonObjectFindPath(selhash, "//aggregate");
 	    first = 1;
 	    gfirst = 1;
 	    jsonIterator* selclass_itr = jsonNewIterator( selhash );
@@ -2634,12 +2636,13 @@
 						"Selected class is not defined"
 					);
 				jsonIteratorFree( selclass_itr );
-				jsonObjectFree( is_agg );
+				//jsonObjectFree( is_agg );
 				buffer_free( sql_buf );
 				buffer_free( select_buf );
 				buffer_free( order_buf );
 				buffer_free( group_buf );
 				buffer_free( having_buf );
+				if( defaultselhash ) jsonObjectFree( defaultselhash );
 				free( core_class );
 				return NULL;
 			}
@@ -2699,12 +2702,13 @@
 						"Selected class not in FROM clause in JSON query"
 					);
 				jsonIteratorFree( selclass_itr );
-				jsonObjectFree( is_agg );
+				//jsonObjectFree( is_agg );
 				buffer_free( sql_buf );
 				buffer_free( select_buf );
 				buffer_free( order_buf );
 				buffer_free( group_buf );
 				buffer_free( having_buf );
+				if( defaultselhash ) jsonObjectFree( defaultselhash );
 				free( core_class );
 				return NULL;
 			}
@@ -2751,12 +2755,13 @@
 							);
 						jsonIteratorFree( select_itr );
 						jsonIteratorFree( selclass_itr );
-						jsonObjectFree( is_agg );
+						//jsonObjectFree( is_agg );
 						buffer_free( sql_buf );
 						buffer_free( select_buf );
 						buffer_free( order_buf );
 						buffer_free( group_buf );
 						buffer_free( having_buf );
+						if( defaultselhash ) jsonObjectFree( defaultselhash );
 						free( core_class );
 						return NULL;
 					}
@@ -2805,12 +2810,13 @@
 							);
 						jsonIteratorFree( select_itr );
 						jsonIteratorFree( selclass_itr );
-						jsonObjectFree( is_agg );
+						//jsonObjectFree( is_agg );
 						buffer_free( sql_buf );
 						buffer_free( select_buf );
 						buffer_free( order_buf );
 						buffer_free( group_buf );
 						buffer_free( having_buf );
+						if( defaultselhash ) jsonObjectFree( defaultselhash );
 						free( core_class );
 						return NULL;
 					}
@@ -2869,16 +2875,33 @@
 						);
 					jsonIteratorFree( select_itr );
 					jsonIteratorFree( selclass_itr );
-					jsonObjectFree( is_agg );
+					//jsonObjectFree( is_agg );
 					buffer_free( sql_buf );
 					buffer_free( select_buf );
 					buffer_free( order_buf );
 					buffer_free( group_buf );
 					buffer_free( having_buf );
+					if( defaultselhash ) jsonObjectFree( defaultselhash );
 					free( core_class );
 					return NULL;
 				}
 
+				const jsonObject* agg_obj = jsonObjectGetKey( selfield, "aggregate" );
+				if( agg_obj )
+					aggregate_found = 1;
+
+				if( ( ! agg_obj ) || ( ! obj_is_true( agg_obj ) ) ) {
+					// Append a comma (except for the first one)
+					// and add the column to a GROUP BY clause
+					if (gfirst)
+						gfirst = 0;
+					else
+						OSRF_BUFFER_ADD_CHAR( group_buf, ',' );
+
+					buffer_fadd(group_buf, " %d", sel_pos);
+				}
+
+#if 0
 			    if (is_agg->size || (flags & SELECT_DISTINCT)) {
 
 					const jsonObject* aggregate_obj = jsonObjectGetKey( selfield, "aggregate" );
@@ -2890,6 +2913,7 @@
 					    }
 
 					    buffer_fadd(group_buf, " %d", sel_pos);
+
 					/*
 				    } else if (is_agg = jsonObjectGetKey( selfield, "having" )) {
 					    if (gfirst) {
@@ -2905,6 +2929,7 @@
 					*/
 				    }
 			    }
+#endif
 
 			    sel_pos++;
 		    } // end while -- iterating across SELECT columns
@@ -2914,7 +2939,7 @@
 
         jsonIteratorFree(selclass_itr);
 
-	    if (is_agg) jsonObjectFree(is_agg);
+	    //if (is_agg) jsonObjectFree(is_agg);
     }
 
 
@@ -3155,7 +3180,7 @@
 
 	string = buffer_release(group_buf);
 
-	if ( *string ) {
+	if ( *string && ( aggregate_found || (flags & SELECT_DISTINCT) ) ) {
 		OSRF_BUFFER_ADD( sql_buf, " GROUP BY " );
 		OSRF_BUFFER_ADD( sql_buf, string );
 	}