mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Refactor Elasticsearch backend classes to drop version 2

pull/6521/head
Matt Westcott 2020-11-04 22:42:40 +00:00 zatwierdzone przez Matt Westcott
rodzic 6e1e36256a
commit a6a70dff04
7 zmienionych plików z 1052 dodań i 1149 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1129
wagtail/search/backends/elasticsearch2.py
Wyświetl plik

Plik diff jest za duży Load Diff

1060
wagtail/search/backends/elasticsearch5.py
Wyświetl plik

Plik diff jest za duży Load Diff

4
wagtail/search/backends/elasticsearch6.py
Wyświetl plik

@ -1,7 +1,7 @@
from .elasticsearch2 import ElasticsearchAutocompleteQueryCompilerImpl
from .elasticsearch5 import ( from .elasticsearch5 import (
Elasticsearch5Index, Elasticsearch5Mapping, Elasticsearch5SearchBackend, Elasticsearch5Index, Elasticsearch5Mapping, Elasticsearch5SearchBackend,
Elasticsearch5SearchQueryCompiler, Elasticsearch5SearchResults) Elasticsearch5SearchQueryCompiler, Elasticsearch5SearchResults,
ElasticsearchAutocompleteQueryCompilerImpl)
class Elasticsearch6Mapping(Elasticsearch5Mapping): class Elasticsearch6Mapping(Elasticsearch5Mapping):

2
wagtail/search/backends/elasticsearch7.py
Wyświetl plik

@ -3,7 +3,7 @@ from copy import deepcopy
from elasticsearch import NotFoundError from elasticsearch import NotFoundError
from elasticsearch.helpers import bulk from elasticsearch.helpers import bulk
from wagtail.search.backends.elasticsearch2 import ElasticsearchAutocompleteQueryCompilerImpl from wagtail.search.backends.elasticsearch5 import ElasticsearchAutocompleteQueryCompilerImpl
from wagtail.search.backends.elasticsearch6 import ( from wagtail.search.backends.elasticsearch6 import (
Elasticsearch6Index, Elasticsearch6Mapping, Elasticsearch6SearchBackend, Elasticsearch6Index, Elasticsearch6Mapping, Elasticsearch6SearchBackend,
Elasticsearch6SearchQueryCompiler, Elasticsearch6SearchResults) Elasticsearch6SearchQueryCompiler, Elasticsearch6SearchResults)

2
wagtail/search/tests/test_elasticsearch5_backend.py
Wyświetl plik

@ -743,7 +743,7 @@ class TestElasticsearch5MappingInheritance(TestCase):
self.assertDictEqual(document, expected_result) self.assertDictEqual(document, expected_result)
@mock.patch('wagtail.search.backends.elasticsearch2.Elasticsearch') @mock.patch('wagtail.search.backends.elasticsearch5.Elasticsearch')
class TestBackendConfiguration(TestCase): class TestBackendConfiguration(TestCase):
def test_default_settings(self, Elasticsearch): def test_default_settings(self, Elasticsearch):
Elasticsearch5SearchBackend(params={}) Elasticsearch5SearchBackend(params={})

2
wagtail/search/tests/test_elasticsearch6_backend.py
Wyświetl plik

@ -745,7 +745,7 @@ class TestElasticsearch6MappingInheritance(TestCase):
self.assertDictEqual(document, expected_result) self.assertDictEqual(document, expected_result)
@mock.patch('wagtail.search.backends.elasticsearch2.Elasticsearch') @mock.patch('wagtail.search.backends.elasticsearch5.Elasticsearch')
class TestBackendConfiguration(TestCase): class TestBackendConfiguration(TestCase):
def test_default_settings(self, Elasticsearch): def test_default_settings(self, Elasticsearch):
Elasticsearch6SearchBackend(params={}) Elasticsearch6SearchBackend(params={})

2
wagtail/search/tests/test_elasticsearch7_backend.py
Wyświetl plik

@ -741,7 +741,7 @@ class TestElasticsearch7MappingInheritance(TestCase):
self.assertDictEqual(document, expected_result) self.assertDictEqual(document, expected_result)
@mock.patch('wagtail.search.backends.elasticsearch2.Elasticsearch') @mock.patch('wagtail.search.backends.elasticsearch5.Elasticsearch')
class TestBackendConfiguration(TestCase): class TestBackendConfiguration(TestCase):
def test_default_settings(self, Elasticsearch): def test_default_settings(self, Elasticsearch):
Elasticsearch7SearchBackend(params={}) Elasticsearch7SearchBackend(params={})