May 2009 - developers-list

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_interpreter.mx, , 1.303, 1.304
by Sjoerd Mullender 23 May '09

23 May '09

Is this a bug fix? On 2009-05-23 11:56, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19871 > > Modified Files: > mal_interpreter.mx > Log Message: > We better protect global variables in the interpreter. > > > U mal_interpreter.mx > Index: mal_interpreter.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v > retrieving revision 1.303 > retrieving revision 1.304 > diff -u -d -r1.303 -r1.304 > --- mal_interpreter.mx 16 May 2009 18:26:23 -0000 1.303 > +++ mal_interpreter.mx 23 May 2009 09:55:57 -0000 1.304 > @@ -734,11 +734,12 @@ > #endif > @:performanceVariables@ > > -#ifdef DEBUG_FLOW2 > + pci = getInstrPtr(flow->mb, stkpc); > +#ifdef DEBUG_FLOW > stream_printf(cntxt->fdout,"#execute thread %d \n", tid); > + printInstruction(GDKstdout, flow->mb, 0, pci, LIST_MAL_ALL); > #endif > THRset_errbuf(THRget(THRgettid()), cntxt->errbuf); /* where to leave errors */ > - pci = getInstrPtr(flow->mb, stkpc); > if (stk->cmd || mb->trap) { > lng tm = 0; > if( oldtimer) > @@ -857,9 +858,13 @@ > { > int i; > > - assert(worker == NULL); > + mal_set_lock(mal_contextLock, "DFLOWcreate"); > + if ( work != NULL){ > + mal_unset_lock(mal_contextLock, "DFLOWcreate"); > + return; > + } > > - work = q_create(256); > + work = q_create(256); /* seems enough for the time being */ > > nway = GDKnr_threads; > worker = (FlowTask *) GDKzalloc(sizeof(FlowTask)*nway); > @@ -868,6 +873,7 @@ > /* create the thread and let it wait */ > MT_create_thread(&worker[i].tid, runDFLOWworker, worker+i); > } > + mal_unset_lock(mal_contextLock, "DFLOWcreate"); > } > > static void > > > ------------------------------------------------------------------------------ > Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT > is a gathering of tech-side developers & brand creativity professionals. Meet > the minds behind Google Creative Lab, Visual Complexity, Processing, & > iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian > Group, R/GA, & Big Spaceship. http://www.creativitycat.com > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

2 1

[Monetdb-developers] ODBC windows build script
by Stefan de Konink 23 May '09

23 May '09

Is there any 'asset' available that allows to build the Windows ODBC driver from within Linux or a howto to build it in Windows? Especially related to the recent authentication changes. Stefan

3 3

[Monetdb-developers] DBSlayer for MonetDB
by Stefan de Konink 22 May '09

22 May '09

Hi, I have set up a development server for OpenStreetMap that allows 'Joe Regular' to perform /any/ SQL request on a dataset limited to the borders of The Netherlands, Belgium and Luxembourgh. That means around 700MB of data. Because OpenStreetMap mainly targets webdevelopment, making it easy-to-use and efficient-to-parse become key issues. Because my favorite webserver [1] implemented DBSlayer [2] technology for MySQL; I could plugin an architecture layer to support different databases. MonetDB is in beta phase, and PostgreSQL is coded. The output is available in native PHP, Python and Ruby arrays; JSON, and XML-RPC is coded but not yet in production. The attached script shows a trivial example how to query a database farm over the web. Hanging more servers under the webserver, automatically increases performance and redundancy. I configured the webserver in such way that a rewrite takes place if no LIMIT was specified. Because the requests are URIs, every request is logged, what makes it possible to analyse the performance and benchmark the test set against new releases. With this platform I am able to plugin my multicolumn 'optimizer' idea, so we all benefit. To the outside Mapi is available, for accessing it by our mclient or ODBC client. If our 'native' Ruby/Python MAPI implementations are ready for testing, I can promote them on the site, or provide a sandbox. The site itself is still boring; http://xapi.openstreet.nl:8000/ Stefan [1] http://www.cherokee-project.com/ [2] http://code.nytimes.com/projects/dbslayer #!/usr/bin/env python import urllib sql="SELECT lat, long FROM nodes_legacy, node_tags WHERE id = node AND k = 'amenity' and v = 'atm';" query = urllib.quote(sql) print 'Original:', sql print 'Encoded:', query url = 'http://xapi.openstreet.nl:8000/python/%s'%(query) response = urllib.urlopen(url) print 'RESPONSE:', response print 'URL :', response.geturl() headers = response.info() print 'DATE :', headers['date'] print 'HEADERS :' print '---------' print headers data = response.read() print 'LENGTH :', len(data) print 'DATA :' print '---------' obj = eval(data) print obj

1 0

Re: [Monetdb-developers] [Monetdb-checkins] clients/src/ruby activerecord-monetdb-adapter-0.1.gem, , NONE, 1.1 activerecord-monetdb-adapter-0.1.gemspec, , NONE, 1.1 Changelog, , 1.2, 1.3 README, , 1.3, 1.4 TODO, , 1.2, 1.3 ruby-monetdb-sql-0.1.gem, , 1.2, 1.3
by Stefan Manegold 20 May '09

20 May '09

On Wed, May 20, 2009 at 11:17:14AM +0000, Gabriele Modena wrote: > Update of /cvsroot/monetdb/clients/src/ruby > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30426 > > Modified Files: > Changelog README TODO ruby-monetdb-sql-0.1.gem > Added Files: > activerecord-monetdb-adapter-0.1.gem > activerecord-monetdb-adapter-0.1.gemspec > Log Message: > Fixed bugs that prevented the correct working of activerecords' migration; The activerecord connector now supports insertion, update and alter table operations; Type casting is working in activerecord; Added a rubygem and rakefile for activerecord-monetdb-adapter; Added a new usage example for activerecord to the README file; Added an example directory to the cvs tree; The driver now correctly works with merovingian. ^^^^^^^^^^ Shouldn't this checkin then have gone to the May2009 release branch? See `man cvs` and/or pages 8 - 16 of http://homepages.cwi.nl/~manegold/Presentations/MonetDBdevTTT.pdf for information about how to use CVS branches in genral and/or with MonetDB in particular. Don't hesitate to ask if you have questions. Please check with Sjoerd, whether a(n execptional!) back-port is desired; if so, see the above references (or ask) how to do this using CVS commands, only. If required, I can help. Stefan > > U Changelog > Index: Changelog > =================================================================== > RCS file: /cvsroot/monetdb/clients/src/ruby/Changelog,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- Changelog 9 May 2009 14:49:30 -0000 1.2 > +++ Changelog 20 May 2009 11:17:12 -0000 1.3 > @@ -1,3 +1,13 @@ > +* Mon 18 May 2009 15:22:31 CEST > +Fixed bugs that prevented the correct working of activerecords' migration; > +The activerecord connector now supports insertion, update and alter table operations; > +Type casting is working in activerecord; > +Added a rubygem and rakefile for activerecord-monetdb-adapter; > +Added a new usage example for activerecord to the README file; > +Added an example directory to the cvs tree; > +The driver now correctly works with merovingian. > + > + > * Sat 9 May 2009 15:58:36 CEST > Fixed bugs with the query processing in the standalone driver; > Added INSERT and UPDATE methods in the activerecord connector. > > --- NEW FILE: activerecord-monetdb-adapter-0.1.gemspec --- > Gem::Specification.new do |s| > s.required_ruby_version = '>= 1.8.0' > s.name = %q{activerecord-monetdb-adapter} > s.version = "0.1" > s.date = %q{2009-05-18} > s.authors = ["G Modena"] > s.email = %q{gm(a)cwi.nl} > s.summary = %q{ActiveRecord Connector for MonetDB} > s.homepage = %q{http://monetdb.cwi.nl/} > s.description = %q{ActiveRecord Connector for MonetDB built on top of the pure Ruby database driver} > s.files = [ "adapter/active_record/connection_adapters/monetdb_adapter.rb" ] > s.has_rdoc = true > s.require_path = './lib' > s.add_dependency(%q<activerecord>, [">= 2.3.2"]) > s.add_dependency(%q<ruby-monetdb-sql>, [">= 0.1"]) > end > > U ruby-monetdb-sql-0.1.gem > Index: ruby-monetdb-sql-0.1.gem > =================================================================== > RCS file: /cvsroot/monetdb/clients/src/ruby/ruby-monetdb-sql-0.1.gem,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > Binary files /tmp/cvs9arhWX and /tmp/cvsfjZs3J differ > > --- NEW FILE: activerecord-monetdb-adapter-0.1.gem --- > (This appears to be a binary file; contents omitted.) > > U README > Index: README > =================================================================== > RCS file: /cvsroot/monetdb/clients/src/ruby/README,v > retrieving revision 1.3 > retrieving revision 1.4 > diff -u -d -r1.3 -r1.4 > --- README 7 May 2009 15:06:41 -0000 1.3 > +++ README 20 May 2009 11:17:12 -0000 1.4 > @@ -2,7 +2,6 @@ > This directory contains the a ruby interface to monetdb5 > written in pure ruby. > > - > lib/MonetDB.rb > lib/MonetDBConnection.rb > lib/MonetDBStatements.rb > @@ -16,54 +15,8 @@ > > doc/: rubydoc in HTML format > > -== ActiveRecord adapter == > -Active Record connects business objects and database tables to create a persistable domain model where logic and data are presented in one wrapping. It‘s an implementation of the object-relational mapping (ORM) pattern. > - > -Required files: > -adapter/lib/active_record/monetdb_adapter.rb > - > -At the moment connection and SELECT queries are supported. > - > -Usage example follows: > - > - > -require 'active_record' > - > -ActiveRecord::Base.establish_connection( > - :adapter => "monetdb", > - :host => "localhost", > - :database => "demo" > -) > - > -# map the tables schema to a class > -class Tables < ActiveRecord::Base > -end > - > -# return the first result of the query SELECT * from tables > -puts Tables.find(:first) > - > - > - > - > -== Rubygem == > - > -The standalone ruby driver can be distributed as a ruby gem. > -A gem file is already available; however, it can be generated > -starting from the ruby-monetdb-sql-0.1.gemspec file: > - > -$ gem build ruby-monetdb-sql-0.1.gemspec > - > -To install the file run the command: > - > -$ gem install ruby-monetdb-sql-0.1.gem > - > -Documentation in ri and html format will be generated and installed as well > - > == Usage == > -To use the driver import the 'MonetDB' class and 'rubygems' (in case you installed it using gems). > - > - > -* Processing Statements that Return a Result Set > +To use the standalone driver import the 'MonetDB' class and 'rubygems' (in case you installed it using gems). > > A typical sequence of events is as follows: > Invoke query using the database handle to send the statement to the server and get back a result set object. > @@ -104,3 +57,85 @@ > db.close > > See lib/demo.rb and the MonetDBDatar class documentation for more examples. > + > + > + > +== ActiveRecord connector adapter == > +Active Record connects business objects and database tables to create a persistable domain model where logic and data are presented in one wrapping. It‘s an implementation of the object-relational mapping (ORM) pattern. > + > +Required files: > + > +adapter/lib/active_record/monetdb_adapter.rb > + > +Usage example follows: > +require 'active_record' > + > +ActiveRecord::Base.logger = Logger.new(STDERR) > +ActiveRecord::Base.colorize_logging = true > + > +ActiveRecord::Base.establish_connection( > + :adapter => "monetdb", > + :host => "localhost", > + :database => "demo" > +) > + > +# Create a new table > +class AddTests < ActiveRecord::Migration > + def self.up > + create_table :tests do |table| > + table.column :name, :string > + table.column :surname, :string > + end > + end > + > + def self.down > + drop_table :tests > + end > + > +end > + > +AddTests.up > + > +# Migration: add a column name with a default value > +class AddAge < ActiveRecord::Migration > + def self.up > + add_column :tests, :age, :smallint, :default => 18 > + end > + > + def self.down > + remove_column :tests, :age > + end > + > +end > + > +class Test < ActiveRecord::Base > +end > + > +# Insert an entry in the table > +Test.create(:name => 'X', :surname => 'Y') > + > +# add a column > +AddAge.up > + > +# return the first result of the query SELECT * from tables > +row = Test.find(:first) > +printf "SELECT * from tests LIMIT 1:\n" > +printf "Name: %s, Surname: %s, Age: %s\n", row.name, row.surname, row.age > + > +# Drop the table > +AddTests.down > + > +== Rubygem == > + > +The standalone ruby driver can be distributed as a ruby gem. > +A gem file is already available; however, it can be generated > +starting from the ruby-monetdb-sql-0.1.gemspec file: > + > +$ gem build ruby-monetdb-sql-0.1.gemspec > + > +To install the file run the command: > + > +$ gem install ruby-monetdb-sql-0.1.gem > + > +Documentation in ri and html format will be generated and installed as well > + > > U TODO > Index: TODO > =================================================================== > RCS file: /cvsroot/monetdb/clients/src/ruby/TODO,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- TODO 7 May 2009 15:06:41 -0000 1.2 > +++ TODO 20 May 2009 11:17:12 -0000 1.3 > @@ -1,5 +1,15 @@ > +* implement PROTOCOL 9 login changes > + > * improve activerecord driver > + > * profiling and performance tuning > + > * improve type conversion (do conversion "on demand" as in jdbc driver) > + > * improve tests > + > * code and documentation cleanup > + > +* fix syntax errors with ruby 1.9 > + > +* OSM on rails demo > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

2 2

[Monetdb-developers] OpenSSL header check
by Stefan de Konink 20 May '09

20 May '09

I was just compiling MonetDB head on this distro called `Debian' (poor me). In the middle of the compilation I had missing headers. Wouldn't it be feasible to check for them like we check for PCRE presence? Stefan

2 4

Re: [Monetdb-developers] [Monetdb-checkins] buildtools/conf MonetDB.m4, May2009, 1.118, 1.118.2.1
by Jan Rittinger 19 May '09

19 May '09

That's no solution in my eyes... Now I get the following configure output for the clients module... checking for OpenSSL >= 0x0090800f... configure: error: not sufficient > ... and cannot build the clients code anymore. Jan On May 18, 2009, at 20:40, Fabian wrote: > Update of /cvsroot/monetdb/buildtools/conf > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29422 > > Modified Files: > Tag: May2009 > MonetDB.m4 > Log Message: > check for >openssl-0.9.8, sha-2 is only implemented there, thanks > Jan Rittinger > > U MonetDB.m4 > Index: MonetDB.m4 > =================================================================== > RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v > retrieving revision 1.118 > retrieving revision 1.118.2.1 > diff -u -d -r1.118 -r1.118.2.1 > --- MonetDB.m4 6 May 2009 16:08:00 -0000 1.118 > +++ MonetDB.m4 18 May 2009 18:39:58 -0000 1.118.2.1 > @@ -2402,6 +2402,19 @@ > fi > if test "x$have_openssl" != xno; then > AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the OpenSSL library]) > + dnl SHA-2 is implemented starting from version 0.9.8 > + req_openssl_ver=0x0090800f > + AC_MSG_CHECKING([for OpenSSL >= $req_openssl_ver]) > + AC_TRY_COMPILE([#include <openssl/opensslv.h>],[ > +#if !defined(OPENSSL_VERSION_NUMBER) > +#error "Hmmm no OpenSSL version?" > +#endif > +#if (OPENSSL_VERSION_NUMBER < ${req_openssl_ver}L) > +#error "Need more recent version than " OPENSSL_VERSION_TEXT > +#endif], > + [AC_MSG_RESULT(OK)], > + [AC_MSG_ERROR([not sufficient])] > + ) > else > OPENSSL_LIBS="" > OPENSSL_INCS="" > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Jan Rittinger Lehrstuhl Datenbanken und Informationssysteme Wilhelm-Schickard-Institut für Informatik Eberhard-Karls-Universität Tübingen http://www-db.informatik.uni-tuebingen.de/team/rittinger

4 7

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal mkey.mx, May2009, 1.15, 1.15.2.1
by Stefan Manegold 19 May '09

19 May '09

Martin, maybe the compiler reminded us that you originally intended the following, i.e., propagation the actual error message of CMDbulk_rotate_xor_hash() upwards instead of just saying OPERATION_FAILED: ======== $ cvs diff MonetDB5/src/modules/mal/mkey.mx Index: MonetDB5/src/modules/mal/mkey.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mkey.mx,v retrieving revision 1.15.2.1 diff -u -r1.15.2.1 mkey.mx --- MonetDB5/src/modules/mal/mkey.mx 19 May 2009 05:52:49 -0000 1.15.2.1 +++ MonetDB5/src/modules/mal/mkey.mx 19 May 2009 07:39:01 -0000 @@ -584,6 +584,7 @@ str MKEYbulk_rotate_xor_hash(int *ret, int *hid, int *nbits, int *bid){ BAT *hn, *b, *bn=0; + str msg= MAL_SUCCEED; if ((hn = BATdescriptor(*hid)) == NULL) { throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING); @@ -593,15 +594,15 @@ throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING); } - if( CMDbulk_rotate_xor_hash(&bn,hn,nbits,b) != MAL_SUCCEED){ + if( (msg= CMDbulk_rotate_xor_hash(&bn,hn,nbits,b)) != MAL_SUCCEED){ BBPreleaseref(hn->batCacheid); BBPreleaseref(b->batCacheid); - throw(MAL, "mkey.bulk_rotate_xor_hash", OPERATION_FAILED); + throw(MAL, "mkey.bulk_rotate_xor_hash", msg); } BBPreleaseref(hn->batCacheid); BBPreleaseref(b->batCacheid); *ret= bn->batCacheid; BBPkeepref(bn->batCacheid); - return MAL_SUCCEED; + return msg; } @} ======== ? Stefan On Tue, May 19, 2009 at 05:52:51AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30928 > > Modified Files: > Tag: May2009 > mkey.mx > Log Message: > Silence compiler > > > U mkey.mx > Index: mkey.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mkey.mx,v > retrieving revision 1.15 > retrieving revision 1.15.2.1 > diff -u -d -r1.15 -r1.15.2.1 > --- mkey.mx 17 May 2009 21:14:54 -0000 1.15 > +++ mkey.mx 19 May 2009 05:52:49 -0000 1.15.2.1 > @@ -584,7 +584,6 @@ > str > MKEYbulk_rotate_xor_hash(int *ret, int *hid, int *nbits, int *bid){ > BAT *hn, *b, *bn=0; > - str msg= MAL_SUCCEED; > > if ((hn = BATdescriptor(*hid)) == NULL) { > throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING); > @@ -594,7 +593,7 @@ > throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING); > } > > - if( (msg= CMDbulk_rotate_xor_hash(&bn,hn,nbits,b)) != MAL_SUCCEED){ > + if( CMDbulk_rotate_xor_hash(&bn,hn,nbits,b) != MAL_SUCCEED){ > BBPreleaseref(hn->batCacheid); > BBPreleaseref(b->batCacheid); > throw(MAL, "mkey.bulk_rotate_xor_hash", OPERATION_FAILED); > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins > > > -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

1 0

[Monetdb-developers] New stable branch created
by Sjoerd Mullender 18 May '09

18 May '09

I have created new stable branches for the upcoming release. From now on *all* bug fixes and *only* bug fixes *must* go to this new stable branch. I reserve the right to undo any changes that do not comply with this rule. All packages use the same name for the branch: May2009. So in each of your stable checkout directories you can do cvs update -rMay2009 to update to the new branch. I have created branches for the following packages: MonetDB MonetDB4 MonetDB5 TestTools buildtools clients geom java pathfinder sql template testing. Note that datacell is missing from this list. It is not yet released and will not be released in this round. -- Sjoerd Mullender

2 1

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/optimizer opt_datacyclotron.mx, , 1.6, 1.7 opt_derivepath.mx, , 1.4, 1.5 opt_joinpath.mx, , 1.46, 1.47 opt_macro.mx, , 1.46, 1.47 opt_prejoin.mx, , 1.7, 1.8 opt_remap.mx, , 1.47, 1.48 opt_statistics.mx, , 1.18, 1.19 opt_support.mx, , 1.100, 1.101 opt_trace.mx, , 1.12, 1.13 optimizer.mx, , 1.83, 1.84 optimizerWrapper.mx, , 1.29, 1.30
by Sjoerd Mullender 17 May '09

17 May '09

Where are the definitions of ILLARG_CONSTANTS, PROGRAM_NYI and OPTIMIZER_CYCLE? On 2009-05-16 23:02, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/optimizer > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2012 > > Modified Files: > opt_datacyclotron.mx opt_derivepath.mx opt_joinpath.mx > opt_macro.mx opt_prejoin.mx opt_remap.mx opt_statistics.mx > opt_support.mx opt_trace.mx optimizer.mx optimizerWrapper.mx > Log Message: > The next batch of straightforward error clean up and condensation. > > > U opt_derivepath.mx > Index: opt_derivepath.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_derivepath.mx,v > retrieving revision 1.4 > retrieving revision 1.5 > diff -u -d -r1.4 -r1.5 > --- opt_derivepath.mx 3 Apr 2009 16:48:41 -0000 1.4 > +++ opt_derivepath.mx 16 May 2009 21:02:04 -0000 1.5 > @@ -141,6 +141,6 @@ > (void) mb; > (void) stk; > (void) pci; > - throw(MAL,"group.derivePath","nyi"); > + throw(MAL,"group.derivePath",PROGRAM_NYI); > } > @} > > U opt_support.mx > Index: opt_support.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_support.mx,v > retrieving revision 1.100 > retrieving revision 1.101 > diff -u -d -r1.100 -r1.101 > --- opt_support.mx 6 May 2009 16:54:13 -0000 1.100 > +++ opt_support.mx 16 May 2009 21:02:04 -0000 1.101 > @@ -628,7 +628,7 @@ > sprintf(buf,"%-20s actions=%2d time=" LLFMT " usec",name,actions,usec); > newComment(mb,buf); > if (mb->errors) > - throw(MAL,name,"failed\n"); > + throw(MAL, name, PROGRAM_GENERAL); > } > /* code to collect all last versions to study code coverage in SQL > {stream *fd; > @@ -677,7 +677,7 @@ > } > } while (qot && cnt++ < mb->stop); > if (cnt >= mb->stop) > - throw(MAL, "optimizer.MALoptimizer", "too many optimization cycles\n"); > + throw(MAL, "optimizer.MALoptimizer", OPTIMIZER_CYCLE); > return 0; > } > > > U optimizerWrapper.mx > Index: optimizerWrapper.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/optimizerWrapper.mx,v > retrieving revision 1.29 > retrieving revision 1.30 > diff -u -d -r1.29 -r1.30 > --- optimizerWrapper.mx 16 May 2009 08:54:40 -0000 1.29 > +++ optimizerWrapper.mx 16 May 2009 21:02:04 -0000 1.30 > @@ -57,9 +57,7 @@ > !isVarConstant(mb,getArg(p,1)) || > !isVarConstant(mb,getArg(p,2)) > ) { > - char buf[1024]; > - snprintf(buf,1024, "Optimizer requires constant string arguments\n"); > - throw(MAL, "optimizer.@1",buf); > + throw(MAL, "optimizer.@1", ILLARG_CONSTANTS); > } > if( stk != 0){ > modnme= *(str*)getArgReference(stk,p,1); > @@ -72,8 +70,8 @@ > > if( s == NULL) { > char buf[1024]; > - snprintf(buf,1024, "Could not find %s.%s\n",modnme,fcnnme); > - throw(MAL, "optimizer.@1",buf); > + snprintf(buf,1024, "%s.%s",modnme,fcnnme); > + throw(MAL, "optimizer.@1", RUNTIME_OBJECT_UNDEFINED, buf); > } > #ifdef _DEBUG_OPTIMIZER_ > stream_printf(cntxt->fdout,"@1 %s %s\n",modnme,fcnnme); > > U opt_remap.mx > Index: opt_remap.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_remap.mx,v > retrieving revision 1.47 > retrieving revision 1.48 > diff -u -d -r1.47 -r1.48 > --- opt_remap.mx 16 May 2009 08:54:40 -0000 1.47 > +++ opt_remap.mx 16 May 2009 21:02:04 -0000 1.48 > @@ -529,7 +529,7 @@ > #else > (void) cntxt; > #endif > - throw(MAL,"opt.remap","no implementation present"); > + throw(MAL, "opt.remap", PROGRAM_NYI); > } > @include optimizerWrapper.mx > @h > > U opt_prejoin.mx > Index: opt_prejoin.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_prejoin.mx,v > retrieving revision 1.7 > retrieving revision 1.8 > diff -u -d -r1.7 -r1.8 > --- opt_prejoin.mx 12 Apr 2009 20:22:29 -0000 1.7 > +++ opt_prejoin.mx 16 May 2009 21:02:04 -0000 1.8 > @@ -62,11 +62,11 @@ > > *rl = *rr = 0; > if( (bl= BATdescriptor(*l)) == NULL ){ > - throw(MAL, "algebra.prejoin", "Cannot access descriptor"); > + throw(MAL, "algebra.prejoin", INTERNAL_BAT_ACCESS); > } > if( (br= BATdescriptor(*r)) == NULL ){ > BBPreleaseref(bl->batCacheid); > - throw(MAL, "algebra.prejoin", "Cannot access descriptor"); > + throw(MAL, "algebra.prejoin", INTERNAL_BAT_ACCESS); > } > lpages= (BUN) ((bl->H->heap.size + bl->T->heap.size)/MT_pagesize()); > rpages= (BUN) ((br->H->heap.size + br->T->heap.size)/MT_pagesize()); > > U opt_macro.mx > Index: opt_macro.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_macro.mx,v > retrieving revision 1.46 > retrieving revision 1.47 > diff -u -d -r1.46 -r1.47 > --- opt_macro.mx 16 May 2009 08:54:40 -0000 1.46 > +++ opt_macro.mx 16 May 2009 21:02:04 -0000 1.47 > @@ -388,7 +388,7 @@ > retseen = p->token == RETURNsymbol || p->token == YIELDsymbol || p->barrier == RETURNsymbol || p->barrier == YIELDsymbol; > } > if (retseen && i != mb->stop - 1) > - throw(MAL, "optimizer.MACROvalidate", "RETURN statement is not the last one"); > + throw(MAL, "optimizer.MACROvalidate", MACRO_SYNTAX_ERROR); > return MAL_SUCCEED; > } > > @@ -417,13 +417,13 @@ > stream_printf(cntxt->fdout,"Hit, replace macro call %s\n", t->name); > #endif > if (i == last) > - throw(MAL, "optimizer.MACROoptimizer", "duplicate macro expansion"); > + throw(MAL, "optimizer.MACROoptimizer", MACRO_DUPLICATE); > > last = i; > i = inlineMALblock(mb, i, t->def); > cnt++; > if (cnt > MAXEXPANSION) > - throw(MAL, "optimizer.MACROoptimizer", "too many macro expansions"); > + throw(MAL, "optimizer.MACROoptimizer", MACRO_TOO_DEEP); > } > } > return msg; > > U opt_trace.mx > Index: opt_trace.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_trace.mx,v > retrieving revision 1.12 > retrieving revision 1.13 > diff -u -d -r1.12 -r1.13 > --- opt_trace.mx 7 Jan 2009 14:15:13 -0000 1.12 > +++ opt_trace.mx 16 May 2009 21:02:04 -0000 1.13 > @@ -90,7 +90,7 @@ > > trace= fopen(defaultLog,"a"); > if( trace == 0) > - throw(MAL,"mdb.collect","Could not create trace file"); > + throw(MAL, "mdb.collect", RUNTIME_FILE_NOT_FOUND); > fprintf(trace,"#-------- \n"); > fflush(trace); > } > > U optimizer.mx > Index: optimizer.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/optimizer.mx,v > retrieving revision 1.83 > retrieving revision 1.84 > diff -u -d -r1.83 -r1.84 > --- optimizer.mx 16 May 2009 08:54:40 -0000 1.83 > +++ optimizer.mx 16 May 2009 21:02:04 -0000 1.84 > @@ -151,7 +151,7 @@ > } > s = findSymbol(cntxt->nspace, putName(modnme,strlen(modnme)), fcnnme); > if (s == NULL) > - throw(MAL, "optimizer.optimize", "operation not found\n"); > + throw(MAL, "optimizer.optimize", SEMANTIC_OPERATION_MISSING); > removeInstruction(mb, pci); > return optimizeMALBlock(cntxt, s->def); > } > @@ -180,8 +180,8 @@ > > if (s == NULL) { > char buf[1024]; > - snprintf(buf,1024, "Could not find %s.%s\n", modnme, fcnnme); > - throw(MAL, "optimizer.showFlowGraph", buf); > + snprintf(buf,1024, "%s.%s", modnme, fcnnme); > + throw(MAL, "optimizer.showFlowGraph", RUNTIME_OBJECT_UNDEFINED, buf); > } > showFlowGraph(s->def, stk, fname); > return MAL_SUCCEED; > @@ -209,8 +209,8 @@ > > if (s == NULL) { > char buf[1024]; > - snprintf(buf,1024, "Could not find %s.%s\n", modnme, fcnnme); > - throw(MAL, "optimizer.showPlan", buf); > + snprintf(buf,1024, "%s.%s", modnme, fcnnme); > + throw(MAL, "optimizer.showPlan", RUNTIME_OBJECT_UNDEFINED, buf); > } > mb= s->def; > } > @@ -271,7 +271,7 @@ > #endif > if( s== 0) > return throwException(MALEXCEPTION,"optimizer.@1optimizer", > - "module '%s' not found\n",fcn); > + RUNTIME_OBJECT_UNDEFINED, fcn); > if( s->subscope){ > j = getSubScope(fcn); > for(t= s->subscope[j];t!=NULL;t=t->peer) > > U opt_joinpath.mx > Index: opt_joinpath.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_joinpath.mx,v > retrieving revision 1.46 > retrieving revision 1.47 > diff -u -d -r1.46 -r1.47 > --- opt_joinpath.mx 29 Apr 2009 07:41:50 -0000 1.46 > +++ opt_joinpath.mx 16 May 2009 21:02:04 -0000 1.47 > @@ -484,7 +484,7 @@ > for( --top; top>=0; top--) > BBPreleaseref(joins[top]->batCacheid); > GDKfree(joins); > - throw(MAL, "algebra.joinPath", "Cannot access descriptor"); > + throw(MAL, "algebra.joinPath", INTERNAL_BAT_ACCESS); > } > joins[top++] = b; > } > > U opt_datacyclotron.mx > Index: opt_datacyclotron.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_datacyclotron.mx,v > retrieving revision 1.6 > retrieving revision 1.7 > diff -u -d -r1.6 -r1.7 > --- opt_datacyclotron.mx 5 May 2009 14:20:06 -0000 1.6 > +++ opt_datacyclotron.mx 16 May 2009 21:02:04 -0000 1.7 > @@ -114,14 +114,14 @@ > (void) tab; > (void) col; > (void) kind; > - throw(MAL,"datacyclotron.request","nyi"); > + throw(MAL,"datacyclotron.request",PROGRAM_NYI); > } > > str > DCpin(int *ret, int *bid){ > (void) ret; > (void) bid; > - throw(MAL,"datacyclotron.pin","nyi"); > + throw(MAL,"datacyclotron.pin",PROGRAM_NYI); > } > > > @@ -129,6 +129,6 @@ > DCunpin(int *ret, int *bid){ > (void) ret; > (void) bid; > - throw(MAL,"datacyclotron.unpin","nyi"); > + throw(MAL,"datacyclotron.unpin",PROGRAM_NYI); > } > > > U opt_statistics.mx > Index: opt_statistics.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_statistics.mx,v > retrieving revision 1.18 > retrieving revision 1.19 > diff -u -d -r1.18 -r1.19 > --- opt_statistics.mx 7 Jan 2009 14:15:13 -0000 1.18 > +++ opt_statistics.mx 16 May 2009 21:02:04 -0000 1.19 > @@ -192,10 +192,8 @@ > int idx; > QOTstatisticsInit(); > idx= QOTindex(*nme); > - if( idx < 0) > - throw(MAL,"optimizer.getStatistics","Illegal property"); > - if( qotStat[idx] == 0) > - throw(MAL,"optimizer.getStatistics","Statistics table not valid"); > + if( idx < 0 || qotStat[idx] == 0 ) > + throw(ILLARG,"optimizer.getStatistics",RUNTIME_OBJECT_MISSING); > BBPincref(*ret= qotStat[idx]->batCacheid, TRUE); > return MAL_SUCCEED; > } > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_authorize.mx, , 1.73, 1.74 mal_client.mx, , 1.195, 1.196 mal_debugger.mx, , 1.263, 1.264 mal_exception.mx, , 1.54, 1.55 mal_factory.mx, , 1.87, 1.88 mal_interpreter.mx, , 1.302, 1.303 mal_linker.mx, , 1.110, 1.111 mal_profiler.mx, , 1.128, 1.129 mal_sabaoth.mx, , 1.53, 1.54 mal_scenario.mx, , 1.123, 1.124 mal_session.mx, , 1.195, 1.196
by Martin Kersten 16 May '09

16 May '09

Fabian Groffen wrote: > On 16-05-2009 18:26:25 +0000, Martin Kersten wrote: >> Update of /cvsroot/monetdb/MonetDB5/src/mal >> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27406 >> >> Modified Files: >> mal_authorize.mx mal_client.mx mal_debugger.mx >> mal_exception.mx mal_factory.mx mal_interpreter.mx >> mal_linker.mx mal_profiler.mx mal_sabaoth.mx mal_scenario.mx >> mal_session.mx >> Log Message: >> Collecting the exception/errors messages in one place leads to easier detection >> of duplicates and can be used later for internationalization efforts > > Why not do it the gettext way, in that case? Yes, i am fully aware of gettext. It is a multi-step process, first condense..... and gettext() performs translations based on strings e.g. the ones now identified. > >> U mal_linker.mx >> Index: mal_linker.mx >> =================================================================== >> RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_linker.mx,v >> retrieving revision 1.110 >> retrieving revision 1.111 >> diff -u -d -r1.110 -r1.111 >> --- mal_linker.mx 7 Jan 2009 14:15:12 -0000 1.110 >> +++ mal_linker.mx 16 May 2009 18:26:23 -0000 1.111 >> @@ -251,7 +251,7 @@ >> >> if (fullname == NULL) { >> if( flag) >> - throw(LOADER, "loadLibrary", "%s: file not found", filename); >> + throw(LOADER, "loadLibrary", RUNTIME_FILE_NOT_FOUND, filename); > > I think this is prone to errors and mistakes, since you no longer know > how many %X are in the constant, of what type, etc. true... see how many are really needed after condensation > > I do think consistency is good, I doubt about translations, but I think > this approach is a good solution. Please look into gettext, see > applications like mutt for an example how to use it. > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

2 5