- developers-list - monetdb.org

MonetDb Clustering
by nguewo dominique 09 Jan '13

09 Jan '13

Hey guys, I'm trying to do a MonetDb Clustering. I am using two laptops both with ubuntu 12.10 installed. In both laptops, MonetDb is installed. I followed the following steps as described in the cluster management documentation: 1. I created a DB farm and set the passphrase in both laptops worker% monetdbd create /fullpath/to/mydbfarm worker% monetdbd set passphrase=mypassphrase /fullpath/to/mydbfarm worker% monetdbd start /fullpath/to/mydbfarm 2. From one system I'm able to discover the other system guarded with monetdbd willem% monetdb discover 3. Using one system I created a database in the other one willem% monetdb -h cruquius -P mypassphrase create pump Since I only have two laptops I created the same database in both the laptops and I'm trying to set the shared property so that i will be able to refer to the same Database from both the laptops. The goal is to have different dataset(tables) of the same database stored in different machines but being able to query the database as a whole from a system. I tried the following but was unsuccesfull laptop1% monetdb -h laptop2-P mypassphrase set shared=pump/1/ pump laptop1% monetdb -h laptop1-P mypassphrase set shared=pump/2/ pump then laptop1% mclient -d '*/pump/2' laptop1% mclient -d '*/pump/1' How should I go about it? Dominique _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

1 0

Re: MonetDB: Feb2013 - Reduce CATNAP in vmtrim
by Sjoerd Mullender 08 Jan '13

08 Jan '13

Please revert. The reason why there is a loop that sleeps 50 ms per iteration is to get a responsive exit. With your change you have to wait up to half a second before the server exits. That is too long. If you want to reduce the frequency with which the vmtrim thread does actual work, you need to change the number of times the loop is run, not the duration of the sleep. On 2013-01-08 01:21, Martin Kersten wrote: > Changeset: 4ca22f5177b6 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ca22f5177b6 > Modified Files: > gdk/gdk_utils.c > Branch: Feb2013 > Log Message: > > Reduce CATNAP in vmtrim > The overload on memory is already protected in the dataflow scheduler > and optimizer pipeline, which means we probably can relax the time to > issue the BBPtrim(). > > > diffs (22 lines): > > diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c > --- a/gdk/gdk_utils.c > +++ b/gdk/gdk_utils.c > @@ -1034,6 +1034,7 @@ GDKmunmap(void *addr, size_t size) > * Their value is turned into a blanc space. > */ > > +#define CATNAP 500 > int GDKrecovery = 0; > > static MT_Id GDKvmtrim_id; > @@ -1053,8 +1054,8 @@ GDKvmtrim(void *limit) > size_t cursize; > > /* sleep using catnaps so we can exit in a timely fashion */ > - for (t = highload ? 500 : 5000; t > 0; t -= 50) { > - MT_sleep_ms(50); > + for (t = highload ? CATNAP : 10 * CATNAP; t > 0; t -= CATNAP) { > + MT_sleep_ms(CATNAP); > if (GDKexiting()) > return; > } > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > http://mail.monetdb.org/mailman/listinfo/checkin-list > -- Sjoerd Mullender _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

3 3

Re: MonetDB: Feb2013 - Limit the number of concurrent queries
by Stefan Manegold 04 Jan '13

04 Jan '13

> Changeset: e79b2edeba71 for MonetDB > URL: > http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e79b2edeba71 > Modified Files: > monetdb5/mal/mal.c > monetdb5/mal/mal.h > monetdb5/mal/mal_interpreter.c > Branch: Feb2013 > Log Message: > > Limit the number of concurrent queries > The total throughput for small (and large) queries is > improved if we limit the number of concurrent queries > being executed. This patch is geared at SQL, wrapping > callMAL with a semaphore to limit the level of parallelism > to number of physical cores. > > > diffs (59 lines): > > diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c > --- a/monetdb5/mal/mal.c > +++ b/monetdb5/mal/mal.c > @@ -195,6 +195,7 @@ MT_Lock mal_remoteLock; > MT_Lock mal_profileLock ; > MT_Lock mal_copyLock; > MT_Lock mal_delayLock; > +MT_Sema mal_parallelism; > /* > * Initialization of the MAL context > * The compiler directive STRUCT_ALIGNED tells that the > @@ -233,6 +234,7 @@ int mal_init(void){ > MT_lock_init( &mal_profileLock, "mal_profileLock"); > MT_lock_init( &mal_copyLock, "mal_copyLock"); > MT_lock_init( &mal_delayLock, "mal_delayLock"); > + MT_sema_init( &mal_parallelism, (GDKnr_threads ? GDKnr_threads/2 : 4), "mal_parallelism"); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ With GDKnr_threads == 1 (single threaded execution or single-core system), this results in mal_parallelism == 0, which in turn results in all SQL tests failing (hanging until timeout) with `Mtest.py -n1` (single-threaded). Stefan > > tstAligned(); > MCinit(); > diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h > --- a/monetdb5/mal/mal.h > +++ b/monetdb5/mal/mal.h > @@ -118,6 +118,7 @@ mal_export MT_Lock mal_remoteLock; > mal_export MT_Lock mal_profileLock ; > mal_export MT_Lock mal_copyLock ; > mal_export MT_Lock mal_delayLock ; > +mal_export MT_Sema mal_parallelism; > > > mal_export int mal_init(void); > diff --git a/monetdb5/mal/mal_interpreter.c > b/monetdb5/mal/mal_interpreter.c > --- a/monetdb5/mal/mal_interpreter.c > +++ b/monetdb5/mal/mal_interpreter.c > @@ -479,7 +479,13 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS > ValPtr lhs; > InstrPtr pci = getInstrPtr(mb, 0); > RuntimeProfileRecord runtimeProfile; > - > + > +/* > + * Control the level of parallelism. The maximum number of > concurrent MAL plans > + * is determined by an environment variable. It is initially set > equal to the > + * number of cores, which may be too coarse. > + */ > + MT_sema_down(&mal_parallelism,"mal_parallelism"); > runtimeProfileInit(mb, &runtimeProfile, cntxt->flags & memoryFlag); > #ifdef DEBUG_CALLMAL > mnstr_printf(cntxt->fdout, "callMAL\n"); > @@ -518,8 +524,10 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS > case PATcall: > case CMDcall: > default: > + MT_sema_up(&mal_parallelism,"mal_parallelism"); > throw(MAL, "mal.interpreter", RUNTIME_UNKNOWN_INSTRUCTION); > } > + MT_sema_up(&mal_parallelism,"mal_parallelism"); > if (cntxt->qtimeout && time(NULL) - stk->clock.tv_usec > > cntxt->qtimeout) > throw(MAL, "mal.interpreter", RUNTIME_QRY_TIMEOUT); > return ret; > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > http://mail.monetdb.org/mailman/listinfo/checkin-list > _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

1 1

Redirect dev.monetdb.org to dev.monetdb.org/hg
by Stefan de Konink 04 Jan '13

04 Jan '13

As $subj, Would probably make it more easy for users to find the hg repositories. Stefan _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

1 0

Table column type meta-data and the MonetDB API (MAPI)
by Brandon Jackson 03 Jan '13

03 Jan '13

Good day, I am working on improvements to the Pentaho MonetDB Bulk Loader plugin and want to get some advice for how to properly use the MonetDB API to get the MonetDB column data type meta-data for a given table. Here is the use case: A row of data in Pentaho Data Integration is composed of fields which have a basic Java data type and other meta data kept in a helper class that keeps track of format strings, digits of precision and so on. At the current state of development a user has to know exactly which data type was used for a particular column and in which order the columns were defined by the original SQL CREATE statement. In PDI, every field (column) starts life with primitive Java data types without necessarily having a specific format defined when the variable is initialized, a user might send a TIMESTAMP (i.e. 2013-01-03 00:00:00) to MonetDB where really a DATE (i.e 2013-01-03) was expected. What I would like to do is before the bulk load actually runs, ask MonetDB through the API what the meta data is for each of the columns and output to the end user a table that shows the columns reported by MonetDB for a given table, the data type specified in the DDL, and show the user a suggested format string, which they could modify if they know what they are doing. Format strings look like "yyyy-MM-dd HH:mm:ss" and "#,###.#" etc. Generally, what API calls or approach is recommended to accomplish what I am trying to do? As a fall back, I considered querying the meta-data out like so: SELECT name AS column_name, type as column_data_type FROM "sys"."columns" WHERE table_id = ( SELECT id AS TABLE_ID FROM "sys"."tables" WHERE name = 'DIM_DATE' and schema_id = (SELECT id AS SCHEMA_ID FROM "sys"."schemas" WHERE name = 'testing')) ORDER BY number; This brings back two columns, name and type where I can match them to the outgoing fields. Then I can process the result set in the step and update the value meta-data with the appropriate format mask. Running such SQL should be unnecessary but at least I have a fall-back solution. Thanks for the advice, Brandon Jackson _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

2 1

Re: MonetDB: Feb2013 - Make joinpath signatures specific
by Stefan Manegold 31 Dec '12

31 Dec '12

Martin, this causes tests monetdb5/optimizer/Tests/tst4300.mal and monetdb5/optimizer/Tests/tst4610.mal to fail with !TypeException:user.main[17]:'algebra.joinPath' undefined in: zz:any := algebra.joinPath(b:bat[:oid,:lng], cr:bat[:lng,:oid], d:bat[:oid,:lng]) and !TypeException:user.main[9]:'algebra.joinPath' undefined in: r:any := algebra.joinPath(a:bat[:oid,:int], br:bat[:int,:oid], c:bat[:oid,:int]) Stefan On Mon, Dec 31, 2012 at 04:55:02AM +0100, Martin Kersten wrote: > Changeset: 9ac4a1b83d56 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ac4a1b83d56 > Modified Files: > monetdb5/optimizer/optimizer.mal > Branch: Feb2013 > Log Message: > > Make joinpath signatures specific > > > diffs (27 lines): > > diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal > --- a/monetdb5/optimizer/optimizer.mal > +++ b/monetdb5/optimizer/optimizer.mal > @@ -280,19 +280,19 @@ pattern optimizer.joinPath(mod:str, fcn: > address OPTwrapper > comment "Join path constructor"; > > -pattern algebra.joinPath(l:bat[:any,:any]...):bat[:any,:any] > +pattern algebra.joinPath(l:bat[:oid,:any]...):bat[:oid,:any] > address ALGjoinPath > comment "Routine to handle join paths. The type analysis is rather tricky."; > > -pattern algebra.leftjoinPath(l:bat[:any,:any]...):bat[:any,:any] > +pattern algebra.leftjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] > address ALGjoinPath > comment "Routine to handle join paths. The type analysis is rather tricky."; > > -pattern algebra.leftfetchjoinPath(l:bat[:any,:any]...):bat[:any,:any] > +pattern algebra.leftfetchjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] > address ALGjoinPath > comment "Routine to handle join paths. The type analysis is rather tricky."; > > -pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any] > +pattern algebra.semijoinPath(l:bat[:oid,:any]...):bat[:oid,:any] > address ALGjoinPath > comment "Routine to handle join paths. The type analysis is rather tricky."; > > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > http://mail.monetdb.org/mailman/listinfo/checkin-list -- | Stefan.Manegold @ CWI.nl | DB Architectures (INS1) | | http://CWI.nl/~manegold/ | Science Park 123 (L321) | | Tel.: +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) | _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

1 0

Unique key constraint violation violated
by Tapomay Dey 28 Dec '12

28 Dec '12

Is this a known issue that you are working on? If so please give me the bug id where I would know when its fixed. The case is as follows: I have a table with 32 columns with unique key on 3 of them. I am running live ETLs for putting data into monetdb. These ETLs are generating sql insert scripts.(inserts/updates/ddls) Using JDBC and c3p0 connection pooling. Have developed an external wrapper module to achieve master-master replication. One common consistency check would be a count*. Observation: Queries are run in batches of 100 inserts clubbed into a single insert. I do a select count(*) after each batch of 100. After running 9100 queries the count* on one DB was 9100 but in the other was 9200. The second DB had 100 records that were duplicates of 8901-9000. It means when I inserted 9001 to 9100 the previous batch went into the store again with it and somehow surpassed the unique key constraint check. I have also observed another case where count(*) gave less results than actual no. of rows in the DB. REQUEST: Just want to confirm if such kind of issues are part of active development. Otherwise it would be really difficult for me to push monetdb usage into production. Will try again with MonetDataSource instead of c3p0. But I doubt if the issues are client side or connection-related. Plz note that the keys for which this occurs is random and thus I concluded it's not a data issue. Regards, Tapomay Dey. Software Design Engg. Sokrati Inc. Email: tapomayATsokratiDOTcom _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

2 2

fast bit integration into monetdb
by Stanislav Seltser 27 Dec '12

27 Dec '12

does anybody know if fastbit integration into scidb was ever completed? _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

3 4

Unique key constraint violation violated
by Tapomay Dey 26 Dec '12

26 Dec '12

Is this a known issue that you are working on? If so please give me the bug id where I would know when its fixed. The case is as follows: I have a table with 32 columns. It has a unique key on 3 of them. I know that it's recommended that you do bulk inserts from csv for performance. But in my case I am running live ETLs for putting data into monetdb. These ETLs are generating sql insert scripts.(inserts/updates/ddls) I use JDBC and c3p0 connection pooling for executing these sqls. I have a failover mechanism where the scripts are executed on multiple DBs and I try to keep their states consistent. One common consistency check would be a count*. I am running the latest stable installation from repo on Ubuntu 10.04 64 bit. Observation: After running 9100 queries the count* on one DB was 9100 but in the other was 9200. I have diagnostics in place to do a select count* after running a batch of 100 queries in a single JDBC transaction. I observed that the count* was consistent until 9000 queries were executed. It failed at 9100. I did a manual check to see if duplicate records exist with same unique key values and they did. Following is the query I used for the same: select ad_group_id, count(*) from ad_groups group by ad_group_id having count(ad_group_id)>1 and client_id=X and account_id=Y; My constraint is as follows: CONSTRAINT "ad_groups_client_id_account_id_ad_group_id_unique" UNIQUE ("client_id", "account_id", "ad_group_id") I found exactly 100 tuples with group_by_count* = 2 and the ad_group_id(unique key) values for these exactly matched queries 8901 to 9000. It means when I inserted 9001 to 9100 the previous batch went into the store again with it and somehow surpassed the unique key constraint check. Please note that I am converting a batch of 100 insert queries into a single insert query and running this single bulk insert in a single JDBC transaction to reduce network traffic. This same issue recurred at 21500 only this time it happened for 300 records with same unique key value being duplicated. And their unique key values were exactly matching the ones in the last 3 batches Ad_group_id s 21103-21202, 21203-21302, 21303-21402 existed twice. 21403-21502 existed exactly once. REQUEST: Can anyone tell me if I can enable query logs - something like what mysql has. I will try re-installing monetdb and see if this problem goes away. :) Merry Christmas and Warm Regards, Tapomay _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

1 1

Re: MonetDB: Feb2013 - ported fix to the query cache from Oct2012
by Stefan Manegold 23 Dec '12

23 Dec '12

Niels, does this replace a merge of your Oct2012 checkin to the Feb2013 branch? Before this checkin, the merge worked without any conflicts (I did not test, whether/how it works). After this checkin, the merge fails with conflicts (I did not check the details). Thanks! Stefan Niels Nes <commits(a)monetdb.org> wrote: Changeset: ee6e585e72c5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee6e585e72c5 Modified Files: sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/server/sql_mvc.c sql/server/sql_parser.y sql/server/sql_qc.c sql/test/ADT2006/Tests/bram.stable.out sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/variable_arg_substring.SF_942981.stable.out sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out sql/test/BugDay_2005-11-09_2.9.3/Tests/union-duplicates.SF-1119186.stable.out sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out sql/test/BugTracker-2009/Tests/group_by_on_values.SF-2837561.stable.out sql/test/BugTracker-2009/Tests/not_equal.SF-2678502.stable.out sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out sql/test/BugTracker-2009/Tests/push_select_down_crash.stable.out sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/crash_on_where_in.Bug-2333.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out sql/test/BugTracker-2010/Tests/order_by_on_single_row_view.SF-2950453.stable.out sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out sql/test/BugTracker-2011/Tests/case-when-alias.Bug-2848.stable.out sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker/Tests/assert_fails_on_algebra_version.SF-2019349.stable.out sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err sql/test/BugTracker/Tests/crash_on_delete.SF-1639108.stable.out sql/test/BugTracker/Tests/crash_on_delete.SF-1651567.stable.out sql/test/BugTracker/Tests/crash_on_insert.SF-1639113.stable.out sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Skyserver/Tests/Skyserver.stable.out sql/test/Tests/coalesce.stable.out sql/test/Tests/decimal2.stable.out sql/test/Tests/setoptimizer.stable.out sql/test/VOC/Tests/VOC.stable.out sql/test/bugs/Tests/crash_order_by.stable.out sql/test/bugs/Tests/select_from_values.stable.out sql/test/bugs/Tests/simple_view.stable.out sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out sql/test/bugs/Tests/subselect_single_value-bug-sf-941791.stable.out sql/test/bugs/Tests/subselect_union-bug-sf-941826.stable.out sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out sql/test/bugs/Tests/union_all_where_1=1-bug-sf-936386.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp3.stable.out sql/test/pg_regress/Tests/char.stable.out sql/test/pg_regress/Tests/strings_concat.stable.out sql/test/pg_regress/Tests/text.stable.out sql/test/pg_regress/Tests/varchar.stable.out sql/test/rdf/Tests/q2_28_v.stable.out sql/test/rdf/Tests/q2_v.stable.out sql/test/rdf/Tests/q3_28_v.stable.out sql/test/rdf/Tests/q3_v.stable.out sql/test/rdf/Tests/q4_28_v.stable.out sql/test/rdf/Tests/q4_v.stable.out sql/test/rdf/Tests/q6_28_v.stable.out sql/test/rdf/Tests/q6_v.stable.out Branch: Feb2013 Log Message: ported fix to the query cache from Oct2012 diffs (truncated from 3392 to 300 lines): diff --git a/sql/backends/monet5/Tests/optimizers.stable.out b/sql/backends/monet5/Tests/optimizers.stable.out --- a/sql/backends/monet5/Tests/optimizers.stable.out +++ b/sql/backends/monet5/Tests/optimizers.stable.out @@ -47,31 +47,31 @@ Ready. #select 'optimizer test:',optimizer; % ., . # table_name % single_value, single_value # name -% char, varchar # type +% varchar, varchar # type % 15, 12 # length [ "optimizer test:", "default_pipe" ] #select 'optimizer off test:',optimizer; % ., . # table_name % single_value, single_value # name -% char, varchar # type +% varchar, varchar # type % 19, 12 # length [ "optimizer off test:", "default_pipe" ] #select 'optimizer on test:',optimizer; % ., . # table_name % single_value, single_value # name -% char, varchar # type +% varchar, varchar # type % 18, 12 # length [ "optimizer on test:", "default_pipe" ] #select 'optimizer <empty> test:',optimizer; % ., . # table_name % single_value, single_value # name -% char, varchar # type +% varchar, varchar # type % 23, 12 # length [ "optimizer <empty> test:", "default_pipe" ] #select 'done'; % . # table_name % single_value # name -% char # type +% varchar # type % 4 # length [ "done" ] diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out --- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out +++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out @@ -45,12 +45,10 @@ end s0_1; % mal # name % clob # type % 71 # length -function user.s2_1{autoCommit=true}(A0:sht,A1:sht):void; +function user.s1_1{autoCommit=true}(A0:sht,A1:sht):void; X_4 := udf.fuse(A0,A1); sql.exportValue(1,".","fuse_single_value":str,"int",32,0,6,X_4,""); -end s2_1; -# optimizer.mitosis() -# optimizer.dataflow() +end s1_1; #select fuse(1000,2000); % . # table_name % fuse_single_value # name @@ -62,12 +60,10 @@ end s2_1; % mal # name % clob # type % 74 # length -function user.s4_1{autoCommit=true}(A0:int,A1:int):void; +function user.s2_1{autoCommit=true}(A0:int,A1:int):void; X_4 := udf.fuse(A0,A1); sql.exportValue(1,".","fuse_single_value":str,"bigint",64,0,6,X_4,""); -end s4_1; -# optimizer.mitosis() -# optimizer.dataflow() +end s2_1; #select fuse(1000000,2000000); % . # table_name % fuse_single_value # name @@ -97,7 +93,7 @@ end s4_1; % mal # name % clob # type % 60 # length -function user.s11_1{autoCommit=true}():void; +function user.s5_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse"); X_6 := sql.bind(X_2,"sys","udf_fuse","a",0); @@ -115,15 +111,13 @@ function user.s11_1{autoCommit=true}():v sql.rsColumn(X_25,"sys.","fuse_a","smallint",16,0,X_23); X_30 := io.stdout(); sql.exportResult(X_30,X_25); -end s11_1; -# optimizer.mitosis() -# optimizer.dataflow() +end s5_1; #explain select fuse(c,d) from udf_fuse; % .explain # table_name % mal # name % clob # type % 57 # length -function user.s12_1{autoCommit=true}():void; +function user.s6_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse"); X_6 := sql.bind(X_2,"sys","udf_fuse","c",0); @@ -141,15 +135,13 @@ function user.s12_1{autoCommit=true}():v sql.rsColumn(X_25,"sys.","fuse_c","int",32,0,X_23); X_30 := io.stdout(); sql.exportResult(X_30,X_25); -end s12_1; -# optimizer.mitosis() -# optimizer.dataflow() +end s6_1; #explain select fuse(e,f) from udf_fuse; % .explain # table_name % mal # name % clob # type % 58 # length -function user.s13_1{autoCommit=true}():void; +function user.s7_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse"); X_6 := sql.bind(X_2,"sys","udf_fuse","e",0); @@ -167,9 +159,7 @@ function user.s13_1{autoCommit=true}():v sql.rsColumn(X_25,"sys.","fuse_e","bigint",64,0,X_23); X_30 := io.stdout(); sql.exportResult(X_30,X_25); -end s13_1; -# optimizer.mitosis() -# optimizer.dataflow() +end s7_1; #select fuse(a,b) from udf_fuse; % sys. # table_name % fuse_a # name diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out --- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out +++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out @@ -82,7 +82,7 @@ end s0_1; % mal # name % clob # type % 62 # length -function user.s7_1{autoCommit=true}():void; +function user.s3_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_reverse"); X_6 := sql.bind(X_2,"sys","udf_reverse","x",0); @@ -95,7 +95,7 @@ function user.s7_1{autoCommit=true}():vo sql.rsColumn(X_18,"sys.","reverse_x":str,"clob",0,0,X_16); X_22 := io.stdout(); sql.exportResult(X_22,X_18); -end s7_1; +end s3_1; #select reverse(x) from udf_reverse; % sys. # table_name % reverse_x # name diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c --- a/sql/server/sql_mvc.c +++ b/sql/server/sql_mvc.c @@ -193,8 +193,6 @@ mvc_trans(mvc *m) qc_clean(m->qc); } } - if (m->session->active) - m->type = Q_TRANS; store_unlock(); } diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y --- a/sql/server/sql_parser.y +++ b/sql/server/sql_parser.y @@ -3954,7 +3954,7 @@ literal: string { char *s = sql2str($1); int len = _strlen(s); sql_subtype t; - sql_find_subtype(&t, "char", len, 0 ); + sql_find_subtype(&t, "varchar", len, 0 ); $$ = _newAtomNode( _atom_string(&t, s)); } | HEXADECIMAL { int len = _strlen($1), i = 2, err = 0; diff --git a/sql/server/sql_qc.c b/sql/server/sql_qc.c --- a/sql/server/sql_qc.c +++ b/sql/server/sql_qc.c @@ -143,6 +143,11 @@ param_cmp(sql_subtype *t1, sql_subtype * if (t1->scale != t2->scale) return -1; + + if (t1->type->eclass == EC_NUM && t2->type->eclass == EC_NUM && + t1->digits >= t2->digits) + return 0; + res = is_subtype(t2, t1); if (!res) return -1; @@ -178,7 +183,7 @@ param_list_cmp(sql_subtype *typelist, at if ((!((at->type->eclass == EC_DEC || at->type->eclass == EC_NUM) && tp->type->eclass == EC_FLT)) && - (!(EC_VARCHAR(tp->type->eclass) && + (!(EC_VARCHAR(tp->type->eclass) && EC_VARCHAR(at->type->eclass) && (!tp->digits || tp->digits >= at->digits))) && diff --git a/sql/test/ADT2006/Tests/bram.stable.out b/sql/test/ADT2006/Tests/bram.stable.out --- a/sql/test/ADT2006/Tests/bram.stable.out +++ b/sql/test/ADT2006/Tests/bram.stable.out @@ -458,7 +458,7 @@ Ready. #(SELECT 'Major' AS grade, count(na % ., .inspector # table_name % grade, inspectors # name -% char, wrd # type +% varchar, wrd # type % 9, 1 # length [ "Detective", 3 ] [ "Constable", 3 ] @@ -475,7 +475,7 @@ Ready. # + cast(substring(length from (position('\'' in length) + 1) for (position('"' in length) + 1)) AS integer)) as height from victim v % .L1, . # table_name % L1, average_height # name -% char, char # type +% varchar, varchar # type % 6, 4 # length [ "blonde", "5'7\"" ] [ "brown", "5'5\"" ] diff --git a/sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out b/sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out --- a/sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out +++ b/sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out @@ -20,12 +20,12 @@ Ready. % . # table_name % single_value # name -% char # type +% varchar # type % 2 # length [ "aa" ] % . # table_name % single_value # name -% char # type +% varchar # type % 3 # length [ "a'a" ] diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out @@ -101,7 +101,7 @@ Ready. [ "users", "SELECT u.\"t\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM \"sys\".\"db_users\" AS u, \"sys\".\"db_user_info\" AS ui WHERE u.\"h\" = ui.\"id\" AND u.\"h\" NOT IN (SELECT s.\"h\" FROM \"sys\".\"db_scens\" AS s WHERE s.\"t\" NOT LIKE 'sql');", false, true, 0, 0 ] % .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name % table_cat, table_schem, table_name, table_type, remarks, type_cat, type_schem, type_name, self_referencing_col_name, ref_generation # name -% char, varchar, varchar, char, varchar, char, char, char, char, char # type +% varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar # type % 4, 3, 8, 12, 222, 4, 4, 4, 2, 6 # length [ "null", "sys", "columns", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] [ "null", "sys", "db_scens", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out b/sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out @@ -63,8 +63,9 @@ Ready. [ 1 ] % . # table_name % single_value # name -% char # type -% 1 # length +% varchar # type +% 0 # length +#select * from my_table where 1 = 0; % sys.my_table # table_name % att # name % int # type diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out b/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out @@ -31,7 +31,7 @@ Ready. [ 1 ] % sys. # table_name % ifthenelse_isnull_=_i # name -% char # type +% varchar # type % 23 # length [ "base table" ] [ "system table" ] diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out b/sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out @@ -43,8 +43,8 @@ Ready. #ORDER BY "TABLE_TYPE", % .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name % TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE, REMARKS, TYPE_CAT, TYPE_SCHEM, TYPE_NAME, SELF_REFERENCING_COL_NAME, REF_GENERATION # name -% char, varchar, varchar, char, char, char, char, char, char, char # type -% 0, 0, 0, 12, 0, 0, 0, 0, 2, 6 # length +% char, varchar, varchar, varchar, varchar, char, char, char, varchar, varchar # type +% 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 # length # 11:50:19 > # 11:50:19 > Done. diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out b/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out @@ -26,8 +26,8 @@ Ready. % .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name % TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE, REMARKS, TYPE_CAT, TYPE_SCHEM, TYPE_NAME, SELF_REFERENCING_COL_NAME, REF_GENERATION # name -% char, varchar, varchar, char, char, char, char, char, char, char # type -% 4, 3, 4, 20, 0, 0, 0, 0, 5, 6 # length +% varchar, varchar, varchar, varchar, varchar, char, char, char, varchar, varchar # type _______________________________________________ checkin-list mailing list checkin-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list _______________________________________________ developers-list mailing list developers-list(a)monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list

1 0