Changeset: 88185cfea41c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88185cfea41c
Modified Files:
sql/backends/monet5/sql_optimizer.c
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
Branch: Aug2011
Log Message:
fixed bug in handling deletes + mitosis / mergetable/ dataflow
diffs (71 lines):
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -369,6 +369,17 @@ SQLgetStatistics(Client cntxt, mvc *m, M
}
rows = (wrd) cnt;
}
+ } else if (s && f == binddbatRef) {
+ size_t cnt;
+ sql_table *t = mvc_bind_table(m, s, tname);
+ sql_column *c = NULL;
+
+ if (t->columns.set->h) {
+ c = t->columns.set->h->data;
+
+ cnt = store_funcs.count_col(c);
+ rows = (wrd) cnt;
+ }
}
if (rows > 1 && mode != RD_INS)
varSetProp(mb, k, rowsProp, op_eq, VALset(&vr,
TYPE_wrd, &rows));
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -37,7 +37,7 @@ Over..
% 0 # length
function user.s0_1{autoCommit=true}():void;
X_23 := nil:bat[:oid,:dbl];
-barrier X_59 := language.dataflow();
+barrier X_55 := language.dataflow();
X_2 := sql.mvc();
X_10:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",0);
X_8:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",2);
@@ -49,12 +49,12 @@ barrier X_59 := language.dataflow();
X_16 := bat.reverse(X_15);
X_17 := algebra.kdifference(X_14,X_16);
X_18 := batcalc.flt(X_17);
- X_43 := batmmath.log10(X_18);
- X_19 := algebra.thetauselect(X_43,1:flt,">");
+ X_42 := batmmath.log10(X_18);
+ X_19 := algebra.thetauselect(X_42,1:flt,">");
X_21 := algebra.markT(X_19,0@0:oid);
X_22 := bat.reverse(X_21);
X_23 := algebra.leftjoin(X_22,X_14);
-exit X_59;
+exit X_55;
X_24 := sql.resultSet(1,1,X_23);
sql.rsColumn(X_24,"sys.tab_2826","d","double",53,0,X_23);
X_30 := io.stdout();
diff --git a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
--- a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
+++ b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
@@ -79,7 +79,7 @@ stderr of test 'insert_values.SF-1578838
# 19:33:23 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33470
# 19:33:23 >
-MAPI = monetdb@alf:36639
+MAPI = monetdb@niels:30467
QUERY = INSERT INTO "examines" ("docID", "vicID") VALUES
(
(
@@ -94,8 +94,7 @@ QUERY = INSERT INTO "examines" ("docID",
)
);
ERROR = !SQLException:zero_or_one:cardinality violation (2>1)
- !SQLException:zero_or_one:cardinality violation (2>1)
-MAPI = monetdb@alf:36639
+MAPI = monetdb@niels:30467
QUERY = INSERT INTO "timelines" ("vicID", "time", "event") VALUES
(
(
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
