[ML] Removes use of types from ES index and search calls (#28987)

x-pack/plugins/ml/common/constants/annotations.ts

@@ -9,5 +9,4 @@ export enum ANNOTATION_TYPE {
   COMMENT = 'comment',
 }
 
-export const ANNOTATION_DOC_TYPE = 'doc';
 export const ANNOTATION_USER_UNKNOWN = '<user unknown>';

x-pack/plugins/ml/common/types/__mocks__/job_config_farequote.json

@@ -72,7 +72,6 @@
     "indices": [
       "farequote"
     ],
-    "types": [],
     "query": {
       "bool": {
         "must": [

x-pack/plugins/ml/public/services/ml_api_service/index.js

@@ -375,7 +375,6 @@ export const ml = {
   getCardinalityOfFields(obj) {
     const data = pick(obj, [
       'index',
-      'types',
       'fieldNames',
       'query',
       'timeFieldName',

x-pack/plugins/ml/server/models/annotation_service/annotation.ts

@@ -7,7 +7,7 @@
 import Boom from 'boom';
 import _ from 'lodash';
 
-import { ANNOTATION_DOC_TYPE, ANNOTATION_TYPE } from '../../../common/constants/annotations';
+import { ANNOTATION_TYPE } from '../../../common/constants/annotations';
 import {
   ML_ANNOTATIONS_INDEX_ALIAS_READ,
   ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
@@ -47,7 +47,6 @@ interface GetResponse {
 
 interface IndexParams {
   index: string;
-  type: string;
   body: Annotation;
   refresh?: string;
   id?: string;
@@ -55,7 +54,6 @@ interface IndexParams {
 
 interface DeleteParams {
   index: string;
-  type: string;
   refresh?: string;
   id: string;
 }
@@ -78,7 +76,6 @@ export function annotationProvider(
 
     const params: IndexParams = {
       index: ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
-      type: ANNOTATION_DOC_TYPE,
       body: annotation,
       refresh: 'wait_for',
     };
@@ -232,7 +229,6 @@ export function annotationProvider(
   async function deleteAnnotation(id: string) {
     const param: DeleteParams = {
       index: ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
-      type: ANNOTATION_DOC_TYPE,
       id,
       refresh: 'wait_for',
     };

x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.js

@@ -41,7 +41,6 @@ export function calculateModelMemoryLimitProvider(callWithRequest) {
       function splitFieldCardinality() {
         return fieldsService.getCardinalityOfFields(
           indexPattern,
-          [],
           [splitFieldName],
           query,
           timeFieldName,
@@ -54,7 +53,6 @@ export function calculateModelMemoryLimitProvider(callWithRequest) {
       function influencerCardinality(influencerName) {
         return fieldsService.getCardinalityOfFields(
           indexPattern,
-          [],
           [influencerName],
           query,
           timeFieldName,

x-pack/plugins/ml/server/models/fields_service/fields_service.js

@@ -15,7 +15,6 @@ export function fieldsServiceProvider(callWithRequest) {
   // with values equal to the cardinality of the field.
   function getCardinalityOfFields(
     index,
-    types,
     fieldNames,
     query,
     timeFieldName,
@@ -36,10 +35,6 @@ export function fieldsServiceProvider(callWithRequest) {
       }
     ];
 
-    if (types && types.length) {
-      mustCriteria.push({ terms: { _type: types } });
-    }
-
     if (query) {
       mustCriteria.push(query);
     }

x-pack/plugins/ml/server/models/file_data_visualizer/import_data.js

@@ -81,12 +81,10 @@ export function importDataProvider(callWithRequest) {
     if (await indexExits(index) === false) {
       const body = {
         mappings: {
-          _doc: {
-            _meta: {
-              created_by: INDEX_META_DATA_CREATED_BY
-            },
-            properties: mappings
+          _meta: {
+            created_by: INDEX_META_DATA_CREATED_BY
           },
+          properties: mappings
         }
       };
 
@@ -102,14 +100,13 @@ export function importDataProvider(callWithRequest) {
 
   async function indexData(index, pipelineId, data) {
     try {
-      const type = '_doc';
       const body = [];
       for (let i = 0; i < data.length; i++) {
         body.push({ index: {} });
         body.push(data[i]);
       }
 
-      const settings = { index, type, body };
+      const settings = { index, body };
       if (pipelineId !== undefined) {
         settings.pipeline = pipelineId;
       }

x-pack/plugins/ml/server/routes/fields_service.js

@@ -15,7 +15,6 @@ function getCardinalityOfFields(callWithRequest, payload) {
   const fs = fieldsServiceProvider(callWithRequest);
   const {
     index,
-    types,
     fieldNames,
     query,
     timeFieldName,
@@ -23,7 +22,6 @@ function getCardinalityOfFields(callWithRequest, payload) {
     latestMs } = payload;
   return fs.getCardinalityOfFields(
     index,
-    types,
     fieldNames,
     query,
     timeFieldName,