Changeset: 6c3c8834f7f5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c3c8834f7f5
Modified Files:
monetdb5/modules/mal/mal_init.mx
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_prelude.mx
monetdb5/optimizer/opt_support.mx
sql/backends/monet5/datacell/Tests/dctemper00.sql
sql/backends/monet5/datacell/Tests/scenario06.sql
Branch: default
Log Message:
Minor textual updates
diffs (122 lines):
diff --git a/monetdb5/modules/mal/mal_init.mx b/monetdb5/modules/mal/mal_init.mx
--- a/monetdb5/modules/mal/mal_init.mx
+++ b/monetdb5/modules/mal/mal_init.mx
@@ -140,6 +140,7 @@
include opt_mitosis;
include opt_reorder;
include opt_octopus;
+include opt_origin;
include opt_partitions;
include opt_peephole;
include opt_prejoin;
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -58,6 +58,7 @@
opt_mitosis.mx \
opt_multiplex.mx \
opt_octopus.mx \
+ opt_origin.mx \
opt_partitions.mx \
opt_peephole.mx \
opt_pipes.mx \
@@ -95,7 +96,7 @@
opt_evaluate.mx opt_inline.mx opt_pushranges.mx
opt_derivepath.mx \
opt_accessmode.mx opt_joinpath.mx opt_heuristics.mx
opt_remap.mx \
opt_statistics.mx opt_trace.mx opt_recycler.mx opt_dataflow.mx
\
- opt_cluster.mx opt_dictionary.mx opt_mapreduce.mx \
+ opt_cluster.mx opt_dictionary.mx opt_mapreduce.mx opt_origin.mx
\
opt_mitosis.mx opt_octopus.mx opt_tarantula.mx opt_history.mx
opt_selcrack.mx opt_sidcrack.mx
}
diff --git a/monetdb5/optimizer/opt_prelude.mx
b/monetdb5/optimizer/opt_prelude.mx
--- a/monetdb5/optimizer/opt_prelude.mx
+++ b/monetdb5/optimizer/opt_prelude.mx
@@ -239,6 +239,8 @@
opt_export int hubProp; /* any (head upper bound) */
opt_export int tlbProp; /* any (tail lower bound) */
opt_export int tubProp; /* any (tail upper bound) */
+opt_export int horiginProp; /* original oid source */
+opt_export int toriginProp; /* original oid source */
opt_export void optimizerInit(void);
#endif
@@ -457,6 +459,8 @@
int hubProp;
int tlbProp;
int tubProp;
+int horiginProp; /* original oid source */
+int toriginProp; /* original oid source */
void optimizerInit(){
if(batRef == NULL){
@@ -671,6 +675,9 @@
hubProp = PropertyIndex("hub");
tlbProp = PropertyIndex("tlb");
tubProp = PropertyIndex("tub");
+
+ horiginProp = PropertyIndex("horigin");
+ toriginProp = PropertyIndex("torigin");
@-
Set the optimizer debugging flag
@c
diff --git a/monetdb5/optimizer/opt_support.mx
b/monetdb5/optimizer/opt_support.mx
--- a/monetdb5/optimizer/opt_support.mx
+++ b/monetdb5/optimizer/opt_support.mx
@@ -544,6 +544,7 @@
#define DEBUG_OPT_MACRO 23
#define DEBUG_OPT_MERGETABLE 24
#define DEBUG_OPT_OCTOPUS 25
+#define DEBUG_OPT_ORIGIN 52
#define DEBUG_OPT_PARTITIONS 26
#define DEBUG_OPT_PEEPHOLE 27
#define DEBUG_OPT_PREJOIN 28
@@ -721,6 +722,7 @@
{"mitosis", 0, 0, 0, DEBUG_OPT_MITOSIS},
{"multiplex", 0, 0, 0, DEBUG_OPT_MULTIPLEX},
{"octopus", 0, 0, 0, DEBUG_OPT_OCTOPUS},
+{"origin", 0, 0, 0, DEBUG_OPT_ORIGIN},
{"partitions", 0, 0, 0, DEBUG_OPT_PARTITIONS},
{"peephole", 0, 0, 0, DEBUG_OPT_PEEPHOLE},
{"prejoin", 0, 0, 0, DEBUG_OPT_PREJOIN},
diff --git a/sql/backends/monet5/datacell/Tests/dctemper00.sql
b/sql/backends/monet5/datacell/Tests/dctemper00.sql
--- a/sql/backends/monet5/datacell/Tests/dctemper00.sql
+++ b/sql/backends/monet5/datacell/Tests/dctemper00.sql
@@ -10,7 +10,7 @@
create table datacell.temperature(
location string,
tag time with time zone,
- tmp decimal(3,1)
+ tmp decimal(4,2)
);
create table datacell.warnings (msg string, ts time with time zone, location
string);
@@ -23,9 +23,9 @@
create procedure datacell.guardian()
begin
declare flg boolean;
- set flg = datacell.window('datacell.temperature',interval '3' second,
interval '1' second);
+ set flg = datacell.window('datacell.temperature',interval '5' minute,
interval '1' minute);
insert into datacell.warnings
- select 'WARNING', now(), location from datacell.temperature group by
location having avg(tmp) >3;
+ select 'WARNING', now(), location from datacell.temperature group by
location having avg(tmp) > 0.2;
insert into datacell.templog values (now(), (select count(*) from
datacell.temperature));
end;
call datacell.query('datacell.guardian');
@@ -40,6 +40,6 @@
-- wrapup
call datacell.postlude();
drop table datacell.temperature;
-drop table datacell.tempout;
+drop table datacell.warnings;
drop table datacell.templog;
diff --git a/sql/backends/monet5/datacell/Tests/scenario06.sql
b/sql/backends/monet5/datacell/Tests/scenario06.sql
--- a/sql/backends/monet5/datacell/Tests/scenario06.sql
+++ b/sql/backends/monet5/datacell/Tests/scenario06.sql
@@ -38,4 +38,5 @@
call datacell.postlude();
drop table datacell.barrelin;
drop table datacell.barrelout;
+drop table datacell.barrellog;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
