Branch: refs/heads/transferring-snapshot-to-replica
Home: https://github.com/tarantool/tarantool
Commit: 919b342be7a0062cbf8703a88e3edfaf3ea24605
https://github.com/tarantool/tarantool/commit/919b342be7a0062cbf8703a88e3edfaf3ea24605
Author: Eugine Blikh <[email protected]>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
Log Message:
-----------
1. Make `=` to be optional in `setopt delimiter 'string'`
2. Make support of multiline delimiters
Commit: 31aeeaac63f3e267cbfe7f42ff382354e311ce6a
https://github.com/tarantool/tarantool/commit/31aeeaac63f3e267cbfe7f42ff382354e311ce6a
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M extra/tarantool_box
Log Message:
-----------
rpm-start-activecheck: check for the active tarantool instance
before starting another one.
Commit: ace8cfff604f0fde839955c4cb2d4c87e4263763
https://github.com/tarantool/tarantool/commit/ace8cfff604f0fde839955c4cb2d4c87e4263763
Author: Eugine Blikh <[email protected]>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M client/tarantool/tc_buf.c
M client/tarantool/tc_cli.c
Log Message:
-----------
Fix for CR from pmwkaa
Commit: 7e06fc8ac4a8edb5a22721b6703eeadf9eeb301b
https://github.com/tarantool/tarantool/commit/7e06fc8ac4a8edb5a22721b6703eeadf9eeb301b
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-07 (Sat, 07 Sep 2013)
Changed paths:
M debian/changelog
Log Message:
-----------
New debian package.
Commit: c84e35c3bf5fe0fdcc9d06ac9437ab0146351b70
https://github.com/tarantool/tarantool/commit/c84e35c3bf5fe0fdcc9d06ac9437ab0146351b70
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-08 (Sun, 08 Sep 2013)
Changed paths:
M CMakeLists.txt
M include/tarantool/config.h.cmake
M src/tarantool.cc
M third_party/tarantool_ev.c
M third_party/tarantool_ev.h
Log Message:
-----------
Fix build process on Debian/FreeBSD and BSD.
* sys/prctl.h can be found only on Linux, but cmake recognizes Debian/kFreeBSD
as Linux.
* extern "C" for TIMEOUT_INFINITY (it is used in plugins)
Commit: 4382f1641ff885c09ab9ab1bf285941b0f815a94
https://github.com/tarantool/tarantool/commit/4382f1641ff885c09ab9ab1bf285941b0f815a94
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-08 (Sun, 08 Sep 2013)
Changed paths:
M debian/changelog
M debian/control
Log Message:
-----------
New Debian snapshot.
Commit: a064ebee0b287fe7805c3f3ba034da2d2da72bd1
https://github.com/tarantool/tarantool/commit/a064ebee0b287fe7805c3f3ba034da2d2da72bd1
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-08 (Sun, 08 Sep 2013)
Changed paths:
M debian/changelog
M debian/rules
Log Message:
-----------
Fix debian/rules clean section (cleanup CMake files).
Commit: f2974d60f5685a4fd8af27e97974332befa9499a
https://github.com/tarantool/tarantool/commit/f2974d60f5685a4fd8af27e97974332befa9499a
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M debian/changelog
M debian/rules
Log Message:
-----------
Remove tarantool/config.h pointedly (Debian/BSD).
Commit: 9f2e6466f4ffd823869403e03e6b762954b1f34a
https://github.com/tarantool/tarantool/commit/9f2e6466f4ffd823869403e03e6b762954b1f34a
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Drop BSD dependencies in Debian/kFreeBSD.
Commit: b856cdb266556339f6d3acff41db888e6858ab3a
https://github.com/tarantool/tarantool/commit/b856cdb266556339f6d3acff41db888e6858ab3a
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M debian/changelog
Log Message:
-----------
New Debian upload.
Commit: eb56eca8ecdbbfe5102972707cf0754f27f86ead
https://github.com/tarantool/tarantool/commit/eb56eca8ecdbbfe5102972707cf0754f27f86ead
Author: Eugine Blikh <[email protected]>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M client/tarantool/tc.c
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
Log Message:
-----------
1. Get port number from admin connection
2. delete setopt and delimiter contractions
Commit: ec3c76bad201f85aad01d3b10d3f7a4b971ef029
https://github.com/tarantool/tarantool/commit/ec3c76bad201f85aad01d3b10d3f7a4b971ef029
Author: Eugine Blikh <[email protected]>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M client/tarantool/tc.c
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
Log Message:
-----------
1. Get port number from admin connection
2. delete setopt and delimiter contractions
Commit: 3a0b40a6c7d1efa1d61b4b54e30ed0f2a5276b78
https://github.com/tarantool/tarantool/commit/3a0b40a6c7d1efa1d61b4b54e30ed0f2a5276b78
Author: Eugine Blikh <[email protected]>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M client/tarantool/tc.c
Log Message:
-----------
Add backwards compatibility
Commit: 2fe783149989e754867f7a5dbbb928d2ffd78950
https://github.com/tarantool/tarantool/commit/2fe783149989e754867f7a5dbbb928d2ffd78950
Author: Eugine Blikh <[email protected]>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M client/tarantool/tc.c
Log Message:
-----------
Fix CR style errors
Commit: dd572eed55b96b4652fc8241904724b75113feae
https://github.com/tarantool/tarantool/commit/dd572eed55b96b4652fc8241904724b75113feae
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M src/box/alter.cc
M src/box/box_lua.cc
M src/box/key_def.cc
M src/box/lua/schema.lua
M src/box/space.cc
M src/box/space.h
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/lua.result
Log Message:
-----------
Continue adding test coverage for the new data dictionary: ALTER INDEX.
Debug index:alter().
Add tests for changes in index id, name, type, unique/not unique.
Make box.space[i].index[j] output yaml-parsable (- idx: index 0
parsing problem).
Commit: 7522de0192dcb9167719509a0f98460d49e6849a
https://github.com/tarantool/tarantool/commit/7522de0192dcb9167719509a0f98460d49e6849a
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M extra/tarantool_box
Log Message:
-----------
Merge branch 'rpm-start-activecheck' into stable
Commit: d81461afb485572da72dffc3c6ab91ce59dd2e31
https://github.com/tarantool/tarantool/commit/d81461afb485572da72dffc3c6ab91ce59dd2e31
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M include/errcode.h
M src/box/alter.cc
M src/box/key_def.cc
M src/box/lua/schema.lua
M src/box/tuple.cc
M src/box/tuple.h
M test/big/sql.result
M test/big/tree_pk_multipart.result
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/lua.result
M test/box/lua_misc.result
M test/lib/sql_ast.py
Log Message:
-----------
Continue covering MODIFY INDEX with tests.
Implement tuple validation when building a new index.
This introduces such checks as for field type, presence of a field,
etc. in all tuples added to the new index.
Add error code ER_INDEX_ARITY, update tests.
Add a check that the primary key is always unique.
Test unique -> non-unique transition.
Commit: 932867650c97a4d0cf2c7121e338434b5b8c0ca4
https://github.com/tarantool/tarantool/commit/932867650c97a4d0cf2c7121e338434b5b8c0ca4
Author: Eugine Blikh <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M .gitmodules
M test/lib/box_connection.py
M test/lib/sql_ast.py
A test/lib/tarantool-python
Log Message:
-----------
Add first support of python backend for TT. Still need to add support of
error code (now it return 0 everytime)
Commit: fbb4275880646d189c0c8c04de07bef1efb592cb
https://github.com/tarantool/tarantool/commit/fbb4275880646d189c0c8c04de07bef1efb592cb
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M src/say.cc
Log Message:
-----------
macosx: MacOS X doesn't have sigtimedwait()
Commit: 43c930b44c4edf0464a4ebae65dc218d0611ec76
https://github.com/tarantool/tarantool/commit/43c930b44c4edf0464a4ebae65dc218d0611ec76
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M src/say.cc
Log Message:
-----------
Merge branch 'stable'
Commit: b1b99cc0b05a1ecc154761cca12cf9c261d755b5
https://github.com/tarantool/tarantool/commit/b1b99cc0b05a1ecc154761cca12cf9c261d755b5
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M src/say.cc
Log Message:
-----------
Merge branch 'stable' of github.com:tarantool/tarantool into stable
Commit: 024acb385b6c519cbefcd0209bd6b902a477691d
https://github.com/tarantool/tarantool/commit/024acb385b6c519cbefcd0209bd6b902a477691d
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M extra/tarantool_box
Log Message:
-----------
Merge branch 'stable'
Commit: 901366f89008b61ab869d9fe77d5261a663a327b
https://github.com/tarantool/tarantool/commit/901366f89008b61ab869d9fe77d5261a663a327b
Author: Eugine Blikh <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M test/lib/box_connection.py
M test/lib/sql_ast.py
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
Log Message:
-----------
Fix number of bugs and output
Commit: e7f6f936ebaa955e6f72b20a7c4040e9153fd2e0
https://github.com/tarantool/tarantool/commit/e7f6f936ebaa955e6f72b20a7c4040e9153fd2e0
Author: Eugine Blikh <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M test/big/sql.result
M test/box/admin.result
M test/box/admin.test.py
M test/box/bad_trigger.result
M test/box/bad_trigger.test.py
M test/box/iproto.result
M test/box/lua.result
M test/box/lua.test.py
M test/box/reconfigure.result
M test/box/reconfigure.test.py
M test/box/snapshot.result
M test/box/snapshot.test.py
M test/box/sql.result
M test/box/sql.test.py
M test/box/stat.result
A test/box/stat.test.lua
R test/box/stat.test.py
M test/replication/swap.result
M test/replication/swap.test.py
Log Message:
-----------
Move test files to new format of box_connection output (yaml-like). Move stat
test to LUA. We may move reconfigure.test(??) and sql test to LUA, i suppose
Commit: 0bcb77a23497e36444f75c1e4e7e1817446f8616
https://github.com/tarantool/tarantool/commit/0bcb77a23497e36444f75c1e4e7e1817446f8616
Author: Eugine Blikh <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
M client/tarantool/tc.c
Log Message:
-----------
use strncmp instead of strcmp
Commit: c502b00d616e1cd061076f29f59b443551782637
https://github.com/tarantool/tarantool/commit/c502b00d616e1cd061076f29f59b443551782637
Author: Eugine Blikh <[email protected]>
Date: 2013-09-13 (Fri, 13 Sep 2013)
Changed paths:
A test/box/admin.test.lua
Log Message:
-----------
first try of admin.test.lua
Commit: f2a41d1f67e971d0cf9fffe134b042b2647731e3
https://github.com/tarantool/tarantool/commit/f2a41d1f67e971d0cf9fffe134b042b2647731e3
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-15 (Sun, 15 Sep 2013)
Changed paths:
M client/tarantool/tc.c
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
Log Message:
-----------
Merge branch 'tc-port' into stable
Commit: c3023451462a0bd4a93e2a301f86400072f36754
https://github.com/tarantool/tarantool/commit/c3023451462a0bd4a93e2a301f86400072f36754
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-15 (Sun, 15 Sep 2013)
Changed paths:
M client/tarantool/tc.c
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
Log Message:
-----------
Merge branch 'stable'
Conflicts:
client/tarantool/tc.c
Commit: 00ba6cbc4549e9018b4b085932f77a9a61e5a7e7
https://github.com/tarantool/tarantool/commit/00ba6cbc4549e9018b4b085932f77a9a61e5a7e7
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-15 (Sun, 15 Sep 2013)
Changed paths:
M client/tarantool/tc.c
Log Message:
-----------
Merge remote-tracking branch 'origin/tt-port-master'
Conflicts:
client/tarantool/tc.c
Commit: 236e46c229440364e115ab769b353104bfda4e68
https://github.com/tarantool/tarantool/commit/236e46c229440364e115ab769b353104bfda4e68
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-15 (Sun, 15 Sep 2013)
Changed paths:
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
Log Message:
-----------
Merge remote-tracking branch 'origin/tc-newline-fix'
Conflicts:
client/tarantool/tc_cli.c
Commit: 706997e441ff4316c5e447a6e6e9c5c9980d7d48
https://github.com/tarantool/tarantool/commit/706997e441ff4316c5e447a6e6e9c5c9980d7d48
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/box/admin.result
M test/box/admin.test.lua
R test/box/admin.test.py
Log Message:
-----------
Move admin.test to lua
Commit: f63240df4793b666104ed1d8d9d111d136d8e605
https://github.com/tarantool/tarantool/commit/f63240df4793b666104ed1d8d9d111d136d8e605
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/box/admin.result
M test/box/admin.test.lua
Log Message:
-----------
Add forgotten space:drop()
Commit: d133d1909f68582e741d25d46d4291a708e0b837
https://github.com/tarantool/tarantool/commit/d133d1909f68582e741d25d46d4291a708e0b837
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/lib/tarantool_server.py
Log Message:
-----------
Fix race condition
Commit: 19f001f9ad04d961ba0edf042a2de55813329bf1
https://github.com/tarantool/tarantool/commit/19f001f9ad04d961ba0edf042a2de55813329bf1
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M include/errcode.h
M src/box/alter.cc
M src/box/box_lua.cc
M src/box/box_lua_space.cc
M src/box/index.h
M src/box/key_def.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/schema.h
M src/box/space.cc
M src/box/space.h
M src/box/tuple.cc
M src/box/tuple.h
M test/big/sql.result
M test/big/tree_pk_multipart.result
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/lua.result
M test/box/lua.test.py
M test/box/lua_misc.result
M test/lib/sql_ast.py
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into tt-pythonize
Commit: b2b293a7c4f02f12961ae86b2dab0b938149a5de
https://github.com/tarantool/tarantool/commit/b2b293a7c4f02f12961ae86b2dab0b938149a5de
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/big/sql.result
M test/big/sql.test.py
M test/box/admin.result
M test/box/admin.test.lua
M test/box/bad_trigger.result
M test/box/lua.result
M test/box/sql.result
M test/box/sql.test.py
M test/lib/box_connection.py
M test/lib/sql_ast.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/replication/swap.test.py
Log Message:
-----------
1. remove tnt* aliases
2. modify errmsg
3. rewrite Lua - check_type
4. Move try-except importerror to test_suite file
Commit: 8acf452929ac704a8c17853d948804412ce877c1
https://github.com/tarantool/tarantool/commit/8acf452929ac704a8c17853d948804412ce877c1
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/lib/box_connection.py
M test/lib/sql_ast.py
Log Message:
-----------
Remove trailing whitespaces
Commit: 2852e99a88c76f87273e07a3ee09e5991022871a
https://github.com/tarantool/tarantool/commit/2852e99a88c76f87273e07a3ee09e5991022871a
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M client/tarantool/tc.c
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M extra/tarantool_box
M src/say.cc
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into tt-pythonize
Commit: 06fff63c2c1445919c33674cc48ce2598d4be473
https://github.com/tarantool/tarantool/commit/06fff63c2c1445919c33674cc48ce2598d4be473
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M .gitmodules
M test/big/sql.result
M test/big/sql.test.py
M test/box/admin.result
A test/box/admin.test.lua
R test/box/admin.test.py
M test/box/bad_trigger.result
M test/box/bad_trigger.test.py
M test/box/iproto.result
M test/box/lua.result
M test/box/lua.test.py
M test/box/reconfigure.result
M test/box/reconfigure.test.py
M test/box/snapshot.result
M test/box/snapshot.test.py
M test/box/sql.result
M test/box/sql.test.py
M test/box/stat.result
A test/box/stat.test.lua
R test/box/stat.test.py
M test/lib/box_connection.py
M test/lib/sql_ast.py
A test/lib/tarantool-python
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/replication/swap.result
M test/replication/swap.test.py
Log Message:
-----------
Merge branch 'tt-pythonize'
Commit: f477edcd10b9a785e33133421e285c7fc700076c
https://github.com/tarantool/tarantool/commit/f477edcd10b9a785e33133421e285c7fc700076c
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/big/sql.result
M test/box/bad_trigger.result
M test/box/lua.result
M test/box/sql.result
M test/lib/box_connection.py
M test/lib/sql_ast.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
Log Message:
-----------
Remove spaces in errmsg and rename tarantool-python import checking function
Commit: cc37c540abcc5cd5bd3cb8807247f9511cb96d4e
https://github.com/tarantool/tarantool/commit/cc37c540abcc5cd5bd3cb8807247f9511cb96d4e
Author: Eugine Blikh <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M test/big/sql.result
M test/box/bad_trigger.result
M test/box/lua.result
M test/box/sql.result
M test/lib/box_connection.py
M test/lib/sql_ast.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
Log Message:
-----------
Merge branch 'tt-pythonize'
Commit: 64d90c35c26e742e3657a1b31420966de32878e9
https://github.com/tarantool/tarantool/commit/64d90c35c26e742e3657a1b31420966de32878e9
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M doc/user/configuration-reference.xml
M doc/user/language-reference.xml
M doc/user/persistence-architecture.xml
M doc/user/replication.xml
M doc/user/stored-procedures.xml
M doc/user/target.db
Log Message:
-----------
Document lua-console and begin adding docs for dynamic add/drop space.
Commit: 3a9f44f2de816efff257604b36132b6f126078c0
https://github.com/tarantool/tarantool/commit/3a9f44f2de816efff257604b36132b6f126078c0
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M src/lua/init.cc
M test/box/fiber.result
M test/box/fiber.test
Log Message:
-----------
Fix https://github.com/tarantool/tarantool/issues/33
Fix a crash when box.fiber.find() is called with no arguments.
Add a check for empty Lua stack.
Add a test.
Commit: 9436bdc7c5f5dab73ff7b1dffe5087f76986ea71
https://github.com/tarantool/tarantool/commit/9436bdc7c5f5dab73ff7b1dffe5087f76986ea71
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M src/lua/fiber.cc
M test/box/fiber.result
M test/box/fiber.test.lua
Log Message:
-----------
Merge branch 'stable'
Conflicts:
src/lua/init.cc
test/box/fiber.result
test/box/fiber.test
Commit: 5de684f84c439fa8b4d306f4569464b77ea5d770
https://github.com/tarantool/tarantool/commit/5de684f84c439fa8b4d306f4569464b77ea5d770
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M include/errcode.h
M src/box/alter.cc
M src/box/box_lua_space.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/space.h
M src/box/txn.cc
M src/iproto.cc
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/lua.result
M test/box/lua_misc.result
A test/box/temp-spaces.result
A test/box/temp-spaces.test.lua
Log Message:
-----------
Temporary spaces for tarantool 1.6.
Commit: f27e41e10c3343e1f1b4dcda7df37d00c6fe3ce2
https://github.com/tarantool/tarantool/commit/f27e41e10c3343e1f1b4dcda7df37d00c6fe3ce2
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M src/box/box_lua_space.cc
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
Log Message:
-----------
Add test coverage for start/stop from snapshot. Fix bugs it revealed.
Commit: 6641b7230de73d1c86ff2f4074e44df12c31a1d6
https://github.com/tarantool/tarantool/commit/6641b7230de73d1c86ff2f4074e44df12c31a1d6
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M .gitmodules
M client/tarantool/tc.c
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M doc/user/configuration-reference.xml
M doc/user/language-reference.xml
M doc/user/persistence-architecture.xml
M doc/user/replication.xml
M doc/user/stored-procedures.xml
M doc/user/target.db
M test/big/sql.result
M test/big/sql.test.py
M test/box/admin.result
A test/box/admin.test.lua
R test/box/admin.test.py
M test/box/bad_trigger.result
M test/box/bad_trigger.test.py
M test/box/iproto.result
M test/box/lua.result
M test/box/lua.test.py
M test/box/reconfigure.result
M test/box/reconfigure.test.py
M test/box/snapshot.result
M test/box/snapshot.test.py
M test/box/sql.result
M test/box/sql.test.py
M test/box/stat.result
A test/box/stat.test.lua
R test/box/stat.test.py
M test/lib/box_connection.py
M test/lib/sql_ast.py
A test/lib/tarantool-python
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/replication/swap.result
M test/replication/swap.test.py
Log Message:
-----------
Merge branch 'master' of github.com:tarantool/tarantool
Commit: 0c3c78aafee73696afe860265b523c3ac244ad7c
https://github.com/tarantool/tarantool/commit/0c3c78aafee73696afe860265b523c3ac244ad7c
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M src/box/box_lua_space.cc
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
Log Message:
-----------
Merge branch 'master' of github.com:tarantool/tarantool
Commit: 015a4df847965bdcc87a00701b047abfd4853bf6
https://github.com/tarantool/tarantool/commit/015a4df847965bdcc87a00701b047abfd4853bf6
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M src/box/box.cc
Log Message:
-----------
Temp spaces aren't write in snapshot, too.
Commit: 2acb733e2a6062e97fbf466d45b66ff1fc2b378a
https://github.com/tarantool/tarantool/commit/2acb733e2a6062e97fbf466d45b66ff1fc2b378a
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M src/recovery.cc
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/errinj.result
M test/box/errinj.test.lua
Log Message:
-----------
When gaps in LSN fall on xlog boundaries, recovery could fail.
When looking for the next xlog to recover from, take
into account gaps in LSNs which may occur due to wal_write()
failures.
Add test coverage for create/drop space and error injections.
Add cleanup to alter_limits.test
Commit: b1240769891203788dccf05899688cfafbd0c60b
https://github.com/tarantool/tarantool/commit/b1240769891203788dccf05899688cfafbd0c60b
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M include/errcode.h
M src/box/alter.cc
M src/box/box.cc
M src/box/box_lua_space.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/space.h
M src/box/txn.cc
M src/iproto.cc
M test/box/alter_limits.result
M test/box/lua.result
M test/box/lua_misc.result
R test/box/temp-spaces.result
R test/box/temp-spaces.test.lua
A test/box/temp_spaces.result
A test/box/temp_spaces.test.lua
Log Message:
-----------
Code review for tmp_spaces_1_6, fixes gh-34.
Commit: 0cea242653e04701477a5768777f2e3a1c72b397
https://github.com/tarantool/tarantool/commit/0cea242653e04701477a5768777f2e3a1c72b397
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M src/box/alter.cc
M src/box/box.cc
M src/box/box_lua_space.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/space.h
M src/box/txn.cc
M test/box/alter_limits.result
M test/box/lua.result
A test/box/temp_spaces.result
A test/box/temp_spaces.test.lua
Log Message:
-----------
Merge branch 'tmp_spaces_1_6'
Conflicts:
test/box/alter_limits.test.lua
Commit: 45e93245e4aa4db57679c9e2b95322c1744a4787
https://github.com/tarantool/tarantool/commit/45e93245e4aa4db57679c9e2b95322c1744a4787
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
fix snap_io_rate_limit handling
Commit: 47406e7da3b3983ee8e669dc829c9a45f3721149
https://github.com/tarantool/tarantool/commit/47406e7da3b3983ee8e669dc829c9a45f3721149
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M include/fiber.h
M src/fiber.cc
R src/memcached-grammar.cc
Log Message:
-----------
Remove dead code.
Commit: c3145e2e8338a5a7ce5d27b0d0813eb65b8fa7cb
https://github.com/tarantool/tarantool/commit/c3145e2e8338a5a7ce5d27b0d0813eb65b8fa7cb
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M include/salloc.h
M src/box/tuple.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
shared-arena: shared arena, closes #36
Allocate slab arena in shared memory to reduce pages splits during
snapshotting.
Adaptation of patch made by Yuri Nevinitsin @nevinitsin.
Commit: d7db11af358ae2e162bc7b55890d9eb6f1008abd
https://github.com/tarantool/tarantool/commit/d7db11af358ae2e162bc7b55890d9eb6f1008abd
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M src/log_io.cc
M src/recovery.cc
Log Message:
-----------
replace fdatasync() to open(O_SYNC)
Commit: a0d934af5ffb2e3c60cb85fd4d722b2e38870177
https://github.com/tarantool/tarantool/commit/a0d934af5ffb2e3c60cb85fd4d722b2e38870177
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M src/lua/init.cc
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
Fixes gh-37: print(64-bit number) adds extra newline
A copy-paste implementation of print(64 bit number)
used to add an extra newline at the end of printed string.
Commit: d550c002872b36c3b11c2712a86f3bfbdd612ee1
https://github.com/tarantool/tarantool/commit/d550c002872b36c3b11c2712a86f3bfbdd612ee1
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Log Message:
-----------
Merge branch 'stable'
Conflicts:
src/lua/init.cc
test/box/lua.result
test/box/lua.test
Commit: 9349d6c3f1b3187aa92a820e0881713f402e14fa
https://github.com/tarantool/tarantool/commit/9349d6c3f1b3187aa92a820e0881713f402e14fa
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M test/box/lua_misc.result
M test/box/lua_misc.test.lua
Log Message:
-----------
Add a test case for gh-37 (print of 64-bit number adds extra newline)
Commit: b74be31f3728d0ee1ad67845de7df4ce4623a144
https://github.com/tarantool/tarantool/commit/b74be31f3728d0ee1ad67845de7df4ce4623a144
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M CMakeLists.txt
M cfg/warning.c
M cfg/warning.h
M cmake/BuildMisc.cmake
M include/tarantool.h
M include/tarantool/config.h.cmake
M include/tarantool/util.h
M src/lua/init.cc
M src/tarantool.cc
A third_party/open_memstream.c
Log Message:
-----------
Do not use tbuf for config output, use open_memstream() instead.
Provide open_memstream() implementation for system which
miss it (Mac OS X).
Commit: 64e67b9879436f48e1208aff74381e01c6d98959
https://github.com/tarantool/tarantool/commit/64e67b9879436f48e1208aff74381e01c6d98959
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M test/box/lua_misc.result
M test/box/lua_misc.test.lua
Log Message:
-----------
Merge branch 'master' of github.com:tarantool/tarantool
Commit: 83e62ddb33cb84c16b566fe911ed38a6d4417843
https://github.com/tarantool/tarantool/commit/83e62ddb33cb84c16b566fe911ed38a6d4417843
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M include/tarantool/util.h
M src/box/alter.cc
M src/lua/fiber.cc
Log Message:
-----------
Port the current master to Mac OS X.
Commit: fff2d177e5c3067af6ec988e0f48a38100bc41ef
https://github.com/tarantool/tarantool/commit/fff2d177e5c3067af6ec988e0f48a38100bc41ef
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M extra/rpm.spec.in
Log Message:
-----------
opentar-51: add rpm dependency for libgcc >= 4.1.2-50
Commit: 50b3aa6841f796199352376e3fcb3e3ffc33536a
https://github.com/tarantool/tarantool/commit/50b3aa6841f796199352376e3fcb3e3ffc33536a
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M extra/rpm.spec.in
Log Message:
-----------
Merge branch 'stable'
Commit: ff39a973ab2814134b8edca0033d72e15e8d8133
https://github.com/tarantool/tarantool/commit/ff39a973ab2814134b8edca0033d72e15e8d8133
Author: Yuriy Nevinitsin <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M src/log_io.cc
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
fix: do fdatasync() only when snap_io_rate_limit bytes written
Commit: ae1ec016a2e229eb6b30767f2947a23a894d287e
https://github.com/tarantool/tarantool/commit/ae1ec016a2e229eb6b30767f2947a23a894d287e
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M extra/tarantool_deploy.sh
Log Message:
-----------
rpm-chkconfig: call chkconfig after a deploy.
Commit: 525c3f1d444fe06d4b9c768a72ffbdebbb02abec
https://github.com/tarantool/tarantool/commit/525c3f1d444fe06d4b9c768a72ffbdebbb02abec
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M extra/tarantool_deploy.sh
Log Message:
-----------
Merge remote-tracking branch 'origin/rpm-chkconfig'
Commit: eed921100006c835ed874f5247203fb0a0b5ac47
https://github.com/tarantool/tarantool/commit/eed921100006c835ed874f5247203fb0a0b5ac47
Author: Eugine Blikh <[email protected]>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
Log Message:
-----------
Reformat --format tarantool for one-line input
Commit: 571762565da7f1686d1d9e882d5d8dd54c430e3f
https://github.com/tarantool/tarantool/commit/571762565da7f1686d1d9e882d5d8dd54c430e3f
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
A include/qbuf.h
M include/salloc.h
M src/box/tuple.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
shared-arena: review fixes, slab_q moved to separate file.
Commit: 8e8cd06184672fabfcb1e9c2d14ca6c92ce5f92c
https://github.com/tarantool/tarantool/commit/8e8cd06184672fabfcb1e9c2d14ca6c92ce5f92c
Author: Roman Tsisyk <[email protected]>
Date: 2013-09-26 (Thu, 26 Sep 2013)
Changed paths:
M include/errcode.h
M test/box/lua.result
M test/box/lua.test
M test/lib/sql_ast.py
Log Message:
-----------
Add support for custom error codes in box.raise()
Fix https://github.com/tarantool/tarantool/issues/44
Commit: f67634c41776bf0587e1043a8cbd75a53bc48cfa
https://github.com/tarantool/tarantool/commit/f67634c41776bf0587e1043a8cbd75a53bc48cfa
Author: Roman Tsisyk <[email protected]>
Date: 2013-09-26 (Thu, 26 Sep 2013)
Changed paths:
M include/errcode.h
M test/box/lua.result
M test/box/lua.test.py
M test/lib/sql_ast.py
Log Message:
-----------
Merge branch 'stable'
Conflicts:
test/box/lua.result
test/box/lua.test
test/lib/sql_ast.py
Commit: aacc30c22c204d0fa4d51468fcd4569773807971
https://github.com/tarantool/tarantool/commit/aacc30c22c204d0fa4d51468fcd4569773807971
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M CMakeLists.txt
M client/tarantar/main.c
M client/tarantool/tc.c
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M client/tarantool/tc_store.c
M connector/c/include/tarantool/tnt_proto.h
M connector/c/include/tarantool/tnt_request.h
M connector/c/include/tp.h
M connector/c/tnt/tnt_request.c
M debian/changelog
M debian/control
M debian/copyright
M debian/rules
M debian/scripts/tarantool_snapshot_rotate
A debian/source/options
M extra/rpm.spec.in
M extra/tarantool_box
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/box/lua/box.lua
M src/box/tuple.cc
M src/box/tuple.h
M src/lua/init.cc
M src/lua/lua_ipc.cc
M src/replication.cc
M src/say.cc
M src/sio.cc
M src/tarantool.cc
M test/box/fiber.result
M test/box/fiber.test
M test/box/lua.result
M test/box/lua.test
M test/lib/sql_ast.py
M third_party/tarantool_ev.c
M third_party/tarantool_ev.h
Log Message:
-----------
Merge branch 'stable' into odkl-fix-snap-io-rate-limit
Commit: 41985b159f0061c314d9c64abcad862a846eb2c4
https://github.com/tarantool/tarantool/commit/41985b159f0061c314d9c64abcad862a846eb2c4
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/recovery.h
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
gh-45: review fixes
Commit: 61a82866d9c4b39c5d54466f644f536947b20e8c
https://github.com/tarantool/tarantool/commit/61a82866d9c4b39c5d54466f644f536947b20e8c
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/recovery.h
M src/recovery.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'stable'
Fixes gh-45.
Conflicts:
src/recovery.cc
Commit: f3d78c9ede9980fb223b7402a81ef90ae9b6fa3e
https://github.com/tarantool/tarantool/commit/f3d78c9ede9980fb223b7402a81ef90ae9b6fa3e
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M src/recovery.cc
M test/box/reconfigure.result
M test/box/reconfigure.test.py
Log Message:
-----------
Fix a merge bug for gh-45, add a test case.
Commit: fcb2fc649cf64744c987e70cca454b5b031868e7
https://github.com/tarantool/tarantool/commit/fcb2fc649cf64744c987e70cca454b5b031868e7
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
A test/box/snap_io_rate_limit.cfg
Log Message:
-----------
gh-45: add forgotten config file for test
Commit: fd80a32b79747107fd67386620b7b3298ebddc8a
https://github.com/tarantool/tarantool/commit/fd80a32b79747107fd67386620b7b3298ebddc8a
Author: Alexandr <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/fiber.h
M src/box/txn.cc
M src/iproto.cc
M src/lua/init.cc
M src/session.cc
Log Message:
-----------
saving remote sockaddr to WAL
Commit: f59a1d1b3a031878a0cfe4fa0b63d32afa0bcfd6
https://github.com/tarantool/tarantool/commit/f59a1d1b3a031878a0cfe4fa0b63d32afa0bcfd6
Author: Dmitry Simonenko <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M include/salloc.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
shared-arena: make arena snapshot-version aware.
On snapshot, increase snapshot version id (u32),
save current snapshot version within a tuple.
On tuple free, check if tuple version is equal to current
snapshot id, if so do direct free, otherwise append tuple
to the delayed free list.
Commit: ee2c771d83ec655b776e5da4e7d7a7c3664baf8a
https://github.com/tarantool/tarantool/commit/ee2c771d83ec655b776e5da4e7d7a7c3664baf8a
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M doc/user/language-reference.xml
M doc/user/preface.xml
M src/box/tuple.cc
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
gh-47: (shared-arena) review fixes
Add comments, update the manual.
Commit: 315b111225985b98beaebed859c4c33629c6318b
https://github.com/tarantool/tarantool/commit/315b111225985b98beaebed859c4c33629c6318b
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M doc/user/language-reference.xml
M doc/user/preface.xml
A include/qbuf.h
M include/salloc.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/salloc.cc
M src/tarantool.cc
Log Message:
-----------
Merge branch 'shared-arena' into stable
Commit: 678e934438d9522a627a5ebbef929544ca30f247
https://github.com/tarantool/tarantool/commit/678e934438d9522a627a5ebbef929544ca30f247
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M test/wal/oom.result
Log Message:
-----------
gh-47: update wal/oom.test
Tuples are got a big bigger with shared-arena patch (4 bytes
per tuple overhead).
So we exhaust the current arena in out-of-memory test a bit
faster than before.
Commit: 8e17a07a3d6482735952f07bf529677b5839004a
https://github.com/tarantool/tarantool/commit/8e17a07a3d6482735952f07bf529677b5839004a
Author: Konstantin Osipov <[email protected]>
Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths:
M doc/user/language-reference.xml
M doc/user/preface.xml
A include/qbuf.h
M include/salloc.h
M src/box/box.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/salloc.cc
M src/tarantool.cc
M test/big/tree_variants.result
M test/big/tree_variants.test.lua
M test/wal/oom.result
Log Message:
-----------
Merge branch 'stable'
Fixes gh-47.
Update test results to be more deterministic.
Conflicts:
src/box/space.cc
src/box/tuple.cc
test/wal/oom.result
Commit: eb3e64cb73e926322c89d80b1c4229276b32d715
https://github.com/tarantool/tarantool/commit/eb3e64cb73e926322c89d80b1c4229276b32d715
Author: Dmitry Simonenko <[email protected]>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
Log Message:
-----------
opentar-48, opentar-52: support old config layout.
Commit: f89a60e3a468ece576f05a8d053c58c1a904a8a5
https://github.com/tarantool/tarantool/commit/f89a60e3a468ece576f05a8d053c58c1a904a8a5
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
Log Message:
-----------
Merge branch 'stable'
Commit: 0a5213d98b16274fd9fd2f7167716a1e82400b8f
https://github.com/tarantool/tarantool/commit/0a5213d98b16274fd9fd2f7167716a1e82400b8f
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
Log Message:
-----------
Merge branch 'tc-tarantool-newf' into stable
Commit: 883043c6ad192018fc69883be7a51a1a5a4d8acd
https://github.com/tarantool/tarantool/commit/883043c6ad192018fc69883be7a51a1a5a4d8acd
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
Log Message:
-----------
Merge branch 'stable'
Commit: ed199f4f852ea7e80e078b6e79374c2fa5b92ff5
https://github.com/tarantool/tarantool/commit/ed199f4f852ea7e80e078b6e79374c2fa5b92ff5
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
M doc/user/language-reference.xml
M doc/user/preface.xml
M extra/rpm.spec.in
M extra/tarantool_deploy.sh
M include/errcode.h
A include/qbuf.h
M include/recovery.h
M include/salloc.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/recovery.cc
M src/salloc.cc
M src/tarantool.cc
M test/box/lua.result
M test/box/lua.test
M test/lib/sql_ast.py
M test/wal/oom.result
Log Message:
-----------
Merge remote-tracking branch 'origin/stable' into
saving-remote-sockaddr-to-WAL
Commit: 3e4884d4013e58f76ab8e84fffd1f6012321cf32
https://github.com/tarantool/tarantool/commit/3e4884d4013e58f76ab8e84fffd1f6012321cf32
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M include/session.h
M src/admin.cc
M src/admin.rl
M src/coio.cc
M src/iproto.cc
M src/memcached.cc
M src/session.cc
Log Message:
-----------
gh-35, opentar-45: review fixes
Remove get_socket_addr(), use existing sockaddr_in
to save in the cookie.
Commit: 1fbf3ea066ad8fa898731066c009d12309199bfc
https://github.com/tarantool/tarantool/commit/1fbf3ea066ad8fa898731066c009d12309199bfc
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-04 (Fri, 04 Oct 2013)
Changed paths:
M include/fiber.h
M include/log_io.h
M include/recovery.h
M include/session.h
M src/admin.cc
A src/admin.rl
M src/box/txn.cc
M src/coio.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/fiber.cc
M src/recovery.cc
M src/session.cc
Log Message:
-----------
Merge branch 'stable', opentar-45
Conflicts:
src/admin.cc
src/admin.rl
src/box/txn.cc
src/lua/init.cc
src/memcached.cc
src/session.cc
Commit: 673a2944499a1943883deccdc6adbd76113e79a4
https://github.com/tarantool/tarantool/commit/673a2944499a1943883deccdc6adbd76113e79a4
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-05 (Sat, 05 Oct 2013)
Changed paths:
M .gitmodules
M CMakeLists.txt
M cfg/warning.c
M cfg/warning.h
M client/tarantool/tc.c
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
M cmake/BuildMisc.cmake
M doc/user/configuration-reference.xml
M doc/user/language-reference.xml
M doc/user/persistence-architecture.xml
M doc/user/preface.xml
M doc/user/replication.xml
M doc/user/stored-procedures.xml
M doc/user/target.db
M extra/rpm.spec.in
M extra/tarantool_box
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/log_io.h
A include/qbuf.h
M include/recovery.h
M include/salloc.h
M include/session.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M include/tarantool/util.h
M src/admin.cc
A src/admin.rl
M src/box/alter.cc
M src/box/box.cc
M src/box/box_lua.cc
M src/box/box_lua_space.cc
M src/box/key_def.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/space.cc
M src/box/space.h
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/coio.cc
M src/fiber.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/fiber.cc
M src/lua/init.cc
R src/memcached-grammar.cc
M src/recovery.cc
M src/salloc.cc
M src/say.cc
M src/session.cc
M src/tarantool.cc
M test/big/sql.result
M test/big/sql.test.py
M test/big/tree_pk_multipart.result
M test/big/tree_variants.result
M test/big/tree_variants.test.lua
M test/box/admin.result
A test/box/admin.test.lua
R test/box/admin.test.py
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/bad_trigger.result
M test/box/bad_trigger.test.py
M test/box/errinj.result
M test/box/errinj.test.lua
M test/box/fiber.result
M test/box/fiber.test.lua
M test/box/iproto.result
M test/box/lua.result
M test/box/lua.test.py
M test/box/lua_misc.result
M test/box/lua_misc.test.lua
M test/box/reconfigure.result
M test/box/reconfigure.test.py
A test/box/snap_io_rate_limit.cfg
M test/box/snapshot.result
M test/box/snapshot.test.py
M test/box/sql.result
M test/box/sql.test.py
M test/box/stat.result
A test/box/stat.test.lua
R test/box/stat.test.py
A test/box/temp_spaces.result
A test/box/temp_spaces.test.lua
M test/lib/box_connection.py
M test/lib/sql_ast.py
A test/lib/tarantool-python
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/replication/swap.result
M test/replication/swap.test.py
M test/wal/oom.result
A third_party/open_memstream.c
Log Message:
-----------
Merge branch 'master' into transferring-snapshot-to-replica
Conflicts:
CMakeLists.txt
Commit: c67278ce9600c8f4d5f027848d138b1088670d06
https://github.com/tarantool/tarantool/commit/c67278ce9600c8f4d5f027848d138b1088670d06
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/log_io.h
M include/recovery.h
M include/replication.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/box/box.cc
M src/box/box_cfg.cfg_tmpl
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M src/tarantool.cc
M test/box/admin.result
M test/box/configuration.result
M test/box/lua.result
Log Message:
-----------
https://blueprints.launchpad.net/tarantool/+spec/start-replication-last-dump
Review fixes:
- New configuration variable 'replication_protocol'
is defined in the configuration file. The original patch
would hand-craft it into generated files.
- Simplified numeric version id generation.
- Removed timeouts from new sio_* calls. They did't quite work,
especially with blocking sockits. Timeouts should at least use
select(), which updates wait time on exit..
- Removed include cfg/tarantool_box_cfg.h into recovery.cc, instead
passed around all arguments explicitly.
- Removed unused headers.
- reused handshake code in master and replica
- simplified handshake in replica fiber
- removed clutter
- touched here and there.
Compare:
https://github.com/tarantool/tarantool/compare/7ef52cfd9a85...c67278ce9600
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
