From d30848eb23353121d80cc93c83d2c8613d41d541 Mon Sep 17 00:00:00 2001
From: Hendrik Muhs <hendrik.muhs@elastic.co>
Date: Mon, 11 Mar 2019 17:26:16 +0100
Subject: [PATCH] change internal index to index doc_type, id, source and dest
 (#39913)

change internal index to index doc_type, id, source and dest
---
 .../xpack/core/dataframe/DataFrameField.java       |  2 ++
 .../action/PreviewDataFrameTransformAction.java    |  3 ++-
 .../transforms/DataFrameTransformConfig.java       | 14 ++++++--------
 .../persistence/DataFrameInternalIndex.java        | 11 +++++++----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java
index 73bdca2e59e..e25b2619b19 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java
@@ -24,6 +24,8 @@ public final class DataFrameField {
     public static final ParseField WAIT_FOR_COMPLETION = new ParseField("wait_for_completion");
     public static final ParseField STATS_FIELD = new ParseField("stats");
     public static final ParseField INDEX_DOC_TYPE = new ParseField("doc_type");
+    public static final ParseField SOURCE = new ParseField("source");
+    public static final ParseField DESTINATION = new ParseField("dest");
 
     // common strings
     public static final String TASK_NAME = "data_frame/transforms";
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java
index 18860661801..ef170dcf9bc 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java
@@ -23,6 +23,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xpack.core.dataframe.DataFrameField;
 import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig;
 
 import java.io.IOException;
@@ -58,7 +59,7 @@ public class PreviewDataFrameTransformAction extends Action<PreviewDataFrameTran
         public static Request fromXContent(final XContentParser parser) throws IOException {
             Map<String, Object> content = parser.map();
             // Destination and ID are not required for Preview, so we just supply our own
-            content.put(DataFrameTransformConfig.DESTINATION.getPreferredName(), "unused-transform-preview-index");
+            content.put(DataFrameField.DESTINATION.getPreferredName(), "unused-transform-preview-index");
             try(XContentBuilder xContentBuilder = XContentFactory.jsonBuilder().map(content);
                 XContentParser newParser = XContentType.JSON
                     .xContent()
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java
index 1b86310aeee..d50716317a0 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java
@@ -38,8 +38,6 @@ public class DataFrameTransformConfig extends AbstractDiffable<DataFrameTransfor
 
     private static final String NAME = "data_frame_transform_config";
     public static final ParseField HEADERS = new ParseField("headers");
-    public static final ParseField SOURCE = new ParseField("source");
-    public static final ParseField DESTINATION = new ParseField("dest");
     public static final ParseField QUERY = new ParseField("query");
 
     // types of transforms
@@ -99,8 +97,8 @@ public class DataFrameTransformConfig extends AbstractDiffable<DataFrameTransfor
                 });
 
         parser.declareString(optionalConstructorArg(), DataFrameField.ID);
-        parser.declareString(constructorArg(), SOURCE);
-        parser.declareString(constructorArg(), DESTINATION);
+        parser.declareString(constructorArg(), DataFrameField.SOURCE);
+        parser.declareString(constructorArg(), DataFrameField.DESTINATION);
 
         parser.declareString(optionalConstructorArg(), DataFrameField.INDEX_DOC_TYPE);
         parser.declareObject(optionalConstructorArg(), (p, c) -> p.mapStrings(), HEADERS);
@@ -121,8 +119,8 @@ public class DataFrameTransformConfig extends AbstractDiffable<DataFrameTransfor
                                     final QueryConfig queryConfig,
                                     final PivotConfig pivotConfig) {
         this.id = ExceptionsHelper.requireNonNull(id, DataFrameField.ID.getPreferredName());
-        this.source = ExceptionsHelper.requireNonNull(source, SOURCE.getPreferredName());
-        this.dest = ExceptionsHelper.requireNonNull(dest, DESTINATION.getPreferredName());
+        this.source = ExceptionsHelper.requireNonNull(source, DataFrameField.SOURCE.getPreferredName());
+        this.dest = ExceptionsHelper.requireNonNull(dest, DataFrameField.DESTINATION.getPreferredName());
         this.queryConfig = ExceptionsHelper.requireNonNull(queryConfig, QUERY.getPreferredName());
         this.setHeaders(headers == null ? Collections.emptyMap() : headers);
         this.pivotConfig = pivotConfig;
@@ -197,8 +195,8 @@ public class DataFrameTransformConfig extends AbstractDiffable<DataFrameTransfor
     public XContentBuilder toXContent(final XContentBuilder builder, final Params params) throws IOException {
         builder.startObject();
         builder.field(DataFrameField.ID.getPreferredName(), id);
-        builder.field(SOURCE.getPreferredName(), source);
-        builder.field(DESTINATION.getPreferredName(), dest);
+        builder.field(DataFrameField.SOURCE.getPreferredName(), source);
+        builder.field(DataFrameField.DESTINATION.getPreferredName(), dest);
         if (queryConfig != null) {
             builder.field(QUERY.getPreferredName(), queryConfig);
         }
diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java
index 9f89ebb8553..9cd6df3d060 100644
--- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java
+++ b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java
@@ -29,7 +29,6 @@ public final class DataFrameInternalIndex {
     public static final String INDEX_NAME = INDEX_TEMPLATE_NAME;
 
     // constants for mappings
-    public static final String ENABLED = "enabled";
     public static final String DYNAMIC = "dynamic";
     public static final String PROPERTIES = "properties";
     public static final String TYPE = "type";
@@ -59,10 +58,8 @@ public final class DataFrameInternalIndex {
         builder.startObject(MapperService.SINGLE_MAPPING_NAME);
         addMetaInformation(builder);
 
-        // no need to analyze anything, we use the config index as key value store, revisit if we decide to search on it
-        builder.field(ENABLED, false);
         // do not allow anything outside of the defined schema
-        builder.field(DYNAMIC, "strict");
+        builder.field(DYNAMIC, "false");
         // the schema definitions
         builder.startObject(PROPERTIES);
         // overall doc type
@@ -83,6 +80,12 @@ public final class DataFrameInternalIndex {
         return builder
             .startObject(DataFrameField.ID.getPreferredName())
                 .field(TYPE, KEYWORD)
+            .endObject()
+            .startObject(DataFrameField.SOURCE.getPreferredName())
+                .field(TYPE, KEYWORD)
+            .endObject()
+            .startObject(DataFrameField.DESTINATION.getPreferredName())
+                .field(TYPE, KEYWORD)
             .endObject();
     }