From fd2a323146f326f90385401ae788ec06cd211b72 Mon Sep 17 00:00:00 2001 From: felix Date: Thu, 2 Dec 2021 12:35:53 +0800 Subject: [PATCH] =?UTF-8?q?build=EF=BC=9A=201.0.9;=20=E4=BC=98=E5=8C=96ES6?= =?UTF-8?q?.x=20=E5=92=8C7.x=E4=B8=ADtype=E9=97=AE=E9=A2=98=EF=BC=8C=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96routing=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easy-es-core/pom.xml | 5 +- .../indi/felix/easy/core/elastic/EasyEs.java | 13 +++++ .../core/elastic/client/AbstractService.java | 13 ++--- .../core/elastic/client/EasyEsService.java | 6 ++- .../easy/core/elastic/model/SettingModel.java | 5 +- .../easy/core/elastic/rest/DocRestApi.java | 25 +++++----- .../easy/core/elastic/rest/EasyRest.java | 23 +++++---- .../easy/core/elastic/rest/IndexRestApi.java | 3 +- .../easy/core/elastic/rest/SearchRestApi.java | 10 ++-- .../felix/easy/core/elastic/utool/Const.java | 7 ++- .../easy/core/elastic/utool/EsUtils.java | 42 +++++++++++++---- .../felix/easy/core/elastic/utool/Main.java | 43 ----------------- .../easy/core/elastic/utool/Monitor.java | 38 --------------- .../core/elastic/utool/ZlPendProducer.java | 47 ------------------- .../core/elastic/utool/ZlReadProducer.java | 46 ------------------ .../easy/core/elastic/rest/EasyRestTest.java | 2 +- .../core/elastic/rest/SearchRestApiTest.java | 3 ++ pom.xml | 2 +- 18 files changed, 106 insertions(+), 227 deletions(-) delete mode 100644 easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Main.java delete mode 100644 easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Monitor.java delete mode 100644 easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlPendProducer.java delete mode 100644 easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlReadProducer.java diff --git a/easy-es-core/pom.xml b/easy-es-core/pom.xml index 998b9ac..8b20a1d 100644 --- a/easy-es-core/pom.xml +++ b/easy-es-core/pom.xml @@ -5,7 +5,7 @@ easy-es indi.felix.easy - 1.0.6 + 1.0.8 4.0.0 easy-es-core @@ -65,7 +65,6 @@ junit junit - test @@ -75,13 +74,11 @@ org.apache.logging.log4j log4j-core - org.apache.logging.log4j log4j-api - commons-logging diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/EasyEs.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/EasyEs.java index 604a9f5..087d58b 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/EasyEs.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/EasyEs.java @@ -182,6 +182,19 @@ public class EasyEs { // return responseBody(defaultMethod, newEndpoint); // } + public void bulkAddDoc(String index, List objects, String idKey, String routingKey, String parentKey) { + BulkRequest request = new BulkRequest(); + + if(!rest().indexExists(index)){ + throw new ElasticsearchException("index is not exists"); + } + if (objects == null || objects.size() < 1) { + throw new ElasticsearchException("mappers can not be empty"); + } + + search().bulkInsert(index, objects, 2000); + } + public void bulkAddDoc(String index, List objects) { BulkRequest request = new BulkRequest(); diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/AbstractService.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/AbstractService.java index dd11785..c15ab72 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/AbstractService.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/AbstractService.java @@ -12,7 +12,6 @@ import indi.felix.easy.core.elastic.utool.DelEsListener; import indi.felix.easy.core.elastic.utool.EsUtils; import indi.felix.easy.core.exceptions.ElasticsearchException; import indi.felix.easy.core.metadata.RuntimeElasticMetaData; -import indi.felix.easy.core.utils.FastJsonUtils; import javafx.util.Pair; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -96,7 +95,7 @@ public abstract class AbstractService { * @param list * @return */ - protected ArrayList> insertBatch(String index, List list, int batchSize) { + protected ArrayList> insertBatch(String index, List list, int batchSize, String idKey, String routingKey, String parentKey) { ArrayList> failure = new ArrayList<>(); if (batchSize <= 0 || batchSize > 2000) { batchSize = 2000; @@ -111,18 +110,20 @@ public abstract class AbstractService { String json = JSON.toJSONString(obj); if (StringUtils.isNotEmpty(json)) { if (cursor < batchSize) { - IndexRequest indexRequest = new IndexRequest(index, DOC_TYPE); +// IndexRequest indexRequest = new IndexRequest(index, DOC_TYPE); + IndexRequest indexRequest = new IndexRequest(index); // 设置ID， routing , parent 等字段 - EsUtils.setDefaultProperties(indexRequest, json); + EsUtils.setDefaultProperties(indexRequest, json, idKey, routingKey, parentKey); request.add(indexRequest.create(false).source(json, XContentType.JSON)); } else { everyBatchWrapper(restHighLevelClient, request, failure); cursor = 0; request = new BulkRequest(); - IndexRequest indexRequest = new IndexRequest(index, DOC_TYPE); +// IndexRequest indexRequest = new IndexRequest(index, DOC_TYPE); + IndexRequest indexRequest = new IndexRequest(index); // 设置ID， routing , parent 等字段 - EsUtils.setDefaultProperties(indexRequest, json); + EsUtils.setDefaultProperties(indexRequest, json, idKey, routingKey, parentKey); request.add(indexRequest.create(false).source(json, XContentType.JSON)); } cursor++; diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/EasyEsService.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/EasyEsService.java index 3b282fe..dcb12ca 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/EasyEsService.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/client/EasyEsService.java @@ -107,7 +107,11 @@ public class EasyEsService extends AbstractService { * @return ArrayList */ public ArrayList> bulkInsert(String index, List list, int batchSize) { - return insertBatch(index, list, batchSize); + return insertBatch(index, list, batchSize, null, null, null); + } + + public ArrayList> bulkInsert(String index, List list, int batchSize, String idKey, String routingKey, String parentKey) { + return insertBatch(index, list, batchSize, idKey, routingKey, parentKey); } diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/model/SettingModel.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/model/SettingModel.java index 50b228c..cbe7b1c 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/model/SettingModel.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/model/SettingModel.java @@ -16,7 +16,8 @@ import java.util.Map; @Data public class SettingModel { /** - * 分片数, 默认5, static + * 分片数, 默认1, static + * 默认分片数将从5变为1在7.x版本，如想使用默认的5可以新建带有索引模板的索引请求 */ private int shards; @@ -40,7 +41,7 @@ public class SettingModel { private int totalFields; public SettingModel() { - this.shards = 5; + this.shards = 1; this.replicas = 1; this.totalFields = 5000; // this.refreshInterval = 1s diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/DocRestApi.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/DocRestApi.java index 275f3be..58021fa 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/DocRestApi.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/DocRestApi.java @@ -83,9 +83,6 @@ public class DocRestApi extends BaseRest { return addDoc(index, params, map); } -// public String updateByQuery() { -// -// } private String addDoc(String index, Map params, Map map) { Args.notNull(index, "index"); @@ -104,20 +101,22 @@ public class DocRestApi extends BaseRest { return true; } String newEndpoint = null; - if (id.length == 1) { - newEndpoint = MessageFormat.format("/{0}/{1}", index, id[0]); - Response response = res(DELETE, newEndpoint, Collections.EMPTY_MAP, null); - int code = response.getStatusLine().getStatusCode(); + IdsQueryBuilder idsQueryBuilder = new IdsQueryBuilder(); + idsQueryBuilder.addIds(id); + + return deleteDocByQuery(index, idsQueryBuilder); +// if (id.length == 1) { +// newEndpoint = MessageFormat.format("/{0}/{1}", index, id[0]); +// Response response = res(DELETE, newEndpoint, Collections.EMPTY_MAP, null); +// int code = response.getStatusLine().getStatusCode(); +// +// return code == 200; - return code == 200; - } else { +// } else { // todo 待完善 // newEndpoint = MessageFormat.format("/{0}/{1}/{2}", index, DOC_TYPE, "_delete_by_query"); - IdsQueryBuilder idsQueryBuilder = new IdsQueryBuilder(); - idsQueryBuilder.addIds(id); - return deleteDocByQuery(index, idsQueryBuilder); - } +// } } public boolean deleteDocByQuery(String index, QueryBuilder queryBuilder) { diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/EasyRest.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/EasyRest.java index 62ebc60..ae7a736 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/EasyRest.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/EasyRest.java @@ -151,30 +151,33 @@ public class EasyRest extends BaseRest { try { Map map = new HashMap<>(); if (setting != null && setting.size() > 0) { + map.put("settings", setting); + } else { + //默认分片数将从5变为1在7.x版本，如想使用默认的5可以新建带有索引模板的索引请求 + SettingModel settingModel = new SettingModel(); + setting = settingModel.getSettingMap(); + map.put("settings", setting); } + // 创建默认mapping + Map mappingMap = new HashMap<>(); + // 考虑需要使用join查询， 索引mapping中_routing的required必须设置为true。 if (mapping != null && mapping.size() > 0) { if (mapping.containsKey("properties")) { - // 设置type - Map mappingMap = new HashMap<>(); mappingMap.put(DOC_TYPE, mapping); - map.put("mappings", mappingMap); } else { - map.put("mappings", mapping); + mappingMap = mapping; } } else { - // 创建默认mapping - Map mappingMap = new HashMap<>(); mappingMap.put(DOC_TYPE, Collections.EMPTY_MAP); - - map.put("mappings", mappingMap); } - + map.put("mappings", mappingMap); String jsonString = JSON.toJSONString(map); + String newEndpoint = index + "?include_type_name=true"; Request request = new Request( "PUT", - index); + newEndpoint); request.setEntity(new NStringEntity( jsonString, ContentType.APPLICATION_JSON)); diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/IndexRestApi.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/IndexRestApi.java index eda1219..5933b96 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/IndexRestApi.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/IndexRestApi.java @@ -38,7 +38,8 @@ public class IndexRestApi extends BaseRest { * @return */ public boolean exists(String index) { - Response response = res(HEAD, index, Collections.EMPTY_MAP, null); + String newEndpoint = index + "?include_type_name=true"; + Response response = res(HEAD, newEndpoint, Collections.EMPTY_MAP, null); int code = response.getStatusLine().getStatusCode(); return code == 200; } diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/SearchRestApi.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/SearchRestApi.java index 2ade345..0055143 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/SearchRestApi.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/rest/SearchRestApi.java @@ -48,15 +48,17 @@ public class SearchRestApi extends BaseRest { /** * 查询指定ID的文档 - * + * 如果索引设置了routing， 会报routing_missing_exception 异常 * @param index 多个索引查询用逗号分割 * @param id * @return */ public String requestById(String index, String id) { - String newEndpoint = MessageFormat.format("/{0}/{1}", index, id); - - return responseBody(defaultMethod, newEndpoint); + String newEndpoint = MessageFormat.format("/{0}/{1}/{2}", index, DOC_TYPE, id); + //?routing=key1 + // 采用index/_doc/id 这种api 可能会有routing的问题， +// return responseBody(GET, newEndpoint); + return requestByIds(index, id); } /** diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Const.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Const.java index 8445d0b..d5d89df 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Const.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Const.java @@ -8,12 +8,15 @@ public class Const { */ public static final String DOC_TYPE = "_doc"; + + public static final String UID = "_id"; + + + /** * 默认的ID字段， 对象中如果有该字段， 默认存储ES将按该字段设置ID */ public static final String ID = "id"; - - public static final String UID = "_id"; /** * 默认的routing字段, 同ID */ diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/EsUtils.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/EsUtils.java index 7c9051f..2b0f1f4 100644 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/EsUtils.java +++ b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/EsUtils.java @@ -9,37 +9,63 @@ import java.util.Map; public class EsUtils { - public static IndexRequest setDefaultProperties(IndexRequest indexRequest, Object object) { + public static IndexRequest setDefaultProperties(IndexRequest indexRequest, Object object, String idKey, String routingKey, String parentKey) { JSONObject jsonObject = null; if (object instanceof JSONObject) { jsonObject = (JSONObject) object; - } else if(object instanceof String){ + } else if (object instanceof String) { jsonObject = JSON.parseObject(object.toString()); } else { jsonObject = (JSONObject) JSONObject.toJSON(object); } - if (jsonObject.containsKey(Const.ID)) { - String id = jsonObject.getString(Const.ID); + if (StringUtils.isNotBlank(idKey)) { + String id = jsonObject.getString(idKey); if (StringUtils.isNotBlank(id)) { indexRequest.id(id); } } - if (jsonObject.containsKey(Const.ROUTING)) { - String routing = jsonObject.getString(Const.ROUTING); + if (StringUtils.isNotBlank(routingKey)) { + String routing = jsonObject.getString(routingKey); if (StringUtils.isNotBlank(routing)) { indexRequest.routing(routing); } } - if (jsonObject.containsKey(Const.PARENT)) { - String parent = jsonObject.getString(Const.PARENT); + if (StringUtils.isNotBlank(parentKey)) { + String parent = jsonObject.getString(parentKey); if (StringUtils.isNotBlank(parent)) { indexRequest.parent(parent); } } +// if (jsonObject.containsKey(Const.ID)) { +// String id = jsonObject.getString(Const.ID); +// if (StringUtils.isNotBlank(id)) { +// indexRequest.id(id); +// } +// } else if (jsonObject.containsKey("ID")) { +// String id = jsonObject.getString("ID"); +// if (StringUtils.isNotBlank(id)) { +// indexRequest.id(id); +// } +// } +// +// if (jsonObject.containsKey(Const.ROUTING)) { +// String routing = jsonObject.getString(Const.ROUTING); +// if (StringUtils.isNotBlank(routing)) { +// indexRequest.routing(routing); +// } +// } +// +// if (jsonObject.containsKey(Const.PARENT)) { +// String parent = jsonObject.getString(Const.PARENT); +// if (StringUtils.isNotBlank(parent)) { +// indexRequest.parent(parent); +// } +// } + return indexRequest; } } diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Main.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Main.java deleted file mode 100644 index 66c4e94..0000000 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Main.java +++ /dev/null @@ -1,43 +0,0 @@ -package indi.felix.easy.core.elastic.utool; - -import org.elasticsearch.common.settings.Settings; - -import java.sql.Connection; -import java.sql.DriverManager; - -public class Main { - - public static void main(String[] args) { - -// Connection conn = DriverManager.getConnection(url, user, password); -// // 监控线程 -// Monitor monitorService = new Monitor(); -// monitorService.monitorToES(); -// // 已办生产者线程 -// Thread pendProducerThread = new Thread(new ZlPendProducer(conn, "ZlPendProducer")); -// pendProducerThread.start(); -// // 已阅生产者线程 -// Thread readProducerThread = new Thread(new ZlReadProducer(conn, "ZlReadProducer")); -// readProducerThread.start(); -// -// String cName = meta.get("cName");//es集群名字 -// String esNodes = meta.get("esNodes");//es集群ip节点 -// Settings esSetting = Settings.builder() -// .put("cluster.name", cName) -// .put("client.transport.sniff", true)//增加嗅探机制，找到ES集群 -// .put("thread_pool.search.size", 5)//增加线程池个数，暂时设为5 -// .build(); -// String[] nodes = esNodes.split(","); -// Object client =new PreBuiltTransportClient(esSetting); -// for(String node :nodes){ -// if (node.length() > 0) { -// String[] hostPort = node.split(":"); -// client.addTransportAddress(new TransportAddress(InetAddress.getByName(hostPort[0]), Integer.parseInt(hostPort[1]))); -// } -// } - } - - - - -} diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Monitor.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Monitor.java deleted file mode 100644 index 88993f3..0000000 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/Monitor.java +++ /dev/null @@ -1,38 +0,0 @@ -package indi.felix.easy.core.elastic.utool; - -public class Monitor { - public void monitorToES() { -// new Thread(() -> { -// while (true) { -// StringBuilder sb = new StringBuilder(); -// sb.append("已办表数::").append(Const.TBL.TBL_PEND_COUNT) -// .append("::已办总数::").append(Const.COUNTER.LD_P_TOTAL) -// .append("::已办入库总数::").append(Const.COUNTER.LD_P); -// sb.append("~~~~已阅表数::").append(Const.TBL.TBL_READ_COUNT); -// sb.append("::已阅总数::").append(Const.COUNTER.LD_R_TOTAL) -// .append("::已阅入库总数::").append(Const.COUNTER.LD_R); -// if (ldPrevPendCount == 0 && ldPrevReadCount == 0) { -// ldPrevPendCount = Const.COUNTER.LD_P.get(); -// ldPrevReadCount = Const.COUNTER.LD_R.get(); -// start = System.currentTimeMillis(); -// } else { -// long end = System.currentTimeMillis(); -// if ((end - start) / 1000 >= 60) { -// start = end; -// sb.append("\n#########################################\n"); -// sb.append("已办每分钟TPS::" + (Const.COUNTER.LD_P.get() - ldPrevPendCount) + "条"); -// sb.append("::已阅每分钟TPS::" + (Const.COUNTER.LD_R.get() - ldPrevReadCount) + "条"); -// ldPrevPendCount = Const.COUNTER.LD_P.get(); -// ldPrevReadCount = Const.COUNTER.LD_R.get(); -// } -// } -// System.out.println(sb.toString()); -// try { -// Thread.sleep(3000); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// } -// }).start(); - } -} diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlPendProducer.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlPendProducer.java deleted file mode 100644 index 93a4379..0000000 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlPendProducer.java +++ /dev/null @@ -1,47 +0,0 @@ -package indi.felix.easy.core.elastic.utool; - -import java.sql.Connection; -import java.util.ArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public class ZlPendProducer implements Runnable { -// private final static String threadName = "ES-Import-"; - - private static int THREADS = 21; -// public static ExecutorService POR = Executors.newFixedThreadPool(THREADS); -// public static ExecutorService ROR = Executors.newFixedThreadPool(THREADS); - - public ZlPendProducer(Connection connectionnn, String threadName){ - - } - - @Override - public void run() { -// System.out.println(threadName + "::启动..."); -// for (int j = 0; j < Const.TBL.TBL_PEND_COUNT; j++) { -// try { -// int size = 1000; -// for (int i = 0; i < count; i += size) { -// if (i + size > count) { -// //作用为size最后没有100条数据则剩余几条newList中就装几条 -// size = count - i; -// } -// String sql = "select * from " + tableName + " limit " + i + ", " + size; -// System.out.println(tableName + "::sql::" + sql); -// rs = statement.executeQuery(sql); -// List lst = new ArrayList<>(); -// while (rs.next()) { -// HistPendingEntity p = PendUtils.getHistPendingEntity(rs); -// lst.add(p); -// } -// MteExecutor.POR.submit(new ZlPendConsumer(lst)); -// Thread.sleep(2000); -// } -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } - } -} diff --git a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlReadProducer.java b/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlReadProducer.java deleted file mode 100644 index 656310d..0000000 --- a/easy-es-core/src/main/java/indi/felix/easy/core/elastic/utool/ZlReadProducer.java +++ /dev/null @@ -1,46 +0,0 @@ -package indi.felix.easy.core.elastic.utool; - -import java.sql.Connection; -import java.util.ArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public class ZlReadProducer implements Runnable { - - private static int THREADS = 21; -// public static ExecutorService POR = Executors.newFixedThreadPool(THREADS); -// public static ExecutorService ROR = Executors.newFixedThreadPool(THREADS); - - public ZlReadProducer(Connection connectionnn, String threadName){ - - } - - @Override - public void run() { -// System.out.println(threadName + "::启动..."); -// for (int j = 0; j < Const.TBL.TBL_PEND_COUNT; j++) { -// try { -// int size = 1000; -// for (int i = 0; i < count; i += size) { -// if (i + size > count) { -// //作用为size最后没有100条数据则剩余几条newList中就装几条 -// size = count - i; -// } -// String sql = "select * from " + tableName + " limit " + i + ", " + size; -// System.out.println(tableName + "::sql::" + sql); -// rs = statement.executeQuery(sql); -// List lst = new ArrayList<>(); -// while (rs.next()) { -// HistPendingEntity p = PendUtils.getHistPendingEntity(rs); -// lst.add(p); -// } -// MteExecutor.POR.submit(new ZlPendConsumer(lst)); -// Thread.sleep(2000); -// } -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } - } -} diff --git a/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/EasyRestTest.java b/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/EasyRestTest.java index c08ab98..4ddda8c 100644 --- a/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/EasyRestTest.java +++ b/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/EasyRestTest.java @@ -43,7 +43,7 @@ public class EasyRestTest extends TestCase { easyEs.rest().document().addDoc(testIndexName, "123457", "123457", map2); - Assert.assertEquals("{\"_index\":\"test_20210907\",\"_type\":\"doc\",\"_id\":\"123456\",\"_version\":1,\"found\":true,\"_source\":{\"name\":\"李四\",\"age\":\"11\"}}", + Assert.assertEquals("{\"docs\":[{\"_index\":\"test_20210907\",\"_type\":\"_doc\",\"_id\":\"123456\",\"_version\":1,\"_seq_no\":1,\"_primary_term\":1,\"found\":true,\"_source\":{\"name\":\"李四\",\"age\":\"11\"}}]}", easyEs.rest().search().requestById(testIndexName, "123456")); diff --git a/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/SearchRestApiTest.java b/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/SearchRestApiTest.java index 90e8e15..6fd67b6 100644 --- a/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/SearchRestApiTest.java +++ b/easy-es-core/src/test/java/indi/felix/easy/core/elastic/rest/SearchRestApiTest.java @@ -13,6 +13,9 @@ public class SearchRestApiTest extends TestCase { String res = easyEs.rest().search().requestByIds(testIndexName, ids); System.out.println(res); + String re1s = easyEs.rest().search().requestById(testIndexName, "pa_18978559"); + + System.out.println(re1s); } diff --git a/pom.xml b/pom.xml index c97ce1a..ed212df 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ indi.felix.easy easy-es pom - 1.0.6 + 1.0.8 easy-es-core -- GitLab