提交 88a86888 编写于 作者: FelixHPP's avatar FelixHPP

build:1.1.0版本, 修复批量新增API bug

上级 33f33e02
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easy-es</artifactId> <artifactId>easy-es</artifactId>
<groupId>indi.felix.easy</groupId> <groupId>indi.felix.easy</groupId>
<version>1.0.9</version> <version>1.1.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>easy-es-core</artifactId> <artifactId>easy-es-core</artifactId>
......
...@@ -182,6 +182,14 @@ public class EasyEs { ...@@ -182,6 +182,14 @@ public class EasyEs {
// return responseBody(defaultMethod, newEndpoint); // return responseBody(defaultMethod, newEndpoint);
// } // }
/**
* 批量新增
* @param index 索引名称
* @param objects 批量插入的对象
* @param idKey ID字段名称, 没有传入null
* @param routingKey 作为routing字段的名称,没有传入null
* @param parentKey 作为parent字段的名称, 没有传入null
*/
public void bulkAddDoc(String index, List<Map> objects, String idKey, String routingKey, String parentKey) { public void bulkAddDoc(String index, List<Map> objects, String idKey, String routingKey, String parentKey) {
BulkRequest request = new BulkRequest(); BulkRequest request = new BulkRequest();
...@@ -192,7 +200,7 @@ public class EasyEs { ...@@ -192,7 +200,7 @@ public class EasyEs {
throw new ElasticsearchException("mappers can not be empty"); throw new ElasticsearchException("mappers can not be empty");
} }
search().bulkInsert(index, objects, 2000); search().bulkInsert(index, objects, 2000, idKey, routingKey, parentKey);
} }
public void bulkAddDoc(String index, List<Map> objects) { public void bulkAddDoc(String index, List<Map> objects) {
......
...@@ -46,6 +46,19 @@ public class SearchRestApi extends BaseRest { ...@@ -46,6 +46,19 @@ public class SearchRestApi extends BaseRest {
return responseBody(defaultMethod, newEndpoint, dsl); return responseBody(defaultMethod, newEndpoint, dsl);
} }
/**
*
* @param index 多个索引查询用逗号分割
* @param routing routing, 多个用逗号隔开
* @param dsl
* @return
*/
public String requestDsl(String index, String routing, String dsl) {
String newEndpoint = MessageFormat.format("/{0}/_search?routing={1}", index, routing);
return responseBody(defaultMethod, newEndpoint, dsl);
}
/** /**
* 查询指定ID的文档 * 查询指定ID的文档
* 如果索引设置了routing, 会报routing_missing_exception 异常 * 如果索引设置了routing, 会报routing_missing_exception 异常
...@@ -103,6 +116,10 @@ public class SearchRestApi extends BaseRest { ...@@ -103,6 +116,10 @@ public class SearchRestApi extends BaseRest {
return requestDsl(index, queryBuilder.toString()); return requestDsl(index, queryBuilder.toString());
} }
public String requestByQuery(String index, String routing, SearchSourceBuilder queryBuilder) {
return requestDsl(index, routing, queryBuilder.toString());
}
/** /**
* 根据查询条件查询指定索引文档 * 根据查询条件查询指定索引文档
* @param index * @param index
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<groupId>indi.felix.easy</groupId> <groupId>indi.felix.easy</groupId>
<artifactId>easy-es</artifactId> <artifactId>easy-es</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.9</version> <version>1.1.0</version>
<modules> <modules>
<module>easy-es-core</module> <module>easy-es-core</module>
<!-- <module>easy-es-spring</module>--> <!-- <module>easy-es-spring</module>-->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册