[svn-commits] r168 - in branches/advisor/src: back/dmf/dmu back/opf/opv front/st/vdba

[thial01 at ingres.com]

Author: thial01
Date: 2008-07-21 10:40:55 -0700 (Mon, 21 Jul 2008)
New Revision: 168

Modified:
   branches/advisor/src/back/dmf/dmu/dmuindex.c
   branches/advisor/src/back/opf/opv/opvparser.c
   branches/advisor/src/front/st/vdba/makimau.sql
Log:
More bug fixes for the virtual indexes - see #174


Modified: branches/advisor/src/back/dmf/dmu/dmuindex.c
===================================================================
--- branches/advisor/src/back/dmf/dmu/dmuindex.c	2008-07-18 21:18:38 UTC (rev 167)
+++ branches/advisor/src/back/dmf/dmu/dmuindex.c	2008-07-21 17:40:55 UTC (rev 168)
@@ -903,7 +903,6 @@
 	indx_cb->indxcb_d_fill = 80;
 	indx_cb->indxcb_compressed = 0;
 	indx_cb->indxcb_index_compressed = 0;
-	indx_cb->indxcb_virtual = 0;
 	indx_cb->indxcb_unique = 0;
 	indx_cb->indxcb_min_pages = 0;
 	indx_cb->indxcb_max_pages = 0;

Modified: branches/advisor/src/back/opf/opv/opvparser.c
===================================================================
--- branches/advisor/src/back/opf/opv/opvparser.c	2008-07-18 21:18:38 UTC (rev 167)
+++ branches/advisor/src/back/opf/opv/opvparser.c	2008-07-21 17:40:55 UTC (rev 168)
@@ -579,6 +579,10 @@
 	    	
 	    	i4	i;
 	    	for (i = 0; i < gvar; i++) {
+	    		
+	    		if (gbase->opv_grv[i]->opv_relation == NULL) {
+	    			continue;
+	    		}
 	    		DMT_TBL_ENTRY *tbl = gbase->opv_grv[i]->opv_relation->rdr_rel;
     			/* 
     			** We are looking for the corresponding base table

Modified: branches/advisor/src/front/st/vdba/makimau.sql
===================================================================
--- branches/advisor/src/front/st/vdba/makimau.sql	2008-07-18 21:18:38 UTC (rev 167)
+++ branches/advisor/src/front/st/vdba/makimau.sql	2008-07-21 17:40:55 UTC (rev 168)
@@ -2494,7 +2494,7 @@
         is 'exp.scf.scm.ana.cpu',
     dio integer4 not null not default
         is 'exp.scf.scm.ana.dio',
-    pages_touchedcpu integer4 not null not default
+    pages_touched integer4 not null not default
         is 'exp.scf.scm.ana.pages_touched',
     vindexes varchar(1000) not null not default
         is 'exp.scf.scm.ana.vindexes'