]>
git.sur5r.net Git - bacula/bacula/log
Kern Sibbald [Sat, 10 Apr 2010 10:20:53 +0000 (12:20 +0200)]
Kern Sibbald [Sat, 10 Apr 2010 10:20:45 +0000 (12:20 +0200)]
Revert "Add header to both myingres.sc and myingres.sh"
This reverts commit
48b0b5ad1151b98c6bb36ac8f00230ac34ce7fc9 .
Kern Sibbald [Sat, 10 Apr 2010 10:20:35 +0000 (12:20 +0200)]
Kern Sibbald [Sat, 10 Apr 2010 10:20:28 +0000 (12:20 +0200)]
Revert "Let INGgetisnull return an bool"
This reverts commit
aaf7299b2d90878b2f5cf9ad28f6b0c5e5696422 .
Kern Sibbald [Sat, 10 Apr 2010 10:20:14 +0000 (12:20 +0200)]
Revert "Lets fix calling INGfreeDescriptor before INGfreeINGresult as INGfreeINGresult free the whole INGresult struct"
This reverts commit
35235b8647eae94a46db9d60d99344ee560c570b .
Kern Sibbald [Sat, 10 Apr 2010 10:19:31 +0000 (12:19 +0200)]
Revert "Implement my_ingres_currval function."
This reverts commit
3cc269cc16c56f0d33efb61f0c51c38819e99418 .
Kern Sibbald [Sat, 10 Apr 2010 10:19:22 +0000 (12:19 +0200)]
Revert "Lets not use PostgreSQL macros for sizes."
This reverts commit
aa0dfc0c7010c096283f938a9dfd95b1d04ff7bf .
Kern Sibbald [Sat, 10 Apr 2010 10:19:14 +0000 (12:19 +0200)]
Revert "Make the Ingres grant script work."
This reverts commit
7a0d08261ba66de7c28bee25d3732c00e308ff54 .
Kern Sibbald [Sat, 10 Apr 2010 10:19:06 +0000 (12:19 +0200)]
Revert "Fix username argument to sql for Ingres grants."
This reverts commit
a3b556c30f5fed2fe59f5b5a6c4c0d88514cf2b5 .
Kern Sibbald [Sat, 10 Apr 2010 10:18:59 +0000 (12:18 +0200)]
Revert "Do all Ingres operations as the user invoking the script just as for all"
This reverts commit
bea3788b3f0d90c89d8fa912b2d574a8f6de8d38 .
Kern Sibbald [Sat, 10 Apr 2010 10:18:51 +0000 (12:18 +0200)]
Revert "Create user in the right database for Ingres."
This reverts commit
809c70ad620adc067ea6f63649b7bd5c45d92579 .
Kern Sibbald [Sat, 10 Apr 2010 10:18:43 +0000 (12:18 +0200)]
Revert "Creating a database as an other user and giving grants doesn't seem to work for Ingres."
This reverts commit
a87309a9aa0729805910bbfbab8f8a57d7f0629c .
Kern Sibbald [Sat, 10 Apr 2010 10:18:34 +0000 (12:18 +0200)]
Revert "Lets rewrite the query at a higher level then we see the new query in the debugging and"
This reverts commit
c8fe384b0b90cd7c364d4709a1ad36ac6601186a .
Kern Sibbald [Sat, 10 Apr 2010 10:18:26 +0000 (12:18 +0200)]
Revert "Lets close the session based on session_id so we close the session we want to close not just an active connection."
This reverts commit
f3c6e021a48cff1bf5337eca37f471b2bb58a204 .
Kern Sibbald [Sat, 10 Apr 2010 10:18:18 +0000 (12:18 +0200)]
Revert "Regenerated myingres.c from myingres.sc"
This reverts commit
a2ba35768ab227762580a7fc6cc34ce5043f6d38 .
Kern Sibbald [Sat, 10 Apr 2010 10:18:10 +0000 (12:18 +0200)]
Revert "As we have a multithreaded application let tell that to esqlcc so it can optimize for that."
This reverts commit
db52d239f5b8d2b3c29f123630cb192305485838 .
Kern Sibbald [Sat, 10 Apr 2010 10:17:57 +0000 (12:17 +0200)]
Kern Sibbald [Sat, 10 Apr 2010 10:17:50 +0000 (12:17 +0200)]
Revert "Use -lq.1 -lcompat.1 as shared libraries instead of linking with -lingres which is a static library."
This reverts commit
58bf155b833be0693c7d71afe83d7041b25a1845 .
Kern Sibbald [Sat, 10 Apr 2010 10:17:42 +0000 (12:17 +0200)]
Revert "Need an extra lib for dynamic linking against Ingres."
This reverts commit
ec44b798b02b4b779bdd402cb83ef7b9e5dc5aab .
Kern Sibbald [Sat, 10 Apr 2010 10:17:33 +0000 (12:17 +0200)]
Revert "First attempt at making things multi-threaded and make it possible to"
This reverts commit
69820d0776da2818115d90a2a73b790885c16aa5 .
Kern Sibbald [Sat, 10 Apr 2010 10:17:24 +0000 (12:17 +0200)]
Revert "Fix logic error introduced when implementing multi thread support, overwriting rowcount"
This reverts commit
1dcd347a86b7edd99d3c48dc2e28016ea4a3be6f .
Kern Sibbald [Sat, 10 Apr 2010 10:17:14 +0000 (12:17 +0200)]
Revert "Fix typo in sql."
This reverts commit
2001be4095d75e9993f26ed2e498a37aec666246 .
Kern Sibbald [Sat, 10 Apr 2010 10:16:58 +0000 (12:16 +0200)]
Revert "First version of Ingres Batch Insert code."
This reverts commit
65e9ccf4e2ede3aed10c5f769e3f86544143a8d2 .
Kern Sibbald [Sat, 10 Apr 2010 10:16:48 +0000 (12:16 +0200)]
Revert "Add support for transactions. Normal operations for Ingres is to make things one big transaction."
This reverts commit
746626e78f27849c603fc89eeab9d9093d0fa4dd .
Kern Sibbald [Sat, 10 Apr 2010 10:16:39 +0000 (12:16 +0200)]
Revert "Fix typos"
This reverts commit
d2833a5f89205838d397cdc7b2dd4d73b5c2a6fd .
Kern Sibbald [Sat, 10 Apr 2010 10:16:28 +0000 (12:16 +0200)]
Revert "Lets call it COMMIT and not END as that seems to be the counterpart of BEGIN for transactions."
This reverts commit
683329b67a22094295bcc6d50d2852718fe11cd7 .
Kern Sibbald [Sat, 10 Apr 2010 10:16:20 +0000 (12:16 +0200)]
Revert "Lets claim we also did something on it."
This reverts commit
eba7ad87ba5bb84450f4b17d2237dabd10a25868 .
Kern Sibbald [Sat, 10 Apr 2010 10:16:06 +0000 (12:16 +0200)]
Kern Sibbald [Sat, 10 Apr 2010 10:15:58 +0000 (12:15 +0200)]
Revert "Drop have_insert_id in mdb as its always true for all backends."
This reverts commit
e4c79f3a2a6e9eff312b474fda10e097660e131f .
Kern Sibbald [Sat, 10 Apr 2010 10:15:46 +0000 (12:15 +0200)]
Revert "Make sql_insert_id a atomic function which executes the insert query and when that succeeds"
This reverts commit
ed89adc8a1d40dda9739903ae7341485ba356487 .
Kern Sibbald [Sat, 10 Apr 2010 10:15:35 +0000 (12:15 +0200)]
Revert "Fix some typos and some forgotten things. Now the code at least compiles for all backends."
This reverts commit
11a33ed8e43b341d5d0319e431e996245103a5d9 .
Kern Sibbald [Sat, 10 Apr 2010 10:15:27 +0000 (12:15 +0200)]
Revert "Added empty db_check_backend_thread_safe to dbi backend."
This reverts commit
0555a0f3507e0122478017ef9c377b90dc482b87 .
Kern Sibbald [Sat, 10 Apr 2010 10:15:18 +0000 (12:15 +0200)]
Kern Sibbald [Sat, 10 Apr 2010 10:15:10 +0000 (12:15 +0200)]
Revert "Replace INGcheck with EXEC SQL WHENEVER SQLERROR GOTO construction used by Ingres embedded SQL."
This reverts commit
f1f3bea96e1a984a4fadb319043e46b3b512c226 .
Kern Sibbald [Sat, 10 Apr 2010 10:15:02 +0000 (12:15 +0200)]
Revert "Regenerated Ingres code using esqlcc"
This reverts commit
e70e63e107849f8e8c74e04a52a50fc87cb5deb0 .
Kern Sibbald [Sat, 10 Apr 2010 10:14:54 +0000 (12:14 +0200)]
Revert "Lets uniformly call a INGconn a dbconn in all Ingres functions."
This reverts commit
9714f462d7bee6aa48c3cea900457f55af5ef746 .
Kern Sibbald [Sat, 10 Apr 2010 10:14:42 +0000 (12:14 +0200)]
Revert "Fix error introduced when refactoring some of the code."
This reverts commit
04730852a0c96baa796ad3f1b52631daaa798977 .
Kern Sibbald [Sat, 10 Apr 2010 10:14:33 +0000 (12:14 +0200)]
Revert "Program currval retrieval somewhat more robust."
This reverts commit
2d02e4b0c13e2f26b138ebb411f6f5e253c91d4d .
Kern Sibbald [Sat, 10 Apr 2010 10:14:24 +0000 (12:14 +0200)]
Revert "We need to fool the Ingres code a bit more to think we are in a transaction when doing an"
This reverts commit
9510b20ea24351f838bf709bb2e99f26bdd9e8e1 .
Kern Sibbald [Sat, 10 Apr 2010 10:14:17 +0000 (12:14 +0200)]
Revert "Implement a different default locking mode for our queries initialized for each new"
This reverts commit
4fc1c03543d87df8bf4e292f7161c90b6ecffe39 .
Kern Sibbald [Sat, 10 Apr 2010 10:14:08 +0000 (12:14 +0200)]
Revert "Make the batch insert functions return bool instead of int."
This reverts commit
58a085a309bfe9982b9a3bca71d3051aa79d180f .
Kern Sibbald [Sat, 10 Apr 2010 10:13:59 +0000 (12:13 +0200)]
Revert "Prepare and describe the Ingres statement in one line of embedded sql."
This reverts commit
e8841905a312bbc489193cd72938ded3c0b57eaf .
Kern Sibbald [Sat, 10 Apr 2010 10:13:51 +0000 (12:13 +0200)]
Revert "Fix stupid inverted logic"
This reverts commit
a84d3bb9d29accc4fa855ffc2e9be48814bbe2b8 .
Kern Sibbald [Sat, 10 Apr 2010 10:13:42 +0000 (12:13 +0200)]
Revert "Add back something that for whatever reason got lost on last big merge."
This reverts commit
de14c0146bed3ff60637f45b223c8fee8aa87f23 .
Kern Sibbald [Sat, 10 Apr 2010 10:13:32 +0000 (12:13 +0200)]
Revert "Drop all Ingres tables with one commit."
This reverts commit
fbc6b7fae7868243bb515c866f114585733656a2 .
Kern Sibbald [Sat, 10 Apr 2010 10:13:19 +0000 (12:13 +0200)]
Revert "We need to call INGfreeINGresult before INGfreeDescriptor and as such need a temporary variable"
This reverts commit
885efbd49cfe014f160c6ac10d27b8f39f4d890b .
Marco van Wieringen [Fri, 9 Apr 2010 17:11:51 +0000 (19:11 +0200)]
We need to call INGfreeINGresult before INGfreeDescriptor and as such need a temporary variable
to store the sqlda structure which is stored in the INGresult. This makes sure we don't get
all those dreaded orphaned buffers on exit of bacula-dir.
Marco van Wieringen [Fri, 9 Apr 2010 12:02:41 +0000 (14:02 +0200)]
Drop all Ingres tables with one commit.
Marco van Wieringen [Thu, 8 Apr 2010 05:30:27 +0000 (07:30 +0200)]
Add back something that for whatever reason got lost on last big merge.
Marco van Wieringen [Wed, 7 Apr 2010 18:08:43 +0000 (20:08 +0200)]
Fix stupid inverted logic
Marco van Wieringen [Wed, 7 Apr 2010 17:04:31 +0000 (19:04 +0200)]
Prepare and describe the Ingres statement in one line of embedded sql.
Added extra check when rowcount == -1 to see if there is were really any errors
because some queries give a negative rowcount when they are executed ok (e.g.
DECLARE GLOBAL TEMPORARY TABLE for instance.
Marco van Wieringen [Wed, 7 Apr 2010 14:31:58 +0000 (16:31 +0200)]
Make the batch insert functions return bool instead of int.
Marco van Wieringen [Wed, 7 Apr 2010 07:17:14 +0000 (09:17 +0200)]
Implement a different default locking mode for our queries initialized for each new
session opened. Not quite sure if this is the best option but it looks to be better
then the other defaults.
Marco van Wieringen [Tue, 6 Apr 2010 21:10:56 +0000 (23:10 +0200)]
We need to fool the Ingres code a bit more to think we are in a transaction when doing an
insert followed by the retrieval of the currval of the id inserted. So we save the current
transaction status set it to true do all our work commit it if we are really not in a
transaction and restore the actual transaction status. Not the nicest but it should work.
Marco van Wieringen [Tue, 6 Apr 2010 20:43:09 +0000 (22:43 +0200)]
Program currval retrieval somewhat more robust.
Marco van Wieringen [Tue, 6 Apr 2010 20:29:50 +0000 (22:29 +0200)]
Fix error introduced when refactoring some of the code.
Marco van Wieringen [Tue, 6 Apr 2010 18:09:22 +0000 (20:09 +0200)]
Lets uniformly call a INGconn a dbconn in all Ingres functions.
Marco van Wieringen [Tue, 6 Apr 2010 13:41:21 +0000 (15:41 +0200)]
Regenerated Ingres code using esqlcc
Marco van Wieringen [Tue, 6 Apr 2010 13:35:18 +0000 (15:35 +0200)]
Replace INGcheck with EXEC SQL WHENEVER SQLERROR GOTO construction used by Ingres embedded SQL.
Marco van Wieringen [Mon, 5 Apr 2010 20:22:50 +0000 (22:22 +0200)]
Fix typo
Marco van Wieringen [Mon, 5 Apr 2010 20:11:51 +0000 (22:11 +0200)]
Added empty db_check_backend_thread_safe to dbi backend.
Marco van Wieringen [Mon, 5 Apr 2010 19:57:58 +0000 (21:57 +0200)]
Fix some typos and some forgotten things. Now the code at least compiles for all backends.
Marco van Wieringen [Mon, 5 Apr 2010 16:53:04 +0000 (18:53 +0200)]
Make sql_insert_id a atomic function which executes the insert query and when that succeeds
retrieves the id the database used for storing the inserted record. Some databases want
this to be atomic (e.g. without a COMMIT in between.) Coding wise this is also much cleaner.
Marco van Wieringen [Mon, 5 Apr 2010 15:15:17 +0000 (17:15 +0200)]
Drop have_insert_id in mdb as its always true for all backends.
Marco van Wieringen [Mon, 5 Apr 2010 14:28:09 +0000 (16:28 +0200)]
Fix typo
Marco van Wieringen [Mon, 5 Apr 2010 13:47:34 +0000 (15:47 +0200)]
Lets claim we also did something on it.
Marco van Wieringen [Mon, 5 Apr 2010 13:42:24 +0000 (15:42 +0200)]
Lets call it COMMIT and not END as that seems to be the counterpart of BEGIN for transactions.
Updated Ingres lock queries to only start a transaction as the current SQL is not valid Ingres SQL.
Marco van Wieringen [Mon, 5 Apr 2010 11:46:59 +0000 (13:46 +0200)]
Fix typos
Marco van Wieringen [Mon, 5 Apr 2010 11:38:12 +0000 (13:38 +0200)]
Add support for transactions. Normal operations for Ingres is to make things one big transaction.
The old code never commits anything and as such you loose all state on exit of the dird.
Now we always commit our work unless we are in a transaction.
Marco van Wieringen [Mon, 5 Apr 2010 08:35:23 +0000 (10:35 +0200)]
First version of Ingres Batch Insert code.
Marco van Wieringen [Sun, 4 Apr 2010 20:40:14 +0000 (22:40 +0200)]
Fix typo in sql.
Marco van Wieringen [Sun, 4 Apr 2010 18:14:00 +0000 (20:14 +0200)]
Fix logic error introduced when implementing multi thread support, overwriting rowcount
with INGcheck value lets use a seperate variable.
Marco van Wieringen [Sun, 4 Apr 2010 17:46:24 +0000 (19:46 +0200)]
First attempt at making things multi-threaded and make it possible to
have multiple connections to the database without having the dreaded
ERR=E_LQ002E The 'execute immediate' query has been issued outside of a DBMS session.
This compiles but seems to give some problems so into the debugger it is.
Marco van Wieringen [Sun, 4 Apr 2010 11:46:25 +0000 (13:46 +0200)]
Need an extra lib for dynamic linking against Ingres.
Marco van Wieringen [Sun, 4 Apr 2010 10:55:22 +0000 (12:55 +0200)]
Use -lq.1 -lcompat.1 as shared libraries instead of linking with -lingres which is a static library.
Also need to change generated code of esqlcc a bit to get things to link with the IIsqlca function.
Marco van Wieringen [Sun, 4 Apr 2010 10:00:02 +0000 (12:00 +0200)]
Fix typo
Marco van Wieringen [Sun, 4 Apr 2010 08:21:47 +0000 (10:21 +0200)]
As we have a multithreaded application let tell that to esqlcc so it can optimize for that.
Marco van Wieringen [Sat, 3 Apr 2010 21:02:23 +0000 (23:02 +0200)]
Regenerated myingres.c from myingres.sc
Marco van Wieringen [Sat, 3 Apr 2010 21:00:29 +0000 (23:00 +0200)]
Lets close the session based on session_id so we close the session we want to close not just an active connection.
Marco van Wieringen [Sat, 3 Apr 2010 20:49:22 +0000 (22:49 +0200)]
Lets rewrite the query at a higher level then we see the new query in the debugging and
we only have to do the rewrite logic once.
Marco van Wieringen [Sat, 3 Apr 2010 20:18:55 +0000 (22:18 +0200)]
Creating a database as an other user and giving grants doesn't seem to work for Ingres.
Strange so for now create everything using the -u${db_user} option. This is something that
needs to be investigated as it should be possible to have an different owner of the database.
Marco van Wieringen [Sat, 3 Apr 2010 20:09:52 +0000 (22:09 +0200)]
Create user in the right database for Ingres.
Marco van Wieringen [Sat, 3 Apr 2010 19:16:50 +0000 (21:16 +0200)]
Do all Ingres operations as the user invoking the script just as for all
the other databases. The grant script will make sure the db_user will have
the proper access rights to the database tables and sequences.
Marco van Wieringen [Sat, 3 Apr 2010 18:58:07 +0000 (20:58 +0200)]
Fix username argument to sql for Ingres grants.
Marco van Wieringen [Sat, 3 Apr 2010 18:55:13 +0000 (20:55 +0200)]
Make the Ingres grant script work.
Marco van Wieringen [Sat, 3 Apr 2010 14:37:25 +0000 (16:37 +0200)]
Lets not use PostgreSQL macros for sizes.
Marco van Wieringen [Sat, 3 Apr 2010 14:10:53 +0000 (16:10 +0200)]
Implement my_ingres_currval function.
Marco van Wieringen [Fri, 2 Apr 2010 19:50:48 +0000 (21:50 +0200)]
Lets fix calling INGfreeDescriptor before INGfreeINGresult as INGfreeINGresult free the whole INGresult struct
and the descriptor is part of that.
Marco van Wieringen [Fri, 2 Apr 2010 15:49:39 +0000 (17:49 +0200)]
Let INGgetisnull return an bool
Marco van Wieringen [Fri, 2 Apr 2010 15:47:25 +0000 (17:47 +0200)]
Fix typo
Marco van Wieringen [Fri, 2 Apr 2010 15:44:03 +0000 (17:44 +0200)]
Add header to both myingres.sc and myingres.sh
Lets include cats.h as we use the B_DB struct now in myingres.c
Fixed missing argument to INGgetDescriptor
Regenerate myingres.c and myingres.h
Marco van Wieringen [Fri, 2 Apr 2010 15:37:28 +0000 (17:37 +0200)]
Fix typo
Marco van Wieringen [Fri, 2 Apr 2010 08:03:10 +0000 (10:03 +0200)]
Regenerated code for Ingres using esqlcc
Marco van Wieringen [Fri, 2 Apr 2010 07:23:10 +0000 (09:23 +0200)]
Added limit_filter which rewrites queries which use the LIMIT functions into
something Ingres can understand. Removed all static functions from the myingres.sh
file as they are no longer an exported interface (we can always put that back when
we have the need to export more functions). Some other rewrites of the code
to make it somewhat cleaner.
Marco van Wieringen [Thu, 1 Apr 2010 20:27:13 +0000 (22:27 +0200)]
Use bstrdup and use a goto for one exit from function.
Marco van Wieringen [Thu, 1 Apr 2010 18:55:55 +0000 (20:55 +0200)]
Make some static functions inline as they only are called once and are there mostly to describe a functional method.
Marco van Wieringen [Thu, 1 Apr 2010 18:19:45 +0000 (20:19 +0200)]
Name all function arguments query so we can use stmt as our internal variable everywhere.
Make some functions static which are not referenced anywhere else so we keep our namespace clean.
Marco van Wieringen [Thu, 1 Apr 2010 17:26:33 +0000 (19:26 +0200)]
Drop Ingres specific versions of queries with #ifdefs
Stefan Reddig [Thu, 1 Apr 2010 16:04:58 +0000 (18:04 +0200)]
fixed syntax LIMIT/NULL behavior/improved tests
Marco van Wieringen [Thu, 8 Apr 2010 16:59:22 +0000 (18:59 +0200)]
Remove line added as Eric seems to have done so also.