Changeset: 62a706b47114 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/62a706b47114
Modified Files:
sql/backends/monet5/sql_optimizer.c
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test
Branch: default
Log Message:
Backout of changeset dfd4015551ee
diffs (224 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
@@ -88,7 +88,7 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
size = SQLgetColumnSize(tr, c, access);
space += size; // accumulate once per table
//lasttable = tname; invalidate this attempt
- if (!prepare && size == 0)
+ if (!prepare && size == 0 && !t->system)
setFunctionId(p, emptybindRef);
}
}
@@ -105,7 +105,7 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
if (i && isTable(i->t)) {
size = SQLgetIdxSize(tr, i, access);
- if (!prepare && size == 0)
+ if (!prepare && size == 0 &&
!i->t->system)
setFunctionId(p,
emptybindidxRef);
}
}
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test
@@ -8,19 +8,21 @@ query T python .explain.function_histogr
explain select name,func from functions where name like '%optimizers%'
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -30,19 +32,21 @@ query T python .explain.function_histogr
explain select name,func from functions where name not like '%optimizers%'
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -52,19 +56,21 @@ query T python .explain.function_histogr
explain select name,func from functions where name ilike '%optimizers%'
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -74,19 +80,21 @@ query T python .explain.function_histogr
explain select name,func from functions where name not ilike '%optimizers%'
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -124,19 +132,21 @@ query T python .explain.function_histogr
explain select name,func from functions where mycontains(name, 'optimizers')
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -146,19 +156,21 @@ query T python .explain.function_histogr
explain select name,func from functions where not_mycontains(name,
'optimizers')
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -168,19 +180,21 @@ query T python .explain.function_histogr
explain select name,func from functions where imycontains(name, 'optimizers')
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
@@ -190,19 +204,21 @@ query T python .explain.function_histogr
explain select name,func from functions where not_imycontains(name,
'optimizers')
----
algebra.likeselect
-1
-algebra.projection
2
bat.pack
5
querylog.define
1
sql.bind
-2
+4
sql.mvc
1
+sql.projectdelta
+2
sql.resultSet
1
+sql.subdelta
+1
sql.tid
1
user.main
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
