From 9c1c100ee1f14a80e11722eb8728f25e772056a5 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Fri, 17 Jan 2014 16:06:07 -0700 Subject: [PATCH] updated elasticsearch dep, includes spec based ping and cleaned up the api*.js files a but. Ping once again timesout at 100 ms. --- grunt/config/run.js | 1 + grunt/config/s3.js | 1 - scripts/generate/js_api.js | 6 ++- src/elasticsearch | 2 +- src/lib/api.js | 89 +++++++++++++------------------------- src/lib/api_0_90.js | 69 +++++++++++++---------------- src/lib/client.js | 13 ------ 7 files changed, 68 insertions(+), 113 deletions(-) diff --git a/grunt/config/run.js b/grunt/config/run.js index 9448488ab..f757b7e94 100644 --- a/grunt/config/run.js +++ b/grunt/config/run.js @@ -1,4 +1,5 @@ var esOpts = [ + '-D es.http.port=9400', '-D es.network.host=localhost', '-D es.cluster.name=elasticsearch_js_test_runners', '-D es.node.name=elasticsearch_js_test_runner', diff --git a/grunt/config/s3.js b/grunt/config/s3.js index a83c43ecc..73cd1ac47 100644 --- a/grunt/config/s3.js +++ b/grunt/config/s3.js @@ -22,5 +22,4 @@ module.exports = { } } } - }; \ No newline at end of file diff --git a/scripts/generate/js_api.js b/scripts/generate/js_api.js index 7e9bdc1d2..e0fe7d3c0 100644 --- a/scripts/generate/js_api.js +++ b/scripts/generate/js_api.js @@ -166,6 +166,10 @@ module.exports = function (branch, done) { spec.bulkBody = true; } + if (name === 'ping') { + spec.requestTimeout = 100; + } + var urls = _.difference(def.url.paths, aliases[name]); var urlSignatures = []; urls = _.map(urls, function (url) { @@ -210,7 +214,7 @@ module.exports = function (branch, done) { return _.omit(url, 'sortOrder'); }); } else { - spec.url = urls[0]; + spec.url = _.omit(urls[0], 'sortOrder'); } spec.params = _.transform(spec.params, function (note, param, name) { diff --git a/src/elasticsearch b/src/elasticsearch index 3ac2f8c78..fe60cca03 160000 --- a/src/elasticsearch +++ b/src/elasticsearch @@ -1 +1 @@ -Subproject commit 3ac2f8c789550531fd5ab87b09647631af91b0f1 +Subproject commit fe60cca038efa71ce2291469765adbadb5ab4314 diff --git a/src/lib/api.js b/src/lib/api.js index 3b02e5424..1940a15fa 100644 --- a/src/lib/api.js +++ b/src/lib/api.js @@ -577,8 +577,7 @@ api.clearScroll = ca({ scrollId: { type: 'list' } - }, - sortOrder: -1 + } }, method: 'DELETE' }); @@ -994,8 +993,7 @@ api['delete'] = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'DELETE' }); @@ -1149,8 +1147,7 @@ api.exists = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'HEAD' }); @@ -1248,8 +1245,7 @@ api.explain = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'POST' }); @@ -1328,8 +1324,7 @@ api.get = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } } }); @@ -1403,8 +1398,7 @@ api.getSource = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } } }); @@ -1746,8 +1740,7 @@ api.indices.prototype.create = ca({ index: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'POST' }); @@ -1814,8 +1807,7 @@ api.indices.prototype.deleteAlias = ca({ name: { type: 'list' } - }, - sortOrder: -2 + } }, method: 'DELETE' }); @@ -1844,8 +1836,7 @@ api.indices.prototype.deleteMapping = ca({ type: { type: 'list' } - }, - sortOrder: -2 + } }, method: 'DELETE' }); @@ -1874,8 +1865,7 @@ api.indices.prototype.deleteTemplate = ca({ name: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'DELETE' }); @@ -1907,8 +1897,7 @@ api.indices.prototype.deleteWarmer = ca({ name: { type: 'list' } - }, - sortOrder: -2 + } }, method: 'DELETE' }); @@ -1948,8 +1937,7 @@ api.indices.prototype.exists = ca({ index: { type: 'list' } - }, - sortOrder: -1 + } }, method: 'HEAD' }); @@ -2032,8 +2020,7 @@ api.indices.prototype.existsTemplate = ca({ name: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'HEAD' }); @@ -2077,8 +2064,7 @@ api.indices.prototype.existsType = ca({ type: { type: 'list' } - }, - sortOrder: -2 + } }, method: 'HEAD' }); @@ -2626,19 +2612,14 @@ api.indices.prototype.open = ca({ name: 'expand_wildcards' } }, - urls: [ - { - fmt: '/<%=index%>/_open', - req: { - index: { - type: 'string' - } + url: { + fmt: '/<%=index%>/_open', + req: { + index: { + type: 'string' } - }, - { - fmt: '/_open' } - ], + }, method: 'POST' }); @@ -2909,8 +2890,7 @@ api.indices.prototype.putTemplate = ca({ name: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'PUT' }); @@ -3611,8 +3591,7 @@ api.mlt = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'POST' }); @@ -4045,8 +4024,7 @@ api.percolate = ca({ type: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'POST' }); @@ -4329,8 +4307,7 @@ api.snapshot.prototype.create = ca({ snapshot: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'POST' }); @@ -4359,8 +4336,7 @@ api.snapshot.prototype.createRepository = ca({ repository: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'POST' }); @@ -4389,8 +4365,7 @@ api.snapshot.prototype['delete'] = ca({ snapshot: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'DELETE' }); @@ -4419,8 +4394,7 @@ api.snapshot.prototype.deleteRepository = ca({ repository: { type: 'list' } - }, - sortOrder: -1 + } }, method: 'DELETE' }); @@ -4449,8 +4423,7 @@ api.snapshot.prototype.get = ca({ snapshot: { type: 'list' } - }, - sortOrder: -2 + } } }); @@ -4513,8 +4486,7 @@ api.snapshot.prototype.restore = ca({ snapshot: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'POST' }); @@ -4669,8 +4641,7 @@ api.update = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'POST' }); diff --git a/src/lib/api_0_90.js b/src/lib/api_0_90.js index bf15edcd7..08ca8e7c7 100644 --- a/src/lib/api_0_90.js +++ b/src/lib/api_0_90.js @@ -85,8 +85,7 @@ api.clearScroll = ca({ scrollId: { type: 'list' } - }, - sortOrder: -1 + } }, method: 'DELETE' }); @@ -627,8 +626,7 @@ api['delete'] = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'DELETE' }); @@ -772,8 +770,7 @@ api.exists = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'HEAD' }); @@ -871,8 +868,7 @@ api.explain = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'POST' }); @@ -938,8 +934,7 @@ api.get = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } } }); @@ -994,8 +989,7 @@ api.getSource = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } } }); @@ -1277,8 +1271,7 @@ api.indices.prototype.close = ca({ index: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'POST' }); @@ -1307,8 +1300,7 @@ api.indices.prototype.create = ca({ index: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'POST' }); @@ -1375,8 +1367,7 @@ api.indices.prototype.deleteAlias = ca({ name: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'DELETE' }); @@ -1405,8 +1396,7 @@ api.indices.prototype.deleteMapping = ca({ type: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'DELETE' }); @@ -1435,8 +1425,7 @@ api.indices.prototype.deleteTemplate = ca({ name: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'DELETE' }); @@ -1508,8 +1497,7 @@ api.indices.prototype.exists = ca({ index: { type: 'list' } - }, - sortOrder: -1 + } }, method: 'HEAD' }); @@ -1587,8 +1575,7 @@ api.indices.prototype.existsType = ca({ type: { type: 'list' } - }, - sortOrder: -2 + } }, method: 'HEAD' }); @@ -1912,8 +1899,7 @@ api.indices.prototype.open = ca({ index: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'POST' }); @@ -2067,8 +2053,7 @@ api.indices.prototype.putMapping = ca({ type: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'PUT' }); @@ -2131,8 +2116,7 @@ api.indices.prototype.putTemplate = ca({ name: { type: 'string' } - }, - sortOrder: -1 + } }, method: 'PUT' }); @@ -2740,8 +2724,7 @@ api.mlt = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'POST' }); @@ -2821,12 +2804,23 @@ api.percolate = ca({ type: { type: 'string' } - }, - sortOrder: -2 + } }, method: 'POST' }); +/** + * Perform a [ping](http://www.elasticsearch.org/guide/) request + * + * @param {Object} params - An object with parameters used to carry out this action + */ +api.ping = ca({ + url: { + fmt: '/' + }, + method: 'HEAD' +}); + /** * Perform a [scroll](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/search-request-scroll.html) request * @@ -3190,8 +3184,7 @@ api.update = ca({ id: { type: 'string' } - }, - sortOrder: -3 + } }, method: 'POST' }); diff --git a/src/lib/client.js b/src/lib/client.js index 9edbb24de..9c14b0b66 100755 --- a/src/lib/client.js +++ b/src/lib/client.js @@ -27,7 +27,6 @@ module.exports = Client; var Transport = require('./transport'); -var ca = require('./client_action'); var _ = require('./utils'); function Client(config) { @@ -43,18 +42,6 @@ function Client(config) { config.host = 'http://localhost:9200'; } - if (!this.ping) { - // 0.90 api does not include ping - this.ping = ca({ - method: 'HEAD', - url: { - fmt: '/' - }, - castExists: true, - requestTimeout: 100 - }); - } - this.close = function () { this.transport.close(); };