Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CC-2037 Support keyword subfields for text types #216

Merged
merged 6 commits into from May 30, 2018
Merged

CC-2037 Support keyword subfields for text types #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a7924c
CC-1491: Remove note about unsupported ES6 from ES quick start
rayokota Feb 14, 2018
1a0e5f0
Merge remote-tracking branch 'upstream/master'
rayokota Feb 14, 2018
3913d8a
Merge remote-tracking branch 'upstream/master'
rayokota Mar 3, 2018
e365878
Merge remote-tracking branch 'upstream/master'
rayokota May 21, 2018
abf3109
Merge remote-tracking branch 'upstream/master'
rayokota May 29, 2018
8201b3a
CC-2037 Use keyword subfield with string fields
rayokota May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/io/confluent/connect/elasticsearch/Mapping.java
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.DOUBLE_TYPE;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.FLOAT_TYPE;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.INTEGER_TYPE;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.KEYWORD_TYPE;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.LONG_TYPE;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.MAP_KEY;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.MAP_VALUE;
Expand Down Expand Up @@ -174,6 +175,9 @@ private static JsonNode inferPrimitive(String type, Object defaultValue) {

ObjectNode obj = JsonNodeFactory.instance.objectNode();
obj.set("type", JsonNodeFactory.instance.textNode(type));
if (type.equals(TEXT_TYPE)) {
addTextMapping(obj);
}
JsonNode defaultValueNode = null;
if (defaultValue != null) {
switch (type) {
Expand Down Expand Up @@ -218,6 +222,16 @@ private static JsonNode inferPrimitive(String type, Object defaultValue) {
return obj;
}

private static void addTextMapping(ObjectNode obj) {
// Add additional mapping for indexing, per https://www.elastic.co/blog/strings-are-dead-long-live-strings
ObjectNode keyword = JsonNodeFactory.instance.objectNode();
keyword.set("type", JsonNodeFactory.instance.textNode(KEYWORD_TYPE));
keyword.set("ignore_above", JsonNodeFactory.instance.numberNode(256));
ObjectNode fields = JsonNodeFactory.instance.objectNode();
fields.set("keyword", keyword);
obj.set("fields", fields);
}

private static byte[] bytes(Object value) {
final byte[] bytes;
if (value instanceof ByteBuffer) {
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/io/confluent/connect/elasticsearch/MappingTest.java
View file
Open in desktop
Expand Up @@ -16,6 +16,9 @@

package io.confluent.connect.elasticsearch;

import com.fasterxml.jackson.databind.node.NumericNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.google.gson.JsonObject;

import org.apache.kafka.connect.data.Date;
Expand All @@ -30,6 +33,11 @@
import org.junit.Test;

import static io.confluent.connect.elasticsearch.DataConverter.BehaviorOnNullValues;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.KEYWORD_TYPE;
import static io.confluent.connect.elasticsearch.ElasticsearchSinkConnectorConstants.TEXT_TYPE;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class MappingTest extends ElasticsearchSinkTestBase {

Expand All @@ -51,6 +59,29 @@ public void testMapping() throws Exception {
verifyMapping(schema, mapping);
}

@Test
@SuppressWarnings("unchecked")
public void testStringMappingForES6() throws Exception {
ElasticsearchClient client = mock(ElasticsearchClient.class);
when(client.getVersion()).thenReturn(ElasticsearchClient.Version.ES_V6);

Schema schema = SchemaBuilder.struct().name("textRecord")
.field("string", Schema.STRING_SCHEMA)
.build();
ObjectNode mapping = (ObjectNode) Mapping.inferMapping(client, schema);
ObjectNode properties = mapping.with("properties");
ObjectNode string = properties.with("string");
TextNode stringType = (TextNode) string.get("type");
ObjectNode fields = string.with("fields");
ObjectNode keyword = fields.with("keyword");
TextNode keywordType = (TextNode) keyword.get("type");
NumericNode ignoreAbove = (NumericNode) keyword.get("ignore_above");

assertEquals(TEXT_TYPE, stringType.asText());
assertEquals(KEYWORD_TYPE, keywordType.asText());
assertEquals(256, ignoreAbove.asInt());
}

protected Schema createSchema() {
Schema structSchema = createInnerSchema();
return SchemaBuilder.struct().name("record")
Expand Down