Changeset: fbe3bda547b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbe3bda547b2
Modified Files:
monetdb5/optimizer/opt_support.c
sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
sql.update's have sideEffects! Solves problems with concurrent use.
approve output
diffs (truncated from 385 to 300 lines):
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -1205,7 +1205,7 @@ hasSideEffects(InstrPtr p, int strict)
/* the update instructions for SQL has side effects.
whether this is relevant should be explicitly checked
in the environment of the call */
- if (isUpdateInstruction(p)) return FALSE;
+ if (isUpdateInstruction(p)) return TRUE;
return TRUE;
}
if( getModuleId(p) == languageRef){
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:35077
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:35077
QUERY = INSERT INTO "timelines" ("vicID", "time", "event") VALUES
(
(
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -35,28 +35,28 @@ Over..
[ "int", "int", 16 ]
[ "int", "lng", 2 ]
[ "int", "str", 142 ]
-[ "int", "str", 1149 ]
-[ "oid", "bit", 1149 ]
-[ "oid", "bit", 1149 ]
+[ "oid", "bit", 1151 ]
+[ "oid", "bit", 1151 ]
[ "oid", "int", 19 ]
[ "oid", "int", 19 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
[ "oid", "lng", 19 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 19 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 3157 ]
-[ "oid", "str", 3157 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 3163 ]
+[ "oid", "str", 3163 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -36,8 +36,8 @@ Over..
[ "oid", "bit", 58 ]
[ "oid", "bit", 58 ]
[ "oid", "bit", 296 ]
-[ "oid", "bit", 1149 ]
-[ "oid", "bit", 1149 ]
+[ "oid", "bit", 1151 ]
+[ "oid", "bit", 1151 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -84,15 +84,15 @@ Over..
[ "oid", "int", 296 ]
[ "oid", "int", 296 ]
[ "oid", "int", 296 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -167,11 +167,11 @@ Over..
[ "oid", "str", 296 ]
[ "oid", "str", 296 ]
[ "oid", "str", 296 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 3157 ]
-[ "oid", "str", 3157 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 3163 ]
+[ "oid", "str", 3163 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -36,8 +36,8 @@ Over..
[ "oid", "bit", 58 ]
[ "oid", "bit", 58 ]
[ "oid", "bit", 296 ]
-[ "oid", "bit", 1149 ]
-[ "oid", "bit", 1149 ]
+[ "oid", "bit", 1151 ]
+[ "oid", "bit", 1151 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -84,15 +84,15 @@ Over..
[ "oid", "int", 296 ]
[ "oid", "int", 296 ]
[ "oid", "int", 296 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -167,11 +167,11 @@ Over..
[ "oid", "str", 296 ]
[ "oid", "str", 296 ]
[ "oid", "str", 296 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 3157 ]
-[ "oid", "str", 3157 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 3163 ]
+[ "oid", "str", 3163 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -36,8 +36,8 @@ Over..
[ "oid", "bit", 59 ]
[ "oid", "bit", 59 ]
[ "oid", "bit", 298 ]
-[ "oid", "bit", 1149 ]
-[ "oid", "bit", 1149 ]
+[ "oid", "bit", 1151 ]
+[ "oid", "bit", 1151 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -84,15 +84,15 @@ Over..
[ "oid", "int", 298 ]
[ "oid", "int", 298 ]
[ "oid", "int", 298 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -167,11 +167,11 @@ Over..
[ "oid", "str", 298 ]
[ "oid", "str", 298 ]
[ "oid", "str", 298 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 3157 ]
-[ "oid", "str", 3157 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 3163 ]
+[ "oid", "str", 3163 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -36,8 +36,8 @@ Over..
[ "oid", "bit", 60 ]
[ "oid", "bit", 60 ]
[ "oid", "bit", 300 ]
-[ "oid", "bit", 1149 ]
-[ "oid", "bit", 1149 ]
+[ "oid", "bit", 1151 ]
+[ "oid", "bit", 1151 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -84,15 +84,15 @@ Over..
[ "oid", "int", 300 ]
[ "oid", "int", 300 ]
[ "oid", "int", 300 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 1149 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
-[ "oid", "int", 3157 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 1151 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
+[ "oid", "int", 3163 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -167,11 +167,11 @@ Over..
[ "oid", "str", 300 ]
[ "oid", "str", 300 ]
[ "oid", "str", 300 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 1149 ]
-[ "oid", "str", 3157 ]
-[ "oid", "str", 3157 ]
+[ "oid", "str", 1151 ]
+[ "oid", "str", 1151 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
