MonetDB: default - Replace property by function test.

[Martin Kersten]

Changeset: 26c06c423294 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26c06c423294
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        sql/backends/monet5/sql_rank.mal
Branch: default
Log Message:

Replace property by function test.


diffs (94 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2392,7 +2392,6 @@ str optimizeMALBlock(Client cntxt, MalBl
 str optimizerCheck(Client cntxt, MalBlkPtr mb, str name, int actions, lng 
usec);
 str optimizerRef;
 str optimizer_prelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-int orderDependendProp;
 str pack2Ref;
 str packRef;
 str parametersRef;
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -233,7 +233,6 @@ int sqlfunctionProp;
 int inlineProp;
 int rowsProp;
 int unsafeProp;
-int orderDependendProp;
 
 int horiginProp;               /* original oid source */
 int toriginProp;               /* original oid source */
@@ -457,7 +456,6 @@ void optimizerInit(void)
        inlineProp = PropertyIndex("inline");
        rowsProp = PropertyIndex("rows");
        unsafeProp = PropertyIndex("unsafe");
-       orderDependendProp = PropertyIndex("orderdependend");
        sqlfunctionProp = PropertyIndex("sqlfunction");
 
        horiginProp = PropertyIndex("horigin");
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -233,7 +233,6 @@ opt_export int sqlfunctionProp;
 opt_export int inlineProp;             /* binary */
 opt_export int rowsProp;               /* long */
 opt_export int unsafeProp;             /* binary */
-opt_export int orderDependendProp;     /* binary */
 
 opt_export int horiginProp;            /* original oid source */
 opt_export int toriginProp;            /* original oid source */
diff --git a/sql/backends/monet5/sql_rank.mal b/sql/backends/monet5/sql_rank.mal
--- a/sql/backends/monet5/sql_rank.mal
+++ b/sql/backends/monet5/sql_rank.mal
@@ -10,7 +10,7 @@ pattern sql.diff(b:any_1) :bit
 address SQLdiff
 comment "return true if cur != prev row";
 
-pattern batsql.diff{orderdependend}(b:bat[:oid,:any_1]) :bat[:oid,:bit]
+pattern batsql.diff(b:bat[:oid,:any_1]) :bat[:oid,:bit]
 address SQLdiff
 comment "return true if cur != prev row";
 
@@ -18,7 +18,7 @@ pattern sql.diff(p:bit, b:any_1) :bit
 address SQLdiff
 comment "return true if cur != prev row";
 
-pattern batsql.diff{orderdependend}(p:bat[:oid,:bit], b:bat[:oid,:any_1]) 
:bat[:oid,:bit]
+pattern batsql.diff(p:bat[:oid,:bit], b:bat[:oid,:any_1]) :bat[:oid,:bit]
 address SQLdiff
 comment "return true if cur != prev row";
 
@@ -27,7 +27,7 @@ pattern sql.row_number(b:any_1, p:bit, o
 address SQLrow_number
 comment "return the row_numer-ed groups";
 
-pattern batsql.row_number{orderdependend}(b:bat[:oid,:any_1], p:any_2, 
o:any_3) :bat[:oid,:int] 
+pattern batsql.row_number(b:bat[:oid,:any_1], p:any_2, o:any_3) 
:bat[:oid,:int] 
 address SQLrow_number
 comment "return the row_numer-ed groups";
 
@@ -35,7 +35,7 @@ pattern sql.rank(b:any_1, p:bit, o:bit) 
 address SQLrank
 comment "return the ranked groups";
 
-pattern batsql.rank{orderdependend}(b:bat[:oid,:any_1], p:any_2, o:any_3) 
:bat[:oid,:int] 
+pattern batsql.rank(b:bat[:oid,:any_1], p:any_2, o:any_3) :bat[:oid,:int] 
 address SQLrank
 comment "return the ranked groups";
 
@@ -43,12 +43,10 @@ pattern sql.dense_rank(b:any_1, p:bit, o
 address SQLdense_rank
 comment "return the densely ranked groups";
 
-pattern batsql.dense_rank{orderdependend}(b:bat[:oid,:any_1], p:any_2, 
o:any_3) :bat[:oid,:int] 
+pattern batsql.dense_rank(b:bat[:oid,:any_1], p:any_2, o:any_3) 
:bat[:oid,:int] 
 address SQLdense_rank
 comment "return the densely ranked groups";
 
-
-
 command aggr.exist(b:bat[:oid,:any_2], h:any_1):bit 
 address ALGexist;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list