date:20120315

MonetDB: default - Approved output after removal of derivePaths ...

2012-03-15 Thread Sjoerd Mullender

Changeset: 47466e959296 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47466e959296
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approved output after removal of derivePaths optimizer.


diffs (22 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
@@ -531,10 +531,6 @@ str ALGcount_bat(wrd *result, int *bid);
 str ALGcount_nil(wrd *result, int *bid, bit *ignore_nils);
 str ALGcount_no_nil(wrd *result, int *bid);
 str ALGcross(int *result, int *lid, int *rid);
-str ALGderiveCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderiveSum(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ALGexist(bit *ret, int *bid, ptr val);
 str ALGexistBUN(bit *ret, int *bid, ptr val, ptr tval);
 str ALGfetch(ptr ret, int *bid, lng *pos);
@@ -4518,7 +4514,6 @@ str OPTcostModel(Client cntxt, MalBlkPtr
 str OPTdatacyclotron(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdeadcode(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str OPTderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdumpQEP(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTemptySet(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Apr2012 - Converted gdk.mx to gdk.h.

2012-03-15 Thread Sjoerd Mullender

Changeset: b239ef124dd8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b239ef124dd8
Added Files:
gdk/gdk.h
Removed Files:
gdk/gdk.mx
Modified Files:
configure.ag
gdk/Makefile.ag
Branch: Apr2012
Log Message:

Converted gdk.mx to gdk.h.


diffs (286 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -28,7 +28,7 @@ AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 dnl use tar-ustar since we have long (longer than 99 characters) file names
 AM_INIT_AUTOMAKE([tar-ustar no-dist-gzip dist-bzip2])
-AC_CONFIG_SRCDIR([gdk/gdk.mx])
+AC_CONFIG_SRCDIR([gdk/gdk.h])
 AM_CONFIG_HEADER([monetdb_config.h])
 AC_SUBST([CONFIG_H], [monetdb_config.h])
 
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -34,7 +34,7 @@ lib_gdk = {
gdk_scanselect_defs_str.mx \
gdk_scanselect_defs_fix.mx \
gdk_scanselect_defs_var.mx \
-   gdk_scanselect.mx gdk.mx gdk_batop.mx \
+   gdk_scanselect.mx gdk.h gdk_batop.mx \
gdk_search.mx gdk_tm.c gdk_align.c gdk_bbp.mx \
gdk_heap.c gdk_setop.mx gdk_utils.mx gdk_atoms.mx \
gdk_qsort.mx gdk_ssort.mx gdk_storage.c gdk_bat.mx \
diff --git a/gdk/gdk.mx b/gdk/gdk.h
rename from gdk/gdk.mx
rename to gdk/gdk.h
--- a/gdk/gdk.mx
+++ b/gdk/gdk.h
@@ -1,25 +1,22 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the License); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.monetdb.org/Legal/MonetDBLicense
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the License); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * Software distributed under the License is distributed on an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2012 MonetDB B.V.
+ * All Rights Reserved.
+ */
 
-Software distributed under the License is distributed on an AS IS
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2012 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f gdk
-
-@h
 /*
  * @t The Goblin Database Kernel
  * @v Version 3.05
@@ -828,13 +825,13 @@ typedef struct {
bte type;   /* type id. */
bte shift;  /* log2 of bunwidth */
bit sorted; /* 0=false, 1=true; */
-   unsigned int 
+   unsigned int
 varsized:1,/* varsized(0) or fixedsized(0). */
 key:2, /* duplicates allowed? */
-dense:1,   
+dense:1,
 nonil:1,   /* nonil isn't propchecked yet */
 nil:1, /* nil is set when we found one nil (propcheck) 
*/
-unused:2; 
+unused:2;
oid align;  /* OID for sync alignment */
BUN nosorted_rev;   /* position that proves sorted_rev==FALSE */
BUN nokey[2];   /* positions that prove key ==FALSE */
@@ -1418,7 +1415,7 @@ gdk_export BUN BUNfnd(BAT *b, ptr left);
  * storage space, but could tolerate more padding).  It would mostly
  * work, only the sort routine and strPut/strLocate (which do not see
  * the BAT header) extra parameters would be needed in their APIs.
- */ 
+ */
 typedef unsigned short stridx_t;
 #define SIZEOF_STRIDX_T SIZEOF_SHORT
 #define GDK_VARSHIFT 3
@@ -1456,7 +1453,7 @@ typedef var_t stridx_t; /* TODO: should 
 #define BUNtail(bi,p)  ((bi).b-tvarsized?BUNtvar(bi,p):BUNtloc(bi,p))
 
 static inline BATiter
-bat_iterator(BAT *b) 
+bat_iterator(BAT *b)
 {
BATiter bi;
 
@@ -1764,8 +1761,8 @@ gdk_export int BATordered_rev(BAT *b);
 gdk_export BAT *BATssort(BAT *b);
 gdk_export BAT *BATssort_rev(BAT *b);
 
-gdk_export void GDKqsort(void *h, void *t, void *base, size_t n, int hs, int 
ts, int tpe); 
-gdk_export void GDKqsort_rev(void *h, void *t, void *base, size_t n, int hs, 
int ts, int tpe); 
+gdk_export void GDKqsort(void *h, void *t, void *base, size_t n, int hs, int 
ts, int tpe);
+gdk_export void GDKqsort_rev(void *h, void *t, void *base, size_t n, int hs, 
int ts, int tpe);
 
 #define BAThordered(b) (((b)-htype == TYPE_void)?GDK_SORTED:(b)-hsorted)

MonetDB: default - Merge with Apr2012 branch.

2012-03-15 Thread Sjoerd Mullender

Changeset: d028d36eb3e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d028d36eb3e9
Added Files:
gdk/gdk.h
Removed Files:
gdk/gdk.mx
Modified Files:
configure.ag
gdk/Makefile.ag
Branch: default
Log Message:

Merge with Apr2012 branch.


diffs (286 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -28,7 +28,7 @@ AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 dnl use tar-ustar since we have long (longer than 99 characters) file names
 AM_INIT_AUTOMAKE([tar-ustar no-dist-gzip dist-bzip2])
-AC_CONFIG_SRCDIR([gdk/gdk.mx])
+AC_CONFIG_SRCDIR([gdk/gdk.h])
 AM_CONFIG_HEADER([monetdb_config.h])
 AC_SUBST([CONFIG_H], [monetdb_config.h])
 
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -34,7 +34,7 @@ lib_gdk = {
gdk_scanselect_defs_str.mx \
gdk_scanselect_defs_fix.mx \
gdk_scanselect_defs_var.mx \
-   gdk_scanselect.mx gdk.mx gdk_batop.mx \
+   gdk_scanselect.mx gdk.h gdk_batop.mx \
gdk_search.mx gdk_tm.c gdk_align.c gdk_bbp.mx \
gdk_heap.c gdk_setop.mx gdk_utils.mx gdk_atoms.mx \
gdk_qsort.mx gdk_ssort.mx gdk_storage.c gdk_bat.mx \
diff --git a/gdk/gdk.mx b/gdk/gdk.h
rename from gdk/gdk.mx
rename to gdk/gdk.h
--- a/gdk/gdk.mx
+++ b/gdk/gdk.h
@@ -1,25 +1,22 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the License); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.monetdb.org/Legal/MonetDBLicense
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the License); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * Software distributed under the License is distributed on an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2012 MonetDB B.V.
+ * All Rights Reserved.
+ */
 
-Software distributed under the License is distributed on an AS IS
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2012 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f gdk
-
-@h
 /*
  * @t The Goblin Database Kernel
  * @v Version 3.05
@@ -828,13 +825,13 @@ typedef struct {
bte type;   /* type id. */
bte shift;  /* log2 of bunwidth */
bit sorted; /* 0=false, 1=true; */
-   unsigned int 
+   unsigned int
 varsized:1,/* varsized(0) or fixedsized(0). */
 key:2, /* duplicates allowed? */
-dense:1,   
+dense:1,
 nonil:1,   /* nonil isn't propchecked yet */
 nil:1, /* nil is set when we found one nil (propcheck) 
*/
-unused:2; 
+unused:2;
oid align;  /* OID for sync alignment */
BUN nosorted_rev;   /* position that proves sorted_rev==FALSE */
BUN nokey[2];   /* positions that prove key ==FALSE */
@@ -1418,7 +1415,7 @@ gdk_export BUN BUNfnd(BAT *b, ptr left);
  * storage space, but could tolerate more padding).  It would mostly
  * work, only the sort routine and strPut/strLocate (which do not see
  * the BAT header) extra parameters would be needed in their APIs.
- */ 
+ */
 typedef unsigned short stridx_t;
 #define SIZEOF_STRIDX_T SIZEOF_SHORT
 #define GDK_VARSHIFT 3
@@ -1456,7 +1453,7 @@ typedef var_t stridx_t; /* TODO: should 
 #define BUNtail(bi,p)  ((bi).b-tvarsized?BUNtvar(bi,p):BUNtloc(bi,p))
 
 static inline BATiter
-bat_iterator(BAT *b) 
+bat_iterator(BAT *b)
 {
BATiter bi;
 
@@ -1764,8 +1761,8 @@ gdk_export int BATordered_rev(BAT *b);
 gdk_export BAT *BATssort(BAT *b);
 gdk_export BAT *BATssort_rev(BAT *b);
 
-gdk_export void GDKqsort(void *h, void *t, void *base, size_t n, int hs, int 
ts, int tpe); 
-gdk_export void GDKqsort_rev(void *h, void *t, void *base, size_t n, int hs, 
int ts, int tpe); 
+gdk_export void GDKqsort(void *h, void *t, void *base, size_t n, int hs, int 
ts, int tpe);
+gdk_export void GDKqsort_rev(void *h, void *t, void *base, size_t n, int hs, 
int ts, int tpe);
 
 #define BAThordered(b) (((b)-htype == TYPE_void)?GDK_SORTED:(b)-hsorted)

MonetDB: gdk-calc - Closing the branch now that it has been merg...

2012-03-15 Thread Sjoerd Mullender

Changeset: d290f10529ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d290f10529ba
Branch: gdk-calc
Log Message:

Closing the branch now that it has been merged into default.

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Enable compilation after gdk upgrade

2012-03-15 Thread Martin Kersten

Changeset: ae9390da561d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae9390da561d
Modified Files:
sql/backends/monet5/datacell/emitter.c
Branch: default
Log Message:

Enable compilation after gdk upgrade


diffs (11 lines):

diff --git a/sql/backends/monet5/datacell/emitter.c 
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -41,7 +41,6 @@
 
 #include monetdb_config.h
 #include emitter.h
-#include batcalc.h
 #include dcsocket.h
 #include stream_socket.h
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approved output after removal of derivePaths ...

MonetDB: Apr2012 - Converted gdk.mx to gdk.h.

MonetDB: default - Merge with Apr2012 branch.

MonetDB: gdk-calc - Closing the branch now that it has been merg...

MonetDB: default - Enable compilation after gdk upgrade

5 matches

Site Navigation

Mail list logo

Footer information