2004-12-11 21:03:51 +01:00
|
|
|
/* Copyright (C) 2004 MySQL AB
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
MySQL Federated Storage Engine
|
|
|
|
|
|
|
|
ha_federated.cc - MySQL Federated Storage Engine
|
|
|
|
Patrick Galbraith and Brian Aker, 2004
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
This is a handler which uses a foreign database as the data file, as
|
2004-12-11 21:03:51 +01:00
|
|
|
opposed to a handler like MyISAM, which uses .MYD files locally.
|
|
|
|
|
|
|
|
How this handler works
|
|
|
|
----------------------------------
|
2005-02-23 09:38:29 +01:00
|
|
|
Normal database files are local and as such: You create a table called
|
|
|
|
'users', a file such as 'users.MYD' is created. A handler reads, inserts,
|
2004-12-11 21:03:51 +01:00
|
|
|
deletes, updates data in this file. The data is stored in particular format,
|
|
|
|
so to read, that data has to be parsed into fields, to write, fields have to
|
2005-02-23 09:38:29 +01:00
|
|
|
be stored in this format to write to this data file.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
With MySQL Federated storage engine, there will be no local files for each
|
2005-02-23 09:38:29 +01:00
|
|
|
table's data (such as .MYD). A foreign database will store the data that would
|
|
|
|
normally be in this file. This will necessitate the use of MySQL client API
|
2004-12-11 21:03:51 +01:00
|
|
|
to read, delete, update, insert this data. The data will have to be retrieve
|
|
|
|
via an SQL call "SELECT * FROM users". Then, to read this data, it will have
|
2005-02-23 09:38:29 +01:00
|
|
|
to be retrieved via mysql_fetch_row one row at a time, then converted from
|
2004-12-11 21:03:51 +01:00
|
|
|
the column in this select into the format that the handler expects.
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
The create table will simply create the .frm file, and within the
|
|
|
|
"CREATE TABLE" SQL, there SHALL be any of the following :
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2004-12-17 04:08:32 +01:00
|
|
|
comment=scheme://username:password@hostname:port/database/tablename
|
|
|
|
comment=scheme://username@hostname/database/tablename
|
|
|
|
comment=scheme://username:password@hostname/database/tablename
|
|
|
|
comment=scheme://username:password@hostname/database/tablename
|
|
|
|
|
|
|
|
An example would be:
|
|
|
|
|
|
|
|
comment=mysql://username:password@hostname:port/database/tablename
|
|
|
|
|
|
|
|
***IMPORTANT***
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
This is a first release, conceptual release
|
2004-12-17 04:08:32 +01:00
|
|
|
Only 'mysql://' is supported at this release.
|
|
|
|
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
This comment connection string is necessary for the handler to be
|
|
|
|
able to connect to the foreign server.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
|
|
|
|
The basic flow is this:
|
|
|
|
|
|
|
|
SQL calls issues locally ->
|
2005-02-23 09:38:29 +01:00
|
|
|
mysql handler API (data in handler format) ->
|
|
|
|
mysql client API (data converted to SQL calls) ->
|
|
|
|
foreign database -> mysql client API ->
|
2004-12-11 21:03:51 +01:00
|
|
|
convert result sets (if any) to handler format ->
|
|
|
|
handler API -> results or rows affected to local
|
|
|
|
|
|
|
|
What this handler does and doesn't support
|
|
|
|
------------------------------------------
|
2005-02-23 09:38:29 +01:00
|
|
|
* Tables MUST be created on the foreign server prior to any action on those
|
|
|
|
tables via the handler, first version. IMPORTANT: IF you MUST use the
|
2004-12-17 04:08:32 +01:00
|
|
|
federated storage engine type on the REMOTE end, MAKE SURE [ :) ] That
|
2005-02-23 09:38:29 +01:00
|
|
|
the table you connect to IS NOT a table pointing BACK to your ORIGNAL
|
2004-12-17 04:08:32 +01:00
|
|
|
table! You know and have heard the screaching of audio feedback? You
|
2005-02-23 09:38:29 +01:00
|
|
|
know putting two mirror in front of each other how the reflection
|
2004-12-17 04:08:32 +01:00
|
|
|
continues for eternity? Well, need I say more?!
|
|
|
|
* There will not be support for transactions.
|
2005-02-23 09:38:29 +01:00
|
|
|
* There is no way for the handler to know if the foreign database or table
|
2004-12-11 21:03:51 +01:00
|
|
|
has changed. The reason for this is that this database has to work like a
|
2005-02-23 09:38:29 +01:00
|
|
|
data file that would never be written to by anything other than the
|
|
|
|
database. The integrity of the data in the local table could be breached
|
|
|
|
if there was any change to the foreign database.
|
2004-12-17 04:08:32 +01:00
|
|
|
* Support for SELECT, INSERT, UPDATE , DELETE, indexes.
|
2004-12-11 21:03:51 +01:00
|
|
|
* No ALTER TABLE, DROP TABLE or any other Data Definition Language calls.
|
2005-02-23 09:38:29 +01:00
|
|
|
* Prepared statements will not be used in the first implementation, it
|
2004-12-11 21:03:51 +01:00
|
|
|
remains to to be seen whether the limited subset of the client API for the
|
2004-12-17 04:08:32 +01:00
|
|
|
server supports this.
|
2005-02-23 09:38:29 +01:00
|
|
|
* This uses SELECT, INSERT, UPDATE, DELETE and not HANDLER for its
|
|
|
|
implementation.
|
2004-12-17 04:08:32 +01:00
|
|
|
* This will not work with the query cache.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
Method calls
|
|
|
|
|
|
|
|
A two column table, with one record:
|
|
|
|
|
|
|
|
(SELECT)
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
"SELECT * FROM foo"
|
2004-12-11 21:03:51 +01:00
|
|
|
ha_federated::info
|
|
|
|
ha_federated::scan_time:
|
|
|
|
ha_federated::rnd_init: share->select_query SELECT * FROM foo
|
|
|
|
ha_federated::extra
|
|
|
|
|
|
|
|
<for every row of data retrieved>
|
|
|
|
ha_federated::rnd_next
|
|
|
|
ha_federated::convert_row_to_internal_format
|
|
|
|
ha_federated::rnd_next
|
|
|
|
</for every row of data retrieved>
|
|
|
|
|
|
|
|
ha_federated::rnd_end
|
|
|
|
ha_federated::extra
|
|
|
|
ha_federated::reset
|
|
|
|
|
|
|
|
(INSERT)
|
|
|
|
|
|
|
|
"INSERT INTO foo (id, ts) VALUES (2, now());"
|
|
|
|
|
|
|
|
ha_federated::write_row
|
|
|
|
|
|
|
|
<for every field/column>
|
2005-01-21 03:36:40 +01:00
|
|
|
Field::quote_data
|
|
|
|
Field::quote_data
|
2004-12-11 21:03:51 +01:00
|
|
|
</for every field/column>
|
|
|
|
|
|
|
|
ha_federated::reset
|
|
|
|
|
|
|
|
(UPDATE)
|
|
|
|
|
|
|
|
"UPDATE foo SET ts = now() WHERE id = 1;"
|
|
|
|
|
|
|
|
ha_federated::index_init
|
|
|
|
ha_federated::index_read
|
|
|
|
ha_federated::index_read_idx
|
2005-01-21 03:36:40 +01:00
|
|
|
Field::quote_data
|
2004-12-11 21:03:51 +01:00
|
|
|
ha_federated::rnd_next
|
|
|
|
ha_federated::convert_row_to_internal_format
|
|
|
|
ha_federated::update_row
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
<quote 3 cols, new and old data>
|
2005-01-21 03:36:40 +01:00
|
|
|
Field::quote_data
|
|
|
|
Field::quote_data
|
|
|
|
Field::quote_data
|
|
|
|
Field::quote_data
|
|
|
|
Field::quote_data
|
|
|
|
Field::quote_data
|
2004-12-11 21:03:51 +01:00
|
|
|
</quote 3 cols, new and old data>
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
ha_federated::extra
|
|
|
|
ha_federated::extra
|
|
|
|
ha_federated::extra
|
|
|
|
ha_federated::external_lock
|
|
|
|
ha_federated::reset
|
|
|
|
|
|
|
|
|
|
|
|
How do I use this handler?
|
|
|
|
--------------------------
|
|
|
|
First of all, you need to build this storage engine:
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
./configure --with-federated-storage-engine
|
|
|
|
make
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
Next, to use this handler, it's very simple. You must
|
2004-12-11 21:03:51 +01:00
|
|
|
have two databases running, either both on the same host, or
|
|
|
|
on different hosts.
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
One the server that will be connecting to the foreign
|
2004-12-11 21:03:51 +01:00
|
|
|
host (client), you create your table as such:
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
CREATE TABLE test_table (
|
2004-12-11 21:03:51 +01:00
|
|
|
id int(20) NOT NULL auto_increment,
|
|
|
|
name varchar(32) NOT NULL default '',
|
|
|
|
other int(20) NOT NULL default '0',
|
|
|
|
PRIMARY KEY (id),
|
|
|
|
KEY name (name),
|
2005-02-23 09:38:29 +01:00
|
|
|
KEY other_key (other))
|
|
|
|
ENGINE="FEDERATED"
|
|
|
|
DEFAULT CHARSET=latin1
|
2004-12-11 21:03:51 +01:00
|
|
|
COMMENT='root@127.0.0.1:9306/federated/test_federated';
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
Notice the "COMMENT" and "ENGINE" field? This is where you
|
|
|
|
respectively set the engine type, "FEDERATED" and foreign
|
|
|
|
host information, this being the database your 'client' database
|
|
|
|
will connect to and use as the "data file". Obviously, the foreign
|
|
|
|
database is running on port 9306, so you want to start up your other
|
|
|
|
database so that it is indeed on port 9306, and your federated
|
|
|
|
database on a port other than that. In my setup, I use port 5554
|
|
|
|
for federated, and port 5555 for the foreign database.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
Then, on the foreign database:
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
CREATE TABLE test_table (
|
2004-12-11 21:03:51 +01:00
|
|
|
id int(20) NOT NULL auto_increment,
|
|
|
|
name varchar(32) NOT NULL default '',
|
|
|
|
other int(20) NOT NULL default '0',
|
|
|
|
PRIMARY KEY (id),
|
|
|
|
KEY name (name),
|
2005-02-23 09:38:29 +01:00
|
|
|
KEY other_key (other))
|
2004-12-11 21:03:51 +01:00
|
|
|
ENGINE="<NAME>" <-- whatever you want, or not specify
|
|
|
|
DEFAULT CHARSET=latin1 ;
|
|
|
|
|
|
|
|
This table is exactly the same (and must be exactly the same),
|
2005-02-23 09:38:29 +01:00
|
|
|
except that it is not using the federated handler and does
|
2004-12-11 21:03:51 +01:00
|
|
|
not need the URL.
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
How to see the handler in action
|
|
|
|
--------------------------------
|
|
|
|
|
|
|
|
When developing this handler, I compiled the federated database with
|
|
|
|
debugging:
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
./configure --with-federated-storage-engine
|
2004-12-11 21:03:51 +01:00
|
|
|
--prefix=/home/mysql/mysql-build/federated/ --with-debug
|
|
|
|
|
|
|
|
Once compiled, I did a 'make install' (not for the purpose of installing
|
|
|
|
the binary, but to install all the files the binary expects to see in the
|
2005-02-23 09:38:29 +01:00
|
|
|
diretory I specified in the build with --prefix,
|
|
|
|
"/home/mysql/mysql-build/federated".
|
|
|
|
|
|
|
|
Then, I started the foreign server:
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/usr/local/mysql/bin/mysqld_safe
|
2004-12-11 21:03:51 +01:00
|
|
|
--user=mysql --log=/tmp/mysqld.5555.log -P 5555
|
|
|
|
|
|
|
|
Then, I went back to the directory containing the newly compiled mysqld,
|
|
|
|
<builddir>/sql/, started up gdb:
|
|
|
|
|
|
|
|
gdb ./mysqld
|
|
|
|
|
|
|
|
Then, withn the (gdb) prompt:
|
|
|
|
(gdb) run --gdb --port=5554 --socket=/tmp/mysqld.5554 --skip-innodb --debug
|
|
|
|
|
|
|
|
Next, I open several windows for each:
|
|
|
|
|
|
|
|
1. Tail the debug trace: tail -f /tmp/mysqld.trace|grep ha_fed
|
2005-02-23 09:38:29 +01:00
|
|
|
2. Tail the SQL calls to the foreign database: tail -f /tmp/mysqld.5555.log
|
2004-12-11 21:03:51 +01:00
|
|
|
3. A window with a client open to the federated server on port 5554
|
|
|
|
4. A window with a client open to the federated server on port 5555
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
I would create a table on the client to the foreign server on port
|
2004-12-11 21:03:51 +01:00
|
|
|
5555, and then to the federated server on port 5554. At this point,
|
|
|
|
I would run whatever queries I wanted to on the federated server,
|
2005-02-23 09:38:29 +01:00
|
|
|
just always remembering that whatever changes I wanted to make on
|
2004-12-11 21:03:51 +01:00
|
|
|
the table, or if I created new tables, that I would have to do that
|
2005-02-23 09:38:29 +01:00
|
|
|
on the foreign server.
|
|
|
|
|
|
|
|
Another thing to look for is 'show variables' to show you that you have
|
2004-12-11 21:03:51 +01:00
|
|
|
support for federated handler support:
|
|
|
|
|
|
|
|
show variables like '%federat%'
|
|
|
|
|
|
|
|
and:
|
|
|
|
|
|
|
|
show storage engines;
|
|
|
|
|
|
|
|
Both should display the federated storage handler.
|
|
|
|
|
|
|
|
|
|
|
|
Testing
|
|
|
|
-------
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
There is a test for MySQL Federated Storage Handler in ./mysql-test/t,
|
2004-12-11 21:03:51 +01:00
|
|
|
federatedd.test It starts both a slave and master database using
|
|
|
|
the same setup that the replication tests use, with the exception that
|
|
|
|
it turns off replication, and sets replication to ignore the test tables.
|
2005-02-23 09:38:29 +01:00
|
|
|
After ensuring that you actually do have support for the federated storage
|
|
|
|
handler, numerous queries/inserts/updates/deletes are run, many derived
|
2004-12-11 21:03:51 +01:00
|
|
|
from the MyISAM tests, plus som other tests which were meant to reveal
|
|
|
|
any issues that would be most likely to affect this handler. All tests
|
|
|
|
should work! ;)
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
To run these tests, go into ./mysql-test (based in the directory you
|
2004-12-11 21:03:51 +01:00
|
|
|
built the server in)
|
|
|
|
|
|
|
|
./mysql-test-run federatedd
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
To run the test, or if you want to run the test and have debug info:
|
|
|
|
|
|
|
|
./mysql-test-run --debug federated
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
This will run the test in debug mode, and you can view the trace and
|
2004-12-11 21:03:51 +01:00
|
|
|
log files in the ./mysql-test/var/log directory
|
|
|
|
|
|
|
|
ls -l mysql-test/var/log/
|
|
|
|
-rw-r--r-- 1 patg patg 17 4 Dec 12:27 current_test
|
|
|
|
-rw-r--r-- 1 patg patg 692 4 Dec 12:52 manager.log
|
|
|
|
-rw-rw---- 1 patg patg 21246 4 Dec 12:51 master-bin.000001
|
|
|
|
-rw-rw---- 1 patg patg 68 4 Dec 12:28 master-bin.index
|
|
|
|
-rw-r--r-- 1 patg patg 1620 4 Dec 12:51 master.err
|
|
|
|
-rw-rw---- 1 patg patg 23179 4 Dec 12:51 master.log
|
|
|
|
-rw-rw---- 1 patg patg 16696550 4 Dec 12:51 master.trace
|
|
|
|
-rw-r--r-- 1 patg patg 0 4 Dec 12:28 mysqltest-time
|
|
|
|
-rw-r--r-- 1 patg patg 2024051 4 Dec 12:51 mysqltest.trace
|
|
|
|
-rw-rw---- 1 patg patg 94992 4 Dec 12:51 slave-bin.000001
|
|
|
|
-rw-rw---- 1 patg patg 67 4 Dec 12:28 slave-bin.index
|
|
|
|
-rw-rw---- 1 patg patg 249 4 Dec 12:52 slave-relay-bin.000003
|
|
|
|
-rw-rw---- 1 patg patg 73 4 Dec 12:28 slave-relay-bin.index
|
|
|
|
-rw-r--r-- 1 patg patg 1349 4 Dec 12:51 slave.err
|
|
|
|
-rw-rw---- 1 patg patg 96206 4 Dec 12:52 slave.log
|
|
|
|
-rw-rw---- 1 patg patg 15706355 4 Dec 12:51 slave.trace
|
|
|
|
-rw-r--r-- 1 patg patg 0 4 Dec 12:51 warnings
|
|
|
|
|
|
|
|
Of course, again, you can tail the trace log:
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
tail -f mysql-test/var/log/master.trace |grep ha_fed
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
As well as the slave query log:
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
tail -f mysql-test/var/log/slave.log
|
|
|
|
|
|
|
|
Files that comprise the test suit
|
|
|
|
---------------------------------
|
|
|
|
mysql-test/t/federated.test
|
|
|
|
mysql-test/r/federated.result
|
|
|
|
mysql-test/r/have_federated_db.require
|
|
|
|
mysql-test/include/have_federated_db.inc
|
|
|
|
|
|
|
|
|
|
|
|
Other tidbits
|
|
|
|
-------------
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
These were the files that were modified or created for this
|
2004-12-11 21:03:51 +01:00
|
|
|
Federated handler to work:
|
|
|
|
|
|
|
|
./configure.in
|
|
|
|
./sql/Makefile.am
|
|
|
|
./config/ac_macros/ha_federated.m4
|
|
|
|
./sql/handler.cc
|
|
|
|
./sql/mysqld.cc
|
|
|
|
./sql/set_var.cc
|
|
|
|
./sql/field.h
|
|
|
|
./sql/sql_string.h
|
|
|
|
./mysql-test/mysql-test-run(.sh)
|
|
|
|
./mysql-test/t/federated.test
|
|
|
|
./mysql-test/r/federated.result
|
|
|
|
./mysql-test/r/have_federated_db.require
|
|
|
|
./mysql-test/include/have_federated_db.inc
|
|
|
|
./sql/ha_federated.cc
|
|
|
|
./sql/ha_federated.h
|
2005-02-23 09:38:29 +01:00
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
*/
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-06-05 16:20:22 +02:00
|
|
|
#include "mysql_priv.h"
|
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
#pragma implementation // gcc: Class implementation
|
2004-12-11 21:03:51 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_FEDERATED_DB
|
|
|
|
#include "ha_federated.h"
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
#include "m_string.h"
|
2004-12-11 21:03:51 +01:00
|
|
|
/* Variables for federated share methods */
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
static HASH federated_open_tables; // Hash used to track open
|
|
|
|
// tables
|
|
|
|
pthread_mutex_t federated_mutex; // This is the mutex we use to
|
|
|
|
// init the hash
|
2005-02-23 09:38:29 +01:00
|
|
|
static int federated_init= FALSE; // Variable for checking the
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
// init state of hash
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-10-03 04:44:28 +02:00
|
|
|
/* Federated storage engine handlerton */
|
|
|
|
|
|
|
|
handlerton federated_hton= {
|
|
|
|
"FEDERATED",
|
|
|
|
SHOW_OPTION_YES,
|
|
|
|
"Federated MySQL storage engine",
|
|
|
|
DB_TYPE_FEDERATED_DB,
|
|
|
|
federated_db_init,
|
|
|
|
0, /* slot */
|
|
|
|
0, /* savepoint size. */
|
|
|
|
NULL, /* close_connection */
|
|
|
|
NULL, /* savepoint */
|
|
|
|
NULL, /* rollback to savepoint */
|
|
|
|
NULL, /* release savepoint */
|
|
|
|
NULL, /* commit */
|
|
|
|
NULL, /* rollback */
|
|
|
|
NULL, /* prepare */
|
|
|
|
NULL, /* recover */
|
|
|
|
NULL, /* commit_by_xid */
|
|
|
|
NULL, /* rollback_by_xid */
|
|
|
|
NULL, /* create_cursor_read_view */
|
|
|
|
NULL, /* set_cursor_read_view */
|
|
|
|
NULL, /* close_cursor_read_view */
|
2005-10-03 05:13:18 +02:00
|
|
|
HTON_ALTER_NOT_SUPPORTED
|
2005-10-03 04:44:28 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/* Function we use in the creation of our hash to get key. */
|
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
static byte *federated_get_key(FEDERATED_SHARE *share, uint *length,
|
|
|
|
my_bool not_used __attribute__ ((unused)))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
|
|
|
*length= share->table_name_length;
|
|
|
|
return (byte*) share->table_name;
|
|
|
|
}
|
|
|
|
|
2005-02-17 08:07:10 +01:00
|
|
|
/*
|
|
|
|
Initialize the federated handler.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
federated_db_init()
|
|
|
|
void
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE OK
|
|
|
|
TRUE Error
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool federated_db_init()
|
|
|
|
{
|
2005-10-03 04:44:28 +02:00
|
|
|
DBUG_ENTER("federated_db_init");
|
|
|
|
if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
|
|
|
|
goto error;
|
|
|
|
if (hash_init(&federated_open_tables, system_charset_info, 32, 0, 0,
|
|
|
|
(hash_get_key) federated_get_key, 0, 0))
|
|
|
|
{
|
|
|
|
VOID(pthread_mutex_destroy(&federated_mutex));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
federated_init= TRUE;
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|
|
|
|
error:
|
|
|
|
have_federated_db= SHOW_OPTION_DISABLED; // If we couldn't use handler
|
|
|
|
DBUG_RETURN(TRUE);
|
2005-02-17 08:07:10 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Release the federated handler.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
federated_db_end()
|
|
|
|
void
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE OK
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool federated_db_end()
|
|
|
|
{
|
|
|
|
if (federated_init)
|
|
|
|
{
|
|
|
|
hash_free(&federated_open_tables);
|
|
|
|
VOID(pthread_mutex_destroy(&federated_mutex));
|
|
|
|
}
|
|
|
|
federated_init= 0;
|
|
|
|
return FALSE;
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:32:21 +01:00
|
|
|
/*
|
|
|
|
Check (in create) whether the tables exists, and that it can be connected to
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
check_foreign_data_source()
|
|
|
|
share pointer to FEDERATED share
|
2005-07-16 02:33:47 +02:00
|
|
|
table_create_flag tells us that ::create is the caller,
|
|
|
|
therefore, return CANT_CREATE_FEDERATED_TABLE
|
2005-03-15 09:32:21 +01:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
This method first checks that the connection information that parse url
|
|
|
|
has populated into the share will be sufficient to connect to the foreign
|
|
|
|
table, and if so, does the foreign table exist.
|
|
|
|
*/
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
static int check_foreign_data_source(
|
|
|
|
FEDERATED_SHARE *share,
|
|
|
|
bool table_create_flag)
|
2005-03-15 09:32:21 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
char escaped_table_name[NAME_LEN*2];
|
2005-07-16 02:33:47 +02:00
|
|
|
char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
2005-03-15 09:32:21 +01:00
|
|
|
uint error_code;
|
|
|
|
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
|
2005-07-16 02:33:47 +02:00
|
|
|
MYSQL *mysql;
|
2005-03-15 09:32:21 +01:00
|
|
|
DBUG_ENTER("ha_federated::check_foreign_data_source");
|
2005-10-07 23:57:40 +02:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
/* Zero the length, otherwise the string will have misc chars */
|
2005-03-15 09:32:21 +01:00
|
|
|
query.length(0);
|
|
|
|
|
|
|
|
/* error out if we can't alloc memory for mysql_init(NULL) (per Georg) */
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!(mysql= mysql_init(NULL)))
|
2005-03-15 09:32:21 +01:00
|
|
|
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
|
|
/* check if we can connect */
|
|
|
|
if (!mysql_real_connect(mysql,
|
|
|
|
share->hostname,
|
|
|
|
share->username,
|
|
|
|
share->password,
|
|
|
|
share->database,
|
|
|
|
share->port,
|
|
|
|
share->socket, 0))
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
we want the correct error message, but it to return
|
|
|
|
ER_CANT_CREATE_FEDERATED_TABLE if called by ::create
|
|
|
|
*/
|
|
|
|
error_code= table_create_flag?
|
2005-07-17 04:10:19 +02:00
|
|
|
ER_CANT_CREATE_FEDERATED_TABLE : ER_CONNECT_TO_FOREIGN_DATA_SOURCE;
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-03-15 09:32:21 +01:00
|
|
|
my_sprintf(error_buffer,
|
2005-07-16 02:33:47 +02:00
|
|
|
(error_buffer, " database %s username %s hostname %s",
|
2005-07-17 04:10:19 +02:00
|
|
|
share->database, share->username, share->hostname));
|
|
|
|
|
|
|
|
my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), error_buffer);
|
2005-03-15 09:32:21 +01:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-06-22 19:29:34 +02:00
|
|
|
/*
|
2005-09-14 08:31:17 +02:00
|
|
|
Since we do not support transactions at this version, we can let the
|
|
|
|
client API silently reconnect. For future versions, we will need more
|
|
|
|
logic to deal with transactions
|
2005-06-22 19:29:34 +02:00
|
|
|
*/
|
|
|
|
mysql->reconnect= 1;
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
2005-09-14 08:31:17 +02:00
|
|
|
Note: I am not using INORMATION_SCHEMA because this needs to work with
|
|
|
|
versions prior to 5.0
|
|
|
|
|
2005-03-15 09:32:21 +01:00
|
|
|
if we can connect, then make sure the table exists
|
2005-07-17 04:10:19 +02:00
|
|
|
|
|
|
|
the query will be: SELECT * FROM `tablename` WHERE 1=0
|
2005-03-15 09:32:21 +01:00
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_SELECT);
|
|
|
|
query.append(FEDERATED_STAR);
|
|
|
|
query.append(FEDERATED_FROM);
|
|
|
|
query.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_name,
|
|
|
|
sizeof(escaped_table_name),
|
|
|
|
share->table_name,
|
|
|
|
share->table_name_length);
|
|
|
|
query.append(escaped_table_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_BTICK);
|
|
|
|
query.append(FEDERATED_WHERE);
|
2005-07-19 03:04:51 +02:00
|
|
|
query.append(FEDERATED_FALSE);
|
2005-03-15 09:32:21 +01:00
|
|
|
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_PRINT("info", ("check_foreign_data_source query %s",
|
|
|
|
query.c_ptr_quick()));
|
2005-07-16 02:33:47 +02:00
|
|
|
if (mysql_real_query(mysql, query.ptr(), query.length()))
|
2005-03-15 09:32:21 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
error_code= table_create_flag ?
|
2005-07-17 04:10:19 +02:00
|
|
|
ER_CANT_CREATE_FEDERATED_TABLE : ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST;
|
2005-07-16 02:33:47 +02:00
|
|
|
my_sprintf(error_buffer, (error_buffer, ": %d : %s",
|
|
|
|
mysql_errno(mysql), mysql_error(mysql)));
|
|
|
|
|
|
|
|
my_error(error_code, MYF(0), error_buffer);
|
2005-03-15 09:32:21 +01:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
error_code=0;
|
2005-03-15 09:32:21 +01:00
|
|
|
|
|
|
|
error:
|
|
|
|
mysql_close(mysql);
|
|
|
|
DBUG_RETURN(error_code);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num)
|
|
|
|
{
|
2005-09-14 20:02:33 +02:00
|
|
|
char buf[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
int buf_len;
|
2005-09-13 20:59:19 +02:00
|
|
|
DBUG_ENTER("ha_federated parse_url_error");
|
2005-10-07 23:57:40 +02:00
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
if (share->scheme)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("error: parse_url. Returning error code %d \
|
|
|
|
freeing share->scheme %lx", error_num, share->scheme));
|
|
|
|
my_free((gptr) share->scheme, MYF(0));
|
|
|
|
share->scheme= 0;
|
|
|
|
}
|
2005-10-07 23:57:40 +02:00
|
|
|
buf_len= min(table->s->connect_string.length,
|
|
|
|
FEDERATED_QUERY_BUFFER_SIZE-1);
|
|
|
|
strmake(buf, table->s->connect_string.str, buf_len);
|
2005-09-13 20:59:19 +02:00
|
|
|
my_error(error_num, MYF(0), buf);
|
|
|
|
DBUG_RETURN(error_num);
|
|
|
|
}
|
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
/*
|
2005-09-13 03:02:17 +02:00
|
|
|
Parse connection info from table->s->connect_string
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
parse_url()
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
share pointer to FEDERATED share
|
|
|
|
table pointer to current TABLE class
|
|
|
|
table_create_flag determines what error to throw
|
2005-01-04 23:39:13 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
DESCRIPTION
|
|
|
|
populates the share with information about the connection
|
2005-02-23 09:38:29 +01:00
|
|
|
to the foreign database that will serve as the data source.
|
2004-12-11 21:03:51 +01:00
|
|
|
This string must be specified (currently) in the "comment" field,
|
2005-01-04 23:39:13 +01:00
|
|
|
listed in the CREATE TABLE statement.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
This string MUST be in the format of any of these:
|
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
scheme://username:password@hostname:port/database/table
|
|
|
|
scheme://username@hostname/database/table
|
|
|
|
scheme://username@hostname:port/database/table
|
|
|
|
scheme://username:password@hostname/database/table
|
2004-12-17 04:08:32 +01:00
|
|
|
|
|
|
|
An Example:
|
|
|
|
|
|
|
|
mysql://joe:joespass@192.168.1.111:9308/federated/testtable
|
|
|
|
|
|
|
|
***IMPORTANT***
|
|
|
|
Currently, only "mysql://" is supported.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
'password' and 'port' are both optional.
|
|
|
|
|
|
|
|
RETURN VALUE
|
2005-07-16 02:33:47 +02:00
|
|
|
0 success
|
|
|
|
error_num particular error code
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
static int parse_url(FEDERATED_SHARE *share, TABLE *table,
|
|
|
|
uint table_create_flag)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
uint error_num= (table_create_flag ?
|
|
|
|
ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE :
|
|
|
|
ER_FOREIGN_DATA_STRING_INVALID);
|
2005-04-06 16:22:21 +02:00
|
|
|
DBUG_ENTER("ha_federated::parse_url");
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-04-06 16:22:21 +02:00
|
|
|
share->port= 0;
|
2005-09-22 02:23:07 +02:00
|
|
|
share->socket= 0;
|
2005-09-13 03:02:17 +02:00
|
|
|
DBUG_PRINT("info", ("Length %d \n", table->s->connect_string.length));
|
|
|
|
DBUG_PRINT("info", ("String %.*s \n", table->s->connect_string.length,
|
|
|
|
table->s->connect_string.str));
|
2005-09-22 02:23:07 +02:00
|
|
|
share->scheme= my_strdup_with_length((const byte*)table->s->
|
|
|
|
connect_string.str,
|
|
|
|
table->s->connect_string.length,
|
|
|
|
MYF(0));
|
2005-09-15 21:32:01 +02:00
|
|
|
|
2005-09-13 03:02:17 +02:00
|
|
|
// Add a null for later termination of table name
|
|
|
|
share->scheme[table->s->connect_string.length]= 0;
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme));
|
2004-12-17 04:08:32 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
remove addition of null terminator and store length
|
|
|
|
for each string in share
|
|
|
|
*/
|
2005-09-13 20:59:19 +02:00
|
|
|
if (!(share->username= strstr(share->scheme, "://")))
|
|
|
|
goto error;
|
|
|
|
share->scheme[share->username - share->scheme]= '\0';
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
if (strcmp(share->scheme, "mysql") != 0)
|
|
|
|
goto error;
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
share->username+= 3;
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
if (!(share->hostname= strchr(share->username, '@')))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
share->username[share->hostname - share->username]= '\0';
|
|
|
|
share->hostname++;
|
|
|
|
|
|
|
|
if ((share->password= strchr(share->username, ':')))
|
|
|
|
{
|
|
|
|
share->username[share->password - share->username]= '\0';
|
|
|
|
share->password++;
|
|
|
|
share->username= share->username;
|
|
|
|
/* make sure there isn't an extra / or @ */
|
|
|
|
if ((strchr(share->password, '/') || strchr(share->hostname, '@')))
|
2005-02-23 09:38:29 +01:00
|
|
|
goto error;
|
2005-09-13 20:59:19 +02:00
|
|
|
/*
|
|
|
|
Found that if the string is:
|
|
|
|
user:@hostname:port/database/table
|
|
|
|
Then password is a null string, so set to NULL
|
|
|
|
*/
|
|
|
|
if ((share->password[0] == '\0'))
|
|
|
|
share->password= NULL;
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
else
|
2005-09-13 20:59:19 +02:00
|
|
|
share->username= share->username;
|
|
|
|
|
|
|
|
/* make sure there isn't an extra / or @ */
|
|
|
|
if ((strchr(share->username, '/')) || (strchr(share->hostname, '@')))
|
2005-02-23 09:38:29 +01:00
|
|
|
goto error;
|
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
if (!(share->database= strchr(share->hostname, '/')))
|
|
|
|
goto error;
|
|
|
|
share->hostname[share->database - share->hostname]= '\0';
|
|
|
|
share->database++;
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
if ((share->sport= strchr(share->hostname, ':')))
|
2005-07-16 02:33:47 +02:00
|
|
|
{
|
2005-09-13 20:59:19 +02:00
|
|
|
share->hostname[share->sport - share->hostname]= '\0';
|
|
|
|
share->sport++;
|
|
|
|
if (share->sport[0] == '\0')
|
|
|
|
share->sport= NULL;
|
|
|
|
else
|
|
|
|
share->port= atoi(share->sport);
|
2005-07-16 02:33:47 +02:00
|
|
|
}
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-09-13 20:59:19 +02:00
|
|
|
if (!(share->table_name= strchr(share->database, '/')))
|
|
|
|
goto error;
|
|
|
|
share->database[share->table_name - share->database]= '\0';
|
|
|
|
share->table_name++;
|
|
|
|
|
|
|
|
share->table_name_length= strlen(share->table_name);
|
|
|
|
|
|
|
|
/* make sure there's not an extra / */
|
|
|
|
if ((strchr(share->table_name, '/')))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (share->hostname[0] == '\0')
|
|
|
|
share->hostname= NULL;
|
|
|
|
|
|
|
|
if (!share->port)
|
|
|
|
{
|
|
|
|
if (strcmp(share->hostname, my_localhost) == 0)
|
|
|
|
share->socket= my_strdup(MYSQL_UNIX_ADDR, MYF(0));
|
|
|
|
else
|
|
|
|
share->port= MYSQL_PORT;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("scheme %s username %s password %s \
|
|
|
|
hostname %s port %d database %s tablename %s\n",
|
|
|
|
share->scheme, share->username, share->password,
|
|
|
|
share->hostname, share->port, share->database,
|
|
|
|
share->table_name));
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
error:
|
|
|
|
DBUG_RETURN(parse_url_error(share, table, error_num));
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
2005-03-15 09:32:21 +01:00
|
|
|
|
A fix and a test case for Bug#10760 and complementary cleanups.
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
include/thr_lock.h:
- add a notion of lock owner to table level locking. When using
cursors, lock owner can not be identified by a thread id any more,
as we must protect cursors from updates issued within the same
connection (thread). So, each cursor has its own lock identifier to
use with table level locking.
- extend return values of thr_lock and thr_multi_lock with
THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions
are now possible (see comments to thr_lock.c)
mysys/thr_lock.c:
Better support for cursors:
- use THR_LOCK_OWNER * as lock identifier, not pthread_t.
- check and return an error for a trivial deadlock case, when an
update statement is issued to a table locked by a cursor which has
been previously opened in the same connection.
- add support for locking timeouts: with use of cursors, trivial
deadlocks can occur. For now the only remedy is the lock wait timeout,
which is initialized from a new global variable 'table_lock_wait_timeout'
Example of a deadlock (assuming the storage engine does not downgrade
locks):
con1: open cursor for select * from t1;
con2: open cursor for select * from t2;
con1: update t2 set id=id*2; -- blocked
con2: update t1 set id=id*2; -- deadlock
Lock timeouts are active only if a connection is using cursors.
- the check in the wait_for_lock loop has been changed from
data->cond != cond to data->cond != 0. data->cond is zeroed
in every place it's changed.
- added comments
sql/examples/ha_archive.cc:
- extend the handlerton with the info about cursor behaviour at commit.
sql/examples/ha_archive.h:
- ctor moved to .cc to make use of archive handlerton
sql/examples/ha_example.cc:
- add handlerton instance, init handler::ht with it
sql/examples/ha_example.h:
- ctor moved to .cc to make use of ha_example handlerton
sql/examples/ha_tina.cc:
- add handlerton instance, init handler::ht with it
sql/examples/ha_tina.h:
- ctor moved to .cc to make use of CSV handlerton
sql/ha_berkeley.cc:
- init handlerton::flags and handler::ht
sql/ha_berkeley.h:
- ctor moved to .cc to make use of BerkeleyDB handlerton
sql/ha_blackhole.cc:
- add handlerton instance, init handler::ht with it
sql/ha_blackhole.h:
- ctor moved to .cc to make use of blackhole handlerton
sql/ha_federated.cc:
- add handlerton instance, init handler::ht with it
sql/ha_federated.h:
- ctor moved to .cc to make use of federated handlerton
sql/ha_heap.cc:
- add handlerton instance, init handler::ht with it
sql/ha_heap.h:
- ctor moved to .cc to make use of ha_heap handlerton
sql/ha_innodb.cc:
- init handlerton::flags and handler::ht of innobase storage engine
sql/ha_innodb.h:
- ctor moved to .cc to make use of archive handlerton
sql/ha_myisam.cc:
- add handlerton instance, init handler::ht with it
sql/ha_myisam.h:
- ctor moved to .cc to make use of MyISAM handlerton
sql/ha_myisammrg.cc:
- init handler::ht in the ctor
sql/ha_myisammrg.h:
- ctor moved to .cc to make use of MyISAM MERGE handlerton
sql/ha_ndbcluster.cc:
- init handlerton::flags and handler::ht
sql/handler.cc:
- drop support for ISAM storage engine, which was removed from 5.0
- close all "transient" cursors at COMMIT/ROLLBACK. A "transient"
SQL level cursor is a cursor that uses tables that have a transaction-
specific state.
sql/handler.h:
- extend struct handlerton with flags, add handlerton *ht to every
handler instance.
sql/lock.cc:
- extend mysql_lock_tables to send error to the client if
thr_multi_lock returns a timeout or a deadlock error.
sql/mysqld.cc:
- add server option --table_lock_wait_timeout (in seconds)
sql/set_var.cc:
- add new global variable 'table_lock_wait_timeout' to specify
a wait timeout for table-level locks of MySQL (in seconds). The default
timeout is 50 seconds. The timeout is active only if the connection
has open cursors.
sql/sql_class.cc:
- implement Statement_map::close_transient_cursors
- safety suggests that we need an assert ensuring
llock_info->n_cursors is functioning properly, adjust destruction of
the Statement_map to allow such assert in THD::~THD
sql/sql_class.h:
- add support for Cursors registry to Statement map.
sql/sql_prepare.cc:
- maintain a list of cursors that must be closed at commit/rollback.
sql/sql_select.cc:
- extend class Cursor to support specific at-COMMIT/ROLLBACK behavior.
If a cursor uses tables of a storage engine that
invalidates all open tables at COMMIT/ROLLBACK, it must be closed
before COMMIT/ROLLBACK is executed.
sql/sql_select.h:
- add an own lock_id and commit/rollback status flag to class Cursor
tests/mysql_client_test.c:
A test case for Bug#10760 and complementary issues: test a simple
deadlock case too.
mysql-test/var:
New BitKeeper file ``mysql-test/var''
2005-07-19 20:21:12 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
** FEDERATED tables
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
ha_federated::ha_federated(TABLE *table_arg)
|
|
|
|
:handler(&federated_hton, table_arg),
|
|
|
|
mysql(0), stored_result(0), scan_flag(0),
|
|
|
|
ref_length(sizeof(MYSQL_ROW_OFFSET)), current_position(0)
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/*
|
2004-12-11 21:03:51 +01:00
|
|
|
Convert MySQL result set row to handler internal format
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
convert_row_to_internal_format()
|
2005-02-23 09:38:29 +01:00
|
|
|
record Byte pointer to record
|
2004-12-11 21:03:51 +01:00
|
|
|
row MySQL result set row from fetchrow()
|
|
|
|
|
|
|
|
DESCRIPTION
|
2005-02-23 09:38:29 +01:00
|
|
|
This method simply iterates through a row returned via fetchrow with
|
2004-12-11 21:03:51 +01:00
|
|
|
values from a successful SELECT , and then stores each column's value
|
|
|
|
in the field object via the field object pointer (pointing to the table's
|
2005-02-23 09:38:29 +01:00
|
|
|
array of field object pointers). This is how the handler needs the data
|
2004-12-11 21:03:51 +01:00
|
|
|
to be stored to then return results back to the user
|
|
|
|
|
|
|
|
RETURN VALUE
|
2005-02-23 09:38:29 +01:00
|
|
|
0 After fields have had field values stored from record
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
uint ha_federated::convert_row_to_internal_format(byte *record, MYSQL_ROW row)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
ulong *lengths;
|
|
|
|
Field **field;
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::convert_row_to_internal_format");
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
lengths= mysql_fetch_lengths(stored_result);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
memset(record, 0, table->s->null_bytes);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
for (field= table->field; *field; field++)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
index variable to move us through the row at the
|
|
|
|
same iterative step as the field
|
|
|
|
*/
|
|
|
|
int x= field - table->field;
|
|
|
|
my_ptrdiff_t old_ptr;
|
|
|
|
old_ptr= (my_ptrdiff_t) (record - table->record[0]);
|
|
|
|
(*field)->move_field(old_ptr);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (!row[x])
|
2004-12-11 21:03:51 +01:00
|
|
|
(*field)->set_null();
|
|
|
|
else
|
2005-07-16 02:33:47 +02:00
|
|
|
{
|
|
|
|
(*field)->set_notnull();
|
2005-02-17 08:07:10 +01:00
|
|
|
(*field)->store(row[x], lengths[x], &my_charset_bin);
|
2005-07-16 02:33:47 +02:00
|
|
|
}
|
|
|
|
(*field)->move_field(-old_ptr);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool emit_key_part_name(String *to, KEY_PART_INFO *part)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("emit_key_part_name");
|
2005-07-17 04:10:19 +02:00
|
|
|
if (to->append(FEDERATED_BTICK) ||
|
2005-07-16 02:33:47 +02:00
|
|
|
to->append(part->field->field_name) ||
|
2005-07-17 04:10:19 +02:00
|
|
|
to->append(FEDERATED_BTICK))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1); // Out of memory
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool emit_key_part_element(String *to, KEY_PART_INFO *part,
|
|
|
|
bool needs_quotes, bool is_like,
|
|
|
|
const byte *ptr, uint len)
|
|
|
|
{
|
|
|
|
Field *field= part->field;
|
|
|
|
DBUG_ENTER("emit_key_part_element");
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (needs_quotes && to->append(FEDERATED_SQUOTE))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
if (part->type == HA_KEYTYPE_BIT)
|
|
|
|
{
|
|
|
|
char buff[STRING_BUFFER_USUAL_SIZE], *buf= buff;
|
|
|
|
|
|
|
|
*buf++= '0';
|
|
|
|
*buf++= 'x';
|
|
|
|
for (; len; ptr++,len--)
|
|
|
|
{
|
|
|
|
uint tmp= (uint)(uchar) *ptr;
|
|
|
|
*buf++= _dig_vec_upper[tmp >> 4];
|
|
|
|
*buf++= _dig_vec_upper[tmp & 15];
|
|
|
|
}
|
|
|
|
if (to->append(buff, (uint)(buf - buff)))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
else if (part->key_part_flag & HA_BLOB_PART)
|
|
|
|
{
|
|
|
|
String blob;
|
|
|
|
uint blob_length= uint2korr(ptr);
|
|
|
|
blob.set_quick((char*) ptr+HA_KEY_BLOB_LENGTH,
|
|
|
|
blob_length, &my_charset_bin);
|
|
|
|
if (append_escaped(to, &blob))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
else if (part->key_part_flag & HA_VAR_LENGTH_PART)
|
|
|
|
{
|
|
|
|
String varchar;
|
|
|
|
uint var_length= uint2korr(ptr);
|
|
|
|
varchar.set_quick((char*) ptr+HA_KEY_BLOB_LENGTH,
|
|
|
|
var_length, &my_charset_bin);
|
|
|
|
if (append_escaped(to, &varchar))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char strbuff[MAX_FIELD_WIDTH];
|
|
|
|
String str(strbuff, sizeof(strbuff), part->field->charset()), *res;
|
|
|
|
|
|
|
|
res= field->val_str(&str, (char *)ptr);
|
|
|
|
|
|
|
|
if (field->result_type() == STRING_RESULT)
|
|
|
|
{
|
|
|
|
if (append_escaped(to, res))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
else if (to->append(res->ptr(), res->length()))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (is_like && to->append(FEDERATED_PERCENT))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (needs_quotes && to->append(FEDERATED_SQUOTE))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/*
|
|
|
|
Create a WHERE clause based off of values in keys
|
|
|
|
Note: This code was inspired by key_copy from key.cc
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
create_where_from_key ()
|
|
|
|
to String object to store WHERE clause
|
|
|
|
key_info KEY struct pointer
|
|
|
|
key byte pointer containing key
|
|
|
|
key_length length of key
|
2005-07-16 02:33:47 +02:00
|
|
|
range_type 0 - no range, 1 - min range, 2 - max range
|
|
|
|
(see enum range_operation)
|
2005-02-23 09:38:29 +01:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Using iteration through all the keys via a KEY_PART_INFO pointer,
|
|
|
|
This method 'extracts' the value of each key in the byte pointer
|
|
|
|
*key, and for each key found, constructs an appropriate WHERE clause
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 After all keys have been accounted for to create the WHERE clause
|
|
|
|
1 No keys found
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
Range flags Table per Timour:
|
|
|
|
|
|
|
|
-----------------
|
|
|
|
- start_key:
|
|
|
|
* ">" -> HA_READ_AFTER_KEY
|
|
|
|
* ">=" -> HA_READ_KEY_OR_NEXT
|
|
|
|
* "=" -> HA_READ_KEY_EXACT
|
|
|
|
|
|
|
|
- end_key:
|
|
|
|
* "<" -> HA_READ_BEFORE_KEY
|
|
|
|
* "<=" -> HA_READ_AFTER_KEY
|
|
|
|
|
|
|
|
records_in_range:
|
|
|
|
-----------------
|
|
|
|
- start_key:
|
|
|
|
* ">" -> HA_READ_AFTER_KEY
|
|
|
|
* ">=" -> HA_READ_KEY_EXACT
|
|
|
|
* "=" -> HA_READ_KEY_EXACT
|
|
|
|
|
|
|
|
- end_key:
|
|
|
|
* "<" -> HA_READ_BEFORE_KEY
|
|
|
|
* "<=" -> HA_READ_AFTER_KEY
|
|
|
|
* "=" -> HA_READ_AFTER_KEY
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
0 HA_READ_KEY_EXACT, Find first record else error
|
|
|
|
1 HA_READ_KEY_OR_NEXT, Record or next record
|
|
|
|
2 HA_READ_KEY_OR_PREV, Record or previous
|
|
|
|
3 HA_READ_AFTER_KEY, Find next rec. after key-record
|
|
|
|
4 HA_READ_BEFORE_KEY, Find next rec. before key-record
|
|
|
|
5 HA_READ_PREFIX, Key which as same prefix
|
|
|
|
6 HA_READ_PREFIX_LAST, Last key with the same prefix
|
|
|
|
7 HA_READ_PREFIX_LAST_OR_PREV, Last or prev key with the same prefix
|
|
|
|
|
|
|
|
Flags that I've found:
|
|
|
|
|
|
|
|
id, primary key, varchar
|
|
|
|
|
|
|
|
id = 'ccccc'
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
read_range_first: start_key 0 end_key NULL
|
|
|
|
|
|
|
|
id > 'ccccc'
|
|
|
|
records_in_range: start_key 3 end_key NULL
|
|
|
|
read_range_first: start_key 3 end_key NULL
|
|
|
|
|
|
|
|
id < 'ccccc'
|
|
|
|
records_in_range: start_key NULL end_key 4
|
|
|
|
read_range_first: start_key NULL end_key 4
|
|
|
|
|
|
|
|
id <= 'ccccc'
|
|
|
|
records_in_range: start_key NULL end_key 3
|
|
|
|
read_range_first: start_key NULL end_key 3
|
|
|
|
|
|
|
|
id >= 'ccccc'
|
|
|
|
records_in_range: start_key 0 end_key NULL
|
|
|
|
read_range_first: start_key 1 end_key NULL
|
|
|
|
|
|
|
|
id like 'cc%cc'
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
read_range_first: start_key 1 end_key 3
|
|
|
|
|
|
|
|
id > 'aaaaa' and id < 'ccccc'
|
|
|
|
records_in_range: start_key 3 end_key 4
|
|
|
|
read_range_first: start_key 3 end_key 4
|
|
|
|
|
|
|
|
id >= 'aaaaa' and id < 'ccccc';
|
|
|
|
records_in_range: start_key 0 end_key 4
|
|
|
|
read_range_first: start_key 1 end_key 4
|
|
|
|
|
|
|
|
id >= 'aaaaa' and id <= 'ccccc';
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
read_range_first: start_key 1 end_key 3
|
|
|
|
|
|
|
|
id > 'aaaaa' and id <= 'ccccc';
|
|
|
|
records_in_range: start_key 3 end_key 3
|
|
|
|
read_range_first: start_key 3 end_key 3
|
|
|
|
|
|
|
|
numeric keys:
|
|
|
|
|
|
|
|
id = 4
|
|
|
|
index_read_idx: start_key 0 end_key NULL
|
|
|
|
|
|
|
|
id > 4
|
|
|
|
records_in_range: start_key 3 end_key NULL
|
|
|
|
read_range_first: start_key 3 end_key NULL
|
|
|
|
|
|
|
|
id >= 4
|
|
|
|
records_in_range: start_key 0 end_key NULL
|
|
|
|
read_range_first: start_key 1 end_key NULL
|
|
|
|
|
|
|
|
id < 4
|
|
|
|
records_in_range: start_key NULL end_key 4
|
|
|
|
read_range_first: start_key NULL end_key 4
|
|
|
|
|
|
|
|
id <= 4
|
|
|
|
records_in_range: start_key NULL end_key 3
|
|
|
|
read_range_first: start_key NULL end_key 3
|
|
|
|
|
|
|
|
id like 4
|
|
|
|
full table scan, select * from
|
|
|
|
|
|
|
|
id > 2 and id < 8
|
|
|
|
records_in_range: start_key 3 end_key 4
|
|
|
|
read_range_first: start_key 3 end_key 4
|
|
|
|
|
|
|
|
id >= 2 and id < 8
|
|
|
|
records_in_range: start_key 0 end_key 4
|
|
|
|
read_range_first: start_key 1 end_key 4
|
|
|
|
|
|
|
|
id >= 2 and id <= 8
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
read_range_first: start_key 1 end_key 3
|
|
|
|
|
|
|
|
id > 2 and id <= 8
|
|
|
|
records_in_range: start_key 3 end_key 3
|
|
|
|
read_range_first: start_key 3 end_key 3
|
|
|
|
|
|
|
|
multi keys (id int, name varchar, other varchar)
|
|
|
|
|
|
|
|
id = 1;
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
read_range_first: start_key 0 end_key NULL
|
|
|
|
|
|
|
|
id > 4;
|
|
|
|
id > 2 and name = '333'; remote: id > 2
|
|
|
|
id > 2 and name > '333'; remote: id > 2
|
|
|
|
id > 2 and name > '333' and other < 'ddd'; remote: id > 2 no results
|
|
|
|
id > 2 and name >= '333' and other < 'ddd'; remote: id > 2 1 result
|
|
|
|
id >= 4 and name = 'eric was here' and other > 'eeee';
|
|
|
|
records_in_range: start_key 3 end_key NULL
|
|
|
|
read_range_first: start_key 3 end_key NULL
|
|
|
|
|
|
|
|
id >= 4;
|
|
|
|
id >= 2 and name = '333' and other < 'ddd';
|
|
|
|
remote: `id` >= 2 AND `name` >= '333';
|
|
|
|
records_in_range: start_key 0 end_key NULL
|
|
|
|
read_range_first: start_key 1 end_key NULL
|
|
|
|
|
|
|
|
id < 4;
|
|
|
|
id < 3 and name = '222' and other <= 'ccc'; remote: id < 3
|
|
|
|
records_in_range: start_key NULL end_key 4
|
|
|
|
read_range_first: start_key NULL end_key 4
|
|
|
|
|
|
|
|
id <= 4;
|
|
|
|
records_in_range: start_key NULL end_key 3
|
|
|
|
read_range_first: start_key NULL end_key 3
|
|
|
|
|
|
|
|
id like 4;
|
|
|
|
full table scan
|
|
|
|
|
|
|
|
id > 2 and id < 4;
|
|
|
|
records_in_range: start_key 3 end_key 4
|
|
|
|
read_range_first: start_key 3 end_key 4
|
|
|
|
|
|
|
|
id >= 2 and id < 4;
|
|
|
|
records_in_range: start_key 0 end_key 4
|
|
|
|
read_range_first: start_key 1 end_key 4
|
|
|
|
|
|
|
|
id >= 2 and id <= 4;
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
read_range_first: start_key 1 end_key 3
|
|
|
|
|
|
|
|
id > 2 and id <= 4;
|
|
|
|
id = 6 and name = 'eric was here' and other > 'eeee';
|
|
|
|
remote: (`id` > 6 AND `name` > 'eric was here' AND `other` > 'eeee')
|
|
|
|
AND (`id` <= 6) AND ( AND `name` <= 'eric was here')
|
|
|
|
no results
|
|
|
|
records_in_range: start_key 3 end_key 3
|
|
|
|
read_range_first: start_key 3 end_key 3
|
|
|
|
|
|
|
|
Summary:
|
|
|
|
|
|
|
|
* If the start key flag is 0 the max key flag shouldn't even be set,
|
|
|
|
and if it is, the query produced would be invalid.
|
|
|
|
* Multipart keys, even if containing some or all numeric columns,
|
|
|
|
are treated the same as non-numeric keys
|
|
|
|
|
|
|
|
If the query is " = " (quotes or not):
|
|
|
|
- records in range start key flag HA_READ_KEY_EXACT,
|
|
|
|
end key flag HA_READ_AFTER_KEY (incorrect)
|
|
|
|
- any other: start key flag HA_READ_KEY_OR_NEXT,
|
|
|
|
end key flag HA_READ_AFTER_KEY (correct)
|
|
|
|
|
|
|
|
* 'like' queries (of key)
|
|
|
|
- Numeric, full table scan
|
|
|
|
- Non-numeric
|
|
|
|
records_in_range: start_key 0 end_key 3
|
|
|
|
other : start_key 1 end_key 3
|
|
|
|
|
|
|
|
* If the key flag is HA_READ_AFTER_KEY:
|
|
|
|
if start_key, append >
|
|
|
|
if end_key, append <=
|
|
|
|
|
|
|
|
* If create_where_key was called by records_in_range:
|
|
|
|
|
|
|
|
- if the key is numeric:
|
|
|
|
start key flag is 0 when end key is NULL, end key flag is 3 or 4
|
|
|
|
- if create_where_key was called by any other function:
|
|
|
|
start key flag is 1 when end key is NULL, end key flag is 3 or 4
|
|
|
|
- if the key is non-numeric, or multipart
|
|
|
|
When the query is an exact match, the start key flag is 0,
|
|
|
|
end key flag is 3 for what should be a no-range condition where
|
|
|
|
you should have 0 and max key NULL, which it is if called by
|
|
|
|
read_range_first
|
|
|
|
|
|
|
|
Conclusion:
|
|
|
|
|
|
|
|
1. Need logic to determin if a key is min or max when the flag is
|
|
|
|
HA_READ_AFTER_KEY, and handle appending correct operator accordingly
|
|
|
|
|
|
|
|
2. Need a boolean flag to pass to create_where_from_key, used in the
|
|
|
|
switch statement. Add 1 to the flag if:
|
|
|
|
- start key flag is HA_READ_KEY_EXACT and the end key is NULL
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool ha_federated::create_where_from_key(String *to,
|
|
|
|
KEY *key_info,
|
|
|
|
const key_range *start_key,
|
|
|
|
const key_range *end_key,
|
|
|
|
bool records_in_range)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
bool both_not_null=
|
|
|
|
(start_key != NULL && end_key != NULL) ? TRUE : FALSE;
|
2005-07-16 02:33:47 +02:00
|
|
|
const byte *ptr;
|
|
|
|
uint remainder, length;
|
|
|
|
char tmpbuff[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
String tmp(tmpbuff, sizeof(tmpbuff), system_charset_info);
|
|
|
|
const key_range *ranges[2]= { start_key, end_key };
|
2005-01-14 03:21:54 +01:00
|
|
|
DBUG_ENTER("ha_federated::create_where_from_key");
|
2005-10-07 23:57:40 +02:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
tmp.length(0);
|
|
|
|
if (start_key == NULL && end_key == NULL)
|
|
|
|
DBUG_RETURN(1);
|
2005-01-14 03:21:54 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
for (int i= 0; i <= 1; i++)
|
|
|
|
{
|
|
|
|
bool needs_quotes;
|
|
|
|
KEY_PART_INFO *key_part;
|
|
|
|
if (ranges[i] == NULL)
|
|
|
|
continue;
|
2005-01-14 03:21:54 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (both_not_null)
|
2005-01-14 03:21:54 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
if (i > 0)
|
2005-07-17 04:10:19 +02:00
|
|
|
tmp.append(FEDERATED_CONJUNCTION);
|
2005-07-16 02:33:47 +02:00
|
|
|
else
|
2005-07-17 04:10:19 +02:00
|
|
|
tmp.append(FEDERATED_OPENPAREN);
|
2005-01-14 03:21:54 +01:00
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
for (key_part= key_info->key_part,
|
|
|
|
remainder= key_info->key_parts,
|
|
|
|
length= ranges[i]->length,
|
|
|
|
ptr= ranges[i]->key; ;
|
|
|
|
remainder--,
|
|
|
|
key_part++)
|
2005-01-14 03:21:54 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
Field *field= key_part->field;
|
|
|
|
uint store_length= key_part->store_length;
|
|
|
|
uint part_length= min(store_length, length);
|
|
|
|
needs_quotes= field->needs_quotes();
|
|
|
|
DBUG_DUMP("key, start of loop", (char *) ptr, length);
|
2005-02-02 21:39:21 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (key_part->null_bit)
|
|
|
|
{
|
|
|
|
if (*ptr++)
|
|
|
|
{
|
|
|
|
if (emit_key_part_name(&tmp, key_part) ||
|
2005-07-17 04:10:19 +02:00
|
|
|
tmp.append(FEDERATED_ISNULL))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2005-01-21 03:36:40 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (tmp.append(FEDERATED_OPENPAREN))
|
2005-01-14 03:21:54 +01:00
|
|
|
DBUG_RETURN(1);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
switch(ranges[i]->flag) {
|
|
|
|
case(HA_READ_KEY_EXACT):
|
|
|
|
if (store_length >= length ||
|
|
|
|
!needs_quotes ||
|
|
|
|
key_part->type == HA_KEYTYPE_BIT ||
|
|
|
|
field->result_type() != STRING_RESULT)
|
|
|
|
{
|
|
|
|
if (emit_key_part_name(&tmp, key_part))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
if (records_in_range)
|
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
if (tmp.append(FEDERATED_GE))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
if (tmp.append(FEDERATED_EQ))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
|
|
|
|
part_length))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* LIKE */
|
|
|
|
{
|
|
|
|
if (emit_key_part_name(&tmp, key_part) ||
|
2005-07-17 04:10:19 +02:00
|
|
|
tmp.append(FEDERATED_LIKE) ||
|
|
|
|
emit_key_part_element(&tmp, key_part, needs_quotes, 1, ptr,
|
|
|
|
part_length))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case(HA_READ_AFTER_KEY):
|
|
|
|
if (store_length >= length) /* end key */
|
|
|
|
{
|
|
|
|
if (emit_key_part_name(&tmp, key_part))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
if (i > 0) /* end key */
|
2005-07-17 04:10:19 +02:00
|
|
|
{
|
|
|
|
if (tmp.append(FEDERATED_LE))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
else /* start key */
|
2005-07-17 04:10:19 +02:00
|
|
|
{
|
|
|
|
if (tmp.append(FEDERATED_GT))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
if (emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
|
2005-07-17 04:10:19 +02:00
|
|
|
part_length))
|
|
|
|
{
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case(HA_READ_KEY_OR_NEXT):
|
2005-07-17 04:10:19 +02:00
|
|
|
if (emit_key_part_name(&tmp, key_part) ||
|
|
|
|
tmp.append(FEDERATED_GE) ||
|
2005-07-16 02:33:47 +02:00
|
|
|
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
|
2005-07-17 04:10:19 +02:00
|
|
|
part_length))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
break;
|
|
|
|
case(HA_READ_BEFORE_KEY):
|
|
|
|
if (store_length >= length)
|
|
|
|
{
|
|
|
|
if (emit_key_part_name(&tmp, key_part) ||
|
2005-07-17 04:10:19 +02:00
|
|
|
tmp.append(FEDERATED_LT) ||
|
|
|
|
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
|
|
|
|
part_length))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case(HA_READ_KEY_OR_PREV):
|
2005-07-17 04:10:19 +02:00
|
|
|
if (emit_key_part_name(&tmp, key_part) ||
|
|
|
|
tmp.append(FEDERATED_LE) ||
|
2005-07-16 02:33:47 +02:00
|
|
|
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
|
|
|
|
part_length))
|
2005-01-14 03:21:54 +01:00
|
|
|
DBUG_RETURN(1);
|
2005-07-16 02:33:47 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBUG_PRINT("info",("cannot handle flag %d", ranges[i]->flag));
|
|
|
|
DBUG_RETURN(1);
|
2005-01-14 03:21:54 +01:00
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
if (tmp.append(FEDERATED_CLOSEPAREN))
|
2005-01-14 03:21:54 +01:00
|
|
|
DBUG_RETURN(1);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
next_loop:
|
|
|
|
if (store_length >= length)
|
|
|
|
break;
|
|
|
|
DBUG_PRINT("info", ("remainder %d", remainder));
|
|
|
|
DBUG_ASSERT(remainder > 1);
|
|
|
|
length-= store_length;
|
|
|
|
ptr+= store_length;
|
2005-07-17 04:10:19 +02:00
|
|
|
if (tmp.append(FEDERATED_AND))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("create_where_from_key WHERE clause: %s",
|
|
|
|
tmp.c_ptr_quick()));
|
2005-01-14 03:21:54 +01:00
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
if (both_not_null)
|
2005-07-17 04:10:19 +02:00
|
|
|
if (tmp.append(FEDERATED_CLOSEPAREN))
|
|
|
|
DBUG_RETURN(1);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (to->append(FEDERATED_WHERE))
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
if (to->append(tmp))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Example of simple lock controls. The "share" it creates is structure we will
|
|
|
|
pass to each federated handler. Do you have to have one of these? Well, you
|
|
|
|
have pieces that are used for locking, and they are needed to function.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
char *select_query, *tmp_table_name;
|
|
|
|
char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
uint tmp_table_name_length;
|
|
|
|
Field **field;
|
2004-12-11 21:03:51 +01:00
|
|
|
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
|
2005-07-16 02:33:47 +02:00
|
|
|
FEDERATED_SHARE *share;
|
|
|
|
/*
|
|
|
|
In order to use this string, we must first zero it's length,
|
|
|
|
or it will contain garbage
|
|
|
|
*/
|
2004-12-11 21:03:51 +01:00
|
|
|
query.length(0);
|
|
|
|
|
|
|
|
pthread_mutex_lock(&federated_mutex);
|
2005-07-16 02:33:47 +02:00
|
|
|
tmp_table_name= (char *)table->s->table_name;
|
|
|
|
tmp_table_name_length= (uint) strlen(tmp_table_name);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (!(share= (FEDERATED_SHARE *) hash_search(&federated_open_tables,
|
2005-02-17 08:07:10 +01:00
|
|
|
(byte*) table_name,
|
2005-07-16 02:33:47 +02:00
|
|
|
strlen(table_name))))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
|
|
|
query.set_charset(system_charset_info);
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_SELECT);
|
2005-07-16 02:33:47 +02:00
|
|
|
for (field= table->field; *field; field++)
|
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
query.append((*field)->field_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_BTICK);
|
|
|
|
query.append(FEDERATED_COMMA);
|
2005-07-16 02:33:47 +02:00
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
query.length(query.length()- strlen(FEDERATED_COMMA));
|
|
|
|
query.append(FEDERATED_FROM);
|
|
|
|
query.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
if (!(share= (FEDERATED_SHARE *)
|
2005-07-16 02:33:47 +02:00
|
|
|
my_multi_malloc(MYF(MY_WME),
|
2004-12-11 21:03:51 +01:00
|
|
|
&share, sizeof(*share),
|
2005-07-16 02:33:47 +02:00
|
|
|
&tmp_table_name, tmp_table_name_length+ 1,
|
|
|
|
&select_query,
|
2005-09-13 03:02:17 +02:00
|
|
|
query.length()+table->s->connect_string.length+1,
|
2005-07-16 02:33:47 +02:00
|
|
|
NullS)))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
|
|
|
pthread_mutex_unlock(&federated_mutex);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (parse_url(share, table, 0))
|
|
|
|
goto error;
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
query.append(share->table_name, share->table_name_length);
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_BTICK);
|
2004-12-11 21:03:51 +01:00
|
|
|
share->select_query= select_query;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
strmov(share->select_query, query.ptr());
|
2005-07-16 02:33:47 +02:00
|
|
|
share->use_count= 0;
|
|
|
|
share->table_name_length= strlen(share->table_name);
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
("share->select_query %s", share->select_query));
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
if (my_hash_insert(&federated_open_tables, (byte*) share))
|
|
|
|
goto error;
|
|
|
|
thr_lock_init(&share->lock);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
share->use_count++;
|
|
|
|
pthread_mutex_unlock(&federated_mutex);
|
|
|
|
|
|
|
|
return share;
|
|
|
|
|
|
|
|
error:
|
|
|
|
pthread_mutex_unlock(&federated_mutex);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (share->scheme)
|
2005-07-16 02:33:47 +02:00
|
|
|
{
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
my_free((gptr) share->scheme, MYF(0));
|
2005-07-16 02:33:47 +02:00
|
|
|
share->scheme= 0;
|
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2005-02-23 09:38:29 +01:00
|
|
|
Free lock controls. We call this whenever we close a table.
|
2004-12-11 21:03:51 +01:00
|
|
|
If the table had the last reference to the share then we
|
|
|
|
free memory associated with it.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
static int free_share(FEDERATED_SHARE *share)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_ENTER("free_share");
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2005-10-07 23:57:40 +02:00
|
|
|
pthread_mutex_lock(&federated_mutex);
|
2004-12-11 21:03:51 +01:00
|
|
|
if (!--share->use_count)
|
|
|
|
{
|
|
|
|
hash_delete(&federated_open_tables, (byte*) share);
|
2005-09-22 18:57:07 +02:00
|
|
|
my_free((gptr) share->scheme, MYF(MY_ALLOW_ZERO_PTR));
|
2005-09-22 02:23:07 +02:00
|
|
|
share->scheme= 0;
|
2004-12-11 21:03:51 +01:00
|
|
|
thr_lock_delete(&share->lock);
|
2005-02-17 08:07:10 +01:00
|
|
|
VOID(pthread_mutex_destroy(&share->mutex));
|
2004-12-11 21:03:51 +01:00
|
|
|
my_free((gptr) share, MYF(0));
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&federated_mutex);
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
ha_rows ha_federated::records_in_range(uint inx, key_range *start_key,
|
|
|
|
key_range *end_key)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
We really want indexes to be used as often as possible, therefore
|
|
|
|
we just need to hard-code the return value to a very low number to
|
|
|
|
force the issue
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
*/
|
|
|
|
DBUG_ENTER("ha_federated::records_in_range");
|
|
|
|
DBUG_RETURN(FEDERATED_RECORDS_IN_RANGE);
|
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
/*
|
|
|
|
If frm_error() is called then we will use this to to find out
|
2005-02-23 09:38:29 +01:00
|
|
|
what file extentions exist for the storage engine. This is
|
|
|
|
also used by the default rename_table and delete_table method
|
2004-12-11 21:03:51 +01:00
|
|
|
in handler.cc.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
const char **ha_federated::bas_ext() const
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
static const char *ext[]=
|
|
|
|
{
|
|
|
|
NullS
|
|
|
|
};
|
|
|
|
return ext;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Used for opening tables. The name will be the name of the file.
|
|
|
|
A table is opened when it needs to be opened. For instance
|
|
|
|
when a request comes in for a select on the table (tables are not
|
|
|
|
open and closed for each request, they are cached).
|
|
|
|
|
|
|
|
Called from handler.cc by handler::ha_open(). The server opens
|
|
|
|
all tables by calling ha_open() which then calls the handler
|
|
|
|
specific open().
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::open(const char *name, int mode, uint test_if_locked)
|
|
|
|
{
|
2005-02-23 09:38:29 +01:00
|
|
|
DBUG_ENTER("ha_federated::open");
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
if (!(share= get_share(name, table)))
|
|
|
|
DBUG_RETURN(1);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
thr_lock_data_init(&share->lock, &lock, NULL);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/* Connect to foreign database mysql_real_connect() */
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
mysql= mysql_init(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
if (!mysql_real_connect(mysql,
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
share->hostname,
|
|
|
|
share->username,
|
|
|
|
share->password,
|
2005-02-17 08:07:10 +01:00
|
|
|
share->database,
|
|
|
|
share->port,
|
|
|
|
share->socket, 0))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-06-22 19:29:34 +02:00
|
|
|
/*
|
|
|
|
Since we do not support transactions at this version, we can let the client
|
|
|
|
API silently reconnect. For future versions, we will need more logic to deal
|
|
|
|
with transactions
|
|
|
|
*/
|
|
|
|
mysql->reconnect= 1;
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Closes a table. We call the free_share() function to free any resources
|
|
|
|
that we have allocated in the "shared" structure.
|
|
|
|
|
|
|
|
Called from sql_base.cc, sql_select.cc, and table.cc.
|
|
|
|
In sql_select.cc it is only used to close up temporary tables or during
|
|
|
|
the process where a temporary table is converted over to being a
|
|
|
|
myisam table.
|
|
|
|
For sql_base.cc look at close_data_tables().
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::close(void)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::close");
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
/* free the result set */
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
{
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
2005-07-17 04:10:19 +02:00
|
|
|
("mysql_free_result result at address %lx", stored_result));
|
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
/* Disconnect from mysql */
|
|
|
|
mysql_close(mysql);
|
2005-07-16 02:33:47 +02:00
|
|
|
retval= free_share(share);
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
Checks if a field in a record is SQL NULL.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
field_in_record_is_null()
|
|
|
|
table TABLE pointer, MySQL table object
|
|
|
|
field Field pointer, MySQL field object
|
|
|
|
record char pointer, contains record
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
This method uses the record format information in table to track
|
2005-02-23 09:38:29 +01:00
|
|
|
the null bit in record.
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
1 if NULL
|
2005-02-23 09:38:29 +01:00
|
|
|
0 otherwise
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
inline uint field_in_record_is_null(TABLE *table,
|
|
|
|
Field *field,
|
|
|
|
char *record)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
|
|
|
int null_offset;
|
|
|
|
DBUG_ENTER("ha_federated::field_in_record_is_null");
|
|
|
|
|
|
|
|
if (!field->null_ptr)
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
2005-02-17 08:07:10 +01:00
|
|
|
null_offset= (uint) ((char*)field->null_ptr - (char*)table->record[0]);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
if (record[null_offset] & field->null_bit)
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
write_row() inserts a row. No extra() hint is given currently if a bulk load
|
|
|
|
is happeneding. buf() is a byte array of data. You can use the field
|
|
|
|
information to extract the data from the native byte array type.
|
|
|
|
Example of this would be:
|
|
|
|
for (Field **field=table->field ; *field ; field++)
|
|
|
|
{
|
|
|
|
...
|
|
|
|
}
|
|
|
|
|
|
|
|
Called from item_sum.cc, item_sum.cc, sql_acl.cc, sql_insert.cc,
|
|
|
|
sql_insert.cc, sql_select.cc, sql_table.cc, sql_udf.cc, and sql_update.cc.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::write_row(byte *buf)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
bool has_fields= FALSE;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
uint all_fields_have_same_query_id= 1;
|
2005-07-16 02:33:47 +02:00
|
|
|
ulong current_query_id= 1;
|
|
|
|
ulong tmp_query_id= 1;
|
|
|
|
char insert_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char values_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char insert_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
Field **field;
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
/* The main insert query string */
|
2004-12-11 21:03:51 +01:00
|
|
|
String insert_string(insert_buffer, sizeof(insert_buffer), &my_charset_bin);
|
2005-02-18 01:17:21 +01:00
|
|
|
/* The string containing the values to be added to the insert */
|
2004-12-11 21:03:51 +01:00
|
|
|
String values_string(values_buffer, sizeof(values_buffer), &my_charset_bin);
|
2005-02-18 01:17:21 +01:00
|
|
|
/* The actual value of the field, to be added to the values_string */
|
2004-12-11 21:03:51 +01:00
|
|
|
String insert_field_value_string(insert_field_value_buffer,
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
sizeof(insert_field_value_buffer),
|
|
|
|
&my_charset_bin);
|
2005-07-16 02:33:47 +02:00
|
|
|
values_string.length(0);
|
|
|
|
insert_string.length(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
insert_field_value_string.length(0);
|
|
|
|
DBUG_ENTER("ha_federated::write_row");
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_PRINT("info",
|
|
|
|
("table charset name %s csname %s",
|
|
|
|
table->s->table_charset->name,
|
|
|
|
table->s->table_charset->csname));
|
2005-02-18 01:17:21 +01:00
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_write_count, &LOCK_status);
|
2004-12-11 21:03:51 +01:00
|
|
|
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
|
|
|
|
table->timestamp_field->set_time();
|
|
|
|
|
|
|
|
/*
|
2005-02-23 09:38:29 +01:00
|
|
|
get the current query id - the fields that we add to the insert
|
|
|
|
statement to send to the foreign will not be appended unless they match
|
|
|
|
this query id
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
|
|
|
current_query_id= table->in_use->query_id;
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info", ("current query id %d", current_query_id));
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
/*
|
|
|
|
start both our field and field values strings
|
|
|
|
*/
|
|
|
|
insert_string.append(FEDERATED_INSERT);
|
|
|
|
insert_string.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
insert_string.append(share->table_name, share->table_name_length);
|
2005-07-17 04:10:19 +02:00
|
|
|
insert_string.append(FEDERATED_BTICK);
|
|
|
|
insert_string.append(FEDERATED_OPENPAREN);
|
|
|
|
|
|
|
|
values_string.append(FEDERATED_VALUES);
|
|
|
|
values_string.append(FEDERATED_OPENPAREN);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/*
|
|
|
|
Even if one field is different, all_fields_same_query_id can't remain
|
|
|
|
0 if it remains 0, then that means no fields were specified in the query
|
|
|
|
such as in the case of INSERT INTO table VALUES (val1, val2, valN)
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-07-16 02:33:47 +02:00
|
|
|
for (field= table->field; *field; field++)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
if (field > table->field && tmp_query_id != (*field)->query_id)
|
2004-12-11 21:03:51 +01:00
|
|
|
all_fields_have_same_query_id= 0;
|
|
|
|
|
|
|
|
tmp_query_id= (*field)->query_id;
|
|
|
|
}
|
|
|
|
/*
|
2005-02-23 09:38:29 +01:00
|
|
|
loop through the field pointer array, add any fields to both the values
|
|
|
|
list and the fields list that match the current query id
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
You might ask "Why an index variable (has_fields) ?" My answer is that
|
2005-07-16 02:33:47 +02:00
|
|
|
we need to count how many fields we actually need
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-07-16 02:33:47 +02:00
|
|
|
for (field= table->field; *field; field++)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-03-15 09:32:21 +01:00
|
|
|
/* if there is a query id and if it's equal to the current query id */
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (((*field)->query_id && (*field)->query_id == current_query_id)
|
|
|
|
|| all_fields_have_same_query_id)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
There are some fields. This will be used later to determine
|
|
|
|
whether to chop off commas and parens.
|
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
has_fields= TRUE;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
if ((*field)->is_null())
|
2005-07-17 04:10:19 +02:00
|
|
|
insert_field_value_string.append(FEDERATED_NULL);
|
2004-12-11 21:03:51 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
(*field)->val_str(&insert_field_value_string);
|
2005-02-18 01:17:21 +01:00
|
|
|
/* quote these fields if they require it */
|
2005-07-16 02:33:47 +02:00
|
|
|
(*field)->quote_data(&insert_field_value_string);
|
|
|
|
}
|
2005-02-18 01:17:21 +01:00
|
|
|
/* append the field name */
|
2004-12-11 21:03:51 +01:00
|
|
|
insert_string.append((*field)->field_name);
|
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
/* append the value */
|
2004-12-11 21:03:51 +01:00
|
|
|
values_string.append(insert_field_value_string);
|
|
|
|
insert_field_value_string.length(0);
|
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
/* append commas between both fields and fieldnames */
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
unfortunately, we can't use the logic
|
|
|
|
if *(fields + 1) to make the following
|
|
|
|
appends conditional because we may not append
|
|
|
|
if the next field doesn't match the condition:
|
|
|
|
(((*field)->query_id && (*field)->query_id == current_query_id)
|
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
insert_string.append(FEDERATED_COMMA);
|
|
|
|
values_string.append(FEDERATED_COMMA);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-07-17 04:10:19 +02:00
|
|
|
remove trailing comma
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
insert_string.length(insert_string.length() - strlen(FEDERATED_COMMA));
|
2004-12-11 21:03:51 +01:00
|
|
|
/*
|
2005-02-23 09:38:29 +01:00
|
|
|
if there were no fields, we don't want to add a closing paren
|
|
|
|
AND, we don't want to chop off the last char '('
|
|
|
|
insert will be "INSERT INTO t1 VALUES ();"
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
if (has_fields)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-02-18 01:17:21 +01:00
|
|
|
/* chops off leading commas */
|
2005-07-17 04:10:19 +02:00
|
|
|
values_string.length(values_string.length() - strlen(FEDERATED_COMMA));
|
|
|
|
insert_string.append(FEDERATED_CLOSEPAREN);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-02-18 01:17:21 +01:00
|
|
|
/* we always want to append this, even if there aren't any fields */
|
2005-07-17 04:10:19 +02:00
|
|
|
values_string.append(FEDERATED_CLOSEPAREN);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
/* add the values */
|
2004-12-11 21:03:51 +01:00
|
|
|
insert_string.append(values_string);
|
|
|
|
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info", ("insert query %s", insert_string.c_ptr_quick()));
|
2004-12-11 21:03:51 +01:00
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (mysql_real_query(mysql, insert_string.ptr(), insert_string.length()))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2005-03-16 03:41:06 +01:00
|
|
|
|
2005-07-19 03:04:51 +02:00
|
|
|
int ha_federated::optimize(THD* thd, HA_CHECK_OPT* check_opt)
|
|
|
|
{
|
|
|
|
char query_buffer[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
|
|
|
|
DBUG_ENTER("ha_federated::optimize");
|
|
|
|
|
|
|
|
query.length(0);
|
|
|
|
|
|
|
|
query.set_charset(system_charset_info);
|
|
|
|
query.append(FEDERATED_OPTIMIZE);
|
|
|
|
query.append(FEDERATED_BTICK);
|
|
|
|
query.append(share->table_name, share->table_name_length);
|
|
|
|
query.append(FEDERATED_BTICK);
|
|
|
|
|
|
|
|
if (mysql_real_query(mysql, query.ptr(), query.length()))
|
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2005-07-19 03:04:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int ha_federated::repair(THD* thd, HA_CHECK_OPT* check_opt)
|
|
|
|
{
|
|
|
|
char query_buffer[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
|
|
|
|
DBUG_ENTER("ha_federated::repair");
|
|
|
|
|
|
|
|
query.length(0);
|
|
|
|
|
|
|
|
query.set_charset(system_charset_info);
|
|
|
|
query.append(FEDERATED_REPAIR);
|
|
|
|
query.append(FEDERATED_BTICK);
|
|
|
|
query.append(share->table_name, share->table_name_length);
|
|
|
|
query.append(FEDERATED_BTICK);
|
|
|
|
if (check_opt->flags & T_QUICK)
|
|
|
|
query.append(FEDERATED_QUICK);
|
|
|
|
if (check_opt->flags & T_EXTEND)
|
|
|
|
query.append(FEDERATED_EXTENDED);
|
|
|
|
if (check_opt->sql_flags & TT_USEFRM)
|
|
|
|
query.append(FEDERATED_USE_FRM);
|
|
|
|
|
|
|
|
if (mysql_real_query(mysql, query.ptr(), query.length()))
|
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2005-07-19 03:04:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
/*
|
|
|
|
Yes, update_row() does what you expect, it updates a row. old_data will have
|
|
|
|
the previous row record in it, while new_data will have the newest data in
|
|
|
|
it.
|
|
|
|
|
|
|
|
Keep in mind that the server can do updates based on ordering if an ORDER BY
|
|
|
|
clause was used. Consecutive ordering is not guarenteed.
|
|
|
|
Currently new_data will not have an updated auto_increament record, or
|
|
|
|
and updated timestamp field. You can do these for federated by doing these:
|
|
|
|
if (table->timestamp_on_update_now)
|
|
|
|
update_timestamp(new_row+table->timestamp_on_update_now-1);
|
|
|
|
if (table->next_number_field && record == table->record[0])
|
|
|
|
update_auto_increment();
|
|
|
|
|
|
|
|
Called from sql_select.cc, sql_acl.cc, sql_update.cc, and sql_insert.cc.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::update_row(const byte *old_data, byte *new_data)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
2005-10-07 23:57:40 +02:00
|
|
|
This used to control how the query was built. If there was a
|
|
|
|
primary key, the query would be built such that there was a where
|
|
|
|
clause with only that column as the condition. This is flawed,
|
|
|
|
because if we have a multi-part primary key, it would only use the
|
|
|
|
first part! We don't need to do this anyway, because
|
|
|
|
read_range_first will retrieve the correct record, which is what
|
|
|
|
is used to build the WHERE clause. We can however use this to
|
|
|
|
append a LIMIT to the end if there is NOT a primary key. Why do
|
|
|
|
this? Because we only are updating one record, and LIMIT enforces
|
|
|
|
this.
|
2005-07-16 02:33:47 +02:00
|
|
|
*/
|
|
|
|
bool has_a_primary_key= (table->s->primary_key == 0 ? TRUE : FALSE);
|
|
|
|
/*
|
|
|
|
buffers for following strings
|
|
|
|
*/
|
|
|
|
char old_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
char new_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
char update_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char where_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/* stores the value to be replaced of the field were are updating */
|
2005-07-16 02:33:47 +02:00
|
|
|
String old_field_value(old_field_value_buffer,
|
|
|
|
sizeof(old_field_value_buffer),
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
&my_charset_bin);
|
2005-02-18 01:17:21 +01:00
|
|
|
/* stores the new value of the field */
|
2005-07-16 02:33:47 +02:00
|
|
|
String new_field_value(new_field_value_buffer,
|
|
|
|
sizeof(new_field_value_buffer),
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
&my_charset_bin);
|
2005-02-18 01:17:21 +01:00
|
|
|
/* stores the update query */
|
2005-07-16 02:33:47 +02:00
|
|
|
String update_string(update_buffer,
|
|
|
|
sizeof(update_buffer),
|
|
|
|
&my_charset_bin);
|
2005-02-23 09:38:29 +01:00
|
|
|
/* stores the WHERE clause */
|
2005-07-16 02:33:47 +02:00
|
|
|
String where_string(where_buffer,
|
|
|
|
sizeof(where_buffer),
|
|
|
|
&my_charset_bin);
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::update_row");
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
set string lengths to 0 to avoid misc chars in string
|
|
|
|
*/
|
2005-03-15 09:32:21 +01:00
|
|
|
old_field_value.length(0);
|
|
|
|
new_field_value.length(0);
|
|
|
|
update_string.length(0);
|
|
|
|
where_string.length(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
update_string.append(FEDERATED_UPDATE);
|
|
|
|
update_string.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
update_string.append(share->table_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
update_string.append(FEDERATED_BTICK);
|
|
|
|
update_string.append(FEDERATED_SET);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
/*
|
2005-02-23 09:38:29 +01:00
|
|
|
In this loop, we want to match column names to values being inserted
|
|
|
|
(while building INSERT statement).
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
Iterate through table->field (new data) and share->old_filed (old_data)
|
|
|
|
using the same index to created an SQL UPDATE statement, new data is
|
|
|
|
used to create SET field=value and old data is used to create WHERE
|
|
|
|
field=oldvalue
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
for (Field **field= table->field; *field; field++)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
where_string.append((*field)->field_name);
|
2004-12-11 21:03:51 +01:00
|
|
|
update_string.append((*field)->field_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
update_string.append(FEDERATED_EQ);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
if ((*field)->is_null())
|
2005-07-17 04:10:19 +02:00
|
|
|
new_field_value.append(FEDERATED_NULL);
|
2004-12-11 21:03:51 +01:00
|
|
|
else
|
|
|
|
{
|
2005-02-23 09:38:29 +01:00
|
|
|
/* otherwise = */
|
2004-12-11 21:03:51 +01:00
|
|
|
(*field)->val_str(&new_field_value);
|
2005-01-21 03:36:40 +01:00
|
|
|
(*field)->quote_data(&new_field_value);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (!field_in_record_is_null(table, *field, (char*) old_data))
|
2005-07-17 04:10:19 +02:00
|
|
|
where_string.append(FEDERATED_EQ);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (field_in_record_is_null(table, *field, (char*) old_data))
|
2005-07-17 04:10:19 +02:00
|
|
|
where_string.append(FEDERATED_ISNULL);
|
2004-12-11 21:03:51 +01:00
|
|
|
else
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
(*field)->val_str(&old_field_value,
|
|
|
|
(char*) (old_data + (*field)->offset()));
|
|
|
|
(*field)->quote_data(&old_field_value);
|
|
|
|
where_string.append(old_field_value);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
update_string.append(new_field_value);
|
|
|
|
new_field_value.length(0);
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
Only append conjunctions if we have another field in which
|
|
|
|
to iterate
|
|
|
|
*/
|
|
|
|
if (*(field + 1))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
update_string.append(FEDERATED_COMMA);
|
|
|
|
where_string.append(FEDERATED_AND);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
old_field_value.length(0);
|
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
update_string.append(FEDERATED_WHERE);
|
2005-02-18 01:17:21 +01:00
|
|
|
update_string.append(where_string);
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
If this table has not a primary key, then we could possibly
|
|
|
|
update multiple rows. We want to make sure to only update one!
|
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!has_a_primary_key)
|
|
|
|
update_string.append(FEDERATED_LIMIT1);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (mysql_real_query(mysql, update_string.ptr(), update_string.length()))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-07-16 02:33:47 +02:00
|
|
|
This will delete a row. 'buf' will contain a copy of the row to be =deleted.
|
2004-12-11 21:03:51 +01:00
|
|
|
The server will call this right after the current row has been called (from
|
|
|
|
either a previous rnd_nexT() or index call).
|
|
|
|
If you keep a pointer to the last row or can access a primary key it will
|
|
|
|
make doing the deletion quite a bit easier.
|
|
|
|
Keep in mind that the server does no guarentee consecutive deletions.
|
|
|
|
ORDER BY clauses can be used.
|
|
|
|
|
|
|
|
Called in sql_acl.cc and sql_udf.cc to manage internal table information.
|
2005-02-23 09:38:29 +01:00
|
|
|
Called in sql_delete.cc, sql_insert.cc, and sql_select.cc. In sql_select
|
2004-12-11 21:03:51 +01:00
|
|
|
it is used for removing duplicates while in insert it is used for REPLACE
|
|
|
|
calls.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::delete_row(const byte *buf)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
char delete_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char data_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
String delete_string(delete_buffer, sizeof(delete_buffer), &my_charset_bin);
|
|
|
|
String data_string(data_buffer, sizeof(data_buffer), &my_charset_bin);
|
|
|
|
DBUG_ENTER("ha_federated::delete_row");
|
|
|
|
|
2005-09-13 03:02:17 +02:00
|
|
|
delete_string.length(0);
|
2005-07-17 04:10:19 +02:00
|
|
|
delete_string.append(FEDERATED_DELETE);
|
|
|
|
delete_string.append(FEDERATED_FROM);
|
|
|
|
delete_string.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
delete_string.append(share->table_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
delete_string.append(FEDERATED_BTICK);
|
|
|
|
delete_string.append(FEDERATED_WHERE);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-06-29 11:44:40 +02:00
|
|
|
for (Field **field= table->field; *field; field++)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-09-13 03:02:17 +02:00
|
|
|
Field *cur_field= *field;
|
|
|
|
data_string.length(0);
|
|
|
|
delete_string.append(cur_field->field_name);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-09-13 03:02:17 +02:00
|
|
|
if (cur_field->is_null())
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
delete_string.append(FEDERATED_IS);
|
|
|
|
data_string.append(FEDERATED_NULL);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
delete_string.append(FEDERATED_EQ);
|
2005-09-13 03:02:17 +02:00
|
|
|
cur_field->val_str(&data_string);
|
|
|
|
cur_field->quote_data(&data_string);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
delete_string.append(data_string);
|
2005-09-13 03:02:17 +02:00
|
|
|
delete_string.append(FEDERATED_AND);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-09-13 03:02:17 +02:00
|
|
|
delete_string.length(delete_string.length()-5); // Remove trailing AND
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
delete_string.append(FEDERATED_LIMIT1);
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
2004-12-11 21:03:51 +01:00
|
|
|
("Delete sql: %s", delete_string.c_ptr_quick()));
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (mysql_real_query(mysql, delete_string.ptr(), delete_string.length()))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
deleted+= mysql->affected_rows;
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("rows deleted %d rows deleted for all time %d",
|
|
|
|
int(mysql->affected_rows), deleted));
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Positions an index cursor to the index specified in the handle. Fetches the
|
|
|
|
row if available. If the key value is null, begin at the first key of the
|
|
|
|
index. This method, which is called in the case of an SQL statement having
|
|
|
|
a WHERE clause on a non-primary key index, simply calls index_read_idx.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::index_read(byte *buf, const byte *key,
|
2005-07-16 02:33:47 +02:00
|
|
|
uint key_len, enum ha_rkey_function find_flag)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::index_read");
|
2005-07-16 02:33:47 +02:00
|
|
|
retval= index_read_idx(buf, active_index, key, key_len, find_flag);
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Positions an index cursor to the index specified in key. Fetches the
|
|
|
|
row if any. This is only used to read whole keys.
|
|
|
|
|
|
|
|
This method is called via index_read in the case of a WHERE clause using
|
2005-02-23 09:38:29 +01:00
|
|
|
a regular non-primary key index, OR is called DIRECTLY when the WHERE clause
|
2004-12-11 21:03:51 +01:00
|
|
|
uses a PRIMARY KEY index.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::index_read_idx(byte *buf, uint index, const byte *key,
|
2005-07-16 02:33:47 +02:00
|
|
|
uint key_len, enum ha_rkey_function find_flag)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
|
|
|
char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char index_value[STRING_BUFFER_USUAL_SIZE];
|
|
|
|
char sql_query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
String index_string(index_value,
|
|
|
|
sizeof(index_value),
|
|
|
|
&my_charset_bin);
|
|
|
|
String sql_query(sql_query_buffer,
|
|
|
|
sizeof(sql_query_buffer),
|
|
|
|
&my_charset_bin);
|
|
|
|
key_range range;
|
2005-10-07 23:57:40 +02:00
|
|
|
DBUG_ENTER("ha_federated::index_read_idx");
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
index_string.length(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
sql_query.length(0);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_key_count,
|
|
|
|
&LOCK_status);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
sql_query.append(share->select_query);
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
range.key= key;
|
|
|
|
range.length= key_len;
|
|
|
|
range.flag= find_flag;
|
|
|
|
create_where_from_key(&index_string,
|
|
|
|
&table->key_info[index],
|
|
|
|
&range,
|
2005-07-17 04:10:19 +02:00
|
|
|
NULL, 0);
|
2004-12-11 21:03:51 +01:00
|
|
|
sql_query.append(index_string);
|
|
|
|
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
("current key %d key value %s index_string value %s length %d",
|
2005-02-18 01:17:21 +01:00
|
|
|
index, (char*) key, index_string.c_ptr_quick(),
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
index_string.length()));
|
2005-01-14 03:21:54 +01:00
|
|
|
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
("current position %d sql_query %s", current_position,
|
|
|
|
sql_query.c_ptr_quick()));
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
|
|
|
if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
my_sprintf(error_buffer, (error_buffer, ": %d : %s",
|
2005-07-17 04:10:19 +02:00
|
|
|
mysql_errno(mysql), mysql_error(mysql)));
|
|
|
|
retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
|
2005-07-16 02:33:47 +02:00
|
|
|
goto error;
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
stored_result= mysql_store_result(mysql);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!stored_result)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
retval= HA_ERR_END_OF_FILE;
|
|
|
|
goto error;
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
This basically says that the record in table->record[0] is legal,
|
|
|
|
and that it is ok to use this record, for whatever reason, such
|
|
|
|
as with a join (without it, joins will not work)
|
|
|
|
*/
|
2005-07-17 04:10:19 +02:00
|
|
|
table->status= 0;
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
retval= rnd_next(buf);
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
error:
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
table->status= STATUS_NOT_FOUND;
|
|
|
|
my_error(retval, MYF(0), error_buffer);
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/* Initialized at each key walk (called multiple times unlike rnd_init()) */
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::index_init(uint keynr)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("ha_federated::index_init");
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
2005-01-07 04:37:16 +01:00
|
|
|
("table: '%s' key: %d", table->s->table_name, keynr));
|
2004-12-11 21:03:51 +01:00
|
|
|
active_index= keynr;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
|
|
|
|
int read_range_first(const key_range *start_key,
|
|
|
|
const key_range *end_key,
|
|
|
|
bool eq_range, bool sorted);
|
|
|
|
*/
|
|
|
|
int ha_federated::read_range_first(const key_range *start_key,
|
|
|
|
const key_range *end_key,
|
|
|
|
bool eq_range, bool sorted)
|
|
|
|
{
|
|
|
|
char sql_query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
int retval;
|
|
|
|
String sql_query(sql_query_buffer,
|
|
|
|
sizeof(sql_query_buffer),
|
|
|
|
&my_charset_bin);
|
|
|
|
DBUG_ENTER("ha_federated::read_range_first");
|
2005-10-07 23:57:40 +02:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (start_key == NULL && end_key == NULL)
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
sql_query.length(0);
|
|
|
|
sql_query.append(share->select_query);
|
|
|
|
create_where_from_key(&sql_query,
|
|
|
|
&table->key_info[active_index],
|
2005-07-17 04:10:19 +02:00
|
|
|
start_key, end_key, 0);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
|
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
|
2005-07-16 02:33:47 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
sql_query.length(0);
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
2005-07-16 02:33:47 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",
|
2005-07-17 04:10:19 +02:00
|
|
|
("mysql_free_result address %lx", stored_result));
|
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
2005-07-16 02:33:47 +02:00
|
|
|
}
|
2005-07-17 04:10:19 +02:00
|
|
|
stored_result= mysql_store_result(mysql);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!stored_result)
|
2005-07-16 02:33:47 +02:00
|
|
|
{
|
|
|
|
retval= HA_ERR_END_OF_FILE;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This was successful, please let it be known! */
|
2005-07-17 04:10:19 +02:00
|
|
|
table->status= 0;
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
retval= rnd_next(table->record[0]);
|
|
|
|
DBUG_RETURN(retval);
|
|
|
|
|
|
|
|
error:
|
|
|
|
table->status= STATUS_NOT_FOUND;
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
2005-07-16 02:33:47 +02:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
DBUG_PRINT("info", ("mysql_free_result address %lx", stored_result));
|
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
2005-07-16 02:33:47 +02:00
|
|
|
}
|
|
|
|
DBUG_RETURN(retval);
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_federated::read_range_next()
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
DBUG_ENTER("ha_federated::read_range_next");
|
|
|
|
retval= rnd_next(table->record[0]);
|
|
|
|
DBUG_RETURN(retval);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/* Used to read forward through the index. */
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::index_next(byte *buf)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::index_next");
|
2005-07-16 02:33:47 +02:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_next_count,
|
|
|
|
&LOCK_status);
|
|
|
|
retval= rnd_next(buf);
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
rnd_init() is called when the system wants the storage engine to do a table
|
|
|
|
scan.
|
|
|
|
|
|
|
|
This is the method that gets data for the SELECT calls.
|
|
|
|
|
|
|
|
See the federated in the introduction at the top of this file to see when
|
|
|
|
rnd_init() is called.
|
|
|
|
|
|
|
|
Called from filesort.cc, records.cc, sql_handler.cc, sql_select.cc,
|
|
|
|
sql_table.cc, and sql_update.cc.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::rnd_init(bool scan)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_ENTER("ha_federated::rnd_init");
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
/*
|
2005-07-16 02:33:47 +02:00
|
|
|
The use of the 'scan' flag is incredibly important for this handler
|
|
|
|
to work properly, especially with updates containing WHERE clauses
|
|
|
|
using indexed columns.
|
2005-02-23 09:38:29 +01:00
|
|
|
|
|
|
|
When the initial query contains a WHERE clause of the query using an
|
|
|
|
indexed column, it's index_read_idx that selects the exact record from
|
|
|
|
the foreign database.
|
|
|
|
|
|
|
|
When there is NO index in the query, either due to not having a WHERE
|
|
|
|
clause, or the WHERE clause is using columns that are not indexed, a
|
|
|
|
'full table scan' done by rnd_init, which in this situation simply means
|
|
|
|
a 'select * from ...' on the foreign table.
|
|
|
|
|
|
|
|
In other words, this 'scan' flag gives us the means to ensure that if
|
|
|
|
there is an index involved in the query, we want index_read_idx to
|
|
|
|
retrieve the exact record (scan flag is 0), and do not want rnd_init
|
|
|
|
to do a 'full table scan' and wipe out that result set.
|
|
|
|
|
|
|
|
Prior to using this flag, the problem was most apparent with updates.
|
|
|
|
|
|
|
|
An initial query like 'UPDATE tablename SET anything = whatever WHERE
|
|
|
|
indexedcol = someval', index_read_idx would get called, using a query
|
|
|
|
constructed with a WHERE clause built from the values of index ('indexcol'
|
|
|
|
in this case, having a value of 'someval'). mysql_store_result would
|
|
|
|
then get called (this would be the result set we want to use).
|
|
|
|
|
|
|
|
After this rnd_init (from sql_update.cc) would be called, it would then
|
|
|
|
unecessarily call "select * from table" on the foreign table, then call
|
|
|
|
mysql_store_result, which would wipe out the correct previous result set
|
|
|
|
from the previous call of index_read_idx's that had the result set
|
|
|
|
containing the correct record, hence update the wrong row!
|
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
*/
|
|
|
|
scan_flag= scan;
|
|
|
|
if (scan)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info", ("share->select_query %s", share->select_query));
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
{
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info",
|
2005-07-17 04:10:19 +02:00
|
|
|
("mysql_free_result address %lx", stored_result));
|
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
if (mysql_real_query(mysql,
|
|
|
|
share->select_query,
|
|
|
|
strlen(share->select_query)))
|
|
|
|
goto error;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
stored_result= mysql_store_result(mysql);
|
|
|
|
if (!stored_result)
|
2005-07-16 02:33:47 +02:00
|
|
|
goto error;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_RETURN(0);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
error:
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int ha_federated::rnd_end()
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::rnd_end");
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result)
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
{
|
2005-07-17 04:10:19 +02:00
|
|
|
DBUG_PRINT("info", ("mysql_free_result address %lx", stored_result));
|
|
|
|
mysql_free_result(stored_result);
|
|
|
|
stored_result= 0;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
retval= index_end();
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int ha_federated::index_end(void)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("ha_federated::index_end");
|
|
|
|
active_index= MAX_KEY;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
This is called for each row of the table scan. When you run out of records
|
|
|
|
you should return HA_ERR_END_OF_FILE. Fill buff up with the row information.
|
|
|
|
The Field structure for the table is the key to getting data into buf
|
|
|
|
in a manner that will allow the server to understand it.
|
|
|
|
|
|
|
|
Called from filesort.cc, records.cc, sql_handler.cc, sql_select.cc,
|
|
|
|
sql_table.cc, and sql_update.cc.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::rnd_next(byte *buf)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
2004-12-11 21:03:51 +01:00
|
|
|
MYSQL_ROW row;
|
|
|
|
DBUG_ENTER("ha_federated::rnd_next");
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (stored_result == 0)
|
2005-03-15 09:32:21 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
Return value of rnd_init is not always checked (see records.cc),
|
|
|
|
so we can get here _even_ if there is _no_ pre-fetched result-set!
|
|
|
|
TODO: fix it.
|
|
|
|
*/
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/* Fetch a row, insert it back in a row format. */
|
2005-07-17 04:10:19 +02:00
|
|
|
current_position= stored_result->data_cursor;
|
2005-03-16 03:41:06 +01:00
|
|
|
DBUG_PRINT("info", ("current position %d", current_position));
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!(row= mysql_fetch_row(stored_result)))
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_RETURN(HA_ERR_END_OF_FILE);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
retval= convert_row_to_internal_format(buf, row);
|
|
|
|
DBUG_RETURN(retval);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
'position()' is called after each call to rnd_next() if the data needs to be
|
|
|
|
ordered. You can do something like the following to store the position:
|
2005-02-20 20:52:28 +01:00
|
|
|
my_store_ptr(ref, ref_length, current_position);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
|
|
|
The server uses ref to store data. ref_length in the above case is the size
|
|
|
|
needed to store current_position. ref is just a byte array that the server
|
|
|
|
will maintain. If you are using offsets to mark rows, then current_position
|
|
|
|
should be the offset. If it is a primary key like in BDB, then it needs to
|
|
|
|
be a primary key.
|
|
|
|
|
|
|
|
Called from filesort.cc, sql_select.cc, sql_delete.cc and sql_update.cc.
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
void ha_federated::position(const byte *record)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("ha_federated::position");
|
2005-02-23 09:38:29 +01:00
|
|
|
/* my_store_ptr Add seek storage */
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
*(MYSQL_ROW_OFFSET *) ref= current_position; // ref is always aligned
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
This is like rnd_next, but you are given a position to use to determine the
|
|
|
|
row. The position will be of the type that you stored in ref. You can use
|
|
|
|
ha_get_ptr(pos,ref_length) to retrieve whatever key or position you saved
|
|
|
|
when position() was called.
|
|
|
|
|
|
|
|
This method is required for an ORDER BY.
|
|
|
|
|
|
|
|
Called from filesort.cc records.cc sql_insert.cc sql_select.cc sql_update.cc.
|
|
|
|
*/
|
2005-02-18 01:17:21 +01:00
|
|
|
int ha_federated::rnd_pos(byte *buf, byte *pos)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("ha_federated::rnd_pos");
|
2005-02-23 09:38:29 +01:00
|
|
|
/*
|
|
|
|
we do not need to do any of this if there has been a scan performed
|
|
|
|
already, or if this is an update and index_read_idx already has a result
|
|
|
|
set in which to build it's update query from
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
*/
|
|
|
|
if (scan_flag)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
int retval;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_rnd_count,
|
|
|
|
&LOCK_status);
|
2005-02-23 09:38:29 +01:00
|
|
|
memcpy_fixed(¤t_position, pos, sizeof(MYSQL_ROW_OFFSET)); // pos
|
2005-02-18 01:17:21 +01:00
|
|
|
/* is not aligned */
|
2005-07-17 04:10:19 +02:00
|
|
|
stored_result->current_row= 0;
|
|
|
|
stored_result->data_cursor= current_position;
|
2005-07-16 02:33:47 +02:00
|
|
|
retval= rnd_next(buf);
|
|
|
|
DBUG_RETURN(retval);
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
::info() is used to return information to the optimizer.
|
|
|
|
Currently this table handler doesn't implement most of the fields
|
|
|
|
really needed. SHOW also makes use of this data
|
|
|
|
Another note, you will probably want to have the following in your
|
|
|
|
code:
|
|
|
|
if (records < 2)
|
|
|
|
records = 2;
|
|
|
|
The reason is that the server will optimize for cases of only a single
|
|
|
|
record. If in a table scan you don't know the number of records
|
|
|
|
it will probably be better to set records to two so you can return
|
|
|
|
as many records as you need.
|
|
|
|
Along with records a few more variables you may wish to set are:
|
|
|
|
records
|
|
|
|
deleted
|
|
|
|
data_file_length
|
|
|
|
index_file_length
|
|
|
|
delete_length
|
|
|
|
check_time
|
|
|
|
Take a look at the public variables in handler.h for more information.
|
|
|
|
|
|
|
|
Called in:
|
|
|
|
filesort.cc
|
|
|
|
ha_heap.cc
|
|
|
|
item_sum.cc
|
|
|
|
opt_sum.cc
|
|
|
|
sql_delete.cc
|
|
|
|
sql_delete.cc
|
|
|
|
sql_derived.cc
|
|
|
|
sql_select.cc
|
|
|
|
sql_select.cc
|
|
|
|
sql_select.cc
|
|
|
|
sql_select.cc
|
|
|
|
sql_select.cc
|
|
|
|
sql_show.cc
|
|
|
|
sql_show.cc
|
|
|
|
sql_show.cc
|
|
|
|
sql_show.cc
|
|
|
|
sql_table.cc
|
|
|
|
sql_union.cc
|
|
|
|
sql_update.cc
|
|
|
|
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
void ha_federated::info(uint flag)
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char status_buf[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
char escaped_table_name[FEDERATED_QUERY_BUFFER_SIZE];
|
|
|
|
int error;
|
|
|
|
uint error_code;
|
2005-07-17 04:10:19 +02:00
|
|
|
MYSQL_RES *result= 0;
|
2005-07-16 02:33:47 +02:00
|
|
|
MYSQL_ROW row;
|
|
|
|
String status_query_string(status_buf, sizeof(status_buf), &my_charset_bin);
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_ENTER("ha_federated::info");
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
error_code= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
|
2005-07-16 02:33:47 +02:00
|
|
|
/* we want not to show table status if not needed to do so */
|
|
|
|
if (flag & (HA_STATUS_VARIABLE | HA_STATUS_CONST))
|
|
|
|
{
|
|
|
|
status_query_string.length(0);
|
2005-07-17 04:10:19 +02:00
|
|
|
status_query_string.append(FEDERATED_INFO);
|
|
|
|
status_query_string.append(FEDERATED_SQUOTE);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_name,
|
|
|
|
sizeof(escaped_table_name),
|
|
|
|
share->table_name,
|
|
|
|
share->table_name_length);
|
|
|
|
status_query_string.append(escaped_table_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
status_query_string.append(FEDERATED_SQUOTE);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
|
|
|
if (mysql_real_query(mysql, status_query_string.ptr(),
|
|
|
|
status_query_string.length()))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
status_query_string.length(0);
|
|
|
|
|
|
|
|
result= mysql_store_result(mysql);
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!result)
|
2005-07-16 02:33:47 +02:00
|
|
|
goto error;
|
|
|
|
|
2005-07-17 04:10:19 +02:00
|
|
|
if (!mysql_num_rows(result))
|
2005-07-16 02:33:47 +02:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (!(row= mysql_fetch_row(result)))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (flag & HA_STATUS_VARIABLE | HA_STATUS_CONST)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
deleted is set in ha_federated::info
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
need to figure out what this means as far as federated is concerned,
|
|
|
|
since we don't have a "file"
|
|
|
|
|
|
|
|
data_file_length = ?
|
|
|
|
index_file_length = ?
|
|
|
|
delete_length = ?
|
|
|
|
*/
|
|
|
|
if (row[4] != NULL)
|
|
|
|
records= (ha_rows) my_strtoll10(row[4], (char**) 0, &error);
|
|
|
|
if (row[5] != NULL)
|
|
|
|
mean_rec_length= (ha_rows) my_strtoll10(row[5], (char**) 0, &error);
|
|
|
|
if (row[12] != NULL)
|
|
|
|
update_time= (ha_rows) my_strtoll10(row[12], (char**) 0, &error);
|
|
|
|
if (row[13] != NULL)
|
|
|
|
check_time= (ha_rows) my_strtoll10(row[13], (char**) 0, &error);
|
|
|
|
}
|
|
|
|
if (flag & HA_STATUS_CONST)
|
|
|
|
{
|
|
|
|
block_size= 4096;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result)
|
|
|
|
mysql_free_result(result);
|
2005-07-17 04:10:19 +02:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (result)
|
|
|
|
mysql_free_result(result);
|
2005-07-17 04:10:19 +02:00
|
|
|
my_sprintf(error_buffer, (error_buffer, ": %d : %s",
|
|
|
|
mysql_errno(mysql), mysql_error(mysql)));
|
2005-07-16 02:33:47 +02:00
|
|
|
my_error(error_code, MYF(0), error_buffer);
|
2004-12-11 21:03:51 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Used to delete all rows in a table. Both for cases of truncate and
|
|
|
|
for cases where the optimizer realizes that all rows will be
|
|
|
|
removed as a result of a SQL statement.
|
|
|
|
|
|
|
|
Called from item_sum.cc by Item_func_group_concat::clear(),
|
|
|
|
Item_sum_count_distinct::clear(), and Item_func_group_concat::clear().
|
|
|
|
Called from sql_delete.cc by mysql_delete().
|
|
|
|
Called from sql_select.cc by JOIN::reinit().
|
|
|
|
Called from sql_union.cc by st_select_lex_unit::exec().
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::delete_all_rows()
|
|
|
|
{
|
2005-07-16 02:33:47 +02:00
|
|
|
char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
|
2004-12-11 21:03:51 +01:00
|
|
|
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
|
2005-10-07 23:57:40 +02:00
|
|
|
DBUG_ENTER("ha_federated::delete_all_rows");
|
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
query.length(0);
|
|
|
|
|
|
|
|
query.set_charset(system_charset_info);
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_TRUNCATE);
|
|
|
|
query.append(FEDERATED_BTICK);
|
2005-07-16 02:33:47 +02:00
|
|
|
query.append(share->table_name);
|
2005-07-17 04:10:19 +02:00
|
|
|
query.append(FEDERATED_BTICK);
|
2004-12-11 21:03:51 +01:00
|
|
|
|
2005-07-16 02:33:47 +02:00
|
|
|
/*
|
|
|
|
TRUNCATE won't return anything in mysql_affected_rows
|
|
|
|
*/
|
|
|
|
deleted+= records;
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (mysql_real_query(mysql, query.ptr(), query.length()))
|
|
|
|
{
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(stash_remote_error());
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(0);
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
The idea with handler::store_lock() is the following:
|
|
|
|
|
|
|
|
The statement decided which locks we should need for the table
|
|
|
|
for updates/deletes/inserts we get WRITE locks, for SELECT... we get
|
|
|
|
read locks.
|
|
|
|
|
|
|
|
Before adding the lock into the table lock handler (see thr_lock.c)
|
|
|
|
mysqld calls store lock with the requested locks. Store lock can now
|
|
|
|
modify a write lock to a read lock (or some other lock), ignore the
|
|
|
|
lock (if we don't want to use MySQL table locks at all) or add locks
|
|
|
|
for many tables (like we do when we are using a MERGE handler).
|
|
|
|
|
|
|
|
Berkeley DB for federated changes all WRITE locks to TL_WRITE_ALLOW_WRITE
|
|
|
|
(which signals that we are doing WRITES, but we are still allowing other
|
|
|
|
reader's and writer's.
|
|
|
|
|
|
|
|
When releasing locks, store_lock() are also called. In this case one
|
|
|
|
usually doesn't have to do anything.
|
|
|
|
|
|
|
|
In some exceptional cases MySQL may send a request for a TL_IGNORE;
|
|
|
|
This means that we are requesting the same lock as last time and this
|
|
|
|
should also be ignored. (This may happen when someone does a flush
|
|
|
|
table when we have opened a part of the tables, in which case mysqld
|
|
|
|
closes and reopens the tables and tries to get the same locks at last
|
|
|
|
time). In the future we will probably try to remove this.
|
|
|
|
|
|
|
|
Called from lock.cc by get_lock_data().
|
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
THR_LOCK_DATA **ha_federated::store_lock(THD *thd,
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
THR_LOCK_DATA **to,
|
|
|
|
enum thr_lock_type lock_type)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-02-23 09:38:29 +01:00
|
|
|
/*
|
|
|
|
Here is where we get into the guts of a row level lock.
|
|
|
|
If TL_UNLOCK is set
|
|
|
|
If we are not doing a LOCK TABLE or DISCARD/IMPORT
|
|
|
|
TABLESPACE, then allow multiple writers
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&
|
2005-07-16 02:33:47 +02:00
|
|
|
lock_type <= TL_WRITE) && !thd->in_lock_tables)
|
2004-12-11 21:03:51 +01:00
|
|
|
lock_type= TL_WRITE_ALLOW_WRITE;
|
|
|
|
|
2005-02-23 09:38:29 +01:00
|
|
|
/*
|
|
|
|
In queries of type INSERT INTO t1 SELECT ... FROM t2 ...
|
|
|
|
MySQL would use the lock TL_READ_NO_INSERT on t2, and that
|
|
|
|
would conflict with TL_WRITE_ALLOW_WRITE, blocking all inserts
|
|
|
|
to t2. Convert the lock to a normal read lock to allow
|
|
|
|
concurrent inserts to t2.
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
|
|
|
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
if (lock_type == TL_READ_NO_INSERT && !thd->in_lock_tables)
|
2004-12-11 21:03:51 +01:00
|
|
|
lock_type= TL_READ;
|
|
|
|
|
|
|
|
lock.type= lock_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
*to++= &lock;
|
|
|
|
|
|
|
|
return to;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
create() does nothing, since we have no local setup of our own.
|
2005-02-23 09:38:29 +01:00
|
|
|
FUTURE: We should potentially connect to the foreign database and
|
2004-12-11 21:03:51 +01:00
|
|
|
*/
|
2005-02-23 09:38:29 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
int ha_federated::create(const char *name, TABLE *table_arg,
|
WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
|
|
|
HA_CREATE_INFO *create_info)
|
2004-12-11 21:03:51 +01:00
|
|
|
{
|
2005-10-07 23:57:40 +02:00
|
|
|
int retval;
|
|
|
|
FEDERATED_SHARE tmp_share; // Only a temporary share, to test the url
|
2005-01-04 23:39:13 +01:00
|
|
|
DBUG_ENTER("ha_federated::create");
|
2005-03-15 09:32:21 +01:00
|
|
|
|
2005-10-07 23:57:40 +02:00
|
|
|
if (!(retval= parse_url(&tmp_share, table_arg, 1)))
|
|
|
|
retval= check_foreign_data_source(&tmp_share, 1);
|
2005-07-16 02:33:47 +02:00
|
|
|
|
2005-10-07 23:57:40 +02:00
|
|
|
my_free((gptr) tmp_share.scheme, MYF(MY_ALLOW_ZERO_PTR));
|
2005-07-16 02:33:47 +02:00
|
|
|
DBUG_RETURN(retval);
|
2005-03-15 09:32:21 +01:00
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
}
|
2005-09-14 08:31:17 +02:00
|
|
|
|
|
|
|
|
|
|
|
int ha_federated::stash_remote_error()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("ha_federated::stash_remote_error()");
|
|
|
|
remote_error_number= mysql_errno(mysql);
|
2005-09-15 21:32:01 +02:00
|
|
|
my_snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE,
|
|
|
|
mysql_error(mysql));
|
2005-09-14 08:31:17 +02:00
|
|
|
DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool ha_federated::get_error_message(int error, String* buf)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("ha_federated::get_error_message");
|
|
|
|
DBUG_PRINT("enter", ("error: %d", error));
|
|
|
|
if (error == HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM)
|
|
|
|
{
|
|
|
|
buf->append("Error on remote system: ");
|
|
|
|
buf->qs_append(remote_error_number);
|
|
|
|
buf->append(": ");
|
|
|
|
buf->append(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE);
|
|
|
|
|
|
|
|
remote_error_number= 0;
|
|
|
|
remote_error_buf[0]= '\0';
|
|
|
|
}
|
|
|
|
DBUG_PRINT("exit", ("message: %s", buf->ptr()));
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|
|
|
|
|
2004-12-11 21:03:51 +01:00
|
|
|
#endif /* HAVE_FEDERATED_DB */
|