Fix unrecongnized parameter 'include_type_name'

fuyb1992 · Dec 9, 2019 · 7b4cf41 · 7b4cf41
1 parent 7e48514
commit 7b4cf41
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/es_pandas/es_pandas.py b/es_pandas/es_pandas.py
@@ -75,7 +75,16 @@ def to_pandas(self, index, query_rule={'query': {'match_all': {}}}, heads=[], dt
         count = self.es.count(index=index, body=query_rule)['count']
         if count < 0:
             raise Exception('Empty for %s' % index)
-        mapping = self.ic.get_mapping(index=index, include_type_name=False)
+        if self.es7:
+            mapping = self.ic.get_mapping(index=index, include_type_name=False)
+        else:
+            # Fix es client unrecongnized parameter 'include_type_name' bug for es 6.x
+            mapping = self.ic.get_mapping(index=index)
+            keys = list(mapping[index]['mappings'].keys())
+            if len(keys) > 2: raise Exception('Multi templates exits: %s' % (','.join(keys)))
+            tmp = mapping[index]['mappings'][keys[1]]['properties']
+            del mapping[index]['mappings'][keys[1]]
+            mapping[index]['mappings']['properties'] = tmp
         if len(heads) < 1:
             heads = [k for k in mapping[index]['mappings']['properties'].keys()]
         else: