Merge ab4de96 into 046f371

.travis.yml

@@ -2,10 +2,10 @@ dist:
   xenial
 
 sudo:
-  false
+  true
 
 services:
-  - elasticsearch
+- elasticsearch
 
 language:
   python
@@ -22,6 +22,15 @@ language:
 env:
   global:
     - TOXENV="py${PYTHON_VERSION//./}"
+  jobs:
+  - ES_VER=5.5.0
+  - ES_VER=7.4.2-amd64
+
+before_install:
+  - >
+    curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VER}.deb &&
+    sudo dpkg -i --force-confnew elasticsearch-${ES_VER}.deb &&
+    sudo service elasticsearch restart || systemctl status elasticsearch.service
 
 install:
   - make install

setup.py

@@ -22,7 +22,7 @@ def read(*paths):
 NAME = PACKAGE.replace('_', '-')
 INSTALL_REQUIRES = [
     'six>=1.9',
-    'elasticsearch>=5.0,<6.0',
+    'elasticsearch>=7.0,<8.0',
 ]
 TESTS_REQUIRE = [
     'mock',

tableschema_elasticsearch/VERSION

@@ -1,2 +1,2 @@
-1.0.0
+1.1.0
 

tableschema_elasticsearch/storage.py

@@ -39,6 +39,7 @@ class Storage(object):
     def __init__(self, es=None):
         # Use the passed `es` or create a new Elasticsearch instance
         self.__es = es if es is not None else Elasticsearch()
+        self.__no_mapping_types = self.__es.info()['version']['number'] >= '7'
 
     def __repr__(self):
         # Template and format
@@ -74,7 +75,11 @@ def put_mapping(self, bucket, doc_types, index_name, mapping_generator_cls):
             mapping = mappers.descriptor_to_mapping(
                 descriptor, mapping_generator_cls=mapping_generator_cls
             )
-            self.__es.indices.put_mapping(doc_type, mapping, index=index_name)
+            params = dict()
+            if doc_type is not None and self.__no_mapping_types:
+                params = dict(include_type_name='true')
+            self.__es.indices.put_mapping(mapping, doc_type=doc_type,
+                                          index=index_name, params=params)
 
     def generate_doc_id(self, row, primary_key):
         return '/'.join([str(row.get(k)) for k in primary_key])
@@ -164,8 +169,21 @@ def iter(self, bucket, doc_type=None):
         size = 100
         done = False
         while not done:
+            body = None
+            if doc_type is not None:
+                body = dict(
+                    query=dict(
+                        bool=dict(
+                            filter=dict(
+                                match=dict(
+                                    _type=doc_type
+                                )
+                            )
+                        )
+                    )
+                )
             results = self.__es.search(index=bucket,
-                                       doc_type=doc_type,
+                                       body=body,
                                        from_=from_,
                                        size=size)
             hits = results.get('hits', {}).get('hits', [])