EvanLjp commented on a change in pull request #6499: URL: https://github.com/apache/skywalking/pull/6499#discussion_r590391560
########## File path: oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexStructures.java ########## @@ -0,0 +1,157 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import lombok.Getter; +import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; + +public class IndexStructures { + private final Map<String, Fields> structures; + @Getter + private final PropertiesExtractor extractor; + @Getter + private final PropertiesWrapper wrapper; + + public IndexStructures() { + this.structures = new HashMap<>(); + this.extractor = doGetPropertiesExtractor(); + this.wrapper = doGetPropertiesWrapper(); + } + + protected PropertiesExtractor doGetPropertiesExtractor() { + return mapping -> (Map<String, Object>) ((Map<String, Object>) mapping.get( + ElasticSearchClient.TYPE)).get("properties"); + } + + protected PropertiesWrapper doGetPropertiesWrapper() { + return properties -> { + HashMap<String, Object> mappings = new HashMap<>(); + HashMap<String, Object> types = new HashMap<>(); + mappings.put(ElasticSearchClient.TYPE, types); + types.put("properties", properties); + return mappings; + }; + } + + public Map<String, Object> getMapping(String tableName) { + return wrapper.wrapper( + structures.containsKey(tableName) ? structures.get(tableName).properties : new HashMap<>()); + } + + /** + * Add or append field when the current structures don't contain the input structure or having new fields in it. + */ + public void resolveStructure(String tableName, Map<String, Object> mapping) { Review comment: renamed the function ########## File path: oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java ########## @@ -38,67 +39,118 @@ @Slf4j public class StorageEsInstaller extends ModelInstaller { private final Gson gson = new Gson(); - private final StorageModuleElasticsearchConfig config; protected final ColumnTypeEsMapping columnTypeEsMapping; + /** + * The mappings of the template . + */ + private final IndexStructures structures; + public StorageEsInstaller(Client client, ModuleManager moduleManager, - final StorageModuleElasticsearchConfig config) { + StorageModuleElasticsearchConfig config) throws StorageException { super(client, moduleManager); this.columnTypeEsMapping = new ColumnTypeEsMapping(); this.config = config; + this.structures = getStructures(); + } + + protected IndexStructures getStructures() { + return new IndexStructures(); } @Override protected boolean isExists(Model model) throws StorageException { ElasticSearchClient esClient = (ElasticSearchClient) client; + String tableName = IndexController.INSTANCE.getTableName(model); + IndexController.LogicIndicesRegister.registerRelation(model.getName(), tableName); try { - if (model.isTimeSeries()) { - return esClient.isExistsTemplate(model.getName()) && esClient.isExistsIndex( - TimeSeriesUtils.latestWriteIndexName(model)); - } else { - return esClient.isExistsIndex(model.getName()); + if (!model.isTimeSeries()) { + return esClient.isExistsIndex(tableName); + } + boolean exist = esClient.isExistsTemplate(tableName) + && esClient.isExistsIndex(TimeSeriesUtils.latestWriteIndexName(model)); + if (RunningMode.isInitMode() && exist && IndexController.INSTANCE.isAggregationModel(model)) { + structures.resolveStructure( + tableName, (Map<String, Object>) esClient.getTemplate(tableName).get("mappings") + ); + exist = structures.containsStructure(tableName, createMapping(model)); } + return exist; } catch (IOException e) { throw new StorageException(e.getMessage()); } } @Override protected void createTable(Model model) throws StorageException { + if (model.isTimeSeries()) { + createTimeSeriesTable(model); + } else { + createNormalTable(model); + } + } + + private void createNormalTable(Model model) throws StorageException { ElasticSearchClient esClient = (ElasticSearchClient) client; + String tableName = IndexController.INSTANCE.getTableName(model); + try { + if (!esClient.isExistsIndex(tableName)) { + boolean isAcknowledged = esClient.createIndex(tableName); + log.info("create {} index finished, isAcknowledged: {}", tableName, isAcknowledged); + if (!isAcknowledged) { + throw new StorageException("create " + tableName + " time series index failure, "); + } + } + } catch (IOException e) { + throw new StorageException("cannot create the normal index", e); + } + } + private void createTimeSeriesTable(Model model) throws StorageException { + ElasticSearchClient esClient = (ElasticSearchClient) client; + String tableName = IndexController.INSTANCE.getTableName(model); Map<String, Object> settings = createSetting(model); Map<String, Object> mapping = createMapping(model); - log.info("index {}'s columnTypeEsMapping builder str: {}", esClient.formatIndexName(model.getName()), mapping - .toString()); - + String indexName = TimeSeriesUtils.latestWriteIndexName(model); try { - String indexName; - if (!model.isTimeSeries()) { - indexName = model.getName(); - } else { - if (!esClient.isExistsTemplate(model.getName())) { - boolean isAcknowledged = esClient.createTemplate(model.getName(), settings, mapping); - log.info( - "create {} index template finished, isAcknowledged: {}", model.getName(), isAcknowledged); - if (!isAcknowledged) { - throw new StorageException("create " + model.getName() + " index template failure, "); - } - } - indexName = TimeSeriesUtils.latestWriteIndexName(model); + boolean shouldUpdateTemplate = !esClient.isExistsTemplate(tableName); + if (IndexController.INSTANCE.isAggregationModel(model)) { + shouldUpdateTemplate = shouldUpdateTemplate || !structures.containsStructure(tableName, mapping); } - if (!esClient.isExistsIndex(indexName)) { - boolean isAcknowledged = esClient.createIndex(indexName); - log.info("create {} index finished, isAcknowledged: {}", indexName, isAcknowledged); + if (shouldUpdateTemplate) { + structures.resolveStructure(tableName, mapping); Review comment: renamed the function ########## File path: oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java ########## @@ -38,67 +39,118 @@ @Slf4j public class StorageEsInstaller extends ModelInstaller { private final Gson gson = new Gson(); - private final StorageModuleElasticsearchConfig config; protected final ColumnTypeEsMapping columnTypeEsMapping; + /** + * The mappings of the template . + */ + private final IndexStructures structures; + public StorageEsInstaller(Client client, ModuleManager moduleManager, - final StorageModuleElasticsearchConfig config) { + StorageModuleElasticsearchConfig config) throws StorageException { super(client, moduleManager); this.columnTypeEsMapping = new ColumnTypeEsMapping(); this.config = config; + this.structures = getStructures(); + } + + protected IndexStructures getStructures() { + return new IndexStructures(); } @Override protected boolean isExists(Model model) throws StorageException { ElasticSearchClient esClient = (ElasticSearchClient) client; + String tableName = IndexController.INSTANCE.getTableName(model); + IndexController.LogicIndicesRegister.registerRelation(model.getName(), tableName); try { - if (model.isTimeSeries()) { - return esClient.isExistsTemplate(model.getName()) && esClient.isExistsIndex( - TimeSeriesUtils.latestWriteIndexName(model)); - } else { - return esClient.isExistsIndex(model.getName()); + if (!model.isTimeSeries()) { + return esClient.isExistsIndex(tableName); + } + boolean exist = esClient.isExistsTemplate(tableName) + && esClient.isExistsIndex(TimeSeriesUtils.latestWriteIndexName(model)); + if (RunningMode.isInitMode() && exist && IndexController.INSTANCE.isAggregationModel(model)) { Review comment: thx ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
