From bd6b17cda7f30760fbd5a7e6acc931bd6841d25b Mon Sep 17 00:00:00 2001 From: dunwu Date: Mon, 15 Apr 2024 07:43:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20elasticsearch=206.x=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elasticsearch/ElasticsearchTemplate.java | 41 +- .../mapper/BaseDynamicEsMapper.java | 285 ++++++++---- .../elasticsearch/mapper/BaseEsMapper.java | 431 +++++++++++++----- .../javadb/elasticsearch/mapper/EsMapper.java | 71 +-- .../BaseElasticsearchTemplateTest.java | 57 ++- .../UserElasticsearchTemplateTest.java | 8 + .../mapper/UserEsMapperTest.java | 43 +- 7 files changed, 658 insertions(+), 278 deletions(-) diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/ElasticsearchTemplate.java b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/ElasticsearchTemplate.java index 730f9f1..749956e 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/ElasticsearchTemplate.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/ElasticsearchTemplate.java @@ -15,6 +15,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; +import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.get.GetIndexRequest; @@ -40,8 +41,10 @@ import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; +import org.elasticsearch.client.GetAliasesResponse; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; @@ -65,6 +68,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.stream.Collectors; @@ -194,6 +198,20 @@ public class ElasticsearchTemplate implements Closeable { return client.indices().exists(request.indices(index), RequestOptions.DEFAULT); } + public Set getIndexSet(String alias) throws IOException { + GetAliasesRequest request = new GetAliasesRequest(alias); + GetAliasesResponse response = client.indices().getAlias(request, RequestOptions.DEFAULT); + if (StrUtil.isNotBlank(response.getError())) { + String msg = StrUtil.format("【ES】获取索引失败！alias: {}, error: {}", alias, response.getError()); + throw new ElasticsearchException(msg); + } + if (response.getException() != null) { + throw response.getException(); + } + Map> aliasMap = response.getAliases(); + return aliasMap.keySet(); + } + public void setMapping(String index, String type, Map propertiesMap) throws IOException { if (MapUtil.isEmpty(propertiesMap)) { @@ -459,7 +477,7 @@ public class ElasticsearchTemplate implements Closeable { throws IOException { if (CollectionUtil.isEmpty(ids)) { - return null; + return new ArrayList<>(0); } MultiGetRequest request = new MultiGetRequest(); @@ -471,7 +489,7 @@ public class ElasticsearchTemplate implements Closeable { if (null == multiGetResponse || multiGetResponse.getResponses() == null || multiGetResponse.getResponses().length <= 0) { - return new ArrayList<>(); + return new ArrayList<>(0); } List list = new ArrayList<>(); @@ -491,7 +509,7 @@ public class ElasticsearchTemplate implements Closeable { public long count(String index, String type, SearchSourceBuilder builder) throws IOException { SearchResponse response = query(index, type, builder); if (response == null || response.status() != RestStatus.OK) { - return -1L; + return 0L; } SearchHits searchHits = response.getHits(); return searchHits.getTotalHits(); @@ -550,15 +568,15 @@ public class ElasticsearchTemplate implements Closeable { /** * search after 分页 */ - public ScrollData pojoPageByLastId(String index, String type, String lastId, int size, + public ScrollData pojoPageByScrollId(String index, String type, String scrollId, int size, QueryBuilder queryBuilder, Class clazz) throws IOException { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.size(size); searchSourceBuilder.sort(BaseEsEntity.DOC_ID, SortOrder.ASC); - if (StrUtil.isNotBlank(lastId)) { + if (StrUtil.isNotBlank(scrollId)) { BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); - boolQueryBuilder.must(queryBuilder).must(QueryBuilders.rangeQuery(BaseEsEntity.DOC_ID).gt(lastId)); + boolQueryBuilder.must(queryBuilder).must(QueryBuilders.rangeQuery(BaseEsEntity.DOC_ID).gt(scrollId)); searchSourceBuilder.query(boolQueryBuilder); } else { searchSourceBuilder.query(queryBuilder); @@ -639,9 +657,7 @@ public class ElasticsearchTemplate implements Closeable { } public T toPojo(GetResponse response, Class clazz) { - if (null == response) { - return null; - } else if (StrUtil.isBlank(response.getSourceAsString())) { + if (null == response || StrUtil.isBlank(response.getSourceAsString())) { return null; } else { return JsonUtil.toBean(response.getSourceAsString(), clazz); @@ -649,15 +665,12 @@ public class ElasticsearchTemplate implements Closeable { } public List toPojoList(SearchResponse response, Class clazz) { - if (response == null || response.status() != RestStatus.OK) { - return new ArrayList<>(); + return new ArrayList<>(0); } - if (ArrayUtil.isEmpty(response.getHits().getHits())) { - return new ArrayList<>(); + return new ArrayList<>(0); } - return Stream.of(response.getHits().getHits()) .map(hit -> JsonUtil.toBean(hit.getSourceAsString(), clazz)) .collect(Collectors.toList()); diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseDynamicEsMapper.java b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseDynamicEsMapper.java index 710594d..c75c6cc 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseDynamicEsMapper.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseDynamicEsMapper.java @@ -1,10 +1,11 @@ package io.github.dunwu.javadb.elasticsearch.mapper; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import io.github.dunwu.javadb.elasticsearch.ElasticsearchTemplate; import io.github.dunwu.javadb.elasticsearch.constant.ResultCode; import io.github.dunwu.javadb.elasticsearch.entity.BaseEsEntity; @@ -20,9 +21,9 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; /** * 动态 ES Mapper 基础类（以时间为维度动态创建、删除 index），用于数据量特别大，需要按照日期分片的索引。 @@ -39,6 +40,11 @@ public abstract class BaseDynamicEsMapper extends BaseEs super(elasticsearchTemplate); } + @Override + public boolean enableAutoCreateIndex() { + return true; + } + // ==================================================================== // 索引管理操作 // ==================================================================== @@ -64,68 +70,139 @@ public abstract class BaseDynamicEsMapper extends BaseEs return alias + "_" + formatDate; } - public boolean isIndexExistsInDay(String day) throws IOException { - return elasticsearchTemplate.isIndexExists(getIndex(day)); - } - - public String createIndexInDay(String day) throws IOException, DefaultException { + public boolean isIndexExistsInDay(String day) { + if (StrUtil.isBlank(day)) { + return false; + } String index = getIndex(day); - boolean indexExists = isIndexExistsInDay(day); - if (indexExists) { - return index; + try { + return elasticsearchTemplate.isIndexExists(getIndex(day)); + } catch (Exception e) { + log.error("【ES】判断索引是否存在异常！index: {}", index, e); + return false; } - elasticsearchTemplate.createIndex(index, getType(), getAlias(), getShard(), getReplica()); - Map map = getPropertiesMap(); - if (MapUtil.isNotEmpty(map)) { - elasticsearchTemplate.setMapping(index, getType(), map); - } - return index; } - public void deleteIndexInDay(String day) throws IOException { - elasticsearchTemplate.deleteIndex(getIndex(day)); + public String createIndexIfNotExistsInDay(String day) { + String index = getIndex(day); + String type = getType(); + String alias = getAlias(); + int shard = getShard(); + int replica = getReplica(); + return createIndex(index, type, alias, shard, replica); } - public void updateAliasInDay(String day) throws IOException { - elasticsearchTemplate.updateAlias(getIndex(day), getAlias()); + public void deleteIndexInDay(String day) { + String index = getIndex(day); + try { + log.info("【ES】删除索引成功！index: {}", index); + elasticsearchTemplate.deleteIndex(index); + } catch (Exception e) { + log.error("【ES】删除索引异常！index: {}", index, e); + } + } + + public void updateAliasInDay(String day) { + String index = getIndex(day); + String alias = getAlias(); + try { + log.info("【ES】更新别名成功！alias: {} -> index: {}", alias, index); + elasticsearchTemplate.updateAlias(index, alias); + } catch (IOException e) { + log.error("【ES】更新别名异常！alias: {} -> index: {}", alias, index, e); + } } // ==================================================================== // CRUD 操作 // ==================================================================== - public GetResponse getByIdInDay(String day, String id) throws IOException { - return elasticsearchTemplate.getById(getIndex(day), getType(), id, null); + public GetResponse getByIdInDay(String day, String id) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.getById(index, type, id, null); + } catch (IOException e) { + log.error("【ES】根据ID查询异常！index: {}, type: {}, id: {}", index, type, id, e); + return null; + } } - public T pojoByIdInDay(String day, String id) throws IOException { - return elasticsearchTemplate.pojoById(getIndex(day), getType(), id, null, getEntityClass()); + public T pojoByIdInDay(String day, String id) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.pojoById(index, type, id, null, getEntityClass()); + } catch (IOException e) { + log.error("【ES】根据ID查询POJO异常！index: {}, type: {}, id: {}", index, type, id, e); + return null; + } } - public List pojoListByIdsInDay(String day, Collection ids) throws IOException { - return elasticsearchTemplate.pojoListByIds(getIndex(day), getType(), ids, getEntityClass()); + public List pojoListByIdsInDay(String day, Collection ids) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.pojoListByIds(index, type, ids, getEntityClass()); + } catch (IOException e) { + log.error("【ES】根据ID查询POJO列表异常！index: {}, type: {}, ids: {}", index, type, ids, e); + return new ArrayList<>(0); + } } - public long countInDay(String day, SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.count(getIndex(day), getType(), builder); + public long countInDay(String day, SearchSourceBuilder builder) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.count(index, type, builder); + } catch (IOException e) { + log.error("【ES】获取匹配记录数异常！index: {}, type: {}", index, type, e); + return 0L; + } } - public SearchResponse queryInDay(String day, SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.query(getIndex(day), getType(), builder); + public SearchResponse queryInDay(String day, SearchSourceBuilder builder) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.query(index, type, builder); + } catch (IOException e) { + log.error("【ES】条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } - public PageData pojoPageInDay(String day, SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.pojoPage(getIndex(day), getType(), builder, getEntityClass()); + public PageData pojoPageInDay(String day, SearchSourceBuilder builder) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.pojoPage(index, type, builder, getEntityClass()); + } catch (IOException e) { + log.error("【ES】from + size 分页条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } - public ScrollData pojoPageByLastIdInDay(String day, String lastId, int size, QueryBuilder queryBuilder) - throws IOException { - return elasticsearchTemplate.pojoPageByLastId(getIndex(day), getType(), lastId, size, - queryBuilder, getEntityClass()); + public ScrollData pojoPageByLastIdInDay(String day, String scrollId, int size, QueryBuilder queryBuilder) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.pojoPageByScrollId(index, type, scrollId, size, queryBuilder, getEntityClass()); + } catch (IOException e) { + log.error("【ES】search after 分页条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } - public ScrollData pojoScrollBeginInDay(String day, SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.pojoScrollBegin(getIndex(day), getType(), builder, getEntityClass()); + public ScrollData pojoScrollBeginInDay(String day, SearchSourceBuilder builder) { + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.pojoScrollBegin(index, type, builder, getEntityClass()); + } catch (IOException e) { + log.error("【ES】开启滚动分页条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } /** @@ -135,11 +212,20 @@ public abstract class BaseDynamicEsMapper extends BaseEs * @param entity 待更新的数据 * @return / */ - public boolean saveInDay(String day, T entity) throws IOException, DefaultException { - String index = checkIndex(day); - checkData(entity); - elasticsearchTemplate.save(index, getType(), entity); - return true; + public T saveInDay(String day, T entity) { + if (StrUtil.isBlank(day) || entity == null) { + return null; + } + String index = getIndex(day); + String type = getType(); + try { + checkIndex(day); + checkData(entity); + return elasticsearchTemplate.save(index, getType(), entity); + } catch (IOException e) { + log.error("【ES】添加数据异常！index: {}, type: {}, entity: {}", index, type, JSONUtil.toJsonStr(entity), e); + return null; + } } /** @@ -149,59 +235,94 @@ public abstract class BaseDynamicEsMapper extends BaseEs * @param list 待更新的数据 * @return / */ - public boolean saveBatchInDay(String day, Collection list) throws IOException, DefaultException { - String index = checkIndex(day); - checkData(list); - elasticsearchTemplate.saveBatch(index, getType(), list); - return true; + public boolean saveBatchInDay(String day, Collection list) { + if (StrUtil.isBlank(day) || CollectionUtil.isEmpty(list)) { + return false; + } + String index = getIndex(day); + String type = getType(); + try { + checkIndex(day); + checkData(list); + return elasticsearchTemplate.saveBatch(index, type, list); + } catch (IOException e) { + log.error("【ES】批量添加数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + return false; + } } - public void asyncSaveBatchInDay(String day, Collection list) throws IOException { - String index = checkIndex(day); - checkData(list); - ActionListener listener = new ActionListener() { - @Override - public void onResponse(BulkResponse response) { - if (response != null && !response.hasFailures()) { - String msg = StrUtil.format("【ES】按日期异步批量保存 {} 成功！", index); - log.info(msg); - } else { - String msg = StrUtil.format("【ES】按日期异步批量保存 {} 失败！", index); - log.warn(msg); - } - } - - @Override - public void onFailure(Exception e) { - String msg = StrUtil.format("【ES】按日期异步批量保存 {} 异常！", index); - log.error(msg, e); - } - }; - asyncSaveBatchInDay(day, list, listener); + public void asyncSaveBatchInDay(String day, Collection list) { + asyncSaveBatchInDay(day, list, DEFAULT_BULK_LISTENER); } - public void asyncSaveBatchInDay(String day, Collection list, ActionListener listener) - throws IOException { - String index = checkIndex(day); - checkData(list); - elasticsearchTemplate.asyncSaveBatch(getIndex(day), getType(), list, listener); + public void asyncSaveBatchInDay(String day, Collection list, ActionListener listener) { + if (StrUtil.isBlank(day) || CollectionUtil.isEmpty(list)) { + return; + } + String index = getIndex(day); + String type = getType(); + try { + checkIndex(day); + checkData(list); + elasticsearchTemplate.asyncSaveBatch(index, type, list, listener); + } catch (Exception e) { + log.error("【ES】异步批量添加数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + } } - public boolean deleteByIdInDay(String day, String id) throws IOException { - return elasticsearchTemplate.deleteById(getIndex(day), getType(), id); + public void asyncUpdateBatchIdsInDay(String day, Collection list) { + asyncUpdateBatchIdsInDay(day, list, DEFAULT_BULK_LISTENER); } - public boolean deleteBatchIdsInDay(String day, Collection ids) throws IOException { - return elasticsearchTemplate.deleteBatchIds(getIndex(day), getType(), ids); + public void asyncUpdateBatchIdsInDay(String day, Collection list, ActionListener listener) { + if (StrUtil.isBlank(day) || CollectionUtil.isEmpty(list)) { + return; + } + String index = getIndex(day); + String type = getType(); + try { + checkData(list); + elasticsearchTemplate.asyncUpdateBatchIds(index, type, list, listener); + } catch (Exception e) { + log.error("【ES】异步批量更新数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + } } - protected String checkIndex(String day) throws IOException { + public boolean deleteByIdInDay(String day, String id) { + if (StrUtil.isBlank(day) || StrUtil.isBlank(id)) { + return false; + } + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.deleteById(index, type, id); + } catch (IOException e) { + log.error("【ES】根据ID删除数据异常！index: {}, type: {}, id: {}", index, type, id, e); + return false; + } + } + + public boolean deleteBatchIdsInDay(String day, Collection ids) { + if (StrUtil.isBlank(day) || CollectionUtil.isEmpty(ids)) { + return false; + } + String index = getIndex(day); + String type = getType(); + try { + return elasticsearchTemplate.deleteBatchIds(index, type, ids); + } catch (IOException e) { + log.error("【ES】根据ID批量删除数据异常！index: {}, type: {}, ids: {}", index, type, ids, e); + return false; + } + } + + protected String checkIndex(String day) { if (!enableAutoCreateIndex()) { return getIndex(day); } - String index = createIndexInDay(day); + String index = createIndexIfNotExistsInDay(day); if (StrUtil.isBlank(index)) { - String msg = StrUtil.format("【ES】按日期批量保存 {} 失败！索引找不到且创建失败！", index); + String msg = StrUtil.format("【ES】索引 {}_{} 找不到且创建失败！", getAlias(), day); throw new DefaultException(ResultCode.ERROR, msg); } return index; diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseEsMapper.java b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseEsMapper.java index 3232f9e..b125bea 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseEsMapper.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/BaseEsMapper.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import io.github.dunwu.javadb.elasticsearch.ElasticsearchTemplate; import io.github.dunwu.javadb.elasticsearch.constant.ResultCode; import io.github.dunwu.javadb.elasticsearch.entity.BaseEsEntity; @@ -20,12 +21,14 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; -import java.io.IOException; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; /** * ES Mapper 基础类 @@ -52,13 +55,6 @@ public abstract class BaseEsMapper implements EsMapper implements EsMapper getPropertiesMap() { - Class clazz = getEntityClass(); Method method; try { method = clazz.getMethod("getPropertiesMap"); } catch (NoSuchMethodException e) { - String msg = StrUtil.format("【ES】检查并创建 {} 索引失败！day 不能为空！", getAlias()); - throw new DefaultException(e, ResultCode.ERROR, msg); + log.error("【ES】{} 中不存在 getPropertiesMap 方法！", clazz.getCanonicalName()); + return new HashMap<>(0); } Object result = ReflectUtil.invokeStatic(method); @@ -99,33 +94,80 @@ public abstract class BaseEsMapper implements EsMapper propertiesMap = getPropertiesMap(); + if (MapUtil.isNotEmpty(propertiesMap)) { + elasticsearchTemplate.setMapping(index, type, propertiesMap); + log.error("【ES】设置索引 mapping 成功！index: {}, type: {}, propertiesMap: {}", + index, type, JSONUtil.toJsonStr(propertiesMap)); + } return index; + } catch (Exception e) { + log.error("【ES】创建索引异常！index: {}, type: {}, alias: {}, shard: {}, replica: {}", + index, type, alias, shard, replica, e); + return null; } - elasticsearchTemplate.createIndex(index, getType(), getAlias(), getShard(), getReplica()); - Map propertiesMap = getPropertiesMap(); - if (MapUtil.isNotEmpty(propertiesMap)) { - elasticsearchTemplate.setMapping(index, getType(), propertiesMap); - } - return index; } @Override - public void deleteIndex() throws IOException { - elasticsearchTemplate.deleteIndex(getIndex()); + public void deleteIndex() { + String index = getIndex(); + try { + log.info("【ES】删除索引成功！index: {}", index); + elasticsearchTemplate.deleteIndex(index); + } catch (Exception e) { + log.error("【ES】删除索引异常！index: {}", index, e); + } } @Override - public void updateAlias() throws IOException { - elasticsearchTemplate.updateAlias(getIndex(), getAlias()); + public void updateAlias() { + String index = getIndex(); + String alias = getAlias(); + try { + log.info("【ES】更新别名成功！alias: {} -> index: {}", alias, index); + elasticsearchTemplate.updateAlias(index, alias); + } catch (Exception e) { + log.error("【ES】更新别名异常！alias: {} -> index: {}", alias, index, e); + } + } + + @Override + public Set getIndexSet() { + String alias = getAlias(); + try { + return elasticsearchTemplate.getIndexSet(alias); + } catch (Exception e) { + log.error("【ES】获取别名的所有索引异常！alias: {}", alias, e); + return new HashSet<>(0); + } } // ==================================================================== @@ -133,172 +175,295 @@ public abstract class BaseEsMapper implements EsMapper pojoListByIds(Collection ids) throws IOException { - return elasticsearchTemplate.pojoListByIds(getIndex(), getType(), ids, getEntityClass()); + public List pojoListByIds(Collection ids) { + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.pojoListByIds(index, type, ids, getEntityClass()); + } catch (Exception e) { + log.error("【ES】根据ID查询POJO列表异常！index: {}, type: {}, ids: {}", index, type, ids, e); + return new ArrayList<>(0); + } } @Override - public long count(SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.count(getIndex(), getType(), builder); + public long count(SearchSourceBuilder builder) { + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.count(index, type, builder); + } catch (Exception e) { + log.error("【ES】获取匹配记录数异常！index: {}, type: {}", index, type, e); + return 0L; + } } @Override - public SearchResponse query(SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.query(getIndex(), getType(), builder); - } - @Override - public PageData pojoPage(SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.pojoPage(getIndex(), getType(), builder, getEntityClass()); + public SearchResponse query(SearchSourceBuilder builder) { + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.query(index, type, builder); + } catch (Exception e) { + log.error("【ES】条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } @Override - public ScrollData pojoPageByLastId(String lastId, int size, QueryBuilder queryBuilder) throws IOException { - return elasticsearchTemplate.pojoPageByLastId(getIndex(), getType(), lastId, size, - queryBuilder, getEntityClass()); + public PageData pojoPage(SearchSourceBuilder builder) { + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.pojoPage(index, type, builder, getEntityClass()); + } catch (Exception e) { + log.error("【ES】from + size 分页条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } @Override - public ScrollData pojoScrollBegin(SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.pojoScrollBegin(getIndex(), getType(), builder, getEntityClass()); + public ScrollData pojoPageByLastId(String scrollId, int size, QueryBuilder queryBuilder) { + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.pojoPageByScrollId(index, type, scrollId, size, queryBuilder, + getEntityClass()); + } catch (Exception e) { + log.error("【ES】search after 分页条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } @Override - public ScrollData pojoScroll(String scrollId, SearchSourceBuilder builder) throws IOException { - return elasticsearchTemplate.pojoScroll(scrollId, builder, getEntityClass()); + public ScrollData pojoScrollBegin(SearchSourceBuilder builder) { + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.pojoScrollBegin(index, type, builder, getEntityClass()); + } catch (Exception e) { + log.error("【ES】开启滚动分页条件查询异常！index: {}, type: {}", index, type, e); + return null; + } } @Override - public boolean pojoScrollEnd(String scrollId) throws IOException { - return elasticsearchTemplate.pojoScrollEnd(scrollId); - } - - - @Override - public T save(T entity) throws IOException { - String index = checkIndex(); - checkData(entity); - return elasticsearchTemplate.save(index, getType(), entity); + public ScrollData pojoScroll(String scrollId, SearchSourceBuilder builder) { + try { + return elasticsearchTemplate.pojoScroll(scrollId, builder, getEntityClass()); + } catch (Exception e) { + log.error("【ES】滚动分页条件查询异常！scrollId: {}", scrollId, e); + return null; + } } @Override - public boolean saveBatch(Collection list) throws IOException { - String index = checkIndex(); - checkData(list); - return elasticsearchTemplate.saveBatch(index, getType(), list); + public boolean pojoScrollEnd(String scrollId) { + try { + return elasticsearchTemplate.pojoScrollEnd(scrollId); + } catch (Exception e) { + log.error("【ES】关闭滚动分页条件查询异常！scrollId: {}", scrollId, e); + return false; + } } @Override - public void asyncSaveBatch(Collection list) throws IOException { - String index = checkIndex(); - checkData(list); - ActionListener listener = new ActionListener() { - @Override - public void onResponse(BulkResponse response) { - if (response != null && !response.hasFailures()) { - String msg = StrUtil.format("【ES】异步批量保存 {} 成功！", index); - log.info(msg); - } else { - String msg = StrUtil.format("【ES】异步批量保存 {} 失败！", index); - log.warn(msg); - } - } - - @Override - public void onFailure(Exception e) { - String msg = StrUtil.format("【ES】异步批量保存 {} 异常！", index); - log.error(msg, e); - } - }; - asyncSaveBatch(list, listener); + public T save(T entity) { + if (entity == null) { + return null; + } + String index = getIndex(); + String type = getType(); + try { + checkIndex(); + checkData(entity); + return elasticsearchTemplate.save(index, type, entity); + } catch (Exception e) { + log.error("【ES】添加数据异常！index: {}, type: {}, entity: {}", index, type, JSONUtil.toJsonStr(entity), e); + return null; + } } @Override - public void asyncSaveBatch(Collection list, ActionListener listener) throws IOException { - String index = checkIndex(); - checkData(list); - elasticsearchTemplate.asyncSaveBatch(index, getType(), list, listener); + public boolean saveBatch(Collection list) { + if (CollectionUtil.isEmpty(list)) { + return false; + } + String index = getIndex(); + String type = getType(); + try { + checkIndex(); + checkData(list); + return elasticsearchTemplate.saveBatch(index, type, list); + } catch (Exception e) { + log.error("【ES】批量添加数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + return false; + } } @Override - public T updateById(T entity) throws IOException { - checkData(entity); - return elasticsearchTemplate.updateById(getIndex(), getType(), entity); + public void asyncSaveBatch(Collection list) { + asyncSaveBatch(list, DEFAULT_BULK_LISTENER); } @Override - public boolean updateBatchIds(Collection list) throws IOException { - checkData(list); - return elasticsearchTemplate.updateBatchIds(getIndex(), getType(), list); + public void asyncSaveBatch(Collection list, ActionListener listener) { + if (CollectionUtil.isEmpty(list)) { + return; + } + String index = getIndex(); + String type = getType(); + try { + checkIndex(); + checkData(list); + elasticsearchTemplate.asyncSaveBatch(index, getType(), list, listener); + } catch (Exception e) { + log.error("【ES】异步批量添加数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + } + } + + @Override + public T updateById(T entity) { + if (entity == null) { + return null; + } + String index = getIndex(); + String type = getType(); + try { + checkData(entity); + return elasticsearchTemplate.updateById(index, type, entity); + } catch (Exception e) { + log.error("【ES】更新数据异常！index: {}, type: {}", index, type, e); + return null; + } + } + + @Override + public boolean updateBatchIds(Collection list) { + if (CollectionUtil.isEmpty(list)) { + return false; + } + String index = getIndex(); + String type = getType(); + try { + checkData(list); + return elasticsearchTemplate.updateBatchIds(index, type, list); + } catch (Exception e) { + log.error("【ES】批量更新数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + return false; + } + } + + @Override + public void asyncUpdateBatchIds(Collection list) { + asyncUpdateBatchIds(list, DEFAULT_BULK_LISTENER); } @Override public void asyncUpdateBatchIds(Collection list, ActionListener listener) { - checkData(list); - elasticsearchTemplate.asyncUpdateBatchIds(getIndex(), getType(), list, listener); + if (CollectionUtil.isEmpty(list)) { + return; + } + String index = getIndex(); + String type = getType(); + try { + checkData(list); + elasticsearchTemplate.asyncUpdateBatchIds(index, type, list, listener); + } catch (Exception e) { + log.error("【ES】异步批量更新数据异常！index: {}, type: {}, size: {}", index, type, list.size(), e); + } } @Override - public boolean deleteById(String id) throws IOException { - return elasticsearchTemplate.deleteById(getIndex(), getType(), id); + public boolean deleteById(String id) { + if (StrUtil.isBlank(id)) { + return false; + } + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.deleteById(index, type, id); + } catch (Exception e) { + log.error("【ES】根据ID删除数据异常！index: {}, type: {}, id: {}", index, type, id, e); + return false; + } } @Override - public boolean deleteBatchIds(Collection ids) throws IOException { - return elasticsearchTemplate.deleteBatchIds(getIndex(), getType(), ids); + public boolean deleteBatchIds(Collection ids) { + if (CollectionUtil.isEmpty(ids)) { + return false; + } + String index = getIndex(); + String type = getType(); + try { + return elasticsearchTemplate.deleteBatchIds(index, type, ids); + } catch (Exception e) { + log.error("【ES】根据ID批量删除数据异常！index: {}, type: {}, ids: {}", index, type, ids, e); + return false; + } } @Override - public void asyncDeleteBatchIds(Collection ids) throws IOException { - ActionListener listener = new ActionListener() { - @Override - public void onResponse(BulkResponse response) { - if (response != null && !response.hasFailures()) { - log.info("【ES】异步批量删除成功！"); - } else { - log.warn("【ES】异步批量删除失败！ids: {}", ids); - } - } - - @Override - public void onFailure(Exception e) { - log.error("【ES】异步批量删除异常！ids: {}", ids, e); - } - }; - asyncDeleteBatchIds(ids, listener); + public void asyncDeleteBatchIds(Collection ids) { + asyncDeleteBatchIds(ids, DEFAULT_BULK_LISTENER); } @Override - public void asyncDeleteBatchIds(Collection ids, ActionListener listener) throws IOException { - elasticsearchTemplate.asyncDeleteBatchIds(getIndex(), getType(), ids, listener); + public void asyncDeleteBatchIds(Collection ids, ActionListener listener) { + if (CollectionUtil.isEmpty(ids)) { + return; + } + String index = getIndex(); + String type = getType(); + try { + elasticsearchTemplate.asyncDeleteBatchIds(index, type, ids, listener); + } catch (Exception e) { + log.error("【ES】异步根据ID批量删除数据异常！index: {}, type: {}, ids: {}", index, type, ids, e); + } } - protected String checkIndex() throws IOException { + protected String checkIndex() { if (!enableAutoCreateIndex()) { return getIndex(); } String index = createIndexIfNotExists(); if (StrUtil.isBlank(index)) { - String msg = StrUtil.format("【ES】索引找不到且创建失败！", index); + String msg = StrUtil.format("【ES】索引 {} 找不到且创建失败！", index); throw new DefaultException(ResultCode.ERROR, msg); } return index; @@ -318,4 +483,20 @@ public abstract class BaseEsMapper implements EsMapper DEFAULT_BULK_LISTENER = new ActionListener() { + @Override + public void onResponse(BulkResponse response) { + if (response != null && !response.hasFailures()) { + log.info("【ES】异步批量写数据成功！index: {}, type: {}", getIndex(), getType()); + } else { + log.warn("【ES】异步批量写数据失败！index: {}, type: {}", getIndex(), getType()); + } + } + + @Override + public void onFailure(Exception e) { + log.error("【ES】异步批量写数据异常！index: {}, type: {}", getIndex(), getType()); + } + }; + } diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/EsMapper.java b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/EsMapper.java index bacabff..5630d66 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/EsMapper.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/main/java/io/github/dunwu/javadb/elasticsearch/mapper/EsMapper.java @@ -13,11 +13,11 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; -import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** * ES Mapper @@ -57,29 +57,38 @@ public interface EsMapper { */ Class getEntityClass(); - RestHighLevelClient getClient() throws IOException; + /** + * 如果开启，添加 ES 数据时，如果索引不存在，会自动创建索引 + */ + default boolean enableAutoCreateIndex() { + return false; + } - BulkProcessor getBulkProcessor() throws IOException; + RestHighLevelClient getClient(); - boolean isIndexExists() throws IOException; + BulkProcessor getBulkProcessor(); - String createIndexIfNotExists() throws IOException; + boolean isIndexExists(); - void deleteIndex() throws IOException; + String createIndexIfNotExists(); - void updateAlias() throws IOException; + void deleteIndex(); - GetResponse getById(String id) throws IOException; + void updateAlias(); - GetResponse getById(String id, Long version) throws IOException; + Set getIndexSet(); - T pojoById(String id) throws IOException; + GetResponse getById(String id); - T pojoById(String id, Long version) throws IOException; + GetResponse getById(String id, Long version); - List pojoListByIds(Collection ids) throws IOException; + T pojoById(String id); - default Map pojoMapByIds(Collection ids) throws IOException { + T pojoById(String id, Long version); + + List pojoListByIds(Collection ids); + + default Map pojoMapByIds(Collection ids) { List list = pojoListByIds(ids); if (CollectionUtil.isEmpty(list)) { return new HashMap<>(0); @@ -92,40 +101,42 @@ public interface EsMapper { return map; } - long count(SearchSourceBuilder builder) throws IOException; + long count(SearchSourceBuilder builder); - SearchResponse query(SearchSourceBuilder builder) throws IOException; + SearchResponse query(SearchSourceBuilder builder); - PageData pojoPage(SearchSourceBuilder builder) throws IOException; + PageData pojoPage(SearchSourceBuilder builder); - ScrollData pojoPageByLastId(String lastId, int size, QueryBuilder queryBuilder) throws IOException; + ScrollData pojoPageByLastId(String scrollId, int size, QueryBuilder queryBuilder); - ScrollData pojoScrollBegin(SearchSourceBuilder builder) throws IOException; + ScrollData pojoScrollBegin(SearchSourceBuilder builder); - ScrollData pojoScroll(String scrollId, SearchSourceBuilder builder) throws IOException; + ScrollData pojoScroll(String scrollId, SearchSourceBuilder builder); - boolean pojoScrollEnd(String scrollId) throws IOException; + boolean pojoScrollEnd(String scrollId); - T save(T entity) throws IOException; + T save(T entity); - boolean saveBatch(Collection list) throws IOException; + boolean saveBatch(Collection list); - void asyncSaveBatch(Collection list) throws IOException; + void asyncSaveBatch(Collection list); - void asyncSaveBatch(Collection list, ActionListener listener) throws IOException; + void asyncSaveBatch(Collection list, ActionListener listener); - T updateById(T entity) throws IOException; + T updateById(T entity); - boolean updateBatchIds(Collection list) throws IOException; + boolean updateBatchIds(Collection list); + + void asyncUpdateBatchIds(Collection list); void asyncUpdateBatchIds(Collection list, ActionListener listener); - boolean deleteById(String id) throws IOException; + boolean deleteById(String id); - boolean deleteBatchIds(Collection ids) throws IOException; + boolean deleteBatchIds(Collection ids); - void asyncDeleteBatchIds(Collection ids) throws IOException; + void asyncDeleteBatchIds(Collection ids); - void asyncDeleteBatchIds(Collection ids, ActionListener listener) throws IOException; + void asyncDeleteBatchIds(Collection ids, ActionListener listener); } diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/BaseElasticsearchTemplateTest.java b/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/BaseElasticsearchTemplateTest.java index 05b95f7..6727795 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/BaseElasticsearchTemplateTest.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/BaseElasticsearchTemplateTest.java @@ -8,6 +8,8 @@ import io.github.dunwu.javadb.elasticsearch.entity.common.ScrollData; import io.github.dunwu.javadb.elasticsearch.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.assertj.core.api.Assertions; +import org.elasticsearch.action.ActionListener; +import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -19,6 +21,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; /** * ElasticsearchTemplate 测试 @@ -75,8 +79,34 @@ public abstract class BaseElasticsearchTemplateTest { Assertions.assertThat(exists).isTrue(); } + public void getIndexList() throws IOException { + Set set = TEMPLATE.getIndexSet(getAlias()); + log.info("alias: {}, indexList: {}", getAlias(), set); + Assertions.assertThat(set).isNotEmpty(); + } + protected void save() throws IOException { String id = "1"; + T oldEntity = getOneMockData(id); + TEMPLATE.save(getIndex(), getType(), oldEntity); + T newEntity = TEMPLATE.pojoById(getIndex(), getType(), id, getEntityClass()); + log.info("记录：{}", JsonUtil.toString(newEntity)); + Assertions.assertThat(newEntity).isNotNull(); + } + + protected void saveBatch() throws IOException { + int total = 5000; + List> listGroup = CollectionUtil.split(getMockList(total), 1000); + for (List list : listGroup) { + TEMPLATE.saveBatch(getIndex(), getType(), list); + } + long count = TEMPLATE.count(getIndex(), getType(), new SearchSourceBuilder()); + log.info("批量更新记录数: {}", count); + Assertions.assertThat(count).isEqualTo(total); + } + + protected void asyncSave() throws IOException { + String id = "10000"; T entity = getOneMockData(id); TEMPLATE.save(getIndex(), getType(), entity); T newEntity = TEMPLATE.pojoById(getIndex(), getType(), id, getEntityClass()); @@ -84,12 +114,13 @@ public abstract class BaseElasticsearchTemplateTest { Assertions.assertThat(newEntity).isNotNull(); } - protected void saveBatch() throws IOException { + protected void asyncSaveBatch() throws IOException, InterruptedException { int total = 10000; List> listGroup = CollectionUtil.split(getMockList(total), 1000); for (List list : listGroup) { - TEMPLATE.saveBatch(getIndex(), getType(), list); + TEMPLATE.asyncSaveBatch(getIndex(), getType(), list, DEFAULT_BULK_LISTENER); } + TimeUnit.SECONDS.sleep(20); long count = TEMPLATE.count(getIndex(), getType(), new SearchSourceBuilder()); log.info("批量更新记录数: {}", count); Assertions.assertThat(count).isEqualTo(total); @@ -167,7 +198,7 @@ public abstract class BaseElasticsearchTemplateTest { long total = TEMPLATE.count(getIndex(), getType(), queryBuilder); ScrollData scrollData = - TEMPLATE.pojoPageByLastId(getIndex(), getType(), null, SIZE, queryBuilder, getEntityClass()); + TEMPLATE.pojoPageByScrollId(getIndex(), getType(), null, SIZE, queryBuilder, getEntityClass()); if (scrollData == null || scrollData.getScrollId() == null) { return; } @@ -181,8 +212,8 @@ public abstract class BaseElasticsearchTemplateTest { String scrollId = scrollData.getScrollId(); while (CollectionUtil.isNotEmpty(scrollData.getContent())) { - scrollData = - TEMPLATE.pojoPageByLastId(getIndex(), getType(), scrollId, SIZE, queryBuilder, getEntityClass()); + scrollData = TEMPLATE.pojoPageByScrollId(getIndex(), getType(), scrollId, SIZE, + queryBuilder, getEntityClass()); if (scrollData == null || CollectionUtil.isEmpty(scrollData.getContent())) { break; } @@ -238,4 +269,20 @@ public abstract class BaseElasticsearchTemplateTest { Assertions.assertThat(count).isEqualTo(total); } + final ActionListener DEFAULT_BULK_LISTENER = new ActionListener() { + @Override + public void onResponse(BulkResponse response) { + if (response != null && !response.hasFailures()) { + log.info("【ES】异步批量写数据成功！index: {}, type: {}", getIndex(), getType()); + } else { + log.warn("【ES】异步批量写数据失败！index: {}, type: {}", getIndex(), getType()); + } + } + + @Override + public void onFailure(Exception e) { + log.error("【ES】异步批量写数据异常！index: {}, type: {}", getIndex(), getType()); + } + }; + } diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/UserElasticsearchTemplateTest.java b/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/UserElasticsearchTemplateTest.java index 3724246..aa8aab5 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/UserElasticsearchTemplateTest.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/UserElasticsearchTemplateTest.java @@ -83,6 +83,7 @@ public class UserElasticsearchTemplateTest extends BaseElasticsearchTemplateTest public void indexTest() throws IOException { super.deleteIndex(); super.createIndex(); + super.getIndexList(); } @Test @@ -92,6 +93,13 @@ public class UserElasticsearchTemplateTest extends BaseElasticsearchTemplateTest super.saveBatch(); } + @Test + @DisplayName("异步写数据测试") + public void asyncWriteTest() throws IOException, InterruptedException { + super.asyncSave(); + super.asyncSaveBatch(); + } + @Test @DisplayName("读数据测试") public void readTest() throws IOException { diff --git a/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/mapper/UserEsMapperTest.java b/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/mapper/UserEsMapperTest.java index ccc7b39..a287be6 100644 --- a/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/mapper/UserEsMapperTest.java +++ b/codes/javadb/elasticsearch/elasticsearch6/src/test/java/io/github/dunwu/javadb/elasticsearch/mapper/UserEsMapperTest.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.io.IOException; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -49,7 +48,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("删除当天索引") - public void deleteIndex() throws IOException { + public void deleteIndex() { String index = mapper.getIndex(); boolean indexExists = mapper.isIndexExists(); if (!indexExists) { @@ -63,7 +62,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("根据日期删除索引") - public void deleteIndexInDay() throws IOException { + public void deleteIndexInDay() { String index = mapper.getIndex(day); boolean indexExists = mapper.isIndexExistsInDay(day); if (!indexExists) { @@ -83,7 +82,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("创建当天索引") - public void createIndex() throws IOException { + public void createIndex() { String index = mapper.getIndex(); boolean indexExists = mapper.isIndexExists(); @@ -99,7 +98,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("根据日期创建索引") - public void createIndexInDay() throws IOException { + public void createIndexInDay() { String index = mapper.getIndex(day); boolean indexExists = mapper.isIndexExistsInDay(day); @@ -108,7 +107,7 @@ public class UserEsMapperTest extends BaseApplicationTests { return; } - mapper.createIndexInDay(day); + mapper.createIndexIfNotExistsInDay(day); indexExists = mapper.isIndexExistsInDay(day); Assertions.assertThat(indexExists).isTrue(); } @@ -121,7 +120,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("保存当天数据") - public void save() throws IOException { + public void save() { String id = "1"; User entity = getOneMockData(id); mapper.save(entity); @@ -132,7 +131,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("保存指定日期数据") - public void saveInDay() throws IOException { + public void saveInDay() { String id = "1"; User entity = getOneMockData(id); mapper.saveInDay(day, entity); @@ -143,7 +142,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("批量保存当天数据") - public void batchSave() throws IOException, InterruptedException { + public void batchSave() throws InterruptedException { int total = 10000; List> listGroup = CollectionUtil.split(getMockList(total), 1000); for (List list : listGroup) { @@ -157,7 +156,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("批量保存指定日期数据") - public void batchSaveInDay() throws IOException, InterruptedException { + public void batchSaveInDay() throws InterruptedException { int total = 10000; List> listGroup = CollectionUtil.split(getMockList(total), 1000); for (List list : listGroup) { @@ -177,7 +176,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("根据ID查找当日数据") - public void pojoById() throws IOException { + public void pojoById() { String id = "1"; User newEntity = mapper.pojoById(id); log.info("entity: {}", JsonUtil.toString(newEntity)); @@ -186,7 +185,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("根据ID查找指定日期数据") - public void pojoByIdInDay() throws IOException { + public void pojoByIdInDay() { String id = "1"; User newEntity = mapper.pojoByIdInDay(day, id); log.info("entity: {}", JsonUtil.toString(newEntity)); @@ -195,7 +194,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("获取匹配条件的记录数") - public void count() throws IOException { + public void count() { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -207,7 +206,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("获取匹配条件的指定日期记录数") - public void countInDay() throws IOException { + public void countInDay() { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -219,7 +218,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("获取匹配条件的记录") - public void query() throws IOException { + public void query() { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -239,7 +238,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("获取匹配条件的指定日期记录") - public void queryInDay() throws IOException { + public void queryInDay() { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -259,7 +258,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("from + size 分页查询当日数据") - public void pojoPage() throws IOException { + public void pojoPage() { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -276,7 +275,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("from + size 分页查询指定日期数据") - public void pojoPageInDay() throws IOException { + public void pojoPageInDay() { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -293,7 +292,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("search after 分页查询当日数据") - protected void pojoPageByLastId() throws IOException { + protected void pojoPageByLastId() { BoolQueryBuilder queryBuilder = new BoolQueryBuilder(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); @@ -332,7 +331,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("search after 分页查询指定日期数据") - protected void pojoPageByLastIdInDay() throws IOException { + protected void pojoPageByLastIdInDay() { BoolQueryBuilder queryBuilder = new BoolQueryBuilder(); queryBuilder.must(QueryBuilders.rangeQuery("docId").lt("100")); @@ -371,7 +370,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("滚动翻页当日数据") - public void pojoScroll() throws IOException { + public void pojoScroll() { final int size = 100; @@ -412,7 +411,7 @@ public class UserEsMapperTest extends BaseApplicationTests { @Test @DisplayName("滚动翻页指定日期数据") - public void pojoScrollInDay() throws IOException { + public void pojoScrollInDay() { final int size = 100;