feature: remove `lua` dir. #1351

moonming · 2020-03-27T11:08:45Z

discuss thread: https://lists.apache.org/thread.html/r10155c0ba784c25de54bd8e19355e5f517cade98af006ed2ef69dd25%40%3Cdev.apisix.apache.org%3E

membphis

we need to update the t/APISIX.pm too

bin/apisix

chnliyong

@membphis @moonming This PR's code seems install the apisix code in directory $PKG_ROOT/apisix/, not $PKG_ROOT/(I just use PKG_ROOT to represent the root package search path), is this right?
We should confirm which method is better.
I prefer treat apisix as a regular rocks lib and the target to be installed in $PKG_ROOT:

$ tree -L 1 deps/share/lua/5.1/
deps/share/lua/5.1/
├── apisix
├── apisix.lua
├── jsonschema
├── jsonschema.lua
├── net
├── opentracing
├── protoc.lua
├── resty
├── tinyyaml.lua
└── typeof.lua

Take this for example: the apisix.lua and apisix directory under this directory, not add a directory level named apisix, which would look like:

deps/share/lua/5.1/
├── apisix
│      ├── apisix
│      └── apisix.lua
│......

chnliyong · 2020-03-28T03:20:44Z

bin/apisix

-local pkg_path  = apisix_home .. "/deps/share/lua/5.1/apisix/lua/?.lua;"
-                  .. "/usr/local/share/lua/5.1/apisix/lua/?.lua;"
+local pkg_path  = apisix_home .. "/deps/share/lua/5.1/apisix/?.lua;"
+                  .. "/usr/local/share/lua/5.1/apisix/?.lua;"


All packages begin at apisix_home, this line looks redundant.

Contributing.md

membphis · 2020-03-28T04:57:53Z

I prefer treat apisix as a regular rocks lib and the target to be installed in $PKG_ROOT:

I agree with you ^_^

moonming · 2020-03-28T05:25:37Z

Will this conflict with other luarocks libraries? YuanSheng Wang <notifications@github.com>于2020年3月28日周六下午12:58写道：

I prefer treat apisix as a regular rocks lib and the target to be installed in $PKG_ROOT: I agree with you ^_^ — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1351 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AGJZBK55QXMASGQJBYRL4SDRJV7V5ANCNFSM4LU5SKRQ> .

-- Thanks, Ming Wen Twitter: _WenMing

Makefile

membphis · 2020-03-28T06:23:18Z

Will this conflict with other luarocks libraries?

No conflict.

membphis · 2020-03-28T09:50:02Z

lua/apisix.lua → apisix.lua

How about lua/apisix.lua → apisix/init.lua ?

moonming · 2020-03-29T02:08:10Z

lua/apisix.lua → apisix.lua

How about lua/apisix.lua → apisix/init.lua ?

good idea

dabue · 2020-03-29T14:21:40Z

that's good. 88786912@qq.com From: Wen Ming Date: 2020-03-29 10:08 To: apache/incubator-apisix CC: Subscribed Subject: Re: [apache/incubator-apisix] [WIP]feature: remove `lua` dir. (#1351) lua/apisix.lua → apisix.lua How about lua/apisix.lua → apisix/init.lua ? good idea — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe.

membphis · 2020-03-31T01:44:52Z

t/admin/balancer.t

@@ -25,7 +25,7 @@ add_block_preprocessor(sub {

    my $init_by_lua_block = <<_EOC_;
    require "resty.core"
-    apisix = require("apisix")
+    apisix = require("init")


This is wrong, we should use the original name "apisix".

./?/init.lua; is the standard Lua source code search path.

please take a look at this:

$ cat ../mm.patch diff --git a/bin/apisix b/bin/apisix index e27da893..c393536e 100755 --- a/bin/apisix +++ b/bin/apisix @@ -132,7 +132,7 @@ stream { init_by_lua_block { require "resty.core" - apisix = require("init") + apisix = require("apisix") apisix.stream_init() } @@ -261,7 +261,7 @@ http { init_by_lua_block { require "resty.core" - apisix = require("init") + apisix = require("apisix") local dns_resolver = { {% for _, dns_addr in ipairs(dns_resolver or {}) do %} "{*dns_addr*}", {% end %} } local args = { diff --git a/dashboard b/dashboard index cfb3ee7b..5ce7c37c 160000 --- a/dashboard +++ b/dashboard @@ -1 +1 @@ -Subproject commit cfb3ee7b8721076975c1deaff3e52da3ea4a312a +Subproject commit 5ce7c37c758f6365da042333d7909c12c0ab6714-dirty diff --git a/t/APISIX.pm b/t/APISIX.pm index e1a336a8..6b191524 100644 --- a/t/APISIX.pm +++ b/t/APISIX.pm @@ -107,7 +107,7 @@ _EOC_ my $stream_enable = $block->stream_enable; my $stream_config = $block->stream_config // <<_EOC_; - lua_package_path "$apisix_home/deps/share/lua/5.1/?.lua;$apisix_home/apisix/?.lua;$apisix_home/t/?.lua;./?.lua;;"; + lua_package_path "$apisix_home/deps/share/lua/5.1/?.lua;$apisix_home/apisix/?.lua;$apisix_home/t/?.lua;./?.lua;./?/init.lua;;"; lua_package_cpath "$apisix_home/deps/lib/lua/5.1/?.so;$apisix_home/deps/lib64/lua/5.1/?.so;./?.so;;"; lua_socket_log_errors off; @@ -127,7 +127,7 @@ _EOC_ require "resty.core" - apisix = require("init") + apisix = require("apisix") apisix.stream_init() } @@ -177,7 +177,7 @@ _EOC_ require "resty.core" - apisix = require("init") + apisix = require("apisix") local args = { dns_resolver = $dns_addrs_tbl_str, } @@ -186,7 +186,7 @@ _EOC_ my $http_config = $block->http_config // ''; $http_config .= <<_EOC_; - lua_package_path "$apisix_home/deps/share/lua/5.1/?.lua;$apisix_home/apisix/?.lua;$apisix_home/t/?.lua;./?.lua;;"; + lua_package_path "$apisix_home/deps/share/lua/5.1/?.lua;$apisix_home/apisix/?.lua;$apisix_home/t/?.lua;./?.lua;./?/init.lua;;"; lua_package_cpath "$apisix_home/deps/lib/lua/5.1/?.so;$apisix_home/deps/lib64/lua/5.1/?.so;./?.so;;"; lua_shared_dict plugin-limit-req 10m; @@ -216,7 +216,7 @@ _EOC_ } init_worker_by_lua_block { - require("init").http_init_worker() + require("apisix").http_init_worker() } # fake server, only for test diff --git a/t/admin/balancer.t b/t/admin/balancer.t index d88f19bf..0be70dbd 100644 --- a/t/admin/balancer.t +++ b/t/admin/balancer.t @@ -25,7 +25,7 @@ add_block_preprocessor(sub { my $init_by_lua_block = <<_EOC_; require "resty.core" - apisix = require("init") + apisix = require("apisix") apisix.http_init() function test(route, ctx, count) diff --git a/t/admin/health-check.t b/t/admin/health-check.t index 1020a30d..8680768e 100644 --- a/t/admin/health-check.t +++ b/t/admin/health-check.t @@ -27,7 +27,7 @@ add_block_preprocessor(sub { my $init_by_lua_block = <<_EOC_; require "resty.core" - apisix = require("init") + apisix = require("apisix") apisix.http_init() json = require("cjson.safe")

membphis · 2020-03-31T06:20:46Z

@moonming you can make a try with this patch:

diff --git a/bin/apisix b/bin/apisix
index e00e9af6..871de12d 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -39,9 +39,7 @@ local pkg_path_org = package.path
 local apisix_home = "/usr/local/apisix"
 local pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
                   .. apisix_home .. "/deps/lib/lua/5.1/?.so;;"
-local pkg_path  = apisix_home .. "/deps/share/lua/5.1/apisix/?.lua;"
-                  .. "/usr/local/share/lua/5.1/apisix/?.lua;"
-                  .. apisix_home .. "/deps/share/lua/5.1/?.lua;;"
+local pkg_path  = apisix_home ..    "/deps/share/lua/5.1/?.lua;;"

 -- only for developer, use current folder as working space
 local is_root_path = false
@@ -58,7 +56,7 @@ if script_path:sub(1, 2) == './' then

     pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
                 .. apisix_home .. "/deps/lib/lua/5.1/?.so;"
-    pkg_path  = apisix_home .. "/apisix/?.lua;"
+    pkg_path  = apisix_home .. "/?/init.lua;"
                 .. apisix_home .. "/deps/share/lua/5.1/?.lua;;"
 end
 -- print("apisix_home: ", apisix_home)
@@ -114,7 +112,7 @@ env APISIX_PROFILE;
 {% if stream_proxy then %}
 stream {
     lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;]=]
-                      .. [=[{*apisix_lua_home*}/apisix/?.lua;;{*lua_path*};";
+                      .. [=[{*apisix_lua_home*}/?.lua;;{*lua_path*};";
     lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
                       .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
                       .. [=[{*lua_cpath*};";
@@ -167,7 +165,7 @@ stream {

 http {
     lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;]=]
-                      .. [=[{*apisix_lua_home*}/apisix/?.lua;;{*lua_path*};";
+                      .. [=[{*apisix_lua_home*}/?.lua;;{*lua_path*};";
     lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
                       .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
                       .. [=[{*lua_cpath*};";

doc/plugin-develop-cn.md

doc/plugin-develop.md

moonming changed the title ~~feature: remove lua dir.~~ [WIP]feature: remove lua dir. Mar 27, 2020

membphis reviewed Mar 27, 2020

View reviewed changes

bin/apisix Outdated Show resolved Hide resolved

chnliyong reviewed Mar 28, 2020

View reviewed changes

membphis reviewed Mar 28, 2020

View reviewed changes

Makefile Outdated Show resolved Hide resolved

moonming force-pushed the remove-lua-dir branch 2 times, most recently from 5f46cb5 to 17f730a Compare March 28, 2020 08:16

moonming changed the title ~~[WIP]feature: remove lua dir.~~ feature: remove lua dir. Mar 29, 2020

moonming force-pushed the remove-lua-dir branch from f0b1309 to 2f4f2f3 Compare March 29, 2020 11:12

moonming force-pushed the remove-lua-dir branch 2 times, most recently from f290920 to 1e93f11 Compare March 30, 2020 13:57

membphis reviewed Mar 31, 2020

View reviewed changes

moonming added 5 commits March 31, 2020 13:58

feature: remove lua dir.

feb873d

update

678bcdf

fix

d098d1b

fix

48f0a88

fix

5f9546d

moonming force-pushed the remove-lua-dir branch from f53623e to 5f9546d Compare March 31, 2020 06:06

moonming added 2 commits March 31, 2020 14:34

fix

e5c7fb2

fix

b626bfa

membphis reviewed Mar 31, 2020

View reviewed changes

doc/plugin-develop-cn.md Show resolved Hide resolved

membphis reviewed Mar 31, 2020

View reviewed changes

doc/plugin-develop.md Show resolved Hide resolved

membphis approved these changes Mar 31, 2020

View reviewed changes

moonming merged commit c76e7e3 into apache:master Mar 31, 2020

membphis mentioned this pull request Apr 6, 2020

bug: failed to find Lua file if Apache APISIX install with Lua 5.3 #1311

Closed

SaberMaster pushed a commit to SaberMaster/incubator-apisix that referenced this pull request Jun 30, 2020

feature: remove lua dir. (apache#1351)

5d833ae

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: remove `lua` dir. #1351

feature: remove `lua` dir. #1351

moonming commented Mar 27, 2020

membphis left a comment

chnliyong left a comment •

edited

Loading

chnliyong Mar 28, 2020

membphis commented Mar 28, 2020

moonming commented Mar 28, 2020 via email

membphis commented Mar 28, 2020

membphis commented Mar 28, 2020

moonming commented Mar 29, 2020

dabue commented Mar 29, 2020 via email

membphis Mar 31, 2020

membphis Mar 31, 2020

membphis commented Mar 31, 2020

feature: remove lua dir. #1351

feature: remove lua dir. #1351

Conversation

moonming commented Mar 27, 2020

membphis left a comment

Choose a reason for hiding this comment

chnliyong left a comment • edited Loading

Choose a reason for hiding this comment

chnliyong Mar 28, 2020

Choose a reason for hiding this comment

membphis commented Mar 28, 2020

moonming commented Mar 28, 2020 via email

membphis commented Mar 28, 2020

membphis commented Mar 28, 2020

moonming commented Mar 29, 2020

dabue commented Mar 29, 2020 via email

membphis Mar 31, 2020

Choose a reason for hiding this comment

membphis Mar 31, 2020

Choose a reason for hiding this comment

membphis commented Mar 31, 2020

feature: remove `lua` dir. #1351

feature: remove `lua` dir. #1351

chnliyong left a comment •

edited

Loading