Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Parent/child: Add missing support for the field data loading option t…
- Loading branch information
Showing
4 changed files
with
231 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
185 changes: 185 additions & 0 deletions
185
src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.child; | ||
|
|
||
| import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse; | ||
| import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.cluster.routing.ShardRouting; | ||
| import org.elasticsearch.common.settings.ImmutableSettings; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.index.mapper.DocumentMapper; | ||
| import org.elasticsearch.index.mapper.FieldMapper; | ||
| import org.elasticsearch.index.mapper.MapperService; | ||
| import org.elasticsearch.index.merge.policy.MergePolicyModule; | ||
| import org.elasticsearch.index.service.IndexService; | ||
| import org.elasticsearch.index.shard.service.InternalIndexShard; | ||
| import org.elasticsearch.indices.IndicesService; | ||
| import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
| import org.elasticsearch.test.junit.annotations.TestLogging; | ||
| import org.elasticsearch.update.UpdateTests; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.greaterThan; | ||
|
|
||
| /** | ||
| */ | ||
| public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest { | ||
|
|
||
| private final Settings indexSettings = ImmutableSettings.builder() | ||
| .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) | ||
| .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) | ||
| .put(InternalIndexShard.INDEX_REFRESH_INTERVAL, -1) | ||
| // We never want merges in this test to ensure we have two segments for the last validation | ||
| .put(MergePolicyModule.MERGE_POLICY_TYPE_KEY, UpdateTests.NoMergePolicyProvider.class) | ||
| .build(); | ||
|
|
||
| @Test | ||
| @TestLogging("index.warmer:TRACE") | ||
| public void testEagerParentFieldLoading() throws Exception { | ||
| logger.info("testing lazy loading..."); | ||
| assertAcked(prepareCreate("test") | ||
| .setSettings(indexSettings) | ||
| .addMapping("parent") | ||
| .addMapping("child", childMapping(FieldMapper.Loading.LAZY))); | ||
| ensureGreen(); | ||
|
|
||
| client().prepareIndex("test", "parent", "1").setSource("{}").get(); | ||
| client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get(); | ||
| refresh(); | ||
|
|
||
| ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get(); | ||
| assertThat(response.getIndicesStats().getIdCache().getMemorySizeInBytes(), equalTo(0l)); | ||
|
|
||
| logger.info("testing default loading..."); | ||
| assertAcked(client().admin().indices().prepareDelete("test").get()); | ||
| assertAcked(prepareCreate("test") | ||
| .setSettings(indexSettings) | ||
| .addMapping("parent") | ||
| .addMapping("child", "_parent", "type=parent")); | ||
| ensureGreen(); | ||
|
|
||
| client().prepareIndex("test", "parent", "1").setSource("{}").get(); | ||
| client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get(); | ||
| refresh(); | ||
|
|
||
| response = client().admin().cluster().prepareClusterStats().get(); | ||
| long idCacheSizeDefault = response.getIndicesStats().getIdCache().getMemorySizeInBytes(); | ||
| assertThat(idCacheSizeDefault, greaterThan(0l)); | ||
|
|
||
| logger.info("testing eager loading..."); | ||
| assertAcked(client().admin().indices().prepareDelete("test").get()); | ||
| assertAcked(prepareCreate("test") | ||
| .setSettings(indexSettings) | ||
| .addMapping("parent") | ||
| .addMapping("child", childMapping(FieldMapper.Loading.EAGER))); | ||
| ensureGreen(); | ||
|
|
||
| client().prepareIndex("test", "parent", "1").setSource("{}").get(); | ||
| client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get(); | ||
| refresh(); | ||
|
|
||
| response = client().admin().cluster().prepareClusterStats().get(); | ||
| assertThat(response.getIndicesStats().getIdCache().getMemorySizeInBytes(), equalTo(idCacheSizeDefault)); | ||
|
|
||
| logger.info("testing eager global ordinals loading..."); | ||
| assertAcked(client().admin().indices().prepareDelete("test").get()); | ||
| assertAcked(prepareCreate("test") | ||
| .setSettings(indexSettings) | ||
| .addMapping("parent") | ||
| .addMapping("child", childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS))); | ||
| ensureGreen(); | ||
|
|
||
| // Need to do 2 separate refreshes, otherwise we have 1 segment and then we can't measure if global ordinals | ||
| // is loaded by the size of the id_cache, because global ordinals on 1 segment shards takes no extra memory. | ||
| client().prepareIndex("test", "parent", "1").setSource("{}").get(); | ||
| refresh(); | ||
| client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get(); | ||
| refresh(); | ||
|
|
||
| response = client().admin().cluster().prepareClusterStats().get(); | ||
| assertThat(response.getIndicesStats().getIdCache().getMemorySizeInBytes(), greaterThan(idCacheSizeDefault)); | ||
| } | ||
|
|
||
| @Test | ||
| @TestLogging("index.warmer:TRACE") | ||
| public void testChangingEagerParentFieldLoadingAtRuntime() throws Exception { | ||
| assertAcked(prepareCreate("test") | ||
| .setSettings(indexSettings) | ||
| .addMapping("parent") | ||
| .addMapping("child", "_parent", "type=parent")); | ||
| ensureGreen(); | ||
|
|
||
| client().prepareIndex("test", "parent", "1").setSource("{}").get(); | ||
| client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get(); | ||
| refresh(); | ||
|
|
||
| ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get(); | ||
| long idCacheSizeDefault = response.getIndicesStats().getIdCache().getMemorySizeInBytes(); | ||
| assertThat(idCacheSizeDefault, greaterThan(0l)); | ||
|
|
||
| PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping("test").setType("child") | ||
| .setSource(childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS)) | ||
| .get(); | ||
| assertAcked(putMappingResponse); | ||
| assertBusy(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| ClusterState clusterState = internalCluster().clusterService().state(); | ||
| ShardRouting shardRouting = clusterState.routingTable().index("test").shard(0).getShards().get(0); | ||
| String nodeName = clusterState.getNodes().get(shardRouting.currentNodeId()).getName(); | ||
|
|
||
| boolean verified = false; | ||
| IndicesService indicesService = internalCluster().getInstance(IndicesService.class, nodeName); | ||
| IndexService indexService = indicesService.indexService("test"); | ||
| if (indexService != null) { | ||
| MapperService mapperService = indexService.mapperService(); | ||
| DocumentMapper documentMapper = mapperService.documentMapper("child"); | ||
| if (documentMapper != null) { | ||
| verified = documentMapper.parentFieldMapper().fieldDataType().getLoading() == FieldMapper.Loading.EAGER_GLOBAL_ORDINALS; | ||
| } | ||
| } | ||
| assertTrue(verified); | ||
| } | ||
| }); | ||
|
|
||
| // Need to add a new doc otherwise the refresh doesn't trigger a new searcher | ||
| // Because it ends up in its own segment, but isn't of type parent or child, this doc doesn't contribute to the size of the id_cache | ||
| client().prepareIndex("test", "dummy", "dummy").setSource("{}").get(); | ||
| refresh(); | ||
| response = client().admin().cluster().prepareClusterStats().get(); | ||
| assertThat(response.getIndicesStats().getIdCache().getMemorySizeInBytes(), greaterThan(idCacheSizeDefault)); | ||
| } | ||
|
|
||
| private XContentBuilder childMapping(FieldMapper.Loading loading) throws IOException { | ||
| return jsonBuilder().startObject().startObject("child").startObject("_parent") | ||
| .field("type", "parent") | ||
| .startObject("fielddata").field(FieldMapper.Loading.KEY, loading).endObject() | ||
| .endObject().endObject().endObject(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters