lp:~jaypipes/drizzle/xa-storage-engine

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development

Brian Aker: Pending requested 2010-02-15

Drizzle Developers: Pending requested 2010-02-15

Diff: 3604 lines (+1232/-795)

31 files modified

drizzled/cursor.cc (+14/-14)
drizzled/cursor.h (+1/-1)
drizzled/drizzled.cc (+2/-1)
drizzled/filesort.cc (+2/-1)
drizzled/handler_structs.h (+0/-46)
drizzled/include.am (+7/-2)
drizzled/named_savepoint.h (+31/-5)
drizzled/plugin/storage_engine.cc (+52/-287)
drizzled/plugin/storage_engine.h (+7/-76)
drizzled/plugin/transactional_storage_engine.cc (+116/-0)
drizzled/plugin/transactional_storage_engine.h (+164/-0)
drizzled/plugin/xa_storage_engine.cc (+237/-0)
drizzled/plugin/xa_storage_engine.h (+108/-0)
drizzled/resource_context.cc (+32/-64)
drizzled/resource_context.h (+75/-51)
drizzled/select_send.h (+3/-2)
drizzled/session.cc (+6/-20)
drizzled/session.h (+9/-12)
drizzled/set_var.cc (+0/-2)
drizzled/sql_delete.cc (+5/-5)
drizzled/sql_insert.cc (+14/-19)
drizzled/sql_load.cc (+3/-3)
drizzled/sql_parse.cc (+1/-1)
drizzled/sql_update.cc (+5/-5)
drizzled/statement/rollback_to_savepoint.cc (+2/-2)
drizzled/table.cc (+3/-2)
drizzled/transaction_context.h (+86/-0)
drizzled/transaction_services.cc (+188/-129)
drizzled/transaction_services.h (+2/-2)
plugin/innobase/handler/ha_innodb.cc (+43/-43)
plugin/innobase/handler/ha_innodb.h (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1292. By Jay Pipes <jpipes@serialcoder> on 2010-02-15

fix for include.am having non-existent transaction_context.cc

1291. By Jay Pipes <jpipes@serialcoder> on 2010-02-15

One more merge conflict...

1290. By Jay Pipes <jpipes@serialcoder> on 2010-02-14

Fix missing files in include.am after merging trunk.

1289. By Jay Pipes <jpipes@serialcoder> on 2010-02-14

Merge trunk and resolve conflicts

1288. By Jay Pipes <jpipes@serialcoder> on 2010-02-14

This patch completes the first step in the splitting of
the XA resource manager API from the storage engine API,
as outlined in the specification here:

http://drizzle.org/wiki/XaStorageEngine

* Splits plugin::StorageEngine into a base StorageEngine
  class and two derived classes, TransactionalStorageEngine
  and XaStorageEngine. XaStorageEngine derives from
  TransactionalStorageEngine and creates the XA Resource
  Manager API for storage engines.

  - The methods moved from StorageEngine to TransactionalStorageEngine
    include releaseTemporaryLatches(), startConsistentSnapshot(),
    commit(), rollback(), setSavepoint(), releaseSavepoint(),
    rollbackToSavepoint() and hasTwoPhaseCommit()
  - The methods moved from StorageEngine to XaStorageEngine
    include recover(), commitXid(), rollbackXid(), and prepare()

* Places all static "EngineVector"s into their proper
  namespaces (typedefs belong in header files, not implementation files)
  and places all static methods corresponding
  to either only transactional engines or only XA engines
  into their respective files in /drizzled/plugin/

* Modifies the InnoDB "handler" files to extend plugin::XaStorageEngine
  and not plugin::StorageEngine

The next step, as outlined in the wiki spec page above, is to isolate
the XA Resource Manager API into its own plugin class and modify
plugin::XaStorageEngine to implement plugin::XaResourceManager via
composition. This is necessary to enable building plugins which can
participate in an XA transaction *without having to have that plugin
implement the entire storage engine API*

1287. By Jay Pipes <jpipes@serialcoder> on 2010-02-08

Merge trunk

1286. By Jay Pipes <jpipes@serialcoder> on 2010-02-06

Style cleanup around TransactionContext::modified_non_trans_table and dead code removal

1285. By Jay Pipes <jpipes@serialcoder> on 2010-02-06

Cleanup style and documentation for ResourceContext and setTransactionReadWrite

1284. By Jay Pipes <jpipes@serialcoder> on 2010-02-06

Merge trunk changes and resolve conflicts

1283. By Jay Pipes <jpipes@serialcoder> on 2010-02-04

* Renames Ha_trx_info to drizzled::ResourceContext
* Renames Sesssion_TRANS to drizzled::TransactionContext
* Replaces homegrown linked-lists of Ha_trx_info pointers
  with vector<drizzled::ResourceContext> operations
* Renames Session::getEngineInfo() to Session::getResourceContext()