From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Igor Munkin <imun@tarantool.org>, Alexander Turenko <alexander.turenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH] build: disable LUAJIT_ENABLE_PAIRSMM Date: Tue, 3 Mar 2020 23:53:51 +0100 [thread overview] Message-ID: <79f7fafa-0d2f-ee26-f5f3-c6766b86d056@tarantool.org> (raw) In-Reply-To: <6b8602a297876492179b695f317e809bd425af79.1582209853.git.imun@tarantool.org> Hi! Thanks for the patch! See 2 comments below. > build: disable LUAJIT_ENABLE_PAIRSMM > > Since this build flag has been removed as a result of reverting the > tarantool/luajit@d4e985a, its definition in the corresponding Tarantool > cmake file is irrelevant. > > Furthermore, considering the breakage faced in #4770 the following tests > are introduced: > * the check whether space __pairs metamethod is set to space.pairs to > create a Lua Fun iterator that handles __pairs manually underneath. > * the check whether pairs builtin behaviour doesn't change when __pairs > is set e.g. on space object. > > Follow-up #4560 > Closes #4770 > > Signed-off-by: Igor Munkin <imun@tarantool.org> > > diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake > index 072db8269..10df633d5 100644 > --- a/cmake/luajit.cmake > +++ b/cmake/luajit.cmake > @@ -217,7 +217,6 @@ macro(luajit_build) > add_definitions(-DLUAJIT_USE_ASAN=1) > set (luajit_ldflags ${luajit_ldflags} -fsanitize=address) > endif() > - add_definitions(-DLUAJIT_ENABLE_PAIRSMM=1) > add_definitions(-DLUAJIT_SMART_STRINGS=1) > # Add all COMPILE_DEFINITIONS to xcflags > get_property(defs DIRECTORY PROPERTY COMPILE_DEFINITIONS) > diff --git a/test/box/misc.result b/test/box/misc.result > index 5ac5e0f26..6fc035171 100644 > --- a/test/box/misc.result > +++ b/test/box/misc.result > @@ -1431,3 +1431,43 @@ test_run:grep_log('default', 'test log') > --- > - test log > ... > +-- > +-- gh-4770: Iteration through space with Lua builtin pairs routine > +-- > +box.cfg{} 1. box.cfg{} is already done by test/box/box.lua, which starts misc.test.lua. > +--- > +... > +s = box.schema.create_space('test') > +--- > +... > +-- Check whether __pairs is set for the space object, since Lua Fun > +-- handles it manually underneath. > +getmetatable(s).__pairs == space.pairs > +--- > +- true > +... > +-- Check whether pairs builtin behaviour doesn't change when the > +-- __pairs is set. > +keys = {} > +--- > +... > +for k, v in pairs(s) do keys[k] = true end > +--- > +... > +keys > +--- > +- engine: true > + before_replace: true > + field_count: true > + id: true > + on_replace: true > + temporary: true > + index: true > + is_local: true > + enabled: true > + name: true > + ck_constraint: true 2. I wouldn't print all the keys, since this test will break anytime when something added to space. I would just check that a couple of fields exists: keys.engine, keys.id, keys.name. Up to you.
next prev parent reply other threads:[~2020-03-03 22:53 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-20 15:20 Igor Munkin 2020-02-20 18:03 ` Konstantin Osipov 2020-02-20 20:48 ` Igor Munkin 2020-02-21 7:12 ` Konstantin Osipov 2020-03-03 22:53 ` Vladislav Shpilevoy [this message] 2020-03-06 16:28 ` Igor Munkin 2020-03-05 5:44 ` Kirill Yukhin 2020-03-06 16:28 ` Igor Munkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=79f7fafa-0d2f-ee26-f5f3-c6766b86d056@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=imun@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] build: disable LUAJIT_ENABLE_PAIRSMM' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox