Update of /cvsroot/monetdb/pathfinder/compiler/sql
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12748/sql
Modified Files:
lalg2sql.brg
Log Message:
-- Align input and output columns of the merge_adjacent_text_nodes operator
in the SQL code generation.
Index: lalg2sql.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/sql/lalg2sql.brg,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- lalg2sql.brg 7 Jan 2010 15:24:28 -0000 1.169
+++ lalg2sql.brg 17 Mar 2010 22:10:27 -0000 1.170
@@ -5338,6 +5338,27 @@
/* copy all existing column, from, and where lists */
copy_cols_from_where (p, R(p));
+ /* align the column names */
+ for (unsigned int i = 0; i < PFarray_last (COLMAP(p)); i++) {
+ PFalg_col_t col;
+ col = (*(sql_column_env_t *) PFarray_at (COLMAP(p), i)).col;
+ if (col == p->sem.merge_adjacent.iter_in) {
+ (*(sql_column_env_t *) PFarray_at (COLMAP(p), i)).col
+ = p->sem.merge_adjacent.iter_res;
+ continue;
+ }
+ if (col == p->sem.merge_adjacent.pos_in) {
+ (*(sql_column_env_t *) PFarray_at (COLMAP(p), i)).col
+ = p->sem.merge_adjacent.pos_res;
+ continue;
+ }
+ if (col == p->sem.merge_adjacent.item_in) {
+ (*(sql_column_env_t *) PFarray_at (COLMAP(p), i)).col
+ = p->sem.merge_adjacent.item_res;
+ continue;
+ }
+ }
+
FRAG(p) = FRAG(L(p));
break;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
