Changeset: ecab9818e222 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecab9818e222
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/colcalc.mal.mx
monetdb5/modules/kernel/sema.mal
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/optimizer.mal
Branch: headless
Log Message:
Removing more warnings
diffs (216 lines):
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -96,7 +96,7 @@
unix.mal
}
-EXTRA_DIST = aggr_ri.mx colcolor.mal lock.mal lock.h sema.mal unix.mal alarm.h
alarm.mal\
+EXTRA_DIST = aggr_ri.mx colcolor.mal lock.mal lock.h sema.h sema.mal unix.mal
alarm.h alarm.mal\
microbenchmark.mal microbenchmark.h
# logger.h \
diff --git a/monetdb5/modules/kernel/colcalc.mal.mx
b/monetdb5/modules/kernel/colcalc.mal.mx
--- a/monetdb5/modules/kernel/colcalc.mal.mx
+++ b/monetdb5/modules/kernel/colcalc.mal.mx
@@ -1,23 +1,22 @@
@f colcalc
@mal
-/*
- * 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
- *
- * 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-2011 MonetDB B.V.
- * All Rights Reserved.
-*/
+#
+# 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# 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-2011 MonetDB B.V.
+# All Rights Reserved.
@= calcGrp1
diff --git a/monetdb5/modules/kernel/sema.mal b/monetdb5/modules/kernel/sema.mal
--- a/monetdb5/modules/kernel/sema.mal
+++ b/monetdb5/modules/kernel/sema.mal
@@ -22,7 +22,7 @@
comment "Create an unset sema, with an initial value";
command down(s:sema)
address SEMAdown
-comment "Decrement the semaphpore if >0; else block";
+comment "Decrement the semaphpore if >0 else block";
command up(s:sema)
address SEMAup
comment "Increment the semaphore";
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -62,7 +62,8 @@
DIR = libdir/monetdb5
SOURCES = language.mal mal_init.mal cbp.mal \
profiler.mal attach.mal extensions.mal \
- inspect.mal manual.mal inout.mal pqueue.mx mkey.mal \
+ inspect.mal manual.mal inout.mal pqueue.mx \
+# mkey.mal
clients.mal \
factories.mal groupby.mal mdb.mal pcrelib.mal tablet.mal \
# mat.mal \
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -52,7 +52,7 @@
include aggr;
include array;
include pqueue;
-include mkey;
+#include mkey;
# Atom extensions
include blob;
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -139,65 +139,65 @@
address OPTwrapper
comment "Join path constructor";
-pattern group.derivePath(l:col[:any]...)(grp:col[:any],ext:col[:any])
-address ALGderivePath
-comment "Derive a group index.";
-
-pattern group.deriveCount(l:col[:any]...):col[:wrd]
-address ALGderiveCount
-comment "Derive a group count.";
-
-pattern group.deriveSum(s:col[:int],l:col[:any]...):col[:int]
-address ALGderiveSum
-comment "Derive a group sum.";
-pattern group.deriveSum(s:col[:lng],l:col[:any]...):col[:lng]
-address ALGderiveSum
-comment "Derive a group sum.";
-pattern group.deriveSum(s:col[:flt],l:col[:any]...):col[:flt]
-address ALGderiveSum
-comment "Derive a group sum.";
-pattern group.deriveSum(s:col[:dbl],l:col[:any]...):col[:dbl]
-address ALGderiveSum
-comment "Derive a group sum.";
+#pattern group.derivePath(l:col[:any]...)(grp:col[:any],ext:col[:any])
+#address ALGderivePath
+#comment "Derive a group index.";
+#
+#pattern group.deriveCount(l:col[:any]...):col[:wrd]
+#address ALGderiveCount
+#comment "Derive a group count.";
+#
+#pattern group.deriveSum(s:col[:int],l:col[:any]...):col[:int]
+#address ALGderiveSum
+#comment "Derive a group sum.";
+#pattern group.deriveSum(s:col[:lng],l:col[:any]...):col[:lng]
+#address ALGderiveSum
+#comment "Derive a group sum.";
+#pattern group.deriveSum(s:col[:flt],l:col[:any]...):col[:flt]
+#address ALGderiveSum
+#comment "Derive a group sum.";
+#pattern group.deriveSum(s:col[:dbl],l:col[:any]...):col[:dbl]
+#address ALGderiveSum
+#comment "Derive a group sum.";
#opt_dictionary.mal
module dictionary;
-command initialize()
-address DICTinitialize
-comment "Intialize the dictionary catalog if needed";
-
-command bind(nme:str) (idx:col[:any_1], val:col[:any_2])
-address DICTbind
-comment "Localise the dictionary";
-
-command expand(val:col[:any_1], b:col[:any_2]):col[:any_2]
-address DICTexpand
-comment "Extend the dictionary with the values in b. This may trigger a
partial recompilation of the MAL program when the storage type :any_1
-is not sufficient anymore.";
-
-command encode(val:col[:any_2], b:col[:any_2]):col[:oid]
-address DICTencode
-comment "Use the dictionary to encode a table b.";
-
-pattern compress{unsafe}(s:str, b:col[:any_2])
-address DICTcompress
-comment "Try to replace a table by its dictionary equivalent.";
-
-command decompress{unsafe}(nme:str)
-address DICTdecompress
-comment "Remove the dictionary entry";
-
-command group(idx:col[:any_1], val:col[:any_2]) :col[:any_2]
-address DICTgroupid
-comment "Obtain a representative oid per value from the index";
-
-pattern optimizer.dictionary():str
-address OPTwrapper;
-pattern optimizer.dictionary(mod:str, fcn:str):str
-address OPTwrapper
-comment "Capitalize dictionary encodings ";
+#command initialize()
+#address DICTinitialize
+#comment "Intialize the dictionary catalog if needed";
+#
+#command bind(nme:str) (idx:col[:any_1], val:col[:any_2])
+#address DICTbind
+#comment "Localise the dictionary";
+#
+#command expand(val:col[:any_1], b:col[:any_2]):col[:any_2]
+#address DICTexpand
+#comment "Extend the dictionary with the values in b. This may trigger a
partial recompilation of the MAL program when the storage type :any_1
+#is not sufficient anymore.";
+#
+#command encode(val:col[:any_2], b:col[:any_2]):col[:oid]
+#address DICTencode
+#comment "Use the dictionary to encode a table b.";
+#
+#pattern compress{unsafe}(s:str, b:col[:any_2])
+#address DICTcompress
+#comment "Try to replace a table by its dictionary equivalent.";
+#
+#command decompress{unsafe}(nme:str)
+#address DICTdecompress
+#comment "Remove the dictionary entry";
+#
+#command group(idx:col[:any_1], val:col[:any_2]) :col[:any_2]
+#address DICTgroupid
+#comment "Obtain a representative oid per value from the index";
+#
+#pattern optimizer.dictionary():str
+#address OPTwrapper;
+#pattern optimizer.dictionary(mod:str, fcn:str):str
+#address OPTwrapper
+#comment "Capitalize dictionary encodings ";
#opt_emptySet.mal
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
