Changeset: b5558ff25bfa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5558ff25bfa
Added Files:
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out
Modified Files:
monetdb5/mal/Tests/tst1225.mal
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/mal/Tests/tst220.mal
monetdb5/mal/Tests/tst220.stable.out
monetdb5/mal/Tests/tst2510.mal
monetdb5/mal/Tests/tst2510.stable.out
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_resolve.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/mal/bbp.c
monetdb5/optimizer/Tests/common.mal
monetdb5/optimizer/Tests/common.stable.out
monetdb5/optimizer/Tests/reorder01.mal
monetdb5/optimizer/Tests/reorder01.stable.out
monetdb5/optimizer/Tests/tst4631.mal
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.mal
monetdb5/optimizer/Tests/tst4730.stable.out
monetdb5/optimizer/opt_support.c
monetdb5/scheduler/run_pipeline.c
sql/backends/monet5/embeddedclient.c.in
sql/backends/monet5/sql_scenario.c
sql/test/BugTracker-2014/Tests/All
testing/Mtest.py.in
testing/README
Branch: Oct2014
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 640 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst1225.mal b/monetdb5/mal/Tests/tst1225.mal
--- a/monetdb5/mal/Tests/tst1225.mal
+++ b/monetdb5/mal/Tests/tst1225.mal
@@ -10,8 +10,8 @@
pc_a := calc.*(23,60);
qc_a := calc.+(pc_a,59);
tzone_bat:= bat.new(:oid,:timezone);
- i8:= 8@0; # don;t use 08@0
- io.print(i8); # don;t use 09@0
+ i8:= 8@0; # don't use 08@0
+ io.print(i8); # don't use 09@0
i9:= 9@0;
io.print(i9);
bd_a := bat.insert(tzone_bat,8@0,tzone_08);
diff --git a/monetdb5/mal/Tests/tst1225.stable.out
b/monetdb5/mal/Tests/tst1225.stable.out
--- a/monetdb5/mal/Tests/tst1225.stable.out
+++ b/monetdb5/mal/Tests/tst1225.stable.out
@@ -22,8 +22,8 @@ stdout of test 'tst1225` in directory 'm
# pc_a := calc.*(23,60);
# qc_a := calc.+(pc_a,59);
# tzone_bat:= bat.new(:oid,:timezone);
-# i8:= 8@0; # don;t use 08@0
-# io.print(i8); # don;t use 09@0
+# i8:= 8@0; # don't use 08@0
+# io.print(i8); # don't use 09@0
# i9:= 9@0;
# io.print(i9);
# bd_a := bat.insert(tzone_bat,8@0,tzone_08);
@@ -45,9 +45,9 @@ function user.main():void;
qc_a := calc.+(pc_a,59);
tzone_bat := bat.new(:oid,:timezone);
i8 := 8@0;
-# don;t use 08@0
+# don't use 08@0
io.print(i8);
-# don;t use 09@0
+# don't use 09@0
i9 := 9@0;
io.print(i9);
bd_a := bat.insert(tzone_bat,8@0,tzone_08);
diff --git a/monetdb5/mal/Tests/tst220.mal b/monetdb5/mal/Tests/tst220.mal
--- a/monetdb5/mal/Tests/tst220.mal
+++ b/monetdb5/mal/Tests/tst220.mal
@@ -24,7 +24,7 @@ end createone;
i:= bbp.getLRefCount(b);
io.printf("refcount =%d[1]\n",i);
- #handle an alias, which isn;t used!
+ #handle an alias, which isn't used!
b2:= b;
i:= bbp.getLRefCount(b);
io.printf("after assignment refcount =%d[2]\n",i);
diff --git a/monetdb5/mal/Tests/tst220.stable.out
b/monetdb5/mal/Tests/tst220.stable.out
--- a/monetdb5/mal/Tests/tst220.stable.out
+++ b/monetdb5/mal/Tests/tst220.stable.out
@@ -82,7 +82,7 @@ function user.main():void;
io.print(b);
i := bbp.getLRefCount(b);
io.printf("refcount =%d[1]\n",i);
-#handle an alias, which isn;t used!
+#handle an alias, which isn't used!
b2 := b;
i := bbp.getLRefCount(b);
io.printf("after assignment refcount =%d[2]\n",i);
diff --git a/monetdb5/mal/Tests/tst2510.mal b/monetdb5/mal/Tests/tst2510.mal
--- a/monetdb5/mal/Tests/tst2510.mal
+++ b/monetdb5/mal/Tests/tst2510.mal
@@ -12,4 +12,4 @@ exit always;
#exit MALException;
return tryme:= false;
end tryme;
-user.tryme(); # shouldn;t hang when you forget the exception
+user.tryme(); # shouldn't hang when you forget the exception
diff --git a/monetdb5/mal/Tests/tst2510.stable.out
b/monetdb5/mal/Tests/tst2510.stable.out
--- a/monetdb5/mal/Tests/tst2510.stable.out
+++ b/monetdb5/mal/Tests/tst2510.stable.out
@@ -37,12 +37,12 @@ exit always;
#exit MALException;
return tryme := false;
end tryme;
-#user.tryme(); # shouldn;t hang when you forget the exception
+#user.tryme(); # shouldn't hang when you forget the exception
#
function user.main():void;
# A exception in a factory should terminate it
user.tryme();
-# shouldn;t hang when you forget the exception
+# shouldn't hang when you forget the exception
end main;
# 08:58:58 >
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1628,7 +1628,7 @@ parseAssign(Client cntxt, int cntrl)
if (l == 0 || i) {
/* we haven't seen a target variable */
/* flow of control statements may end here. */
- /* shouldn;t allow for nameless controls todo*/
+ /* shouldn't allow for nameless controls todo*/
if (i && cst.vtype == TYPE_str)
GDKfree(cst.val.sval);
if (cntrl == LEAVEsymbol || cntrl == REDOsymbol ||
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -224,7 +224,7 @@ findFunctionType(stream *out, Module sco
for (k = 0; k < limit; k++)
polytype[k] = TYPE_any;
/*
- * Most polymorphic functions don;t have a variable
argument
+ * Most polymorphic functions don't have a variable
argument
* list. So we save some instructions factoring this
caise out.
* Be careful, the variable number of return arguments
should
* be considered as well.
@@ -255,7 +255,7 @@ findFunctionType(stream *out, Module sco
formal = getPolyType(formal, polytype);
/*
* Collect the polymorphic types and resolve
them.
- * If it fails, we know this isn;t the function
we are
+ * If it fails, we know this isn't the function
we are
* looking for.
*/
if (resolveType(formal, actual) == -1) {
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -2331,7 +2331,7 @@ ALGprojecttail(Client cntxt, MalBlkPtr m
}
-/* You don;t have to materialize the oids.
+/* You don't have to materialize the oids.
This is taken care upon access */
str
ALGidentity(int *ret, int *bid)
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -60,7 +60,7 @@ CMDbbpbind(Client cntxt, MalBlkPtr mb, M
/* make sure you load the descriptors and heaps */
b = (BAT *) BATdescriptor(i);
if (b == 0)
- /* Simple ignore the binding if you can;t find the bat */
+ /* Simple ignore the binding if you can't find the bat */
throw(MAL, "bbp.bind", RUNTIME_OBJECT_MISSING);
/* check conformity of the actual type and the one requested */
diff --git a/monetdb5/optimizer/Tests/common.mal
b/monetdb5/optimizer/Tests/common.mal
--- a/monetdb5/optimizer/Tests/common.mal
+++ b/monetdb5/optimizer/Tests/common.mal
@@ -1,5 +1,5 @@
#select count(*) from (select * from tables union select * from tables );
-#don;t depend on SQL library
+#don't depend on SQL library
function sql.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
return bat.new(:any_1,:any_2);
end bind;
diff --git a/monetdb5/optimizer/Tests/common.stable.out
b/monetdb5/optimizer/Tests/common.stable.out
--- a/monetdb5/optimizer/Tests/common.stable.out
+++ b/monetdb5/optimizer/Tests/common.stable.out
@@ -216,7 +216,7 @@ function user.s0_0():void;
end s0_0;
function user.main():void;
#select count(*) from (select * from tables union select * from tables );
-#don;t depend on SQL library
+#don't depend on SQL library
mdb.list("user","s0_0");
end main;
function user.s0_0():void;
diff --git a/monetdb5/optimizer/Tests/reorder01.mal
b/monetdb5/optimizer/Tests/reorder01.mal
--- a/monetdb5/optimizer/Tests/reorder01.mal
+++ b/monetdb5/optimizer/Tests/reorder01.mal
@@ -1,5 +1,5 @@
#select count(*) from (select * from tables union select * from tables );
-#don;t depend on SQL library
+#don't depend on SQL library
function sql.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
return bat.new(:any_1,:any_2);
end bind;
diff --git a/monetdb5/optimizer/Tests/reorder01.stable.out
b/monetdb5/optimizer/Tests/reorder01.stable.out
--- a/monetdb5/optimizer/Tests/reorder01.stable.out
+++ b/monetdb5/optimizer/Tests/reorder01.stable.out
@@ -216,7 +216,7 @@ function user.s0_0():void;
end s0_0;
function user.main():void;
#select count(*) from (select * from tables union select * from tables );
-#don;t depend on SQL library
+#don't depend on SQL library
mdb.list("user","s0_0");
end main;
function user.s0_0():void;
diff --git a/monetdb5/optimizer/Tests/tst4631.mal
b/monetdb5/optimizer/Tests/tst4631.mal
--- a/monetdb5/optimizer/Tests/tst4631.mal
+++ b/monetdb5/optimizer/Tests/tst4631.mal
@@ -1,6 +1,6 @@
# TPCH Q1 non-optimized
-#don;t depend on SQL library
+#don't depend on SQL library
function user.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
return bat.new(:any_1,:any_2);
end bind;
diff --git a/monetdb5/optimizer/Tests/tst4631.stable.out
b/monetdb5/optimizer/Tests/tst4631.stable.out
--- a/monetdb5/optimizer/Tests/tst4631.stable.out
+++ b/monetdb5/optimizer/Tests/tst4631.stable.out
@@ -123,7 +123,7 @@ function user.qry1():void;
end qry1;
function user.main():void;
# TPCH Q1 non-optimized
-#don;t depend on SQL library
+#don't depend on SQL library
mdb.List("user","qry1");
end main;
function user.qry1():void; # 0 qry1:void := user.qry1() {G}
diff --git a/monetdb5/optimizer/Tests/tst4730.mal
b/monetdb5/optimizer/Tests/tst4730.mal
--- a/monetdb5/optimizer/Tests/tst4730.mal
+++ b/monetdb5/optimizer/Tests/tst4730.mal
@@ -1,7 +1,7 @@
#TPCH query 1
# the basis for further optimizer tests
-#don;t depend on SQL library
+#don't depend on SQL library
function user.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
return bat.new(:any_1,:any_2);
end bind;
diff --git a/monetdb5/optimizer/Tests/tst4730.stable.out
b/monetdb5/optimizer/Tests/tst4730.stable.out
--- a/monetdb5/optimizer/Tests/tst4730.stable.out
+++ b/monetdb5/optimizer/Tests/tst4730.stable.out
@@ -98,7 +98,7 @@ end qry1;
function user.main():void;
#TPCH query 1
# the basis for further optimizer tests
-#don;t depend on SQL library
+#don't depend on SQL library
mdb.List("user","qry1");
end main;
factory user.qry1(A0:sht,A1:sht,A2:sht,A3:date,A4:int):bit;# 0 qry1:bit :=
user.qry1(A0:sht, A1:sht, A2:sht, A3:date, A4:int) {G}
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
@@ -287,7 +287,7 @@ optimizeMALBlock(Client cntxt, MalBlkPtr
p = getInstrPtr(mb, pc);
if (getModuleId(p) == optimizerRef && p->fcn &&
p->token != REMsymbol) {
/* all optimizers should behave like patterns */
- /* However, we don;t have a stack now */
+ /* However, we don't have a stack now */
qot++;
msg = (str) (*p->fcn) (cntxt, mb, 0, p);
if (msg) {
diff --git a/monetdb5/scheduler/run_pipeline.c
b/monetdb5/scheduler/run_pipeline.c
--- a/monetdb5/scheduler/run_pipeline.c
+++ b/monetdb5/scheduler/run_pipeline.c
@@ -181,7 +181,7 @@ schedulerMALBlock(Client cntxt, MalBlkPt
callMALinterpreter++;
if (p->fcn)
/* all schedulers should behave like
patterns */
- /* However, we don;t have a stack now */
+ /* However, we don't have a stack now */
msg = (str) (*p->fcn) (mb, 0, p);
if (msg)
return msg;
diff --git a/sql/backends/monet5/embeddedclient.c.in
b/sql/backends/monet5/embeddedclient.c.in
--- a/sql/backends/monet5/embeddedclient.c.in
+++ b/sql/backends/monet5/embeddedclient.c.in
@@ -89,7 +89,7 @@ start_sql_server(void *arg)
"@QXlibdir@@QDIRSEP@MonetDB5@PATHSEP@@QXlibdir@@QDIRSEP@MonetDB5@QDIRSEP@lib@PATHSEP@@QXlibdir@@QDIRSEP@MonetDB5@QDIRSEP@bin");
}
Monet_init(&embedded_set, embedded_len);
- /* you don;t need the commandline arguments anymore */
+ /* you don't need the commandline arguments anymore */
mo_free_options(embedded_set, embedded_len);
if (mal_init())
return 0;
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1431,7 +1431,7 @@ SQLstatementIntern(Client c, str *expr,
* to the next statement (if any).
* Now is the time to also perform the semantic analysis,
* optimize and produce code.
- * We don;t search the cache for a previous incarnation yet.
+ * We don't search the cache for a previous incarnation yet.
*/
MSinitClientPrg(c, "user", nme);
oldvtop = c->curprg->def->vtop;
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -31,3 +31,4 @@ unsafe_project_push_down.Bug-3523
non_groupby_column.Bug-3524
orderby_count.Bug-3526
outer_join_using_diff_types_using.Bug-3536
+select-distinct-order-limit.Bug-3527
diff --git
a/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito
b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito
new file mode 100644
diff --git
a/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql
b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql
new file mode 100644
--- /dev/null
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
