Changeset: 82b748170bbe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/82b748170bbe
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal.h
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.h
sql/backends/monet5/generator/generator.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/server/rel_optimizer.c
sql/server/sql_var.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: resource_management
Log Message:
merge default
diffs (truncated from 21312 to 300 lines):
diff --git a/.hgeol b/.hgeol
--- a/.hgeol
+++ b/.hgeol
@@ -13,8 +13,10 @@
**.gz = BIN
**.ico = BIN
**.jpg = BIN
+**.lz4 = BIN
**.pdf = BIN
**.png = BIN
+**.xz = BIN
**.zip = BIN
# all the rest is text
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ monetdb_default_compiler_options()
include(monetdb-defines)
-# required for symbol existance tests
+# required for symbol existence tests
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
add_definitions(-D_XOPEN_SOURCE -D_GNU_SOURCE)
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -36,7 +36,7 @@
# for Enterprise Linux (EPEL) repository is not available, you can
# disable its use by providing rpmbuild or mock with the "--without
# epel" option.
-# If the EPEL repository is availabe, or if building for Fedora, most
+# If the EPEL repository is available, or if building for Fedora, most
# optional sub packages can be built. We indicate that here by
# setting the macro fedpkgs to 1. If the EPEL repository is not
# available and we are not building for Fedora, we set fedpkgs to 0.
@@ -815,7 +815,6 @@ developer, but if you do want to test, t
%files testing-python
%defattr(-,root,root)
-%{_bindir}/Mconvert.py
%{_bindir}/Mtest.py
%{_bindir}/Mz.py
%{_bindir}/mktest.py
@@ -976,6 +975,7 @@ fi
rm
"${RPM_BUILD_ROOT}"%{_bindir}/{M{convert.py,test.py,z.py},bincopydata,example_proxy,m{alsample.pl,client,ktest.py,onetdb{,d},s{erver5,qldump},urltest},s{ample{0,1,4},hutdowntest,mack0{0,1},ql{logictest.py,sample.p{hp,l}},treamcat},testcondvar}
rm -r "${RPM_BUILD_ROOT}"%{_datadir}/doc/MonetDB*
rm "${RPM_BUILD_ROOT}"%{_datadir}/selinux/*/monetdb.pp
+rm -r "${RPM_BUILD_ROOT}"%{_datadir}/monetdb
rm -r "${RPM_BUILD_ROOT}"%{_includedir}/monetdb
rm "${RPM_BUILD_ROOT}"%{_libdir}/*.so
"${RPM_BUILD_ROOT}"%{_libdir}/libmonetdbe.so.*
rm -r "${RPM_BUILD_ROOT}"%{_libdir}/pkgconfig
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -242,7 +242,7 @@
- The tool mnc was removed from installations
* Wed Nov 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212
-- msqldump: Implmented an option (--table/-t) to dump a single table.
+- msqldump: Implemented an option (--table/-t) to dump a single table.
- Changed msqdump's trace option to be in line with mclient. In both
cases, the long option is --Xdebug and the short option is -X.
@@ -251,7 +251,7 @@
* Thu Jul 19 2012 Gijs Molenaar <g.j.molen...@uva.nl> - 11.13.1-20121010
- all strings returned by python2 are unicode, removed use_unicode option
-- python2 and 3 type convertion speed improvements
+- python2 and 3 type conversion speed improvements
- python2 uses new styl objects now (bug #3104)
- split python2 and python3
@@ -260,7 +260,7 @@
returned by the SQL-server.
* Fri Jun 29 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706
-- ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead
+- ODBC: Fixed a bug where SQLNativeSql expected a statement handle instead
of a connection handle.
* Wed May 23 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607
@@ -411,7 +411,7 @@
* Mon Apr 18 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.1-20110907
- When the first non-option argument of mclient does not refer to an
- exising file, it now is taken as database name. This allows to simply
+ existing file, it now is taken as database name. This allows to simply
do `mclient mydb`.
* Fri Jul 1 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
@@ -490,7 +490,7 @@
* Tue Sep 14 2010 Sjoerd Mullender <sjo...@acm.org> - 1.40.1-20101029
- The \d and \D commands now require a space if they are followed by a
- table name. This is to accomodate future expansion where \d and \D
+ table name. This is to accommodate future expansion where \d and \D
could be immediately followed by another letter to indicate the type
of object of interest.
- Implemented dumping of "external" functions. This fixes bug 2546.
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3332,17 +3332,17 @@ aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1]):any_1
zero_or_one;
-if col contains exactly one value return this. Incase of more raise an
exception else return nil
+if col contains exactly one value return this. In case of more raise an
exception else return nil
aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1], X_1:bit):any_1
zero_or_one_error;
-if col contains exactly one value return this. Incase of more raise an
exception if err is true else return nil
+if col contains exactly one value return this. In case of more raise an
exception if err is true else return nil
aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1], X_1:bat[:bit]):any_1
zero_or_one_error_bat;
-if col contains exactly one value return this. Incase of more raise an
exception if err is true else return nil
+if col contains exactly one value return this. In case of more raise an
exception if err is true else return nil
alarm
ctime
unsafe command alarm.ctime():str
@@ -3532,7 +3532,7 @@ algebra
outerselect
command algebra.outerselect(X_0:bat[:oid], X_1:bat[:bit], X_2:bat[:bit],
X_3:bit) (X_4:bat[:oid], X_5:bat[:bit])
ALGouterselect;
-Per input lid return atleast one row, if none of the predicates (p) hold,
return a nil, else 'all' true cases.
+Per input lid return at least one row, if none of the predicates (p) hold,
return a nil, else 'all' true cases.
algebra
project
pattern algebra.project(X_0:bat[:any_1], X_1:any_2):bat[:any_2]
@@ -3977,7 +3977,7 @@ bat
partition
pattern bat.partition(X_0:bat[:any_1]):bat[:any_1]...
CMDBATpartition;
-Create a serie of slices over the BAT argument. The BUNs are distributed
evenly.
+Create a series of slices over the BAT argument. The BUNs are distributed
evenly.
bat
replace
command bat.replace(X_0:bat[:any_1], X_1:bat[:oid],
X_2:bat[:any_1]):bat[:any_1]
@@ -4042,7 +4042,7 @@ bat
single
pattern bat.single(X_0:any_1):bat[:any_1]
CMDBATsingle;
-Create a BAT with a single elemenet
+Create a BAT with a single element
bat
vacuum
command bat.vacuum(X_0:bat[:str]):bat[:str]
@@ -35342,7 +35342,7 @@ batxml
root
command batxml.root(X_0:bat[:xml], X_1:str, X_2:str):bat[:xml]
BATXMLroot;
-Contruct the root nodes.
+Construct the root nodes.
batxml
serialize
command batxml.serialize(X_0:bat[:xml]):bat[:str]
@@ -44712,7 +44712,7 @@ clients
stop
unsafe pattern clients.stop(X_0:int):void
CLTstop;
-Stop the query execution at the next eligble statement.
+Stop the query execution at the next eligible statement.
clients
stopsession
unsafe pattern clients.stopsession(X_0:int):void
@@ -46337,7 +46337,7 @@ identifier
identifier
command identifier.identifier(X_0:str):identifier
IDentifier;
-Cast a string to an identifer
+Cast a string to an identifier
inet
!=
command inet.!=(X_0:inet, X_1:inet):bit
@@ -46487,7 +46487,7 @@ inspect
getEnvironment
command inspect.getEnvironment(X_0:str):str
INSPECTgetEnvironmentKey;
-Get the value of an environemnt variable
+Get the value of an environment variable
inspect
getExistence
pattern inspect.getExistence(X_0:str, X_1:str):bit
@@ -46562,7 +46562,7 @@ io
print
pattern io.print(X_0:bat[:any]...):void
IOtable;
-BATs are printed with '#' for legend @lines, and the BUNs on seperate lines
@between brackets, containing each to @comma separated values (head and tail).
@If multiple BATs are passed for printing, @print() performs an implicit
natural @join on the void head, producing a multi attribute table.
+BATs are printed with '#' for legend @lines, and the BUNs on separate lines
@between brackets, containing each to @comma separated values (head and tail).
@If multiple BATs are passed for printing, @print() performs an implicit
natural @join on the void head, producing a multi attribute table.
io
printf
pattern io.printf(X_0:str):void
@@ -46827,7 +46827,7 @@ language
pass
pattern language.pass(X_0:any_1):void
MALpass;
-Cheap instruction to disgard storage while retaining the dataflow dependency
+Cheap instruction to discard storage while retaining the dataflow dependency
logging
compinfo
pattern logging.compinfo() (X_0:bat[:int], X_1:bat[:str], X_2:bat[:str])
@@ -48992,7 +48992,7 @@ sql
copy_from
unsafe pattern sql.copy_from(X_0:ptr, X_1:str, X_2:str, X_3:str, X_4:str,
X_5:str, X_6:lng, X_7:lng, X_8:int, X_9:str, X_10:int, X_11:int, X_12:str,
X_13:str):bat[:any]...
mvc_import_table_wrap;
-Import a table from bstream s with the @given tuple and seperators (sep/rsep)
+Import a table from bstream s with the @given tuple and separators (sep/rsep)
sql
copy_rejects
pattern sql.copy_rejects() (X_0:bat[:lng], X_1:bat[:int], X_2:bat[:str],
X_3:bat[:str])
@@ -49287,7 +49287,7 @@ sql
eval
unsafe pattern sql.eval(X_0:str, X_1:bit):void
SQLstatement;
-Compile and execute a single sql statement (and optionaly set the output to
columnar format)
+Compile and execute a single sql statement (and optionally set the output to
columnar format)
sql
evalAlgebra
unsafe pattern sql.evalAlgebra(X_0:str, X_1:bit):void
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -2767,17 +2767,17 @@ aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1]):any_1
zero_or_one;
-if col contains exactly one value return this. Incase of more raise an
exception else return nil
+if col contains exactly one value return this. In case of more raise an
exception else return nil
aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1], X_1:bit):any_1
zero_or_one_error;
-if col contains exactly one value return this. Incase of more raise an
exception if err is true else return nil
+if col contains exactly one value return this. In case of more raise an
exception if err is true else return nil
aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1], X_1:bat[:bit]):any_1
zero_or_one_error_bat;
-if col contains exactly one value return this. Incase of more raise an
exception if err is true else return nil
+if col contains exactly one value return this. In case of more raise an
exception if err is true else return nil
alarm
ctime
unsafe command alarm.ctime():str
@@ -2967,7 +2967,7 @@ algebra
outerselect
command algebra.outerselect(X_0:bat[:oid], X_1:bat[:bit], X_2:bat[:bit],
X_3:bit) (X_4:bat[:oid], X_5:bat[:bit])
ALGouterselect;
-Per input lid return atleast one row, if none of the predicates (p) hold,
return a nil, else 'all' true cases.
+Per input lid return at least one row, if none of the predicates (p) hold,
return a nil, else 'all' true cases.
algebra
project
pattern algebra.project(X_0:bat[:any_1], X_1:any_2):bat[:any_2]
@@ -3402,7 +3402,7 @@ bat
partition
pattern bat.partition(X_0:bat[:any_1]):bat[:any_1]...
CMDBATpartition;
-Create a serie of slices over the BAT argument. The BUNs are distributed
evenly.
+Create a series of slices over the BAT argument. The BUNs are distributed
evenly.
bat
replace
command bat.replace(X_0:bat[:any_1], X_1:bat[:oid],
X_2:bat[:any_1]):bat[:any_1]
@@ -3467,7 +3467,7 @@ bat
single
pattern bat.single(X_0:any_1):bat[:any_1]
CMDBATsingle;
-Create a BAT with a single elemenet
+Create a BAT with a single element
bat
vacuum
command bat.vacuum(X_0:bat[:str]):bat[:str]
@@ -26432,7 +26432,7 @@ batxml
root
command batxml.root(X_0:bat[:xml], X_1:str, X_2:str):bat[:xml]
BATXMLroot;
-Contruct the root nodes.
+Construct the root nodes.
batxml
serialize
command batxml.serialize(X_0:bat[:xml]):bat[:str]
@@ -33247,7 +33247,7 @@ clients
stop
unsafe pattern clients.stop(X_0:int):void
CLTstop;
-Stop the query execution at the next eligble statement.
+Stop the query execution at the next eligible statement.
clients
stopsession
unsafe pattern clients.stopsession(X_0:int):void
@@ -34827,7 +34827,7 @@ identifier
identifier
command identifier.identifier(X_0:str):identifier
IDentifier;
-Cast a string to an identifer
+Cast a string to an identifier
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
