Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add elasticsearch5 to search scheme. #297

Closed
wants to merge 1 commit into from
Closed

Add elasticsearch5 to search scheme. #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions environ/environ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class Env:
SEARCH_SCHEMES = {
"elasticsearch": "haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine",
"elasticsearch2": "haystack.backends.elasticsearch2_backend.Elasticsearch2SearchEngine",
"elasticsearch5": "haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine",
"solr": "haystack.backends.solr_backend.SolrEngine",
"whoosh": "haystack.backends.whoosh_backend.WhooshEngine",
"xapian": "haystack.backends.xapian_backend.XapianEngine",
Expand Down Expand Up @@ -576,7 +577,7 @@ def search_url_config(cls, url, engine=None):

if url.scheme == 'simple':
return config
elif url.scheme in ['solr', 'elasticsearch', 'elasticsearch2']:
elif url.scheme in ['solr', 'elasticsearch', 'elasticsearch2', 'elasticsearch5']:
if 'KWARGS' in params.keys():
config['KWARGS'] = params['KWARGS'][0]

Expand All @@ -590,7 +591,7 @@ def search_url_config(cls, url, engine=None):
config['TIMEOUT'] = cls.parse_value(params['TIMEOUT'][0], int)
return config

if url.scheme in ['elasticsearch', 'elasticsearch2']:
if url.scheme in ['elasticsearch', 'elasticsearch2', 'elasticsearch5']:

split = path.rsplit("/", 1)

Expand Down
29 changes: 29 additions & 0 deletions environ/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,8 @@ class SearchTestSuite(unittest.TestCase):

solr_url = 'solr://127.0.0.1:8983/solr'
elasticsearch_url = 'elasticsearch://127.0.0.1:9200/index'
elasticsearch2_url = 'elasticsearch2://127.0.0.1:9200/index'
elasticsearch5_url = 'elasticsearch5://127.0.0.1:9200/index'
whoosh_url = 'whoosh:///home/search/whoosh_index'
xapian_url = 'xapian:///home/search/xapian_index'
simple_url = 'simple:///'
Expand Down Expand Up @@ -636,6 +638,33 @@ def test_elasticsearch_parsing(self):
url = Env.search_url_config(url)

self.assertEqual(url['ENGINE'], 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine')
self.assertEqual(url['URL'], 'http://127.0.0.1:9200')
self.assertTrue('INDEX_NAME' in url.keys())
self.assertEqual(url['INDEX_NAME'], 'index')
self.assertTrue('TIMEOUT' in url.keys())
self.assertEqual(url['TIMEOUT'], timeout)
self.assertTrue('PATH' not in url)

def test_elasticsearch2_parsing(self):
timeout = 360
url = '{}?TIMEOUT={}'.format(self.elasticsearch2_url, timeout)
url = Env.search_url_config(url)

self.assertEqual(url['ENGINE'], 'haystack.backends.elasticsearch2_backend.Elasticsearch2SearchEngine')
self.assertEqual(url['URL'], 'http://127.0.0.1:9200')
self.assertTrue('INDEX_NAME' in url.keys())
self.assertEqual(url['INDEX_NAME'], 'index')
self.assertTrue('TIMEOUT' in url.keys())
self.assertEqual(url['TIMEOUT'], timeout)
self.assertTrue('PATH' not in url)

def test_elasticsearch5_parsing(self):
timeout = 360
url = '{}?TIMEOUT={}'.format(self.elasticsearch5_url, timeout)
url = Env.search_url_config(url)

self.assertEqual(url['ENGINE'], 'haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine')
self.assertEqual(url['URL'], 'http://127.0.0.1:9200')
self.assertTrue('INDEX_NAME' in url.keys())
self.assertEqual(url['INDEX_NAME'], 'index')
self.assertTrue('TIMEOUT' in url.keys())
Expand Down