Branch: refs/heads/core-lua
  Home:   https://github.com/mailru/tarantool

  Commit: 871b5a5b02de5e3cb8f0a6ef9a63a0bb10f451b3
      
https://github.com/mailru/tarantool/commit/871b5a5b02de5e3cb8f0a6ef9a63a0bb10f451b3
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M doc/developer/CMakeLists.txt
  M doc/developer/developer.xml

  Log Message:
  -----------
  Start working on the developer guide.


  Commit: 1a562087ef11595e94cf58fc51422edbbe495e81
      
https://github.com/mailru/tarantool/commit/1a562087ef11595e94cf58fc51422edbbe495e81
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M cfg/tarantool_box_cfg.c
  M cfg/tarantool_box_cfg.h
  M cfg/tarantool_feeder_cfg.c
  M cfg/tarantool_feeder_cfg.h
  M core/fiber.m
  M core/tarantool.m
  M include/exceptions.h
  M include/fiber.h

  Log Message:
  -----------
  Enable manual slave-to-master propagation: code review.

Code review: reformat comments.
Add comments to fiber.h.
Use tnt_FiberCancelException solely to cancel fibers.
Fix alignment of fiber_server.
Use newer confetti.

Reverse the try/finally wrapping of some fiber functions
as unnecessary.


  Commit: 10f492857d99ca7e4bf5ddc0ad20d2caf8e35956
      
https://github.com/mailru/tarantool/commit/10f492857d99ca7e4bf5ddc0ad20d2caf8e35956
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M README
  M cfg/core_cfg.cfg_tmpl
  M cfg/tarantool_feeder_cfg.cfg
  M cfg/tarantool_feeder_cfg.h
  A connector/perl/MANIFEST
  A connector/perl/Makefile.PL
  A connector/perl/lib/MR/IProto.pm
  A connector/perl/lib/MR/SilverBox.pm
  A connector/perl/lib/MR/Storage/Const.pm
  A connector/perl/t/TBox.pm
  A connector/perl/t/box.pl
  A connector/perl/t/box_tree.pl
  A connector/ruby/README
  A connector/ruby/box.rb
  A connector/ruby/iproto.rb
  M core/admin.m
  M core/admin.rl
  M core/log_io.m
  M core/salloc.m
  M core/tbuf.m
  M doc/developer/CMakeLists.txt
  M doc/developer/developer.xml
  A doc/sql.txt
  M doc/user/CMakeLists.txt
  M doc/user/configuration-reference.xml
  A doc/user/connectors.xml
  M doc/user/data-model.xml
  A doc/user/errcode.xml
  A doc/user/html-highlight.xsl
  M doc/user/language-reference.xml
  A doc/user/namespace.xml
  M doc/user/preface.xml
  A doc/user/proctitle.xml
  A doc/user/replication.xml
  M doc/user/target.db
  A doc/user/tnt-fo.xsl
  M doc/user/tnt-html.xsl
  M doc/user/tnt.css
  M doc/user/tutorial.xml
  M doc/user/user.xml
  M include/errcode.h
  M include/tbuf.h
  M mod/box/box.m
  M mod/box/box_cfg.cfg_tmpl
  R mod/box/client/perl/MANIFEST
  R mod/box/client/perl/Makefile.PL
  R mod/box/client/perl/lib/MR/IProto.pm
  R mod/box/client/perl/lib/MR/SilverBox.pm
  R mod/box/client/perl/lib/MR/Storage/Const.pm
  R mod/box/client/ruby/README
  R mod/box/client/ruby/box.rb
  R mod/box/client/ruby/iproto.rb
  M mod/box/index.m
  R mod/box/t/TBox.pm
  R mod/box/t/box.pl
  R mod/box/t/box_tree.pl
  M mod/feeder/feeder.m
  M test/box/sql.result
  M test/box/sql.test
  M test/lib/tarantool_server.py
  M third_party/proctitle.c

  Log Message:
  -----------
  Merge master -> box-switch_mode


  Commit: 18ae0dd4c0a6009ab2e1b2c310a819e7a0dfd84b
      
https://github.com/mailru/tarantool/commit/18ae0dd4c0a6009ab2e1b2c310a819e7a0dfd84b
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M cfg/tarantool_box_cfg.c
  M cfg/tarantool_box_cfg.h
  M cfg/tarantool_feeder_cfg.c
  M cfg/tarantool_feeder_cfg.h
  M core/CMakeLists.txt
  M core/fiber.m
  A core/latch.m
  M core/log_io_remote.m
  M core/tarantool.m
  M include/exceptions.h
  M include/fiber.h
  A include/latch.h
  M include/tarantool.h
  M mod/box/box.m
  M mod/box/box_cfg.cfg_tmpl
  M mod/feeder/feeder.m
  A test/box_replication/common.result
  A test/box_replication/common.test
  A test/box_replication/feeder.cfg
  A test/box_replication/feeder_secondary.cfg
  A test/box_replication/feeder_slave.cfg
  A test/box_replication/suite.ini
  A test/box_replication/tarantool.cfg
  A test/box_replication/tarantool_beholder.cfg
  A test/box_replication/tarantool_beholder_to_slave.cfg
  A test/box_replication/tarantool_slave.cfg
  A test/box_replication/tarantool_slave_secondary_feeder_replication.cfg
  A test/box_replication/tarantool_slave_to_master.cfg
  A test/box_replication/tarantool_to_slave.cfg
  M test/lib/box.py
  M test/lib/server.py
  M test/lib/tarantool_admin.py
  M test/lib/tarantool_box_server.py
  M test/lib/tarantool_connection.py
  M test/lib/tarantool_server.py

  Log Message:
  -----------
  Merge branch 'box-switch_mode'

Conflicts:
        mod/box/box.m


  Commit: 8391a649d37c23750ab4642340dc24886b9183fa
      
https://github.com/mailru/tarantool/commit/8391a649d37c23750ab4642340dc24886b9183fa
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M test/tarantool
  M test/test-run.py

  Log Message:
  -----------
  Make 'tarantool' and 'test-run.py' runnable on FreeBSD


  Commit: 3b81353f2995a2251a54d9b6f3f98586d1456c12
      
https://github.com/mailru/tarantool/commit/3b81353f2995a2251a54d9b6f3f98586d1456c12
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M core/fiber.m

  Log Message:
  -----------
  Blueprint 'manual-slave-to-master': fix buildbot failure.

If fiber_connect() is aborted with tnt_FiberCancelException,
an assertion in fiber_close() could fail that fiber->io is active
(it was not active).

The fix is to check in fiber_close() whether or not fiber->io
is active before closing it.


  Commit: aa2a5bb702ca61377bfa6aa9e1865dc1534977e3
      
https://github.com/mailru/tarantool/commit/aa2a5bb702ca61377bfa6aa9e1865dc1534977e3
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M core/log_io_remote.m
  M mod/box/box.m
  M test/box_replication/common.test
  M test/box_replication/tarantool.cfg
  M test/box_replication/tarantool_beholder.cfg
  M test/box_replication/tarantool_beholder_to_slave.cfg
  M test/box_replication/tarantool_slave.cfg
  M test/box_replication/tarantool_slave_secondary_feeder_replication.cfg
  M test/box_replication/tarantool_slave_to_master.cfg
  M test/box_replication/tarantool_to_slave.cfg
  M test/lib/tarantool_box_server.py

  Log Message:
  -----------
  Blueprint manual-slave-to-master: review fixes

Sweep out the first set of coding bugs in the test suite:
- set slab_alloc_arena to 0.05 in all box_replication configurations,
since otherwise this suite tries to allocate too much memory
and hangs under a VM.
- update some texts that make it into the log (spelling)
- add logging to all configurations
- simplify wait_sync and rename it to wait_lsn
- there was a bug in wait_sync that time.sleep() was
not called in the body of the loop due to \t, and
the loop was a busy-wait one.


  Commit: 3ea86725394078c0a1783e479b056f57fff12259
      
https://github.com/mailru/tarantool/commit/3ea86725394078c0a1783e479b056f57fff12259
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M test/box_replication/common.test
  M test/box_replication/feeder.cfg
  M test/box_replication/feeder_secondary.cfg
  M test/box_replication/feeder_slave.cfg

  Log Message:
  -----------
  box-switch_mode: review fixes.


  Commit: 1b4527182224e9b3e68898df3aac24ed85450684
      
https://github.com/mailru/tarantool/commit/1b4527182224e9b3e68898df3aac24ed85450684
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M core/errcode.c
  M include/errcode.h
  M test/box/protocol.result

  Log Message:
  -----------
  Remove unnecessary quotes from errcode.c.

There were extra quotes in errcode.c, i.e.
quotes were part of the error message.
Remove them.


  Commit: 0a8de795f56c22f3d3893fe91d8d094ff55b8cb8
      
https://github.com/mailru/tarantool/commit/0a8de795f56c22f3d3893fe91d8d094ff55b8cb8
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M core/CMakeLists.txt
  A core/exception.m
  R core/exceptions.m
  A include/exception.h
  R include/exceptions.h
  M include/fiber.h
  M include/pickle.h
  M mod/box/box.h

  Log Message:
  -----------
  Rename exceptions.[hm] to exception.[hm].

Rename exceptions.[hm] to exception.[hm]. Add copyright
information.


  Commit: 1d7195e2c04997e1c11c9b625f7dcafbb8f9cf17
      
https://github.com/mailru/tarantool/commit/1d7195e2c04997e1c11c9b625f7dcafbb8f9cf17
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M cfg/tarantool_box_cfg.cfg
  M cfg/tarantool_box_cfg.h
  M core/admin.m

  Log Message:
  -----------
  Update the generated file to newer confetti/ragel.

Update *.cfg files to newer confetti and comments
in the templates.


  Commit: a815a85fa0f638ef55da3d27e5a3c1581d39bd9e
      
https://github.com/mailru/tarantool/commit/a815a85fa0f638ef55da3d27e5a3c1581d39bd9e
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M test/lib/server.py

  Log Message:
  -----------
  Fix a subtle bug in ./test-run --gdb

Remove an extra space in '-e ' option to term,
not all terminals (rxvt, for example) can handle the extra
space in an option name.


  Commit: 48392dc081f7f143be47831142c716bd2334d0f0
      
https://github.com/mailru/tarantool/commit/48392dc081f7f143be47831142c716bd2334d0f0
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-23 (Thu, 23 Jun 2011)

  Changed paths:
    M test/lib/server.py

  Log Message:
  -----------
  Test-runner: do not attempt to run tests if the port is in use.

Do not try to start another server on a port if it's already in use.
This can lead to very confusing results when running
tests that start and stop the server in parallel.


  Commit: 42833f739f2238ea38a0e676f34f98218cbcfa44
      
https://github.com/mailru/tarantool/commit/42833f739f2238ea38a0e676f34f98218cbcfa44
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M core/fiber.m
  M core/say.m
  M core/tarantool.m

  Log Message:
  -----------
  Handle more gracefully signals sent by the terminal driver

When ctrl-c is pressed on the terminal, a signal (SIGINT)
is sent to all members of the foreground process group.

Since both wal_writer and logger processes' default action
on SIGINT is to terminate, they could terminate before parent.

This led to rather nasty results: in the circumstances, when
the parent somehow ignored SIGINT (e.g. under GDB), or handled
it after its children (a race condition), children would
disappear before parent, then parent would detect that
wal_writer is gone, try to panic/write to the log, which
is also gone, and on top of SIGINT get a SIGPIPE.

Move spawned children to their own process groups
to make sure they don't belong to the main process'
process group, and don't receive signals from the
controlling tty. It's okay in the interactive mode,
since these children are going to die anyway when the
parent dies, after getting a SIGPIPE.


  Commit: c992d9d96b37a2a13d42d4b4201e63af505659f8
      
https://github.com/mailru/tarantool/commit/c992d9d96b37a2a13d42d4b4201e63af505659f8
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M test/lib/box.py
  M test/lib/server.py

  Log Message:
  -----------
  Test-runner: a number of changes to improve debugging

When stopping the server under gdb, send SIGTERM
to the server, not to the terminal in which
gdb is started. This gives you the option
to actually examine gdb output before the test
has ended.

When the server crashes, and we're reading
from it in a client connection, detect EOF
and abort reading (the old code was buggy
and would busyloop indefinitely in case of
a crash).

Remove an unnecessary fork() in
start().


  Commit: 9b3d0a7646f55293ef7d10cad4ba42ad2777aa78
      
https://github.com/mailru/tarantool/commit/9b3d0a7646f55293ef7d10cad4ba42ad2777aa78
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M connector/c/client.c
  M connector/c/client.h
  M core/exception.m
  M core/fiber.m
  M core/iproto.m
  M core/latch.m
  M core/log_io.m
  M core/pickle.m
  M doc/box-protocol.txt
  M doc/user/configuration-reference.xml
  M doc/user/data-model.xml
  M doc/user/errcode.xml
  M doc/user/target.db
  M include/errcode.h
  M include/exception.h
  M include/fiber.h
  M include/iproto.h
  M include/latch.h
  M include/pickle.h
  M mod/box/box.h
  M mod/box/box.m
  M mod/box/index.m
  M mod/box/memcached.m
  M mod/box/memcached.rl
  M test/box/protocol.c
  M test/box/protocol.result
  M test/box/sql.result
  M test/box_big/sql.result
  M test/box_replication/common.result
  M test/lib/sql_ast.py

  Log Message:
  -----------
  https://blueprints.launchpad.net/tarantool/+spec/client-error

Send error messages to the client.

Before this patch, Tarantool would only send an error
code to the client, but record all the details in its error log.

This patch extends the client/server protocol and adds
error text to it. This text can now contain not only
a staple message that corresponds to the error, but
problem-related additional information, such as namespace id,
field number, etc.

All errors still can be logged in the error log, but
not all of them need to be. For errors, which are only
sent to the client, this patch uses ClientError exception
class. Errors which also need to be logged in the error log
must use LoggedError exception class.

To choose between the two, the following rule of thumb is applied:
- client application errors, which, generally, can be non-errors at all,
  such as access to a non-existing namespace, index or field, or
  access to a locked tuple are not logged
- execution and protocol errors, such as an error writing to disk,
an message that doesn't follow the protocol format, is logged.

For the most common error, ER_TUPLE_IS_RO, we do not use
string template to reduce CPU cycles necessary to produce this error
(on my machine one can raise ~200 000 exceptions per second, which is not
too much).

An addition to the above, this patch renames error codes, to
make them shorter (ERR_CODE_* -> ER_*) and rewrites the iproto.m
client connection loop to make it a trifle more efficient.

This patch also fixes a couple of bugs:
- in exception.m, [tnt_Exception alloc]
when we reused the old exception class, we did
not reset its 'isa' pointer, which could lead to a crash
when a message with a different signature was sent to
it.

- in box_dispatch (renamed from box_dispach),
when logging for slow commands was done, txn->op could
already be overwritten by txn_commit()/txn_abort().

A comment on the naming scheme: prefixing every Tarantool
piece of method/data structure with tnt_ would lead
to very bloated code. So in this patch
I decided to reduce the use this
prefix to the client library code and some very
generic names only.


  Commit: ee3e24d7084942063168796c2655036d250503fe
      
https://github.com/mailru/tarantool/commit/ee3e24d7084942063168796c2655036d250503fe
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M core/log_io.m
  M include/log_io.h
  M mod/box/box.m
  M mod/feeder/feeder.m

  Log Message:
  -----------
  Cleanup: remove v04 and v04 snapshot/xlog formats.

Basic cleanup that removew old/unused code.


  Commit: 7bd374f9ee53a3a7ed29c3cbe6b45394ab961942
      
https://github.com/mailru/tarantool/commit/7bd374f9ee53a3a7ed29c3cbe6b45394ab961942
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M core/CMakeLists.txt
  R core/diagnostics.h
  R core/diagnostics.m
  M core/fiber.m
  M core/log_io.m

  Log Message:
  -----------
  Remove diagnostics.[hm] now that we've moved to ObjectiveC exceptions

Remove diagnostics.[hm] since we should use
Objective C exceptions going forward.

A few more cleanups related to v03/v04 snapshot/wal
format.


  Commit: 3e10dc507e0875b8899659ccd9abe88e9bf4b860
      
https://github.com/mailru/tarantool/commit/3e10dc507e0875b8899659ccd9abe88e9bf4b860
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-27 (Mon, 27 Jun 2011)

  Changed paths:
    M core/fiber.m
  M core/iproto.m
  M core/log_io.m
  M include/iproto.h
  M include/log_io.h
  M mod/box/box.m

  Log Message:
  -----------
  box-switch_mode: sync the WAL before becoming a replica

Make sure we do not have pending updates prior to turning
on remote recovery.

Get rid of the boolean variable 'box_updates_allowed'
and pass a function pointer to iproto_interact
instead (one less 'if' on the way of the most common
execution flow).


  Commit: 32656c4342e86d60818ae50bdc035c06f7bd843e
      
https://github.com/mailru/tarantool/commit/32656c4342e86d60818ae50bdc035c06f7bd843e
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-27 (Mon, 27 Jun 2011)

  Changed paths:
    M core/exception.m
  M core/log_io.m
  M core/log_io_remote.m
  M mod/box/box.m

  Log Message:
  -----------
  Minor cleanups in logging.


  Commit: 46fee0c6a2b5b101474d603bbe8f6d9988a1b6e3
      
https://github.com/mailru/tarantool/commit/46fee0c6a2b5b101474d603bbe8f6d9988a1b6e3
  Author: Konstantin Shulgin <[email protected]>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    A doc/coding-style-python.txt
  M test/lib/box.py
  M test/lib/server.py
  M test/lib/sql_ast.py
  M test/lib/tarantool_admin.py
  M test/lib/tarantool_box_server.py
  M test/lib/tarantool_connection.py
  M test/lib/tarantool_feeder_server.py
  M test/lib/tarantool_preprocessor.py
  M test/lib/tarantool_server.py
  M test/lib/test_suite.py

  Log Message:
  -----------
  Refactoring: python to PEP8

PEP8 coding-style for Python code was added. Python code ndentation
was changed to PEP8 format.


  Commit: 2b20309b9877cefae5c71ab910cfab5961ff033f
      
https://github.com/mailru/tarantool/commit/2b20309b9877cefae5c71ab910cfab5961ff033f
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M mod/box/box.m

  Log Message:
  -----------
  box-switch_mode: fix the memory leak on reload configuration

Fix the memory leak which would occur when
allocating memory for the "status" string,
output by 'show info'. The allocation was done
on each RELOAD CONFIGURATION, and
old memory was never freed.

Fix: use static memory instead of palloc.


  Commit: 89df31f8b3e809bbd0b93f3a8224271dfc1b19e2
      
https://github.com/mailru/tarantool/commit/89df31f8b3e809bbd0b93f3a8224271dfc1b19e2
  Author: Yuriy Vostrikov <[email protected]>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M test/box/stat.result
  M test/box/stat.test

  Log Message:
  -----------
  Add cleanup to box/stat.test


  Commit: 0d4ea1bded266ab9e90417eec6f870f761ed6f4f
      
https://github.com/mailru/tarantool/commit/0d4ea1bded266ab9e90417eec6f870f761ed6f4f
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M test/box/stat.result
  M test/box/stat.test

  Log Message:
  -----------
  Merge branch 'master' of github.com:mailru/tarantool


  Commit: 384dbcd3dc5ae78af4e71f1e70e58a3699861ac4
      
https://github.com/mailru/tarantool/commit/384dbcd3dc5ae78af4e71f1e70e58a3699861ac4
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-30 (Thu, 30 Jun 2011)

  Changed paths:
    M core/fiber.c

  Log Message:
  -----------
  Fix for Bug#803864 Constant resize of fiber_registry

Fix a coding error: supplying 0 watermark to kh_init(fiber_registry)
lead to almost constant kh_resize (on every kh_put after a kh_del).


  Commit: 55991c1b74a576085a5a3104fc60bad6f69efca5
      
https://github.com/mailru/tarantool/commit/55991c1b74a576085a5a3104fc60bad6f69efca5
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-06-30 (Thu, 30 Jun 2011)

  Changed paths:
    M core/fiber.m

  Log Message:
  -----------
  Merge branch 'master-stable'


  Commit: c1725cf56d5b157e84903976a20d26e1adf9e41d
      
https://github.com/mailru/tarantool/commit/c1725cf56d5b157e84903976a20d26e1adf9e41d
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-01 (Fri, 01 Jul 2011)

  Changed paths:
    M core/exception.m
  M core/fiber.m
  M core/iproto.m
  M core/log_io.m
  M core/log_io_remote.m
  M include/iproto.h
  M include/log_io.h
  M mod/box/box.m
  M test/box/stat.result
  M test/box/stat.test

  Log Message:
  -----------
  Merge branch 'master', remote branch 'origin' into refactoring-python-to-pep8


  Commit: 19a59c646cf30c539e7922a576af7e3f524321a2
      
https://github.com/mailru/tarantool/commit/19a59c646cf30c539e7922a576af7e3f524321a2
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-01 (Fri, 01 Jul 2011)

  Changed paths:
    M CMakeLists.txt
  M core/fiber.m
  M core/log_io.m
  M core/log_io_remote.m
  M include/log_io.h
  M mod/box/box.m

  Log Message:
  -----------
  box-switch_mode: reorganize the code responsible for entering/leaving master
mode

Reorganize the code responsible for entering/leaving master mode.

Remove remote_recovery_restart, add remote_recovery_{stop/stop},
make sure we know what to do - start or stop recovery.

Move 'remote_recovery' to struct recovery_state.

Remove an extra parameter to recover_follow_remote,
it's always the same currently.


  Commit: b560d6a3e6358478bcaabd47f5502a5885024ad6
      
https://github.com/mailru/tarantool/commit/b560d6a3e6358478bcaabd47f5502a5885024ad6
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-01 (Fri, 01 Jul 2011)

  Changed paths:
    M core/log_io_remote.m
  M include/log_io.h
  M mod/box/box.m

  Log Message:
  -----------
  box-switch_mode: reorder and simplify calls in mod_reload_config().

Reorder and simplify calls to box_enter_master_or_replica_mode()
in mod_relaod_config().

Move recovery_stop_remote() to log_io_remote.c, where it belongs.
Remove now unnecessary recovery_start_remote(),
use recovery_follow_remote() (same thing) instead.


  Commit: 7fa4be57aa540b995909150f4026d689c661b80d
      
https://github.com/mailru/tarantool/commit/7fa4be57aa540b995909150f4026d689c661b80d
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-04 (Mon, 04 Jul 2011)

  Changed paths:
    M CMakeLists.txt
  M core/admin.m
  M core/admin.rl
  M core/fiber.m
  M include/fiber.h
  M mod/box/box.m

  Log Message:
  -----------
  Fix Bug#805350 Make warnings - stops compile -Werror

Remove compilation warnings about unused variables.

Make sure Release and RelWithDebugInfo do
not include -Werror - we don't know compiler version
at the client and shouldn't plant time bombs for him/her.


  Commit: a1605dc6eaf670875afd5796143e621596726ae6
      
https://github.com/mailru/tarantool/commit/a1605dc6eaf670875afd5796143e621596726ae6
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-05 (Tue, 05 Jul 2011)

  Changed paths:
    M mod/box/CMakeLists.txt
  A mod/box/memcached-grammar.m
  A mod/box/memcached-grammar.rl
  R mod/box/memcached.m
  R mod/box/memcached.rl

  Log Message:
  -----------
  Rename memcached.rl -> memcached-grammar.rl


  Commit: c75248aa193cf05370213922b9c3c69dca6e1a0c
      
https://github.com/mailru/tarantool/commit/c75248aa193cf05370213922b9c3c69dca6e1a0c
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-05 (Tue, 05 Jul 2011)

  Changed paths:
    M mod/box/CMakeLists.txt
  M mod/box/memcached-grammar.m
  M mod/box/memcached-grammar.rl
  A mod/box/memcached.m

  Log Message:
  -----------
  Memcached: keep only the parser in memcached-grammar.rl.

We modify memcached code quite often,
and asking ragel to regenerate .m from .rl file
every time .rl file changed was tiresome both
for revision control and for code reviews.

Leave in memcached-grammar.rl only memcached_dispsatch(),
which is generated by ragel, and everything else
move to memcached.m. This should lessen cases
when we have to re-generate memcached-grammar.m.

This patch doesn't produce any code changes,
only moves the code (and cleans up include
files at start of memcached.m).


  Commit: 8fb1f81a595575f672bfd7fcaf813b2d2569ebe0
      
https://github.com/mailru/tarantool/commit/8fb1f81a595575f672bfd7fcaf813b2d2569ebe0
  Author: Roman Tokarev <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.h

  Log Message:
  -----------
  Allow BOX_NOT_STORE flag in requests.


  Commit: 2fbdc5ca75ff6982bbbc9cff4ed2ffbd24f92ed2
      
https://github.com/mailru/tarantool/commit/2fbdc5ca75ff6982bbbc9cff4ed2ffbd24f92ed2
  Author: Roman Tokarev <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.h
  M mod/box/box.m

  Log Message:
  -----------
  Copy DELETE to DELETE_OLD and add `flags' argument to the DELETE command.


  Commit: d5fe3b1461a3fb9b7c4eff61f5d1363f956befc8
      
https://github.com/mailru/tarantool/commit/d5fe3b1461a3fb9b7c4eff61f5d1363f956befc8
  Author: Roman Tokarev <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.m

  Log Message:
  -----------
  Fix issue with empty keys in select request.

Don't read field data in case of zero size.


  Commit: ce0caef6395f2ab6f243a784feef3e6d9ef82f83
      
https://github.com/mailru/tarantool/commit/ce0caef6395f2ab6f243a784feef3e6d9ef82f83
  Author: Roman Tokarev <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/index.m

  Log Message:
  -----------
  Make proper interpretation of a return value of
`sptree_str_t_find' in `index_find_tree'.

`sptree_str_t_find' returns `struct tree_index_member' rather than
`struct box_tuple'.


  Commit: 4279a836df4673f17a1431454a850dadbe4b0f5b
      
https://github.com/mailru/tarantool/commit/4279a836df4673f17a1431454a850dadbe4b0f5b
  Author: Konstantin Shulgin <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M cfg/tarantool_box_cfg.c
  M cfg/tarantool_box_cfg.cfg
  M cfg/tarantool_box_cfg.h
  M core/stat.m
  M core/util.m
  M include/stat.h
  M include/util.h
  M mod/box/box.h
  M mod/box/box.m
  M mod/box/box_cfg.cfg_tmpl
  M mod/box/index.h
  M mod/box/index.m
  A mod/box/memcached.h
  M mod/box/memcached.m
  M test/box/show.result
  A test/box_memcached/binary-get.result
  A test/box_memcached/binary-get.test
  A test/box_memcached/bogus-commands.result
  A test/box_memcached/bogus-commands.test
  A test/box_memcached/cas.result
  A test/box_memcached/cas.test
  A test/box_memcached/expirations.result
  A test/box_memcached/expirations.test
  A test/box_memcached/flags.result
  A test/box_memcached/flags.test
  A test/box_memcached/flush-all.result
  A test/box_memcached/flush-all.test
  A test/box_memcached/getset.result
  A test/box_memcached/getset.test
  A test/box_memcached/incrdecr.reject
  A test/box_memcached/incrdecr.result
  A test/box_memcached/incrdecr.test
  A test/box_memcached/multiversioning.result
  A test/box_memcached/multiversioning.test
  A test/box_memcached/noreply.result
  A test/box_memcached/noreply.test
  A test/box_memcached/suite.ini
  A test/box_memcached/tarantool.cfg
  A test/lib/admin_connection.py
  R test/lib/box.py
  A test/lib/box_connection.py
  A test/lib/memcached_connection.py
  R test/lib/tarantool_admin.py
  M test/lib/tarantool_box_server.py
  M test/lib/tarantool_preprocessor.py
  M test/lib/tarantool_server.py
  M test/tarantool

  Log Message:
  -----------
  Imaplement blueprint 'memcached-separate-port'.

Blueprint 'Make memcached protocol an alternative, not a replacement':

Blueprint was implemented. Memcached now can work
in presence of RELOAD CONFIGURATION statement, even if it
changes a replica to master or a master to replica.

'memcached' configuration file option was removed.
Instead, two new optinos were added:
- memcached_port - optional, default 0, if set, specifies
which port speaks memcached protocol.
- memcached_expire, boolean, which defines whether or not
we run expire on memcached namespace. If not set,
we simply support the protocol, but ignore TTL and never
expire the keys.

Original memcached test was ported to tarantool testing environment.
cas test was disabled, because tarantool has a non-critical bug (in
concurrent environment cas operation can return 'SERVER_ERROR' instead of
'EXISTS')


  Commit: aa71bda4d0e12089d06d6f85098c293ba1a4834e
      
https://github.com/mailru/tarantool/commit/aa71bda4d0e12089d06d6f85098c293ba1a4834e
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/index.m

  Log Message:
  -----------
  Merge branch 'box-bug-sptree_find'


  Commit: 91ccfda7b09b953b27211699fa8f47f06c7e981c
      
https://github.com/mailru/tarantool/commit/91ccfda7b09b953b27211699fa8f47f06c7e981c
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.m

  Log Message:
  -----------
  Merge branch 'box-bug-select_with_empty_keys'


  Commit: 25946e44c031365b0d14e5745445baaf2737c875
      
https://github.com/mailru/tarantool/commit/25946e44c031365b0d14e5745445baaf2737c875
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.h

  Log Message:
  -----------
  Merge branch 'box-allow-box_not_store'


  Commit: 0a3a40ee02a8595d2874c787de6203db25fe5765
      
https://github.com/mailru/tarantool/commit/0a3a40ee02a8595d2874c787de6203db25fe5765
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.h
  M mod/box/box.m

  Log Message:
  -----------
  Merge branch 'box-delete-flags'


  Commit: 0a13f6a157b47caeafc99f408aaa6392f164f967
      
https://github.com/mailru/tarantool/commit/0a13f6a157b47caeafc99f408aaa6392f164f967
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.h
  M mod/box/box.m
  M mod/box/memcached.m
  M test/box/configuration.result
  M test/box/show.result
  M test/box/stat.result
  R test/box_memcached/incrdecr.reject
  M test/box_memcached/multiversioning.result
  M test/lib/sql_ast.py

  Log Message:
  -----------
  DELETE with flags: post-merge fixes.

Update test results, and the Python client.


  Commit: e69838a1d71e887bdabab40b34587d4e0a32d492
      
https://github.com/mailru/tarantool/commit/e69838a1d71e887bdabab40b34587d4e0a32d492
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M mod/box/box.h
  M mod/box/box.m
  M mod/box/memcached-grammar.m
  M mod/box/memcached-grammar.rl
  M mod/box/memcached.m

  Log Message:
  -----------
  Blueprint memcached-separte-port: a follow up

Make sure we do not try to modify data in
read-only mode via memcached port.


  Commit: 159f0f08751ceddcf9467c998f0df6837bb3ed0c
      
https://github.com/mailru/tarantool/commit/159f0f08751ceddcf9467c998f0df6837bb3ed0c
  Author: Konstantin Osipov <[email protected]>
  Date:   2011-07-07 (Thu, 07 Jul 2011)

  Changed paths:
    M CMakeLists.txt
  M cfg/tarantool_box_cfg.c
  M cfg/tarantool_box_cfg.cfg
  M cfg/tarantool_box_cfg.h
  M cfg/tarantool_feeder_cfg.c
  M cfg/tarantool_feeder_cfg.h
  M connector/c/client.c
  M connector/c/client.h
  M core/CMakeLists.txt
  M core/admin.m
  M core/admin.rl
  R core/diagnostics.h
  R core/diagnostics.m
  M core/errcode.c
  A core/exception.m
  R core/exceptions.m
  M core/fiber.m
  M core/iproto.m
  A core/latch.m
  M core/log_io.m
  M core/log_io_remote.m
  M core/pickle.m
  M core/say.m
  M core/stat.m
  M core/tarantool.m
  M core/tbuf.m
  M core/util.m
  M doc/box-protocol.txt
  A doc/coding-style-python.txt
  M doc/developer/CMakeLists.txt
  M doc/developer/developer.xml
  M doc/user/configuration-reference.xml
  M doc/user/data-model.xml
  M doc/user/errcode.xml
  M doc/user/target.db
  M include/errcode.h
  A include/exception.h
  R include/exceptions.h
  M include/fiber.h
  M include/iproto.h
  A include/latch.h
  M include/log_io.h
  M include/pickle.h
  M include/stat.h
  M include/tarantool.h
  M include/util.h
  M mod/box/CMakeLists.txt
  M mod/box/box.h
  M mod/box/box.m
  M mod/box/box_cfg.cfg_tmpl
  M mod/box/index.h
  M mod/box/index.m
  A mod/box/memcached-grammar.m
  A mod/box/memcached-grammar.rl
  A mod/box/memcached.h
  M mod/box/memcached.m
  R mod/box/memcached.rl
  M mod/box/moonbox.m
  M mod/feeder/feeder.m
  M test/box/protocol.c
  M test/box/protocol.result
  M test/box/show.result
  M test/box/sql.result
  M test/box/stat.result
  M test/box/stat.test
  M test/box_big/sql.result
  A test/box_memcached/binary-get.result
  A test/box_memcached/binary-get.test
  A test/box_memcached/bogus-commands.result
  A test/box_memcached/bogus-commands.test
  A test/box_memcached/cas.result
  A test/box_memcached/cas.test
  A test/box_memcached/expirations.result
  A test/box_memcached/expirations.test
  A test/box_memcached/flags.result
  A test/box_memcached/flags.test
  A test/box_memcached/flush-all.result
  A test/box_memcached/flush-all.test
  A test/box_memcached/getset.result
  A test/box_memcached/getset.test
  A test/box_memcached/incrdecr.result
  A test/box_memcached/incrdecr.test
  A test/box_memcached/multiversioning.result
  A test/box_memcached/multiversioning.test
  A test/box_memcached/noreply.result
  A test/box_memcached/noreply.test
  A test/box_memcached/suite.ini
  A test/box_memcached/tarantool.cfg
  A test/box_replication/common.result
  A test/box_replication/common.test
  A test/box_replication/feeder.cfg
  A test/box_replication/feeder_secondary.cfg
  A test/box_replication/feeder_slave.cfg
  A test/box_replication/suite.ini
  A test/box_replication/tarantool.cfg
  A test/box_replication/tarantool_beholder.cfg
  A test/box_replication/tarantool_beholder_to_slave.cfg
  A test/box_replication/tarantool_slave.cfg
  A test/box_replication/tarantool_slave_secondary_feeder_replication.cfg
  A test/box_replication/tarantool_slave_to_master.cfg
  A test/box_replication/tarantool_to_slave.cfg
  A test/lib/admin_connection.py
  R test/lib/box.py
  A test/lib/box_connection.py
  A test/lib/memcached_connection.py
  M test/lib/server.py
  M test/lib/sql_ast.py
  R test/lib/tarantool_admin.py
  M test/lib/tarantool_box_server.py
  M test/lib/tarantool_connection.py
  M test/lib/tarantool_feeder_server.py
  M test/lib/tarantool_preprocessor.py
  M test/lib/tarantool_server.py
  M test/lib/test_suite.py
  M test/tarantool
  M test/test-run.py

  Log Message:
  -----------
  Merge branch 'master' into core-lua

Conflicts:
        core/admin.m
        core/stat.m
        include/fiber.h
        include/pickle.h
        include/stat.h
        mod/box/CMakeLists.txt
        mod/box/box.h
        mod/box/box.m
        test/box/configuration.result
        test/box/show.result
        test/box/stat.result
        test/lib/server.py
        test/lib/sql_ast.py
        test/lib/tarantool_box_server.py


Compare: https://github.com/mailru/tarantool/compare/9a047cd...159f0f0

_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help   : https://help.launchpad.net/ListHelp

Reply via email to