You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2017/01/16 17:04:19 UTC
incubator-ponymail git commit: Rename to agree with ES docs and
Python version
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 2bf51392a -> e332f3ce0
Rename to agree with ES docs and Python version
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/e332f3ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/e332f3ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/e332f3ce
Branch: refs/heads/master
Commit: e332f3ce06fdae315452aaad7b4e7f26e6e19368
Parents: 2bf5139
Author: Sebb <se...@apache.org>
Authored: Mon Jan 16 17:04:10 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Mon Jan 16 17:04:10 2017 +0000
----------------------------------------------------------------------
site/api/lib/elastic.lua | 4 ++--
site/api/pminfo.lua | 2 +-
site/api/stats.lua | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/e332f3ce/site/api/lib/elastic.lua
----------------------------------------------------------------------
diff --git a/site/api/lib/elastic.lua b/site/api/lib/elastic.lua
index f0c14ac..dc4921b 100644
--- a/site/api/lib/elastic.lua
+++ b/site/api/lib/elastic.lua
@@ -231,7 +231,7 @@ local function scroll(sidOrQuery, doctype)
end
-- delete a scroll id after use
-local function deleteScrollId(sid)
+local function clear_scroll(sid)
local url = config.es_url:gsub("[^/]+/?$", "") .. "/_search/scroll?scroll_id=" .. sid
return performDelete(url, true)
end
@@ -278,5 +278,5 @@ return {
default = setDefault,
update = update,
scroll = scroll,
- scrollrelease = deleteScrollId
+ clear_scroll = clear_scroll
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/e332f3ce/site/api/pminfo.lua
----------------------------------------------------------------------
diff --git a/site/api/pminfo.lua b/site/api/pminfo.lua
index 18d27b2..8a927d5 100644
--- a/site/api/pminfo.lua
+++ b/site/api/pminfo.lua
@@ -136,7 +136,7 @@ function handle(r)
end
doc, sid = elastic.scroll(sid)
end
- elastic.scrollrelease(sid) -- we're done with the sid, release it
+ elastic.clear_scroll(sid) -- we're done with the sid, release it
-- scroll always sorts by _doc so we need to fix that
table.sort (hits, function (k1, k2) return k1._source.epoch > k2._source.epoch end )
else
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/e332f3ce/site/api/stats.lua
----------------------------------------------------------------------
diff --git a/site/api/stats.lua b/site/api/stats.lua
index 9df6f90..bcadf11 100644
--- a/site/api/stats.lua
+++ b/site/api/stats.lua
@@ -488,7 +488,7 @@ function handle(r)
end
js, sid = elastic.scroll(sid)
end
- elastic.scrollrelease(sid) -- we're done with the sid, release it
+ elastic.clear_scroll(sid) -- we're done with the sid, release it
-- ES scroll uses _doc order for efficiency; we need to sort here
table.sort (dhh, function (k1, k2) return k1._source.epoch > k2._source.epoch end )
-- otherwise, we can just do a standard raw query