Merge remote-tracking branch 'origin/master' into gh-578-join-thread-3

src/box/engine_sophia.cc

@@ -205,20 +205,16 @@ SophiaFactory::keydefCheck(struct key_def *key_def)
 void
 SophiaFactory::txnFinish(struct txn *txn)
 {
-	/**
-	 * @todo: support multi-statement transactions
-	 * here when sophia supports them.
-	 */
-
-	/* single-stmt case:
-	 *
-	 * no need to unref tuple here, since it will be done by
-	 * TupleGuard in execute_replace().
-	*/
-	(void)txn;
-#if 0
-	struct txn_stmt *stmt = txn_stmt(txn);
-	if (stmt->new_tuple)
-		tuple_unref(stmt->new_tuple);
-#endif
+	/* @todo: multi-statement transactions */
+
+	/* single-stmt case */
+	if (txn->n_stmts == 1) {
+		struct txn_stmt *stmt = txn_stmt(txn);
+		if (stmt->new_tuple) {
+			/* 2 refs: iproto case */
+			/* 3 refs: lua case */
+			assert(stmt->new_tuple->refs >= 2);
+			tuple_unref(stmt->new_tuple);
+		}
+	}
 }

src/lua/trigger.cc

@@ -32,7 +32,9 @@
 void
 lbox_trigger_destroy(struct trigger *trigger)
 {
-	luaL_unref(tarantool_L, LUA_REGISTRYINDEX, (intptr_t) trigger->data);
+	if (tarantool_L)
+		luaL_unref(tarantool_L,
+			LUA_REGISTRYINDEX, (intptr_t) trigger->data);
 	free(trigger);
 }
 

test/app/trigger_atexit.test.lua

+#!/usr/bin/env tarantool
+-- vim: set ft=lua :
+
+-- see https://github.com/tarantool/tarantool/issues/583
+
+tap = require 'tap'
+fio = require 'fio'
+log = require 'log'
+
+tempdir = fio.tempdir()
+
+box.cfg {
+    wal_dir = tempdir,
+    snap_dir = tempdir,
+    sophia_dir = tempdir,
+    logger      = fio.pathjoin(tempdir, 'tarantool.log')
+}
+
+local function test_replace(old_tuple, new_tuple)
+
+end
+
+
+box.schema.create_space('abc')
+box.space.abc:create_index('pk', { type = 'tree' })
+box.space.abc:on_replace(test_replace)
+
+
+cleanup_list = fio.glob(fio.pathjoin(tempdir), '*')
+for _, file in pairs(cleanup_list) do
+    fio.unlink(file)
+end
+fio.rmdir(tempdir)
+os.exit(0)
+

test/box/bsdsocket.skipcond

+
+# vim: set ft=python :
+import re
+import os.path
+import socket
+import os
+
+test_path = '/tmp/tarantool-test-socket'
+
+if os.path.exists(test_path):
+    os.remove(test_path)
+
+s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+try:
+    s.bind(test_path)
+except:
+    self.skip = 1
+
+s.close()
+
+if os.path.exists(test_path):
+    os.remove(test_path)