From: <fir...@us...> - 2011-02-03 13:05:52
|
Revision: 52284 http://firebird.svn.sourceforge.net/firebird/?rev=52284&view=rev Author: firebirds Date: 2011-02-03 13:05:45 +0000 (Thu, 03 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-03 09:35:57 UTC (rev 52283) +++ firebird/trunk/ChangeLog 2011-02-03 13:05:45 UTC (rev 52284) @@ -1,3 +1,105 @@ + 2011-02-03 09:35 dimitr + M src/jrd/dfw.epp + M src/jrd/met.epp +Simplification. Adriano, please review. + + 2011-02-03 08:01 dimitr + M src/jrd/cch.cpp +Removed the supposedly wrong checkout (it was added in v2.0), as theoretically it can lead to race conditions in the page cache. + + 2011-02-03 07:36 dimitr + M src/dsql/AggNodes.cpp +Fixed CORE-2957: count(*) from big table returns negative result. + + 2011-02-02 17:47 dimitr + M src/jrd/cch.cpp +Fixed the cache logic (manifested itself as infinite loops) after Alex's SLONG->ULONG changes for page numbers. There's still room for further changes. While being there, performed some related cleanup. + + 2011-02-02 14:58 hvlad + M src/remote/server/server.cpp +Fixed bug CORE-3327 : Thread pool in network server could create more threads than necessary + + 2011-02-02 14:41 asfernandes + M src/jrd/dfw.epp +Fixed CORE-3330 - Server crashes while recreating the table with a NULL -> NOT NULL change. + + 2011-02-02 13:11 dimitr + M src/dsql/AggNodes.cpp +Fixed CORE-1619: Some aggregate functions doesn't support NULL-constant in 3-d dialect. + + 2011-02-02 12:11 hvlad + M src/common/isc_s_proto.h + M src/common/isc_sync.cpp +Fixed bug CORE-3326 : Fast mutex could be left in locked state by dead process + + 2011-02-02 11:56 hvlad + M src/common/isc_sync.cpp +Correction for previous commit + + 2011-02-02 11:51 hvlad + M src/common/isc_sync.cpp +Fixed bug CORE-3325 : At high load it is possible that new process could fail to map shared memory + + 2011-02-02 11:37 hvlad + M src/utilities/fbtracemgr/traceMgrMain.cpp +Improvement CORE-3324 : ftracemgr should flush its output from time to time + + 2011-02-02 11:31 dimitr + M src/dsql/dsql.cpp + M src/dsql/dsql_proto.h + M src/jrd/inf.cpp + M src/jrd/inf_pub.h + M src/jrd/opt.cpp + M src/jrd/opt_proto.h + M src/jrd/recsrc/AggregatedStream.cpp + M src/jrd/recsrc/BitmapTableScan.cpp + M src/jrd/recsrc/BufferedStream.cpp + M src/jrd/recsrc/ExternalTableScan.cpp + M src/jrd/recsrc/FilteredStream.cpp + M src/jrd/recsrc/FirstRowsStream.cpp + M src/jrd/recsrc/FullOuterJoin.cpp + M src/jrd/recsrc/FullTableScan.cpp + M src/jrd/recsrc/HashJoin.cpp + M src/jrd/recsrc/IndexTableScan.cpp + M src/jrd/recsrc/LockedStream.cpp + M src/jrd/recsrc/MergeJoin.cpp + M src/jrd/recsrc/NestedLoopJoin.cpp + M src/jrd/recsrc/ProcedureScan.cpp + M src/jrd/recsrc/RecordSource.cpp + M src/jrd/recsrc/RecordSource.h + M src/jrd/recsrc/RecursiveStream.cpp + M src/jrd/recsrc/SingularStream.cpp + M src/jrd/recsrc/SkipRowsStream.cpp + M src/jrd/recsrc/SortedStream.cpp + M src/jrd/recsrc/Union.cpp + M src/jrd/recsrc/VirtualTableScan.cpp + M src/jrd/recsrc/WindowedStream.cpp + M src/jrd/trace/TraceObjects.cpp + M src/jrd/trace/TraceObjects.h +Implemented CORE-3332: Provide more detailed information about the query execution plan. Some details are still to be worked on. + + 2011-02-02 11:30 alexpeshkoff + M src/jrd/scl.epp +Fixed CORE-3329:Windows administrator gets RDB$ADMIN role when this is not expected + + 2011-02-02 11:20 hvlad + M src/jrd/Attachment.h + M src/jrd/jrd.cpp + M src/jrd/jrd.h + M src/jrd/lck.cpp + M src/jrd/lck_proto.h + M src/jrd/pag.cpp + M src/jrd/shut.cpp + M src/jrd/tra.cpp + M src/lock/lock.cpp + M src/lock/lock_proto.h +Front ported improvement CORE-3323 : Ability to cancel waiting in lock manager +LM part will be changed to not rely on engine internals. + + 2011-02-02 10:16 dimitr + M src/dsql/parse.y +Fixed CORE-3245: SUBSTRING on long blobs truncates result to 32767 if third argument not present. + 2011-02-02 00:57 asfernandes M src/lock/lock.cpp Correction @@ -30182,7 +30284,7 @@ 2008-11-29 18:47 asfernandes M src/jrd/DataTypeUtil.cpp M src/jrd/DataTypeUtil.h -Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation). +Fixed CORE-2019 – UTF-8 conversion error (string truncation). 2008-11-28 18:49 alexpeshkoff M src/common/classes/SafeArg.cpp @@ -32534,7 +32636,7 @@ 2008-07-16 14:16 asfernandes M src/jrd/idx.cpp -Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint +Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint 2008-07-16 13:55 asfernandes M src/jrd/Optimizer.cpp @@ -33542,7 +33644,7 @@ 2008-06-14 02:17 asfernandes M doc/sql.extensions/README.similar_to.txt M src/jrd/SimilarToMatcher.h -1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized. +1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized. 2) Improve the documentation after some questions from Claudio. 2008-06-13 14:01 dimitr @@ -45810,7 +45912,7 @@ 2007-05-09 15:23 asfernandes M doc/sql.extensions/README.list -Updated LIST documentation - thanks to Maycon Ferra?\195?\167a +Updated LIST documentation - thanks to Maycon Ferraça 2007-05-09 02:03 asfernandes M src/burp/burp.cpp @@ -47761,7 +47863,7 @@ 2007-03-22 13:07 asfernandes M doc/sql.extensions/README.context_variables2 -Document the new context variable - thanks to Maicon Ferra?\195?\167a +Document the new context variable - thanks to Maicon Ferraça 2007-03-22 12:53 dimitr M src/dsql/pass1.cpp @@ -49438,7 +49540,7 @@ 2006-12-14 10:30 asfernandes M doc/sql.extensions/README.returning -Correction - thanks to Maycon Ferra?\195?\167a +Correction - thanks to Maycon Ferraça 2006-12-14 09:14 dimitr A doc/README.monitoring_tables @@ -50882,7 +50984,7 @@ 2006-10-10 03:53 asfernandes M src/jrd/jrd.cpp -Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling +Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling 2006-10-10 03:39 asfernandes M src/jrd/os/posix/isc_ipc.cpp @@ -51231,7 +51333,7 @@ 2006-09-13 12:59 asfernandes M src/dsql/pass1.cpp -Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel +Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel 2006-09-12 16:31 asfernandes M src/jrd/opt.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-03 09:35:57 UTC (rev 52283) +++ firebird/trunk/src/jrd/build_no.h 2011-02-03 13:05:45 UTC (rev 52284) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29041 + FORMAL BUILD NUMBER:29056 */ -#define PRODUCT_VER_STRING "3.0.0.29041" -#define FILE_VER_STRING "WI-T3.0.0.29041" -#define LICENSE_VER_STRING "WI-T3.0.0.29041" -#define FILE_VER_NUMBER 3, 0, 0, 29041 +#define PRODUCT_VER_STRING "3.0.0.29056" +#define FILE_VER_STRING "WI-T3.0.0.29056" +#define LICENSE_VER_STRING "WI-T3.0.0.29056" +#define FILE_VER_NUMBER 3, 0, 0, 29056 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29041" +#define FB_BUILD_NO "29056" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-03 09:35:57 UTC (rev 52283) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-03 13:05:45 UTC (rev 52284) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29041 +BuildNum=29056 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2011-02-03 14:51:56
|
Revision: 52285 http://firebird.svn.sourceforge.net/firebird/?rev=52285&view=rev Author: asfernandes Date: 2011-02-03 14:51:50 +0000 (Thu, 03 Feb 2011) Log Message: ----------- Fixed CORE-3201 - ATAN2 returns incorrect value for (0, 0). Modified Paths: -------------- firebird/trunk/lang_helpers/gds_codes.ftn firebird/trunk/lang_helpers/gds_codes.pas firebird/trunk/src/include/gen/codetext.h firebird/trunk/src/include/gen/iberror.h firebird/trunk/src/include/gen/msgs.h firebird/trunk/src/include/gen/sql_code.h firebird/trunk/src/include/gen/sql_state.h firebird/trunk/src/jrd/SysFunction.cpp firebird/trunk/src/msgs/facilities2.sql firebird/trunk/src/msgs/messages2.sql firebird/trunk/src/msgs/system_errors2.sql Modified: firebird/trunk/lang_helpers/gds_codes.ftn =================================================================== --- firebird/trunk/lang_helpers/gds_codes.ftn 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/lang_helpers/gds_codes.ftn 2011-02-03 14:51:50 UTC (rev 52285) @@ -1458,6 +1458,8 @@ PARAMETER (GDS__cannot_copy_stmt = 335545022) INTEGER*4 GDS__invalid_boolean_usage PARAMETER (GDS__invalid_boolean_usage = 335545023) + INTEGER*4 GDS__sysf_argscant_both_be_zero + PARAMETER (GDS__sysf_argscant_both_be_zero = 335545024) INTEGER*4 GDS__gfix_db_name PARAMETER (GDS__gfix_db_name = 335740929) INTEGER*4 GDS__gfix_invalid_sw Modified: firebird/trunk/lang_helpers/gds_codes.pas =================================================================== --- firebird/trunk/lang_helpers/gds_codes.pas 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/lang_helpers/gds_codes.pas 2011-02-03 14:51:50 UTC (rev 52285) @@ -736,6 +736,7 @@ gds_bad_events_handle = 335545021; gds_cannot_copy_stmt = 335545022; gds_invalid_boolean_usage = 335545023; + gds_sysf_argscant_both_be_zero = 335545024; gds_gfix_db_name = 335740929; gds_gfix_invalid_sw = 335740930; gds_gfix_incmp_sw = 335740932; Modified: firebird/trunk/src/include/gen/codetext.h =================================================================== --- firebird/trunk/src/include/gen/codetext.h 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/include/gen/codetext.h 2011-02-03 14:51:50 UTC (rev 52285) @@ -725,6 +725,7 @@ {"bad_events_handle", 335545021}, {"cannot_copy_stmt", 335545022}, {"invalid_boolean_usage", 335545023}, + {"sysf_argscant_both_be_zero", 335545024}, {"gfix_db_name", 335740929}, {"gfix_invalid_sw", 335740930}, {"gfix_incmp_sw", 335740932}, Modified: firebird/trunk/src/include/gen/iberror.h =================================================================== --- firebird/trunk/src/include/gen/iberror.h 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/include/gen/iberror.h 2011-02-03 14:51:50 UTC (rev 52285) @@ -759,6 +759,7 @@ const ISC_STATUS isc_bad_events_handle = 335545021L; const ISC_STATUS isc_cannot_copy_stmt = 335545022L; const ISC_STATUS isc_invalid_boolean_usage = 335545023L; +const ISC_STATUS isc_sysf_argscant_both_be_zero = 335545024L; const ISC_STATUS isc_gfix_db_name = 335740929L; const ISC_STATUS isc_gfix_invalid_sw = 335740930L; const ISC_STATUS isc_gfix_incmp_sw = 335740932L; @@ -1177,7 +1178,7 @@ const ISC_STATUS isc_trace_switch_param_miss = 337182758L; const ISC_STATUS isc_trace_param_act_notcompat = 337182759L; const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L; -const ISC_STATUS isc_err_max = 1121; +const ISC_STATUS isc_err_max = 1122; #else /* c definitions */ @@ -1906,6 +1907,7 @@ #define isc_bad_events_handle 335545021L #define isc_cannot_copy_stmt 335545022L #define isc_invalid_boolean_usage 335545023L +#define isc_sysf_argscant_both_be_zero 335545024L #define isc_gfix_db_name 335740929L #define isc_gfix_invalid_sw 335740930L #define isc_gfix_incmp_sw 335740932L @@ -2324,7 +2326,7 @@ #define isc_trace_switch_param_miss 337182758L #define isc_trace_param_act_notcompat 337182759L #define isc_trace_mandatory_switch_miss 337182760L -#define isc_err_max 1121 +#define isc_err_max 1122 #endif Modified: firebird/trunk/src/include/gen/msgs.h =================================================================== --- firebird/trunk/src/include/gen/msgs.h 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/include/gen/msgs.h 2011-02-03 14:51:50 UTC (rev 52285) @@ -728,6 +728,7 @@ {335545021, "invalid events id (handle)"}, /* bad_events_handle */ {335545022, "Cannot copy statement @1"}, /* cannot_copy_stmt */ {335545023, "Invalid usage of boolean expression"}, /* invalid_boolean_usage */ + {335545024, "Arguments for @1 cannot both be zero"}, /* sysf_argscant_both_be_zero */ {335740929, "data base file name (@1) already given"}, /* gfix_db_name */ {335740930, "invalid switch @1"}, /* gfix_invalid_sw */ {335740932, "incompatible switch combination"}, /* gfix_incmp_sw */ Modified: firebird/trunk/src/include/gen/sql_code.h =================================================================== --- firebird/trunk/src/include/gen/sql_code.h 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/include/gen/sql_code.h 2011-02-03 14:51:50 UTC (rev 52285) @@ -724,6 +724,7 @@ {335545021, -901}, /* 701 bad_events_handle */ {335545022, -104}, /* 702 cannot_copy_stmt */ {335545023, -104}, /* 703 invalid_boolean_usage */ + {335545024, -833}, /* 704 sysf_argscant_both_be_zero */ {335740929, -901}, /* 1 gfix_db_name */ {335740930, -901}, /* 2 gfix_invalid_sw */ {335740932, -901}, /* 4 gfix_incmp_sw */ Modified: firebird/trunk/src/include/gen/sql_state.h =================================================================== --- firebird/trunk/src/include/gen/sql_state.h 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/include/gen/sql_state.h 2011-02-03 14:51:50 UTC (rev 52285) @@ -724,6 +724,7 @@ {335545021, "08003"}, // 701 bad_events_handle {335545022, "XX000"}, // 702 cannot_copy_stmt {335545023, "22000"}, // 703 invalid_boolean_usage + {335545024, "42000"}, // 704 sysf_argscant_both_be_zero {335740929, "00000"}, // 1 gfix_db_name {335740930, "00000"}, // 2 gfix_invalid_sw {335740932, "00000"}, // 4 gfix_incmp_sw Modified: firebird/trunk/src/jrd/SysFunction.cpp =================================================================== --- firebird/trunk/src/jrd/SysFunction.cpp 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/jrd/SysFunction.cpp 2011-02-03 14:51:50 UTC (rev 52285) @@ -1072,7 +1072,7 @@ if (!v) { status_exception::raise(Arg::Gds(isc_expression_eval_err) << - Arg::Gds(isc_sysf_argmustbe_nonzero) << Arg::Str(function->name));; + Arg::Gds(isc_sysf_argmustbe_nonzero) << Arg::Str(function->name)); } rc = fbcot(v); break; @@ -1235,22 +1235,31 @@ } -dsc* evlAtan2(thread_db* tdbb, const SysFunction*, const NestValueArray& args, +dsc* evlAtan2(thread_db* tdbb, const SysFunction* function, const NestValueArray& args, impure_value* impure) { fb_assert(args.getCount() == 2); jrd_req* request = tdbb->getRequest(); - const dsc* value1 = EVL_expr(tdbb, request, args[0]); - if (request->req_flags & req_null) // return NULL if value1 is NULL + const dsc* desc1 = EVL_expr(tdbb, request, args[0]); + if (request->req_flags & req_null) // return NULL if desc1 is NULL return NULL; - const dsc* value2 = EVL_expr(tdbb, request, args[1]); - if (request->req_flags & req_null) // return NULL if value2 is NULL + const dsc* desc2 = EVL_expr(tdbb, request, args[1]); + if (request->req_flags & req_null) // return NULL if desc2 is NULL return NULL; - impure->vlu_misc.vlu_double = atan2(MOV_get_double(value1), MOV_get_double(value2)); + double value1 = MOV_get_double(desc1); + double value2 = MOV_get_double(desc2); + + if (value1 == 0 && value2 == 0) + { + status_exception::raise(Arg::Gds(isc_expression_eval_err) << + Arg::Gds(isc_sysf_argscant_both_be_zero) << Arg::Str(function->name)); + } + + impure->vlu_misc.vlu_double = atan2(value1, value2); impure->vlu_desc.makeDouble(&impure->vlu_misc.vlu_double); return &impure->vlu_desc; Modified: firebird/trunk/src/msgs/facilities2.sql =================================================================== --- firebird/trunk/src/msgs/facilities2.sql 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/msgs/facilities2.sql 2011-02-03 14:51:50 UTC (rev 52285) @@ -1,7 +1,7 @@ /* MAX_NUMBER is the next number to be used, always one more than the highest message number. */ set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?); -- -('2010-12-17 23:46:00', 'JRD', 0, 704) +('2011-02-02 12:45:00', 'JRD', 0, 705) ('2010-03-15 06:59:09', 'QLI', 1, 531) -- --('2008-11-28 20:27:04', 'GDEF', 2, 346) Modified: firebird/trunk/src/msgs/messages2.sql =================================================================== --- firebird/trunk/src/msgs/messages2.sql 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/msgs/messages2.sql 2011-02-03 14:51:50 UTC (rev 52285) @@ -811,6 +811,7 @@ ('bad_events_handle', NULL, NULL, NULL, 0, 701, NULL, 'invalid events id (handle)', NULL, NULL); ('cannot_copy_stmt', NULL, NULL, NULL, 0, 702, NULL, 'Cannot copy statement @1', NULL, NULL); ('invalid_boolean_usage', NULL, NULL, NULL, 0, 703, NULL, 'Invalid usage of boolean expression', NULL, NULL); +('sysf_argscant_both_be_zero', 'evlAtan2', 'SysFunction.cpp', NULL, 0, 704, NULL, 'Arguments for @1 cannot both be zero', NULL, NULL) -- QLI (NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL); (NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL); Modified: firebird/trunk/src/msgs/system_errors2.sql =================================================================== --- firebird/trunk/src/msgs/system_errors2.sql 2011-02-03 13:05:45 UTC (rev 52284) +++ firebird/trunk/src/msgs/system_errors2.sql 2011-02-03 14:51:50 UTC (rev 52285) @@ -709,6 +709,7 @@ (-901, '08', '003', 0, 701, 'bad_events_handle', NULL, 'ERROR') (-104, 'XX', '000', 0, 702, 'cannot_copy_stmt', NULL, NULL) (-104, '22', '000', 0, 703, 'invalid_boolean_usage', NULL, NULL) +(-833, '42', '000', 0, 704, 'sysf_argscant_both_be_zero', NULL, NULL) -- GFIX (-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL) (-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-04 03:15:52
|
Revision: 52286 http://firebird.svn.sourceforge.net/firebird/?rev=52286&view=rev Author: firebirds Date: 2011-02-04 03:15:45 +0000 (Fri, 04 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-03 14:51:50 UTC (rev 52285) +++ firebird/trunk/ChangeLog 2011-02-04 03:15:45 UTC (rev 52286) @@ -1,3 +1,17 @@ + 2011-02-03 14:51 asfernandes + M lang_helpers/gds_codes.ftn + M lang_helpers/gds_codes.pas + M src/include/gen/codetext.h + M src/include/gen/iberror.h + M src/include/gen/msgs.h + M src/include/gen/sql_code.h + M src/include/gen/sql_state.h + M src/jrd/SysFunction.cpp + M src/msgs/facilities2.sql + M src/msgs/messages2.sql + M src/msgs/system_errors2.sql +Fixed CORE-3201 - ATAN2 returns incorrect value for (0, 0). + 2011-02-03 09:35 dimitr M src/jrd/dfw.epp M src/jrd/met.epp @@ -30284,7 +30298,7 @@ 2008-11-29 18:47 asfernandes M src/jrd/DataTypeUtil.cpp M src/jrd/DataTypeUtil.h -Fixed CORE-2019 – UTF-8 conversion error (string truncation). +Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation). 2008-11-28 18:49 alexpeshkoff M src/common/classes/SafeArg.cpp @@ -32636,7 +32650,7 @@ 2008-07-16 14:16 asfernandes M src/jrd/idx.cpp -Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint +Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint 2008-07-16 13:55 asfernandes M src/jrd/Optimizer.cpp @@ -33644,7 +33658,7 @@ 2008-06-14 02:17 asfernandes M doc/sql.extensions/README.similar_to.txt M src/jrd/SimilarToMatcher.h -1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized. +1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized. 2) Improve the documentation after some questions from Claudio. 2008-06-13 14:01 dimitr @@ -45912,7 +45926,7 @@ 2007-05-09 15:23 asfernandes M doc/sql.extensions/README.list -Updated LIST documentation - thanks to Maycon Ferraça +Updated LIST documentation - thanks to Maycon Ferra?\195?\167a 2007-05-09 02:03 asfernandes M src/burp/burp.cpp @@ -47863,7 +47877,7 @@ 2007-03-22 13:07 asfernandes M doc/sql.extensions/README.context_variables2 -Document the new context variable - thanks to Maicon Ferraça +Document the new context variable - thanks to Maicon Ferra?\195?\167a 2007-03-22 12:53 dimitr M src/dsql/pass1.cpp @@ -49540,7 +49554,7 @@ 2006-12-14 10:30 asfernandes M doc/sql.extensions/README.returning -Correction - thanks to Maycon Ferraça +Correction - thanks to Maycon Ferra?\195?\167a 2006-12-14 09:14 dimitr A doc/README.monitoring_tables @@ -50984,7 +50998,7 @@ 2006-10-10 03:53 asfernandes M src/jrd/jrd.cpp -Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling +Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling 2006-10-10 03:39 asfernandes M src/jrd/os/posix/isc_ipc.cpp @@ -51333,7 +51347,7 @@ 2006-09-13 12:59 asfernandes M src/dsql/pass1.cpp -Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel +Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel 2006-09-12 16:31 asfernandes M src/jrd/opt.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-03 14:51:50 UTC (rev 52285) +++ firebird/trunk/src/jrd/build_no.h 2011-02-04 03:15:45 UTC (rev 52286) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29056 + FORMAL BUILD NUMBER:29057 */ -#define PRODUCT_VER_STRING "3.0.0.29056" -#define FILE_VER_STRING "WI-T3.0.0.29056" -#define LICENSE_VER_STRING "WI-T3.0.0.29056" -#define FILE_VER_NUMBER 3, 0, 0, 29056 +#define PRODUCT_VER_STRING "3.0.0.29057" +#define FILE_VER_STRING "WI-T3.0.0.29057" +#define LICENSE_VER_STRING "WI-T3.0.0.29057" +#define FILE_VER_NUMBER 3, 0, 0, 29057 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29056" +#define FB_BUILD_NO "29057" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-03 14:51:50 UTC (rev 52285) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-04 03:15:45 UTC (rev 52286) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29056 +BuildNum=29057 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-05 03:14:22
|
Revision: 52299 http://firebird.svn.sourceforge.net/firebird/?rev=52299&view=rev Author: firebirds Date: 2011-02-05 03:14:15 +0000 (Sat, 05 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-05 01:49:44 UTC (rev 52298) +++ firebird/trunk/ChangeLog 2011-02-05 03:14:15 UTC (rev 52299) @@ -1,3 +1,46 @@ + 2011-02-05 01:49 asfernandes + M src/dsql/AggNodes.cpp + M src/dsql/AggNodes.h + M src/dsql/parse.y +Fix problem with COUNT in dialect 1. + + 2011-02-05 00:04 asfernandes + M src/dsql/AggNodes.cpp +Misc + + 2011-02-04 23:58 asfernandes + M src/common/isc_sync.cpp + M src/jrd/jrd.cpp + M src/jrd/lck.cpp + M src/jrd/opt.cpp + M src/jrd/recsrc/RecordSource.cpp + M src/jrd/trace/TraceObjects.h + M src/lock/lock.cpp + M src/remote/server/server.cpp +Misc + + 2011-02-04 12:13 dimitr + M src/jrd/recsrc/RecursiveStream.cpp + M src/jrd/recsrc/Union.cpp + M src/jrd/recsrc/WindowedStream.cpp +Slightly clearer output. + + 2011-02-04 10:02 dimitr + M src/jrd/recsrc/Union.cpp +Correction. + + 2011-02-04 08:42 dimitr + M src/dsql/ExprNodes.cpp +Fixed CORE-3335: Wrong results (internal wrapping occured) for the multi-byte blob SUBSTRING function and its boundary arguments. + + 2011-02-04 07:53 dimitr + M src/jrd/val.h +Make all aggregates aware of big tables (more than 2^31 rows). + + 2011-02-04 07:45 dimitr + M src/jrd/dfw.epp +Corrections, thanks to Adriano. + 2011-02-03 14:51 asfernandes M lang_helpers/gds_codes.ftn M lang_helpers/gds_codes.pas Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-05 01:49:44 UTC (rev 52298) +++ firebird/trunk/src/jrd/build_no.h 2011-02-05 03:14:15 UTC (rev 52299) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29057 + FORMAL BUILD NUMBER:29065 */ -#define PRODUCT_VER_STRING "3.0.0.29057" -#define FILE_VER_STRING "WI-T3.0.0.29057" -#define LICENSE_VER_STRING "WI-T3.0.0.29057" -#define FILE_VER_NUMBER 3, 0, 0, 29057 +#define PRODUCT_VER_STRING "3.0.0.29065" +#define FILE_VER_STRING "WI-T3.0.0.29065" +#define LICENSE_VER_STRING "WI-T3.0.0.29065" +#define FILE_VER_NUMBER 3, 0, 0, 29065 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29057" +#define FB_BUILD_NO "29065" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-05 01:49:44 UTC (rev 52298) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-05 03:14:15 UTC (rev 52299) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29057 +BuildNum=29065 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-07 03:15:04
|
Revision: 52312 http://firebird.svn.sourceforge.net/firebird/?rev=52312&view=rev Author: firebirds Date: 2011-02-07 03:14:57 +0000 (Mon, 07 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-06 21:59:20 UTC (rev 52311) +++ firebird/trunk/ChangeLog 2011-02-07 03:14:57 UTC (rev 52312) @@ -1,3 +1,82 @@ + 2011-02-06 21:59 asfernandes + M src/dsql/AggNodes.cpp + M src/dsql/AggNodes.h + M src/dsql/BoolNodes.cpp + M src/dsql/BoolNodes.h + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/Nodes.h + M src/dsql/StmtNodes.cpp + M src/dsql/StmtNodes.h + M src/dsql/Visitors.h + M src/dsql/WinNodes.cpp + M src/dsql/WinNodes.h + M src/jrd/RecordSourceNodes.cpp + M src/jrd/RecordSourceNodes.h + M src/jrd/cmp.cpp +Fixed CORE-3255 - The server could crash using views with GROUP BY. + + 2011-02-06 19:52 dimitr + M src/jrd/recsrc/HashJoin.cpp +Correction in the plan output. + + 2011-02-06 19:50 dimitr + M src/jrd/recsrc/HashJoin.cpp +Correction in the plan output. + + 2011-02-06 19:36 dimitr + M src/jrd/recsrc/IndexTableScan.cpp + M src/jrd/recsrc/MergeJoin.cpp +Warnings. + + 2011-02-06 19:34 dimitr + M src/jrd/RecordSourceNodes.cpp + M src/jrd/recsrc/RecordSource.h + M src/jrd/recsrc/RecursiveStream.cpp +Warnings. + + 2011-02-06 18:55 dimitr + M src/jrd/recsrc/HashJoin.cpp +Warnings. + + 2011-02-06 18:13 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/Nodes.h + M src/dsql/StmtNodes.cpp + M src/dsql/Visitors.h + M src/dsql/ddl.cpp + M src/dsql/gen.cpp + M src/dsql/gen_proto.h + M src/dsql/make.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp + M src/jrd/RecordSourceNodes.cpp + M src/jrd/blp.h + M src/jrd/blr.h + M src/yvalve/gds.cpp +Fixed CORE-3310 - RDB$GET_CONTEXT and between in view. +Fixed CORE-3338 - Some expression indexes with COALESCE, CASE and DECODE became inoperant. +Removed DSQL hidden variables expressions. +Refactored COALESCE, DECODE and (simple) CASE, using new BLR verbs. +Fixed v3 regression with UPDATE OR INSERT inside PROCEDURE/FUNCTION. +Fixed assert with DECODE/CASE with only test parameters and no values. + + 2011-02-06 16:19 dimitr + M src/common/classes/fb_string.cpp + M src/common/classes/fb_string.h +Sorry, but I've got tired of these endless warnings. + + 2011-02-06 15:39 dimitr + M src/jrd/evl.cpp +Misc. + + 2011-02-06 11:57 dimitr + M src/dsql/dsql.cpp +Fixed CORE-1620: Incorrect error message if EXECUTE STATEMENT contains empty string. It doesn't fix the "uninitialized variable" issue per se, but I'm not sure this is strictly required, as it gets initialized if the statement contains at least one character, and all cases of empty string are now caught in advance. + 2011-02-05 01:49 asfernandes M src/dsql/AggNodes.cpp M src/dsql/AggNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-06 21:59:20 UTC (rev 52311) +++ firebird/trunk/src/jrd/build_no.h 2011-02-07 03:14:57 UTC (rev 52312) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29065 + FORMAL BUILD NUMBER:29075 */ -#define PRODUCT_VER_STRING "3.0.0.29065" -#define FILE_VER_STRING "WI-T3.0.0.29065" -#define LICENSE_VER_STRING "WI-T3.0.0.29065" -#define FILE_VER_NUMBER 3, 0, 0, 29065 +#define PRODUCT_VER_STRING "3.0.0.29075" +#define FILE_VER_STRING "WI-T3.0.0.29075" +#define LICENSE_VER_STRING "WI-T3.0.0.29075" +#define FILE_VER_NUMBER 3, 0, 0, 29075 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29065" +#define FB_BUILD_NO "29075" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-06 21:59:20 UTC (rev 52311) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-07 03:14:57 UTC (rev 52312) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29065 +BuildNum=29075 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2011-02-07 17:54:30
|
Revision: 52314 http://firebird.svn.sourceforge.net/firebird/?rev=52314&view=rev Author: dimitr Date: 2011-02-07 17:54:24 +0000 (Mon, 07 Feb 2011) Log Message: ----------- Implement CORE-3076: Better performance for (table.field = :param or :param = -1) in where clause. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc8/engine.vcproj firebird/trunk/builds/win32/msvc9/engine.vcproj firebird/trunk/src/jrd/Optimizer.cpp firebird/trunk/src/jrd/Optimizer.h firebird/trunk/src/jrd/opt.cpp firebird/trunk/src/jrd/recsrc/RecordSource.h Added Paths: ----------- firebird/trunk/src/jrd/recsrc/ConditionalStream.cpp Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-02-07 17:54:24 UTC (rev 52314) @@ -108,6 +108,7 @@ <ClCompile Include="..\..\..\src\jrd\recsrc\AggregatedStream.cpp" /> <ClCompile Include="..\..\..\src\jrd\recsrc\BitmapTableScan.cpp" /> <ClCompile Include="..\..\..\src\jrd\recsrc\BufferedStream.cpp" /> + <ClCompile Include="..\..\..\src\jrd\recsrc\ConditionalStream.cpp" /> <ClCompile Include="..\..\..\src\jrd\recsrc\Cursor.cpp" /> <ClCompile Include="..\..\..\src\jrd\recsrc\ExternalTableScan.cpp" /> <ClCompile Include="..\..\..\src\jrd\recsrc\FilteredStream.cpp" /> Modified: firebird/trunk/builds/win32/msvc8/engine.vcproj =================================================================== --- firebird/trunk/builds/win32/msvc8/engine.vcproj 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/builds/win32/msvc8/engine.vcproj 2011-02-07 17:54:24 UTC (rev 52314) @@ -619,6 +619,10 @@ > </File> <File + RelativePath="..\..\..\src\jrd\recsrc\ConditionalStream.cpp" + > + </File> + <File RelativePath="..\..\..\src\jrd\recsrc\Cursor.cpp" > </File> Modified: firebird/trunk/builds/win32/msvc9/engine.vcproj =================================================================== --- firebird/trunk/builds/win32/msvc9/engine.vcproj 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/builds/win32/msvc9/engine.vcproj 2011-02-07 17:54:24 UTC (rev 52314) @@ -619,6 +619,10 @@ > </File> <File + RelativePath="..\..\..\src\jrd\recsrc\ConditionalStream.cpp" + > + </File> + <File RelativePath="..\..\..\src\jrd\recsrc\Cursor.cpp" > </File> Modified: firebird/trunk/src/jrd/Optimizer.cpp =================================================================== --- firebird/trunk/src/jrd/Optimizer.cpp 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/src/jrd/Optimizer.cpp 2011-02-07 17:54:24 UTC (rev 52314) @@ -382,6 +382,7 @@ nonFullMatchedSegments = MAX_INDEX_SEGMENTS + 1; matchedSegments = 0; boolean = NULL; + condition = NULL; inversion = NULL; scratch = NULL; used = false; @@ -1341,7 +1342,7 @@ { // If this is a unique full equal matched inversion we're done, so // we can make the inversion and return it. - if (currentInv->unique && currentInv->dependencies) + if (currentInv->unique && currentInv->dependencies && !currentInv->condition) { if (!invCandidate) invCandidate = FB_NEW(pool) InversionCandidate(pool); @@ -1413,6 +1414,20 @@ } else { + // Prefer unconditional inversions + if (currentInv->condition) + { + currentInv->used = true; + restartLoop = true; + break; + } + else if (bestCandidate->condition) + { + bestCandidate = currentInv; + restartLoop = true; + break; + } + if (currentInv->unique && !bestCandidate->unique) { // A unique full equal match is better than anything else. @@ -1570,6 +1585,8 @@ invCandidate->nonFullMatchedSegments = 0; invCandidate->matchedSegments = bestCandidate->matchedSegments; invCandidate->dependencies = bestCandidate->dependencies; + invCandidate->condition = bestCandidate->condition; + for (size_t j = 0; j < bestCandidate->matches.getCount(); j++) { if (!matches.exist(bestCandidate->matches[j])) { @@ -1585,6 +1602,8 @@ } else { + fb_assert(!bestCandidate->condition); + if (!bestCandidate->inversion && bestCandidate->scratch) { invCandidate->inversion = composeInversion(invCandidate->inversion, @@ -2115,8 +2134,6 @@ getInversionCandidates(&inversions, &indexOrScratches, scope); invCandidate1 = makeInversion(&inversions); - if (!invCandidate1) - return NULL; // Clear list to remove previously matched conjunctions indexOrScratches.clear(); @@ -2148,7 +2165,7 @@ invCandidate2 = makeInversion(&inversions); - if (invCandidate2) + if (invCandidate1 && invCandidate2) { InversionCandidate* invCandidate = FB_NEW(pool) InversionCandidate(pool); invCandidate->inversion = composeInversion(invCandidate1->inversion, @@ -2162,6 +2179,23 @@ MIN(invCandidate1->matchedSegments, invCandidate2->matchedSegments); invCandidate->dependencies = invCandidate1->dependencies + invCandidate2->dependencies; + if (invCandidate1->condition && invCandidate2->condition) + { + BinaryBoolNode* const newNode = + FB_NEW(*tdbb->getDefaultPool()) BinaryBoolNode(*tdbb->getDefaultPool(), blr_or); + newNode->arg1 = invCandidate1->condition; + newNode->arg2 = invCandidate2->condition; + invCandidate->condition = newNode; + } + else if (invCandidate1->condition) + { + invCandidate->condition = invCandidate1->condition; + } + else if (invCandidate2->condition) + { + invCandidate->condition = invCandidate2->condition; + } + // Add matches conjunctions that exists in both left and right inversion if ((invCandidate1->matches.getCount()) && (invCandidate2->matches.getCount())) { @@ -2179,6 +2213,16 @@ return invCandidate; } + else if (invCandidate1) + { + invCandidate1->condition = binaryNode->arg2; + return invCandidate1; + } + else if (invCandidate2) + { + invCandidate2->condition = binaryNode->arg1; + return invCandidate2; + } return NULL; } Modified: firebird/trunk/src/jrd/Optimizer.h =================================================================== --- firebird/trunk/src/jrd/Optimizer.h 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/src/jrd/Optimizer.h 2011-02-07 17:54:24 UTC (rev 52314) @@ -141,6 +141,7 @@ int indexes; int dependencies; BoolExprNode* boolean; + BoolExprNode* condition; InversionNode* inversion; IndexScratch* scratch; bool used; Modified: firebird/trunk/src/jrd/opt.cpp =================================================================== --- firebird/trunk/src/jrd/opt.cpp 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/src/jrd/opt.cpp 2011-02-07 17:54:24 UTC (rev 52314) @@ -166,7 +166,7 @@ bool isComputable(CompilerScratch* csb) const { - return m_node ? m_node->computable(csb, -1, false, false, NULL) : true; + return m_node ? m_node->computable(csb, -1, false, false) : true; } protected: @@ -2193,8 +2193,8 @@ (inner_flag ? opt->opt_base_missing_conjuncts : opt->opt_conjuncts.getCount()); RecordSource* rsb = NULL; - IndexTableScan* nav_rsb = NULL; InversionNode* inversion = NULL; + BoolExprNode* condition = NULL; if (relation->rel_file) { @@ -2216,12 +2216,26 @@ else { // Persistent table + IndexTableScan* nav_rsb = NULL; OptimizerRetrieval optimizerRetrieval(*tdbb->getDefaultPool(), opt, stream, outer_flag, inner_flag, sort_ptr); AutoPtr<InversionCandidate> candidate(optimizerRetrieval.getInversion(&nav_rsb)); - if (candidate && candidate->inversion) + if (candidate) + { inversion = candidate->inversion; + condition = candidate->condition; + } + + if (nav_rsb) + { + if (inversion && !condition) + { + nav_rsb->setInversion(inversion); + } + + rsb = nav_rsb; + } } if (outer_flag) @@ -2278,17 +2292,22 @@ } } - if (nav_rsb) - { - nav_rsb->setInversion(inversion); - fb_assert(!rsb); - rsb = nav_rsb; - } - if (!rsb) { if (inversion) + { rsb = FB_NEW(*tdbb->getDefaultPool()) BitmapTableScan(csb, alias, stream, inversion); + + if (condition && + condition->computable(csb, -1, false, false) && + !condition->jrdStreamFinder(csb, stream)) + { + RecordSource* const other_rsb = + FB_NEW(*tdbb->getDefaultPool()) FullTableScan(csb, alias, stream); + + rsb = FB_NEW(*tdbb->getDefaultPool()) ConditionalStream(csb, other_rsb, rsb, condition); + } + } else { rsb = FB_NEW(*tdbb->getDefaultPool()) FullTableScan(csb, alias, stream); Added: firebird/trunk/src/jrd/recsrc/ConditionalStream.cpp =================================================================== --- firebird/trunk/src/jrd/recsrc/ConditionalStream.cpp (rev 0) +++ firebird/trunk/src/jrd/recsrc/ConditionalStream.cpp 2011-02-07 17:54:24 UTC (rev 52314) @@ -0,0 +1,171 @@ +/* + * The contents of this file are subject to the Initial + * Developer's Public License Version 1.0 (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.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. + * + * Software distributed under the License is distributed AS IS, + * 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 was created by Dmitry Yemanov + * for the Firebird Open Source RDBMS project. + * + * Copyright (c) 2011 Dmitry Yemanov <di...@fi...> + * and all contributors signed below. + * + * All Rights Reserved. + * Contributor(s): ______________________________________. + */ + +#include "firebird.h" +#include "../common/common.h" +#include "../jrd/jrd.h" +#include "../jrd/req.h" +#include "../dsql/BoolNodes.h" +#include "../jrd/cmp_proto.h" +#include "../jrd/evl_proto.h" +#include "../jrd/mov_proto.h" +#include "../jrd/evl_proto.h" + +#include "RecordSource.h" + +using namespace Firebird; +using namespace Jrd; + +// ------------------------------------ +// Data access: predicate driven filter +// ------------------------------------ + +ConditionalStream::ConditionalStream(CompilerScratch* csb, + RecordSource* first, RecordSource* second, + BoolExprNode* boolean) + : m_first(first), m_second(second), m_boolean(boolean) +{ + fb_assert(m_first && m_second && m_boolean); + + m_impure = CMP_impure(csb, sizeof(Impure)); +} + +void ConditionalStream::open(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + + impure->irsb_flags = irsb_open; + + impure->irsb_next = m_boolean->execute(tdbb, request) ? m_first : m_second; + impure->irsb_next->open(tdbb); +} + +void ConditionalStream::close(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + + invalidateRecords(request); + + Impure* const impure = request->getImpure<Impure>(m_impure); + + if (impure->irsb_flags & irsb_open) + { + impure->irsb_flags &= ~irsb_open; + + impure->irsb_next->close(tdbb); + } +} + +bool ConditionalStream::getRecord(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + + if (!(impure->irsb_flags & irsb_open)) + { + return false; + } + + return impure->irsb_next->getRecord(tdbb); +} + +bool ConditionalStream::refetchRecord(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + return impure->irsb_next->refetchRecord(tdbb); +} + +bool ConditionalStream::lockRecord(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + return impure->irsb_next->lockRecord(tdbb); +} + +void ConditionalStream::print(thread_db* tdbb, string& plan, bool detailed, unsigned level) const +{ + if (detailed) + { + plan += printIndent(++level) + "Condition"; + m_first->print(tdbb, plan, true, level); + m_second->print(tdbb, plan, true, level); + } + else + { + if (!level) + { + plan += "("; + } + + m_first->print(tdbb, plan, false, level + 1); + + plan += ", "; + + m_second->print(tdbb, plan, false, level + 1); + + if (!level) + { + plan += ")"; + } + } +} + +void ConditionalStream::markRecursive() +{ + m_first->markRecursive(); + m_second->markRecursive(); +} + +void ConditionalStream::findUsedStreams(StreamsArray& streams) const +{ + m_first->findUsedStreams(streams); + m_second->findUsedStreams(streams); +} + +void ConditionalStream::invalidateRecords(jrd_req* request) const +{ + Impure* const impure = request->getImpure<Impure>(m_impure); + impure->irsb_next->invalidateRecords(request); +} + +void ConditionalStream::nullRecords(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + impure->irsb_next->nullRecords(tdbb); +} + +void ConditionalStream::saveRecords(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + impure->irsb_next->saveRecords(tdbb); +} + +void ConditionalStream::restoreRecords(thread_db* tdbb) const +{ + jrd_req* const request = tdbb->getRequest(); + Impure* const impure = request->getImpure<Impure>(m_impure); + impure->irsb_next->restoreRecords(tdbb); +} Property changes on: firebird/trunk/src/jrd/recsrc/ConditionalStream.cpp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Modified: firebird/trunk/src/jrd/recsrc/RecordSource.h =================================================================== --- firebird/trunk/src/jrd/recsrc/RecordSource.h 2011-02-07 14:32:21 UTC (rev 52313) +++ firebird/trunk/src/jrd/recsrc/RecordSource.h 2011-02-07 17:54:24 UTC (rev 52314) @@ -996,6 +996,41 @@ size_t m_saveSize; }; + class ConditionalStream : public RecordSource + { + struct Impure : public RecordSource::Impure + { + const RecordSource* irsb_next; + }; + + public: + ConditionalStream(CompilerScratch* csb, RecordSource* first, RecordSource* second, + BoolExprNode* boolean); + + void open(thread_db* tdbb) const; + void close(thread_db* tdbb) const; + + bool getRecord(thread_db* tdbb) const; + bool refetchRecord(thread_db* tdbb) const; + bool lockRecord(thread_db* tdbb) const; + + void print(thread_db* tdbb, Firebird::string& plan, + bool detailed, unsigned level) const; + + void markRecursive(); + void invalidateRecords(jrd_req* request) const; + + void findUsedStreams(StreamsArray& streams) const; + void nullRecords(thread_db* tdbb) const; + void saveRecords(thread_db* tdbb) const; + void restoreRecords(thread_db* tdbb) const; + + private: + NestConst<RecordSource> m_first; + NestConst<RecordSource> m_second; + NestConst<BoolExprNode> const m_boolean; + }; + } // namespace #endif // JRD_RECORD_SOURCE_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-08 03:16:49
|
Revision: 52315 http://firebird.svn.sourceforge.net/firebird/?rev=52315&view=rev Author: firebirds Date: 2011-02-08 03:16:43 +0000 (Tue, 08 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-07 17:54:24 UTC (rev 52314) +++ firebird/trunk/ChangeLog 2011-02-08 03:16:43 UTC (rev 52315) @@ -1,3 +1,14 @@ + 2011-02-07 17:54 dimitr + M builds/win32/msvc10/engine.vcxproj + M builds/win32/msvc8/engine.vcproj + M builds/win32/msvc9/engine.vcproj + M src/jrd/Optimizer.cpp + M src/jrd/Optimizer.h + M src/jrd/opt.cpp + A src/jrd/recsrc/ConditionalStream.cpp + M src/jrd/recsrc/RecordSource.h +Implement CORE-3076: Better performance for (table.field = :param or :param = -1) in where clause. + 2011-02-06 21:59 asfernandes M src/dsql/AggNodes.cpp M src/dsql/AggNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-07 17:54:24 UTC (rev 52314) +++ firebird/trunk/src/jrd/build_no.h 2011-02-08 03:16:43 UTC (rev 52315) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29075 + FORMAL BUILD NUMBER:29076 */ -#define PRODUCT_VER_STRING "3.0.0.29075" -#define FILE_VER_STRING "WI-T3.0.0.29075" -#define LICENSE_VER_STRING "WI-T3.0.0.29075" -#define FILE_VER_NUMBER 3, 0, 0, 29075 +#define PRODUCT_VER_STRING "3.0.0.29076" +#define FILE_VER_STRING "WI-T3.0.0.29076" +#define LICENSE_VER_STRING "WI-T3.0.0.29076" +#define FILE_VER_NUMBER 3, 0, 0, 29076 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29075" +#define FB_BUILD_NO "29076" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-07 17:54:24 UTC (rev 52314) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-08 03:16:43 UTC (rev 52315) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29075 +BuildNum=29076 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-09 03:18:40
|
Revision: 52320 http://firebird.svn.sourceforge.net/firebird/?rev=52320&view=rev Author: firebirds Date: 2011-02-09 03:18:32 +0000 (Wed, 09 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-09 00:29:46 UTC (rev 52319) +++ firebird/trunk/ChangeLog 2011-02-09 03:18:32 UTC (rev 52320) @@ -1,3 +1,12 @@ + 2011-02-09 00:29 asfernandes + M src/jrd/recsrc/AggregatedStream.cpp + M src/jrd/recsrc/RecordSource.h +Do not reuse arbitrary nodes' impure space in aggregate. Relates to CORE-3255. + + 2011-02-08 17:34 dimitr + M src/dsql/make.cpp +Misc. + 2011-02-07 17:54 dimitr M builds/win32/msvc10/engine.vcxproj M builds/win32/msvc8/engine.vcproj Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-09 00:29:46 UTC (rev 52319) +++ firebird/trunk/src/jrd/build_no.h 2011-02-09 03:18:32 UTC (rev 52320) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29076 + FORMAL BUILD NUMBER:29078 */ -#define PRODUCT_VER_STRING "3.0.0.29076" -#define FILE_VER_STRING "WI-T3.0.0.29076" -#define LICENSE_VER_STRING "WI-T3.0.0.29076" -#define FILE_VER_NUMBER 3, 0, 0, 29076 +#define PRODUCT_VER_STRING "3.0.0.29078" +#define FILE_VER_STRING "WI-T3.0.0.29078" +#define LICENSE_VER_STRING "WI-T3.0.0.29078" +#define FILE_VER_NUMBER 3, 0, 0, 29078 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29076" +#define FB_BUILD_NO "29078" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-09 00:29:46 UTC (rev 52319) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-09 03:18:32 UTC (rev 52320) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29076 +BuildNum=29078 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-10 03:16:24
|
Revision: 52327 http://firebird.svn.sourceforge.net/firebird/?rev=52327&view=rev Author: firebirds Date: 2011-02-10 03:16:17 +0000 (Thu, 10 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-09 21:26:18 UTC (rev 52326) +++ firebird/trunk/ChangeLog 2011-02-10 03:16:17 UTC (rev 52327) @@ -1,3 +1,24 @@ + 2011-02-09 21:26 asfernandes + M src/dsql/Nodes.h + M src/dsql/StmtNodes.cpp + M src/jrd/exe.cpp +Fixed hang found with CORE-3340 test-case. + + 2011-02-09 21:25 asfernandes + M src/burp/split/spit.cpp + M src/jrd/trace/TraceCmdLine.cpp + M src/utilities/nbackup/nbackup.cpp +Warnings + + 2011-02-09 10:59 dimitr + M src/dsql/Nodes.h + M src/jrd/exe.cpp +Fixed CORE-3340 (Error in autonomous transaction with empty exception handler: can insert duplicate values into PK/UK column). + + 2011-02-09 10:57 dimitr + M src/dsql/StmtNodes.cpp +Misc. + 2011-02-09 00:29 asfernandes M src/jrd/recsrc/AggregatedStream.cpp M src/jrd/recsrc/RecordSource.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-09 21:26:18 UTC (rev 52326) +++ firebird/trunk/src/jrd/build_no.h 2011-02-10 03:16:17 UTC (rev 52327) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29078 + FORMAL BUILD NUMBER:29082 */ -#define PRODUCT_VER_STRING "3.0.0.29078" -#define FILE_VER_STRING "WI-T3.0.0.29078" -#define LICENSE_VER_STRING "WI-T3.0.0.29078" -#define FILE_VER_NUMBER 3, 0, 0, 29078 +#define PRODUCT_VER_STRING "3.0.0.29082" +#define FILE_VER_STRING "WI-T3.0.0.29082" +#define LICENSE_VER_STRING "WI-T3.0.0.29082" +#define FILE_VER_NUMBER 3, 0, 0, 29082 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29078" +#define FB_BUILD_NO "29082" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-09 21:26:18 UTC (rev 52326) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-10 03:16:17 UTC (rev 52327) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29078 +BuildNum=29082 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-11 03:16:00
|
Revision: 52332 http://firebird.svn.sourceforge.net/firebird/?rev=52332&view=rev Author: firebirds Date: 2011-02-11 03:15:54 +0000 (Fri, 11 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-11 00:43:15 UTC (rev 52331) +++ firebird/trunk/ChangeLog 2011-02-11 03:15:54 UTC (rev 52332) @@ -1,3 +1,19 @@ + 2011-02-11 00:43 asfernandes + M src/jrd/dfw.epp + M src/jrd/evl.cpp + M src/jrd/evl_proto.h + M src/jrd/met.epp +Simplified fix for problem with default values in formats. + + 2011-02-10 20:22 dimitr + M src/jrd/recsrc/BitmapTableScan.cpp + M src/jrd/recsrc/IndexTableScan.cpp +Misc. + + 2011-02-10 14:52 dimitr + M src/jrd/recsrc/RecordSource.h +Misc. + 2011-02-09 21:26 asfernandes M src/dsql/Nodes.h M src/dsql/StmtNodes.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-11 00:43:15 UTC (rev 52331) +++ firebird/trunk/src/jrd/build_no.h 2011-02-11 03:15:54 UTC (rev 52332) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29082 + FORMAL BUILD NUMBER:29085 */ -#define PRODUCT_VER_STRING "3.0.0.29082" -#define FILE_VER_STRING "WI-T3.0.0.29082" -#define LICENSE_VER_STRING "WI-T3.0.0.29082" -#define FILE_VER_NUMBER 3, 0, 0, 29082 +#define PRODUCT_VER_STRING "3.0.0.29085" +#define FILE_VER_STRING "WI-T3.0.0.29085" +#define LICENSE_VER_STRING "WI-T3.0.0.29085" +#define FILE_VER_NUMBER 3, 0, 0, 29085 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29082" +#define FB_BUILD_NO "29085" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-11 00:43:15 UTC (rev 52331) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-11 03:15:54 UTC (rev 52332) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29082 +BuildNum=29085 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-12 03:16:07
|
Revision: 52335 http://firebird.svn.sourceforge.net/firebird/?rev=52335&view=rev Author: firebirds Date: 2011-02-12 03:16:00 +0000 (Sat, 12 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-12 02:00:27 UTC (rev 52334) +++ firebird/trunk/ChangeLog 2011-02-12 03:16:00 UTC (rev 52335) @@ -1,3 +1,12 @@ + 2011-02-12 02:00 asfernandes + M src/dsql/PackageNodes.epp + M src/dsql/PackageNodes.h +Fixed problem with packages reported privately by Vlad. + + 2011-02-11 14:26 asfernandes + M src/jrd/exe.cpp +Fixed DDL trigger crash reported in fb-devel. + 2011-02-11 00:43 asfernandes M src/jrd/dfw.epp M src/jrd/evl.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-12 02:00:27 UTC (rev 52334) +++ firebird/trunk/src/jrd/build_no.h 2011-02-12 03:16:00 UTC (rev 52335) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29085 + FORMAL BUILD NUMBER:29087 */ -#define PRODUCT_VER_STRING "3.0.0.29085" -#define FILE_VER_STRING "WI-T3.0.0.29085" -#define LICENSE_VER_STRING "WI-T3.0.0.29085" -#define FILE_VER_NUMBER 3, 0, 0, 29085 +#define PRODUCT_VER_STRING "3.0.0.29087" +#define FILE_VER_STRING "WI-T3.0.0.29087" +#define LICENSE_VER_STRING "WI-T3.0.0.29087" +#define FILE_VER_NUMBER 3, 0, 0, 29087 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29085" +#define FB_BUILD_NO "29087" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-12 02:00:27 UTC (rev 52334) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-12 03:16:00 UTC (rev 52335) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29085 +BuildNum=29087 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-13 03:14:49
|
Revision: 52346 http://firebird.svn.sourceforge.net/firebird/?rev=52346&view=rev Author: firebirds Date: 2011-02-13 03:14:42 +0000 (Sun, 13 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-12 21:32:05 UTC (rev 52345) +++ firebird/trunk/ChangeLog 2011-02-13 03:14:42 UTC (rev 52346) @@ -1,3 +1,72 @@ + 2011-02-12 21:32 dimitr + M src/jrd/btn.h + M src/jrd/btr.cpp +Fixed the error handling behavior in fast_load(), now it corresponds to the original (FB1) one. +Fixed a possible bugcheck because of an unexpectedly missing index root page. +Simplified the various jump node structures usage. + + 2011-02-12 20:35 dimitr + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/make.cpp + M src/jrd/par.cpp + M src/jrd/par_proto.h +Cleaned up the unused FieldNode::defaultValue. Added a bit of constness to the class members. + + 2011-02-12 20:32 dimitr + M src/jrd/cmp.cpp +Misc. + + 2011-02-12 20:26 dimitr + M src/jrd/evl.cpp +Misc. + + 2011-02-12 18:11 asfernandes + M src/dsql/BoolNodes.cpp + M src/dsql/ExprNodes.cpp + M src/dsql/Nodes.h + M src/jrd/Optimizer.cpp + M src/jrd/Optimizer.h +Refactored out OPT_expression_equal while fixing checking of sameAs involving CASTs. Problem saw by Dmitry. + + 2011-02-12 17:41 asfernandes + M src/jrd/Optimizer.cpp + M src/jrd/Optimizer.h +Avoid casts. + + 2011-02-12 17:26 asfernandes + M src/dsql/Nodes.h +Misc + + 2011-02-12 14:13 dimitr + M src/dsql/BoolNodes.cpp + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/Nodes.h + M src/jrd/Optimizer.cpp + M src/jrd/RecordSourceNodes.cpp + M src/jrd/RecordSourceNodes.h + M src/jrd/opt.cpp +Cleaned up the unused (since FB2) parameter. + + 2011-02-12 14:01 dimitr + M src/dsql/BoolNodes.cpp + M src/dsql/BoolNodes.h + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/Nodes.h + M src/jrd/Optimizer.cpp + M src/jrd/Optimizer.h + M src/jrd/RecordSourceNodes.h +Refactored expression equality to make it independent from the stream being optimized. + + 2011-02-12 08:59 dimitr + M src/jrd/btr.h + M src/jrd/opt.cpp + M src/jrd/recsrc/RecordSource.h + M src/jrd/recsrc/SortedStream.cpp +Misc. + 2011-02-12 02:00 asfernandes M src/dsql/PackageNodes.epp M src/dsql/PackageNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-12 21:32:05 UTC (rev 52345) +++ firebird/trunk/src/jrd/build_no.h 2011-02-13 03:14:42 UTC (rev 52346) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29087 + FORMAL BUILD NUMBER:29097 */ -#define PRODUCT_VER_STRING "3.0.0.29087" -#define FILE_VER_STRING "WI-T3.0.0.29087" -#define LICENSE_VER_STRING "WI-T3.0.0.29087" -#define FILE_VER_NUMBER 3, 0, 0, 29087 +#define PRODUCT_VER_STRING "3.0.0.29097" +#define FILE_VER_STRING "WI-T3.0.0.29097" +#define LICENSE_VER_STRING "WI-T3.0.0.29097" +#define FILE_VER_NUMBER 3, 0, 0, 29097 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29087" +#define FB_BUILD_NO "29097" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-12 21:32:05 UTC (rev 52345) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-13 03:14:42 UTC (rev 52346) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29087 +BuildNum=29097 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-14 03:15:47
|
Revision: 52351 http://firebird.svn.sourceforge.net/firebird/?rev=52351&view=rev Author: firebirds Date: 2011-02-14 03:15:41 +0000 (Mon, 14 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-13 19:16:16 UTC (rev 52350) +++ firebird/trunk/ChangeLog 2011-02-14 03:15:41 UTC (rev 52351) @@ -1,3 +1,20 @@ + 2011-02-13 19:16 hvlad + M doc/sql.extensions/README.execute_statement2 +Correction + + 2011-02-13 14:48 asfernandes + M src/dsql/node.h +Refactored searched CASE. + + 2011-02-13 14:44 asfernandes + M src/dsql/Visitors.h + M src/dsql/gen.cpp + M src/dsql/make.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp +Refactored searched CASE. + 2011-02-12 21:32 dimitr M src/jrd/btn.h M src/jrd/btr.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-13 19:16:16 UTC (rev 52350) +++ firebird/trunk/src/jrd/build_no.h 2011-02-14 03:15:41 UTC (rev 52351) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29097 + FORMAL BUILD NUMBER:29100 */ -#define PRODUCT_VER_STRING "3.0.0.29097" -#define FILE_VER_STRING "WI-T3.0.0.29097" -#define LICENSE_VER_STRING "WI-T3.0.0.29097" -#define FILE_VER_NUMBER 3, 0, 0, 29097 +#define PRODUCT_VER_STRING "3.0.0.29100" +#define FILE_VER_STRING "WI-T3.0.0.29100" +#define LICENSE_VER_STRING "WI-T3.0.0.29100" +#define FILE_VER_NUMBER 3, 0, 0, 29100 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29097" +#define FB_BUILD_NO "29100" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-13 19:16:16 UTC (rev 52350) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-14 03:15:41 UTC (rev 52351) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29097 +BuildNum=29100 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-15 03:15:37
|
Revision: 52360 http://firebird.svn.sourceforge.net/firebird/?rev=52360&view=rev Author: firebirds Date: 2011-02-15 03:15:30 +0000 (Tue, 15 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-14 17:05:23 UTC (rev 52359) +++ firebird/trunk/ChangeLog 2011-02-15 03:15:30 UTC (rev 52360) @@ -1,3 +1,11 @@ + 2011-02-14 15:21 hvlad + M doc/sql.extensions/README.execute_statement2 +Fixed bug CORE-3349 : Constants isc_lock_conflict / isc_eds_statement not recognized in PSQL + + 2011-02-14 08:47 hvlad + M src/jrd/cch.cpp +Fixed problem with GTT's reported by Adriano in fb-devel + 2011-02-13 19:16 hvlad M doc/sql.extensions/README.execute_statement2 Correction Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-14 17:05:23 UTC (rev 52359) +++ firebird/trunk/src/jrd/build_no.h 2011-02-15 03:15:30 UTC (rev 52360) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29100 + FORMAL BUILD NUMBER:29102 */ -#define PRODUCT_VER_STRING "3.0.0.29100" -#define FILE_VER_STRING "WI-T3.0.0.29100" -#define LICENSE_VER_STRING "WI-T3.0.0.29100" -#define FILE_VER_NUMBER 3, 0, 0, 29100 +#define PRODUCT_VER_STRING "3.0.0.29102" +#define FILE_VER_STRING "WI-T3.0.0.29102" +#define LICENSE_VER_STRING "WI-T3.0.0.29102" +#define FILE_VER_NUMBER 3, 0, 0, 29102 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29100" +#define FB_BUILD_NO "29102" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-14 17:05:23 UTC (rev 52359) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-15 03:15:30 UTC (rev 52360) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29100 +BuildNum=29102 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-16 03:15:40
|
Revision: 52376 http://firebird.svn.sourceforge.net/firebird/?rev=52376&view=rev Author: firebirds Date: 2011-02-16 03:15:34 +0000 (Wed, 16 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-16 01:38:48 UTC (rev 52375) +++ firebird/trunk/ChangeLog 2011-02-16 03:15:34 UTC (rev 52376) @@ -1,3 +1,59 @@ + 2011-02-16 01:38 asfernandes + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/Visitors.h + M src/dsql/gen.cpp + M src/dsql/make.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp +Refactored nod_dom_value. + + 2011-02-15 11:04 dimitr + M src/jrd/ods.h +Totally misc. + + 2011-02-15 10:10 hvlad + M src/common/xdr.h + M src/remote/inet.cpp +Fixed bug CORE-3351 : Windows client could put 10054 error messages into firebird.log at connection time + + 2011-02-15 08:47 dimitr + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/DatabaseSnapshot.h + M src/jrd/RecordBuffer.cpp + M src/jrd/RecordBuffer.h + M src/jrd/UserManagement.cpp + M src/jrd/UserManagement.h + M src/jrd/recsrc/RecordSource.h + M src/jrd/recsrc/VirtualTableScan.cpp +Front ported CORE-3138: Internal error or crash occurs when accessing any MON$ table after altering its structure. + + 2011-02-15 07:32 dimitr + M src/jrd/Database.h + M src/jrd/btr.cpp + M src/jrd/btr.h + M src/jrd/idx.cpp +Misc. + + 2011-02-15 07:20 dimitr + M src/jrd/JrdStatement.cpp +Correction. + + 2011-02-15 07:16 dimitr + M src/jrd/Database.cpp + M src/jrd/Database.h + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/JrdStatement.cpp + M src/jrd/jrd.cpp + M src/jrd/pag.cpp + M src/jrd/shut.cpp + M src/jrd/tra.cpp +Front ported: +Refactored the shared counter to support multiple number spaces. +Changed att_id and tra_id to be generated sequentially (without caching), as agreed with Vlad privately. +Fixed CORE-2305: Make mon$statement_id value constant among monitoring snapshots. + 2011-02-14 15:21 hvlad M doc/sql.extensions/README.execute_statement2 Fixed bug CORE-3349 : Constants isc_lock_conflict / isc_eds_statement not recognized in PSQL Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-16 01:38:48 UTC (rev 52375) +++ firebird/trunk/src/jrd/build_no.h 2011-02-16 03:15:34 UTC (rev 52376) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29102 + FORMAL BUILD NUMBER:29109 */ -#define PRODUCT_VER_STRING "3.0.0.29102" -#define FILE_VER_STRING "WI-T3.0.0.29102" -#define LICENSE_VER_STRING "WI-T3.0.0.29102" -#define FILE_VER_NUMBER 3, 0, 0, 29102 +#define PRODUCT_VER_STRING "3.0.0.29109" +#define FILE_VER_STRING "WI-T3.0.0.29109" +#define LICENSE_VER_STRING "WI-T3.0.0.29109" +#define FILE_VER_NUMBER 3, 0, 0, 29109 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29102" +#define FB_BUILD_NO "29109" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-16 01:38:48 UTC (rev 52375) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-16 03:15:34 UTC (rev 52376) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29102 +BuildNum=29109 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-17 03:16:15
|
Revision: 52382 http://firebird.svn.sourceforge.net/firebird/?rev=52382&view=rev Author: firebirds Date: 2011-02-17 03:16:08 +0000 (Thu, 17 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-16 14:38:25 UTC (rev 52381) +++ firebird/trunk/ChangeLog 2011-02-17 03:16:08 UTC (rev 52382) @@ -1,3 +1,11 @@ + 2011-02-16 14:38 asfernandes + M src/dsql/parse.y +Move ALIAS.* construct from column_name to select_item. + + 2011-02-16 14:37 asfernandes + M src/dsql/parse.y +Misc + 2011-02-16 01:38 asfernandes M src/dsql/ExprNodes.cpp M src/dsql/ExprNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-16 14:38:25 UTC (rev 52381) +++ firebird/trunk/src/jrd/build_no.h 2011-02-17 03:16:08 UTC (rev 52382) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29109 + FORMAL BUILD NUMBER:29111 */ -#define PRODUCT_VER_STRING "3.0.0.29109" -#define FILE_VER_STRING "WI-T3.0.0.29109" -#define LICENSE_VER_STRING "WI-T3.0.0.29109" -#define FILE_VER_NUMBER 3, 0, 0, 29109 +#define PRODUCT_VER_STRING "3.0.0.29111" +#define FILE_VER_STRING "WI-T3.0.0.29111" +#define LICENSE_VER_STRING "WI-T3.0.0.29111" +#define FILE_VER_NUMBER 3, 0, 0, 29111 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29109" +#define FB_BUILD_NO "29111" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-16 14:38:25 UTC (rev 52381) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-17 03:16:08 UTC (rev 52382) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29109 +BuildNum=29111 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2011-02-18 00:52:16
|
Revision: 52391 http://firebird.svn.sourceforge.net/firebird/?rev=52391&view=rev Author: asfernandes Date: 2011-02-18 00:52:10 +0000 (Fri, 18 Feb 2011) Log Message: ----------- Misc Modified Paths: -------------- firebird/trunk/doc/sql.extensions/README.execute_statement2 firebird/trunk/src/dsql/ExprNodes.cpp firebird/trunk/src/dsql/gen.cpp firebird/trunk/src/dsql/make.cpp firebird/trunk/src/jrd/Database.h firebird/trunk/src/jrd/DatabaseSnapshot.h firebird/trunk/src/jrd/UserManagement.h firebird/trunk/src/jrd/btr.cpp Modified: firebird/trunk/doc/sql.extensions/README.execute_statement2 =================================================================== --- firebird/trunk/doc/sql.extensions/README.execute_statement2 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/doc/sql.extensions/README.execute_statement2 2011-02-18 00:52:10 UTC (rev 52391) @@ -86,8 +86,8 @@ CURRENT_USER/CURRENT_ROLE is effective user account and role a3) for remote database - operating system account under which engine process is currently run is effective user account. - b) else isc_dpb_user_name (if <user_name> is present and not empty) and isc_dpb_sql_role_name - (if <role_name> is present and not empty) will be filled in DPB and native autentication + b) else isc_dpb_user_name (if <user_name> is present and not empty) and isc_dpb_sql_role_name + (if <role_name> is present and not empty) will be filled in DPB and native autentication is performed. - if WITH CALLER PRIVILEGES is specified and ON EXTERNAL DATA SOURCE is omitted, then Modified: firebird/trunk/src/dsql/ExprNodes.cpp =================================================================== --- firebird/trunk/src/dsql/ExprNodes.cpp 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/dsql/ExprNodes.cpp 2011-02-18 00:52:10 UTC (rev 52391) @@ -2733,10 +2733,11 @@ { FieldNode* fieldNode = other->as<FieldNode>(); + dsc desc1, desc2; + getDesc(tdbb, csb, &desc1); + if (fieldNode) { - dsc desc1, desc2; - getDesc(tdbb, csb, &desc1); fieldNode->getDesc(tdbb, csb, &desc2); if (DSC_EQUIV(&desc1, &desc2, true) && source->sameAs(tdbb, csb, fieldNode)) @@ -2749,9 +2750,6 @@ CastNode* o = other->as<CastNode>(); fb_assert(o); - dsc desc1, desc2; - - getDesc(tdbb, csb, &desc1); o->getDesc(tdbb, csb, &desc2); return DSC_EQUIV(&desc1, &desc2, true) && source->sameAs(tdbb, csb, o->source); Modified: firebird/trunk/src/dsql/gen.cpp =================================================================== --- firebird/trunk/src/dsql/gen.cpp 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/dsql/gen.cpp 2011-02-18 00:52:10 UTC (rev 52391) @@ -115,51 +115,41 @@ **/ void GEN_expr(DsqlCompilerScratch* dsqlScratch, dsql_nod* node) { - switch (node->nod_type) + if (node->nod_type == nod_class_exprnode) { - case nod_class_exprnode: + ExprNode* exprNode = reinterpret_cast<ExprNode*>(node->nod_arg[0]); + + if (exprNode->is<RseNode>()) { - ExprNode* exprNode = reinterpret_cast<ExprNode*>(node->nod_arg[0]); + GEN_rse(dsqlScratch, node); + return; + } - if (exprNode->is<RseNode>()) - { - GEN_rse(dsqlScratch, node); - return; - } + exprNode->genBlr(dsqlScratch); - exprNode->genBlr(dsqlScratch); + // Check whether the node we just processed is for a dialect 3 + // operation which gives a different result than the corresponding + // operation in dialect 1. If it is, and if the client dialect is 2, + // issue a warning about the difference. - // Check whether the node we just processed is for a dialect 3 - // operation which gives a different result than the corresponding - // operation in dialect 1. If it is, and if the client dialect is 2, - // issue a warning about the difference. + // ASF: Shouldn't we check nod_gen_id2 too? - // ASF: Shouldn't we check nod_gen_id2 too? + if (exprNode->dsqlCompatDialectVerb && + dsqlScratch->clientDialect == SQL_DIALECT_V6_TRANSITION) + { + dsc desc; + MAKE_desc(dsqlScratch, &desc, node); - if (exprNode->dsqlCompatDialectVerb && - dsqlScratch->clientDialect == SQL_DIALECT_V6_TRANSITION) + if (desc.dsc_dtype == dtype_int64) { - dsc desc; - MAKE_desc(dsqlScratch, &desc, node); - - if (desc.dsc_dtype == dtype_int64) - { - ERRD_post_warning( - Arg::Warning(isc_dsql_dialect_warning_expr) << - Arg::Str(exprNode->dsqlCompatDialectVerb)); - } + ERRD_post_warning( + Arg::Warning(isc_dsql_dialect_warning_expr) << + Arg::Str(exprNode->dsqlCompatDialectVerb)); } - - return; } - - case nod_assign: - dsqlScratch->appendUChar(blr_assignment); - GEN_expr(dsqlScratch, node->nod_arg[0]); - GEN_expr(dsqlScratch, node->nod_arg[1]); - return; - - default: + } + else + { ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-901) << Arg::Gds(isc_dsql_internal_err) << // expression evaluation not supported Modified: firebird/trunk/src/dsql/make.cpp =================================================================== --- firebird/trunk/src/dsql/make.cpp 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/dsql/make.cpp 2011-02-18 00:52:10 UTC (rev 52391) @@ -483,8 +483,8 @@ DEV_BLKCHK(indices, dsql_type_nod); thread_db* const tdbb = JRD_get_thread_data(); - FieldNode* const node = - FB_NEW(*tdbb->getDefaultPool()) FieldNode(*tdbb->getDefaultPool(), context, field, indices); + FieldNode* const node = FB_NEW(*tdbb->getDefaultPool()) FieldNode( + *tdbb->getDefaultPool(), context, field, indices); if (field->fld_dimensions) { @@ -785,10 +785,6 @@ **/ void MAKE_parameter_names(dsql_par* parameter, const dsql_nod* item) { - const dsql_ctx* context = NULL; - const dsql_str* string; - const dsql_nod* alias; - fb_assert(parameter && item); if (item->nod_type == nod_class_exprnode) Modified: firebird/trunk/src/jrd/Database.h =================================================================== --- firebird/trunk/src/jrd/Database.h 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/jrd/Database.h 2011-02-18 00:52:10 UTC (rev 52391) @@ -396,13 +396,12 @@ struct ValueCache { - Lock* lock; - SLONG curVal; - SLONG maxVal; + Lock* lock; // lock which holds shared counter value + SLONG curVal; // current value of shared counter lock + SLONG maxVal; // maximum cached value of shared counter lock }; public: - enum { ATTACHMENT_ID_SPACE = 0, @@ -417,7 +416,6 @@ void shutdown(thread_db* tdbb); private: - static int blockingAst(void* arg); ValueCache m_counters[TOTAL_ITEMS]; Modified: firebird/trunk/src/jrd/DatabaseSnapshot.h =================================================================== --- firebird/trunk/src/jrd/DatabaseSnapshot.h 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/jrd/DatabaseSnapshot.h 2011-02-18 00:52:10 UTC (rev 52391) @@ -278,6 +278,7 @@ : VirtualTableScan(csb, name, stream) {} +protected: const Format* getFormat(thread_db* tdbb, jrd_rel* relation) const; bool retrieveRecord(thread_db* tdbb, jrd_rel* relation, FB_UINT64 position, Record* record) const; }; Modified: firebird/trunk/src/jrd/UserManagement.h =================================================================== --- firebird/trunk/src/jrd/UserManagement.h 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/jrd/UserManagement.h 2011-02-18 00:52:10 UTC (rev 52391) @@ -45,6 +45,7 @@ : VirtualTableScan(csb, name, stream) {} +protected: const Format* getFormat(thread_db* tdbb, jrd_rel* relation) const; bool retrieveRecord(thread_db* tdbb, jrd_rel* relation, FB_UINT64 position, Record* record) const; }; Modified: firebird/trunk/src/jrd/btr.cpp =================================================================== --- firebird/trunk/src/jrd/btr.cpp 2011-02-17 17:40:27 UTC (rev 52390) +++ firebird/trunk/src/jrd/btr.cpp 2011-02-18 00:52:10 UTC (rev 52391) @@ -3812,7 +3812,7 @@ for (keyList::iterator itr = jumpKeys.begin(); itr < jumpKeys.end(); ++itr) { delete[] (*itr)->keyData; - delete (*itr); + delete *itr; } } // try catch (const Firebird::Exception& ex) @@ -3829,12 +3829,10 @@ // If index flush fails, try to delete the index tree. // If the index delete fails, just go ahead and punt. - try { - + try + { if (error) - { ERR_punt(); - } CCH_flush(tdbb, FLUSH_ALL, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-18 03:15:25
|
Revision: 52393 http://firebird.svn.sourceforge.net/firebird/?rev=52393&view=rev Author: firebirds Date: 2011-02-18 03:15:18 +0000 (Fri, 18 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-18 01:21:48 UTC (rev 52392) +++ firebird/trunk/ChangeLog 2011-02-18 03:15:18 UTC (rev 52393) @@ -1,3 +1,47 @@ + 2011-02-18 00:52 asfernandes + M doc/sql.extensions/README.execute_statement2 + M src/dsql/ExprNodes.cpp + M src/dsql/gen.cpp + M src/dsql/make.cpp + M src/jrd/Database.h + M src/jrd/DatabaseSnapshot.h + M src/jrd/UserManagement.h + M src/jrd/btr.cpp +Misc + + 2011-02-17 17:40 dimitr + M src/dsql/BoolNodes.cpp +Fixed inability to execute LIKE/STARTING/etc if the second argument is a small (<32KB) blob and the first one is a blob of charset NONE. This is partially related to CORE-3233, see my comment there. + + 2011-02-17 14:25 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h + M src/dsql/Nodes.h + M src/dsql/Visitors.h + M src/dsql/gen.cpp + M src/dsql/make.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp + M src/jrd/RecordSourceNodes.cpp +Refactored nod_alias. + + 2011-02-17 07:42 dimitr + M src/dsql/ExprNodes.cpp +Fixed CORE-3353: Predicate (blob_field LIKE ?) describes the parameter as VARCHAR(30) rather than as BLOB. +Also, let's never transfer the CS_dynamic pseudo-charset to the client side. + + 2011-02-17 06:05 dimitr + M src/dsql/ExprNodes.cpp + M src/dsql/StmtNodes.cpp + M src/jrd/dfw.epp + M src/jrd/met.epp + M src/jrd/met_proto.h + M src/jrd/tra.h + M src/jrd/vio.cpp +Fixed CORE-3058: New generators are created with wrong value when more than 32K generators was previously created. + 2011-02-16 14:38 asfernandes M src/dsql/parse.y Move ALIAS.* construct from column_name to select_item. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-18 01:21:48 UTC (rev 52392) +++ firebird/trunk/src/jrd/build_no.h 2011-02-18 03:15:18 UTC (rev 52393) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29111 + FORMAL BUILD NUMBER:29116 */ -#define PRODUCT_VER_STRING "3.0.0.29111" -#define FILE_VER_STRING "WI-T3.0.0.29111" -#define LICENSE_VER_STRING "WI-T3.0.0.29111" -#define FILE_VER_NUMBER 3, 0, 0, 29111 +#define PRODUCT_VER_STRING "3.0.0.29116" +#define FILE_VER_STRING "WI-T3.0.0.29116" +#define LICENSE_VER_STRING "WI-T3.0.0.29116" +#define FILE_VER_NUMBER 3, 0, 0, 29116 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29111" +#define FB_BUILD_NO "29116" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-18 01:21:48 UTC (rev 52392) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-18 03:15:18 UTC (rev 52393) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29111 +BuildNum=29116 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-19 03:15:12
|
Revision: 52404 http://firebird.svn.sourceforge.net/firebird/?rev=52404&view=rev Author: firebirds Date: 2011-02-19 03:15:06 +0000 (Sat, 19 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-18 06:52:44 UTC (rev 52403) +++ firebird/trunk/ChangeLog 2011-02-19 03:15:06 UTC (rev 52404) @@ -1,3 +1,7 @@ + 2011-02-18 06:28 dimitr + M src/dsql/BoolNodes.cpp +Fixed the main reason for CORE-3233: LIKE, STARTING and CONTAINING fail if second operand >= 32K. Thanks to Adriano. + 2011-02-18 00:52 asfernandes M doc/sql.extensions/README.execute_statement2 M src/dsql/ExprNodes.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-18 06:52:44 UTC (rev 52403) +++ firebird/trunk/src/jrd/build_no.h 2011-02-19 03:15:06 UTC (rev 52404) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29116 + FORMAL BUILD NUMBER:29117 */ -#define PRODUCT_VER_STRING "3.0.0.29116" -#define FILE_VER_STRING "WI-T3.0.0.29116" -#define LICENSE_VER_STRING "WI-T3.0.0.29116" -#define FILE_VER_NUMBER 3, 0, 0, 29116 +#define PRODUCT_VER_STRING "3.0.0.29117" +#define FILE_VER_STRING "WI-T3.0.0.29117" +#define LICENSE_VER_STRING "WI-T3.0.0.29117" +#define FILE_VER_NUMBER 3, 0, 0, 29117 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29116" +#define FB_BUILD_NO "29117" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-18 06:52:44 UTC (rev 52403) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-19 03:15:06 UTC (rev 52404) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29116 +BuildNum=29117 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2011-02-20 01:08:55
|
Revision: 52407 http://firebird.svn.sourceforge.net/firebird/?rev=52407&view=rev Author: asfernandes Date: 2011-02-20 01:08:48 +0000 (Sun, 20 Feb 2011) Log Message: ----------- Added EVENT_TYPE and OBJECT_TYPE to DDL_TRIGGER context. Improvement suggested by Thomas Steinmaurer. Modified Paths: -------------- firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt firebird/trunk/src/dsql/DdlNodes.epp firebird/trunk/src/isql/show.epp firebird/trunk/src/jrd/Attachment.h firebird/trunk/src/jrd/SysFunction.cpp firebird/trunk/src/jrd/constants.h Modified: firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt =================================================================== --- firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt 2011-02-19 03:31:22 UTC (rev 52406) +++ firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt 2011-02-20 01:08:48 UTC (rev 52407) @@ -110,7 +110,9 @@ stack. The context elements are: - - DDL_EVENT: event name (<ddl event item>) + - EVENT_TYPE: event type (CREATE, ALTER, DROP) + - OBJECT_TYPE: object type (TABLE, VIEW etc) + - DDL_EVENT: event name (<ddl event item>, which is EVENT_TYPE || ' ' || OBJECT_TYPE) - OBJECT_NAME: metadata object name - SQL_TEXT: sql statement text @@ -198,6 +200,8 @@ id bigint not null primary key, moment timestamp not null, user_name varchar(31) not null, + event_type varchar(25) not null, + object_type varchar(25) not null, ddl_event varchar(25) not null, object_name varchar(31) not null, sql_text blob sub_type text not null, @@ -214,8 +218,11 @@ -- didn't run, the log will survive. in autonomous transaction do begin - insert into ddl_log (id, moment, user_name, ddl_event, object_name, sql_text, ok) + insert into ddl_log (id, moment, user_name, event_type, object_type, ddl_event, object_name, + sql_text, ok) values (next value for ddl_seq, current_timestamp, current_user, + rdb$get_context('DDL_TRIGGER', 'EVENT_TYPE'), + rdb$get_context('DDL_TRIGGER', 'OBJECT_TYPE'), rdb$get_context('DDL_TRIGGER', 'DDL_EVENT'), rdb$get_context('DDL_TRIGGER', 'OBJECT_NAME'), rdb$get_context('DDL_TRIGGER', 'SQL_TEXT'), Modified: firebird/trunk/src/dsql/DdlNodes.epp =================================================================== --- firebird/trunk/src/dsql/DdlNodes.epp 2011-02-19 03:31:22 UTC (rev 52406) +++ firebird/trunk/src/dsql/DdlNodes.epp 2011-02-20 01:08:48 UTC (rev 52407) @@ -597,7 +597,8 @@ fb_assert(action > 0); // first element is NULL DdlTriggerContext context; - context.ddlEvent = DDL_TRIGGER_ACTION_NAMES[action]; + context.eventType = DDL_TRIGGER_ACTION_NAMES[action][0]; + context.objectType = DDL_TRIGGER_ACTION_NAMES[action][1]; context.objectName = objectName; context.sqlText = sqlText; Modified: firebird/trunk/src/isql/show.epp =================================================================== --- firebird/trunk/src/isql/show.epp 2011-02-19 03:31:22 UTC (rev 52406) +++ firebird/trunk/src/isql/show.epp 2011-02-20 01:08:48 UTC (rev 52407) @@ -294,7 +294,10 @@ buffer += " "; if (pos < FB_NELEM(DDL_TRIGGER_ACTION_NAMES)) - buffer += DDL_TRIGGER_ACTION_NAMES[pos]; + { + buffer += string(DDL_TRIGGER_ACTION_NAMES[pos][0]) + " " + + DDL_TRIGGER_ACTION_NAMES[pos][1]; + } else buffer += "<unknown>"; } Modified: firebird/trunk/src/jrd/Attachment.h =================================================================== --- firebird/trunk/src/jrd/Attachment.h 2011-02-19 03:31:22 UTC (rev 52406) +++ firebird/trunk/src/jrd/Attachment.h 2011-02-20 01:08:48 UTC (rev 52407) @@ -92,13 +92,15 @@ struct DdlTriggerContext { DdlTriggerContext() - : ddlEvent(*getDefaultMemoryPool()), + : eventType(*getDefaultMemoryPool()), + objectType(*getDefaultMemoryPool()), objectName(*getDefaultMemoryPool()), sqlText(*getDefaultMemoryPool()) { } - Firebird::string ddlEvent; + Firebird::string eventType; + Firebird::string objectType; Firebird::MetaName objectName; Firebird::string sqlText; }; Modified: firebird/trunk/src/jrd/SysFunction.cpp =================================================================== --- firebird/trunk/src/jrd/SysFunction.cpp 2011-02-19 03:31:22 UTC (rev 52406) +++ firebird/trunk/src/jrd/SysFunction.cpp 2011-02-20 01:08:48 UTC (rev 52407) @@ -210,6 +210,8 @@ SESSION_ID_NAME[] = "SESSION_ID", CURRENT_USER_NAME[] = "CURRENT_USER", CURRENT_ROLE_NAME[] = "CURRENT_ROLE", + EVENT_TYPE_NAME[] = "EVENT_TYPE", + OBJECT_TYPE_NAME[] = "OBJECT_TYPE", DDL_EVENT_NAME[] = "DDL_EVENT", OBJECT_NAME[] = "OBJECT_NAME", SQL_TEXT_NAME[] = "SQL_TEXT"; @@ -2136,8 +2138,12 @@ const DdlTriggerContext& context = Stack<DdlTriggerContext>::const_iterator( attachment->ddlTriggersContext).object(); - if (nameStr == DDL_EVENT_NAME) - resultStr = context.ddlEvent; + if (nameStr == EVENT_TYPE_NAME) + resultStr = context.eventType; + else if (nameStr == OBJECT_TYPE_NAME) + resultStr = context.objectType; + else if (nameStr == DDL_EVENT_NAME) + resultStr = context.eventType + " " + context.objectType; else if (nameStr == OBJECT_NAME) { resultStr = context.objectName.c_str(); Modified: firebird/trunk/src/jrd/constants.h =================================================================== --- firebird/trunk/src/jrd/constants.h 2011-02-19 03:31:22 UTC (rev 52406) +++ firebird/trunk/src/jrd/constants.h 2011-02-20 01:08:48 UTC (rev 52407) @@ -290,51 +290,51 @@ const int DB_TRIGGER_TRANS_ROLLBACK = 4; const int DB_TRIGGER_MAX = 5; -static const char* const DDL_TRIGGER_ACTION_NAMES[] = +static const char* const DDL_TRIGGER_ACTION_NAMES[][2] = { - NULL, - "CREATE TABLE", - "ALTER TABLE", - "DROP TABLE", - "CREATE PROCEDURE", - "ALTER PROCEDURE", - "DROP PROCEDURE", - "CREATE FUNCTION", - "ALTER FUNCTION", - "DROP FUNCTION", - "CREATE TRIGGER", - "ALTER TRIGGER", - "DROP TRIGGER", - "", "", "", // gap for TRIGGER_TYPE_MASK - 3 bits - "CREATE EXCEPTION", - "ALTER EXCEPTION", - "DROP EXCEPTION", - "CREATE VIEW", - "ALTER VIEW", - "DROP VIEW", - "CREATE DOMAIN", - "ALTER DOMAIN", - "DROP DOMAIN", - "CREATE ROLE", - "ALTER ROLE", - "DROP ROLE", - "CREATE INDEX", - "ALTER INDEX", - "DROP INDEX", - "CREATE SEQUENCE", - "ALTER SEQUENCE", - "DROP SEQUENCE", - "CREATE USER", - "ALTER USER", - "DROP USER", - "CREATE COLLATION", - "DROP COLLATION", - "ALTER CHARACTER SET", - "CREATE PACKAGE", - "ALTER PACKAGE", - "DROP PACKAGE", - "CREATE PACKAGE BODY", - "DROP PACKAGE BODY" + {NULL, NULL}, + {"CREATE", "TABLE"}, + {"ALTER", "TABLE"}, + {"DROP", "TABLE"}, + {"CREATE", "PROCEDURE"}, + {"ALTER", "PROCEDURE"}, + {"DROP", "PROCEDURE"}, + {"CREATE", "FUNCTION"}, + {"ALTER", "FUNCTION"}, + {"DROP", "FUNCTION"}, + {"CREATE", "TRIGGER"}, + {"ALTER", "TRIGGER"}, + {"DROP", "TRIGGER"}, + {"", ""}, {"", ""}, {"", ""}, // gap for TRIGGER_TYPE_MASK - 3 bits + {"CREATE", "EXCEPTION"}, + {"ALTER", "EXCEPTION"}, + {"DROP", "EXCEPTION"}, + {"CREATE", "VIEW"}, + {"ALTER", "VIEW"}, + {"DROP", "VIEW"}, + {"CREATE", "DOMAIN"}, + {"ALTER", "DOMAIN"}, + {"DROP", "DOMAIN"}, + {"CREATE", "ROLE"}, + {"ALTER", "ROLE"}, + {"DROP", "ROLE"}, + {"CREATE", "INDEX"}, + {"ALTER", "INDEX"}, + {"DROP", "INDEX"}, + {"CREATE", "SEQUENCE"}, + {"ALTER", "SEQUENCE"}, + {"DROP", "SEQUENCE"}, + {"CREATE", "USER"}, + {"ALTER", "USER"}, + {"DROP", "USER"}, + {"CREATE", "COLLATION"}, + {"DROP", "COLLATION"}, + {"ALTER", "CHARACTER SET"}, + {"CREATE", "PACKAGE"}, + {"ALTER", "PACKAGE"}, + {"DROP", "PACKAGE"}, + {"CREATE", "PACKAGE BODY"}, + {"DROP", "PACKAGE BODY"} }; const int DDL_TRIGGER_BEFORE = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-20 03:14:07
|
Revision: 52408 http://firebird.svn.sourceforge.net/firebird/?rev=52408&view=rev Author: firebirds Date: 2011-02-20 03:14:00 +0000 (Sun, 20 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-20 01:08:48 UTC (rev 52407) +++ firebird/trunk/ChangeLog 2011-02-20 03:14:00 UTC (rev 52408) @@ -1,3 +1,12 @@ + 2011-02-20 01:08 asfernandes + M doc/sql.extensions/README.ddl_triggers.txt + M src/dsql/DdlNodes.epp + M src/isql/show.epp + M src/jrd/Attachment.h + M src/jrd/SysFunction.cpp + M src/jrd/constants.h +Added EVENT_TYPE and OBJECT_TYPE to DDL_TRIGGER context. Improvement suggested by Thomas Steinmaurer. + 2011-02-18 06:28 dimitr M src/dsql/BoolNodes.cpp Fixed the main reason for CORE-3233: LIKE, STARTING and CONTAINING fail if second operand >= 32K. Thanks to Adriano. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-20 01:08:48 UTC (rev 52407) +++ firebird/trunk/src/jrd/build_no.h 2011-02-20 03:14:00 UTC (rev 52408) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29117 + FORMAL BUILD NUMBER:29118 */ -#define PRODUCT_VER_STRING "3.0.0.29117" -#define FILE_VER_STRING "WI-T3.0.0.29117" -#define LICENSE_VER_STRING "WI-T3.0.0.29117" -#define FILE_VER_NUMBER 3, 0, 0, 29117 +#define PRODUCT_VER_STRING "3.0.0.29118" +#define FILE_VER_STRING "WI-T3.0.0.29118" +#define LICENSE_VER_STRING "WI-T3.0.0.29118" +#define FILE_VER_NUMBER 3, 0, 0, 29118 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29117" +#define FB_BUILD_NO "29118" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-20 01:08:48 UTC (rev 52407) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-20 03:14:00 UTC (rev 52408) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29117 +BuildNum=29118 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-21 03:15:19
|
Revision: 52417 http://firebird.svn.sourceforge.net/firebird/?rev=52417&view=rev Author: firebirds Date: 2011-02-21 03:15:13 +0000 (Mon, 21 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-20 15:36:31 UTC (rev 52416) +++ firebird/trunk/ChangeLog 2011-02-21 03:15:13 UTC (rev 52417) @@ -1,3 +1,57 @@ + 2011-02-20 15:36 dimitr + M src/jrd/RecordSourceNodes.cpp +Fixed the porting mistake, thanks to Adriano. + + 2011-02-20 15:34 dimitr + M src/dsql/Nodes.h + M src/jrd/Optimizer.h + M src/jrd/RecordSourceNodes.cpp + M src/jrd/RecordSourceNodes.h + M src/jrd/cmp.cpp + M src/jrd/opt.cpp + M src/jrd/recsrc/AggregatedStream.cpp + M src/jrd/recsrc/BufferedStream.cpp + M src/jrd/recsrc/ConditionalStream.cpp + M src/jrd/recsrc/FilteredStream.cpp + M src/jrd/recsrc/FirstRowsStream.cpp + M src/jrd/recsrc/FullOuterJoin.cpp + M src/jrd/recsrc/HashJoin.cpp + M src/jrd/recsrc/LockedStream.cpp + M src/jrd/recsrc/MergeJoin.cpp + M src/jrd/recsrc/NestedLoopJoin.cpp + M src/jrd/recsrc/RecordSource.cpp + M src/jrd/recsrc/RecordSource.h + M src/jrd/recsrc/SingularStream.cpp + M src/jrd/recsrc/SkipRowsStream.cpp + M src/jrd/recsrc/SortedStream.cpp + M src/jrd/recsrc/WindowedStream.cpp + M src/jrd/rse.h +Removed duplicated type declaration. + + 2011-02-20 15:20 asfernandes + M src/dsql/ExprNodes.cpp + M src/jrd/RecordSourceNodes.cpp +Misc + + 2011-02-20 14:43 dimitr + M src/jrd/RecordSourceNodes.cpp +Front ported the old fix for CORE-3283: BAD PLAN with using LEFT OUTER JOIN in SUBSELECT. + + 2011-02-20 13:23 dimitr + M src/dsql/ExprNodes.cpp + M src/jrd/RecordSourceNodes.cpp +Fixed CORE-3176: View with "subselect" column join table and not use index. + + 2011-02-20 13:19 dimitr + M src/jrd/recsrc/ExternalTableScan.cpp + M src/jrd/recsrc/FullTableScan.cpp + M src/jrd/recsrc/VirtualTableScan.cpp +Totally misc. + + 2011-02-20 13:18 dimitr + M src/dsql/ExprNodes.cpp +In v2.5, we checked both the derived expression argument and its streams. Now I see the former part was lost. Supposedly, this was just a mistake, hence fixed. + 2011-02-20 01:08 asfernandes M doc/sql.extensions/README.ddl_triggers.txt M src/dsql/DdlNodes.epp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-20 15:36:31 UTC (rev 52416) +++ firebird/trunk/src/jrd/build_no.h 2011-02-21 03:15:13 UTC (rev 52417) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29118 + FORMAL BUILD NUMBER:29125 */ -#define PRODUCT_VER_STRING "3.0.0.29118" -#define FILE_VER_STRING "WI-T3.0.0.29118" -#define LICENSE_VER_STRING "WI-T3.0.0.29118" -#define FILE_VER_NUMBER 3, 0, 0, 29118 +#define PRODUCT_VER_STRING "3.0.0.29125" +#define FILE_VER_STRING "WI-T3.0.0.29125" +#define LICENSE_VER_STRING "WI-T3.0.0.29125" +#define FILE_VER_NUMBER 3, 0, 0, 29125 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29118" +#define FB_BUILD_NO "29125" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-20 15:36:31 UTC (rev 52416) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-21 03:15:13 UTC (rev 52417) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29118 +BuildNum=29125 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-22 03:17:29
|
Revision: 52429 http://firebird.svn.sourceforge.net/firebird/?rev=52429&view=rev Author: firebirds Date: 2011-02-22 03:17:22 +0000 (Tue, 22 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-22 01:57:51 UTC (rev 52428) +++ firebird/trunk/ChangeLog 2011-02-22 03:17:22 UTC (rev 52429) @@ -1,3 +1,44 @@ + 2011-02-22 01:57 asfernandes + M src/dsql/StmtNodes.cpp + M src/dsql/StmtNodes.h + M src/dsql/gen.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp +Refactor SET GENERATOR / ALTER SEQUENCE. + + 2011-02-22 00:51 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/DdlNodes.h + M src/dsql/DsqlCompilerScratch.cpp + M src/dsql/DsqlCompilerScratch.h + M src/dsql/Nodes.h + M src/dsql/StmtNodes.cpp + M src/dsql/StmtNodes.h + M src/dsql/gen.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp + M src/dsql/pass1_proto.h +Refactoring nod_list and nod_block statements. + + 2011-02-21 11:18 dimitr + M src/jrd/Optimizer.cpp + M src/jrd/btr.cpp + M src/jrd/btr_proto.h +Fixed CORE-3355: Wrong comparison of DATE and TIMESTAMP if index is used. + + 2011-02-21 10:09 dimitr + M src/jrd/Optimizer.cpp + M src/jrd/Optimizer.h +Misc optimizer tuning. + + 2011-02-21 08:04 dimitr + M src/dsql/pass1.cpp + M src/jrd/recsrc/RecursiveStream.cpp + M src/jrd/recsrc/Union.cpp +Fixed CORE-3173: Empty result when select from SP that contains two CTE (second of them with GROUP BY clause) and INNER join. + 2011-02-20 15:36 dimitr M src/jrd/RecordSourceNodes.cpp Fixed the porting mistake, thanks to Adriano. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-22 01:57:51 UTC (rev 52428) +++ firebird/trunk/src/jrd/build_no.h 2011-02-22 03:17:22 UTC (rev 52429) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29125 + FORMAL BUILD NUMBER:29130 */ -#define PRODUCT_VER_STRING "3.0.0.29125" -#define FILE_VER_STRING "WI-T3.0.0.29125" -#define LICENSE_VER_STRING "WI-T3.0.0.29125" -#define FILE_VER_NUMBER 3, 0, 0, 29125 +#define PRODUCT_VER_STRING "3.0.0.29130" +#define FILE_VER_STRING "WI-T3.0.0.29130" +#define LICENSE_VER_STRING "WI-T3.0.0.29130" +#define FILE_VER_NUMBER 3, 0, 0, 29130 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29125" +#define FB_BUILD_NO "29130" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-22 01:57:51 UTC (rev 52428) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-22 03:17:22 UTC (rev 52429) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29125 +BuildNum=29130 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-23 03:17:19
|
Revision: 52446 http://firebird.svn.sourceforge.net/firebird/?rev=52446&view=rev Author: firebirds Date: 2011-02-23 03:17:12 +0000 (Wed, 23 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-22 16:06:08 UTC (rev 52445) +++ firebird/trunk/ChangeLog 2011-02-23 03:17:12 UTC (rev 52446) @@ -1,3 +1,40 @@ + 2011-02-22 16:06 asfernandes + M src/dsql/StmtNodes.cpp + M src/dsql/gen.cpp + M src/dsql/node.h + M src/dsql/pass1.cpp +Refactor nod_start_savepoint and nod_end_savepoint. + + 2011-02-22 15:44 asfernandes + M src/dsql/parse.y +Misc + + 2011-02-22 15:30 asfernandes + M src/dsql/StmtNodes.cpp + M src/dsql/StmtNodes.h + M src/dsql/gen.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp +Refactor nod_while. + + 2011-02-22 15:29 asfernandes + M src/jrd/Optimizer.cpp +Correction. + + 2011-02-22 15:28 asfernandes + M src/jrd/err.cpp +Misc + + 2011-02-22 14:31 hvlad + M src/jrd/err.cpp +Fixed bug CORE-3125 : AV in Worker::shutdown + + 2011-02-22 12:43 dimitr + M src/jrd/Optimizer.cpp + M src/jrd/btr.cpp +Better solution for CORE-3355, as suggested by Vlad. + 2011-02-22 01:57 asfernandes M src/dsql/StmtNodes.cpp M src/dsql/StmtNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-22 16:06:08 UTC (rev 52445) +++ firebird/trunk/src/jrd/build_no.h 2011-02-23 03:17:12 UTC (rev 52446) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29130 + FORMAL BUILD NUMBER:29137 */ -#define PRODUCT_VER_STRING "3.0.0.29130" -#define FILE_VER_STRING "WI-T3.0.0.29130" -#define LICENSE_VER_STRING "WI-T3.0.0.29130" -#define FILE_VER_NUMBER 3, 0, 0, 29130 +#define PRODUCT_VER_STRING "3.0.0.29137" +#define FILE_VER_STRING "WI-T3.0.0.29137" +#define LICENSE_VER_STRING "WI-T3.0.0.29137" +#define FILE_VER_NUMBER 3, 0, 0, 29137 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29130" +#define FB_BUILD_NO "29137" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-22 16:06:08 UTC (rev 52445) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-23 03:17:12 UTC (rev 52446) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29130 +BuildNum=29137 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-02-25 03:16:52
|
Revision: 52457 http://firebird.svn.sourceforge.net/firebird/?rev=52457&view=rev Author: firebirds Date: 2011-02-25 03:16:46 +0000 (Fri, 25 Feb 2011) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2011-02-25 02:52:51 UTC (rev 52456) +++ firebird/trunk/ChangeLog 2011-02-25 03:16:46 UTC (rev 52457) @@ -1,3 +1,23 @@ + 2011-02-25 02:52 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/StmtNodes.cpp + M src/dsql/StmtNodes.h + M src/dsql/gen.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp + M src/include/fb_blk.h + M src/jrd/exe.h +Refactor DSQL exceptions: nod_on_error, nod_sqlcode, nod_gdscode, nod_exception and nod_default. + + 2011-02-25 01:03 asfernandes + M src/jrd/btr.cpp +Misc + + 2011-02-24 14:06 alexpeshkoff + M builds/posix/Makefile.in +Damyan's fix for an error, noticed by him + 2011-02-22 16:06 asfernandes M src/dsql/StmtNodes.cpp M src/dsql/gen.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-02-25 02:52:51 UTC (rev 52456) +++ firebird/trunk/src/jrd/build_no.h 2011-02-25 03:16:46 UTC (rev 52457) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29137 + FORMAL BUILD NUMBER:29140 */ -#define PRODUCT_VER_STRING "3.0.0.29137" -#define FILE_VER_STRING "WI-T3.0.0.29137" -#define LICENSE_VER_STRING "WI-T3.0.0.29137" -#define FILE_VER_NUMBER 3, 0, 0, 29137 +#define PRODUCT_VER_STRING "3.0.0.29140" +#define FILE_VER_STRING "WI-T3.0.0.29140" +#define LICENSE_VER_STRING "WI-T3.0.0.29140" +#define FILE_VER_NUMBER 3, 0, 0, 29140 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29137" +#define FB_BUILD_NO "29140" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-25 02:52:51 UTC (rev 52456) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-25 03:16:46 UTC (rev 52457) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29137 +BuildNum=29140 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |