Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
956529f3
Commit
956529f3
authored
6 years ago
by
Vladimir Davydov
Browse files
Options
Downloads
Plain Diff
Merge branch '1.10-features' into 2.1
parents
6fefbb0b
64e3830c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.travis.yml
+2
-0
2 additions, 0 deletions
.travis.yml
src/box/gc.c
+11
-1
11 additions, 1 deletion
src/box/gc.c
src/box/lua/session.c
+3
-3
3 additions, 3 deletions
src/box/lua/session.c
test/app-tap/console.test.lua
+9
-1
9 additions, 1 deletion
test/app-tap/console.test.lua
with
25 additions
and
5 deletions
.travis.yml
+
2
−
0
View file @
956529f3
...
...
@@ -57,6 +57,8 @@ matrix:
env
:
OS=ubuntu DIST=artful
-
name
:
Ubuntu Bionic (18.04) build + deploy DEB
env
:
OS=ubuntu DIST=bionic
-
name
:
Ubuntu Cosmic (18.10) build + deploy DEB
env
:
OS=ubuntu DIST=cosmic
-
name
:
Debian Wheezy (7) build + deploy DEB
env
:
OS=debian DIST=wheezy
-
name
:
Debian Jessie (8) build + deploy DEB
...
...
This diff is collapsed.
Click to expand it.
src/box/gc.c
+
11
−
1
View file @
956529f3
...
...
@@ -109,8 +109,18 @@ gc_process_wal_event(struct wal_watcher_msg *);
void
gc_set_wal_watcher
(
void
)
{
/*
* Since the function is called from box_cfg() it is
* important that we do not pass a message processing
* callback to wal_set_watcher(). Doing so would cause
* credentials corruption in the fiber executing
* box_cfg() in case it processes some iproto messages.
* Besides, by the time the function is called
* tx_fiber_pool is already set up and it will process
* all the messages directed to "tx" endpoint safely.
*/
wal_set_watcher
(
&
gc
.
wal_watcher
,
"tx"
,
gc_process_wal_event
,
cbus_process
,
WAL_EVENT_GC
);
NULL
,
WAL_EVENT_GC
);
}
void
...
...
This diff is collapsed.
Click to expand it.
src/box/lua/session.c
+
3
−
3
View file @
956529f3
...
...
@@ -369,15 +369,15 @@ static int
lbox_session_push
(
struct
lua_State
*
L
)
{
struct
session
*
session
=
current_session
();
int
ok
;
uint64_t
sync
;
switch
(
lua_gettop
(
L
))
{
case
1
:
sync
=
session_sync
(
session
);
break
;
case
2
:
sync
=
lua_tointegerx
(
L
,
2
,
&
ok
);
if
(
ok
!=
0
)
{
sync
=
luaL_touint64
(
L
,
2
);
if
(
sync
!=
0
||
(
lua_isnumber
(
L
,
2
)
&&
lua_tonumber
(
L
,
2
)
==
0
))
{
lua_pop
(
L
,
1
);
break
;
}
...
...
This diff is collapsed.
Click to expand it.
test/app-tap/console.test.lua
+
9
−
1
View file @
956529f3
...
...
@@ -21,7 +21,7 @@ local EOL = "\n...\n"
test
=
tap
.
test
(
"console"
)
test
:
plan
(
5
7
)
test
:
plan
(
5
9
)
-- Start console and connect to it
local
server
=
console
.
listen
(
CONSOLE_SOCKET
)
...
...
@@ -39,6 +39,14 @@ test:is(client:read(EOL), '%TAG !push! tag:tarantool.io/push,2018\n--- 200\n...\
"pushed message"
)
test
:
is
(
client
:
read
(
EOL
),
'---\n- true\n...\n'
,
"pushed message"
)
--
-- gh-3790: box.session.push support uint64_t sync.
--
client
:
write
(
'box.session.push(1, 9223372036854775808ULL)\n'
)
test
:
is
(
client
:
read
(
EOL
),
'%TAG !push! tag:tarantool.io/push,2018\n--- 1\n...\n'
,
"pushed message"
)
test
:
is
(
client
:
read
(
EOL
),
'---\n- true\n...\n'
,
"pushed message"
)
-- Execute some command
client
:
write
(
"1\n"
)
test
:
is
(
yaml
.
decode
(
client
:
read
(
EOL
))[
1
],
1
,
"eval"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment