Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ ext.milestoneBuild = !(snapshotBuild || releaseBuild)

subprojects {
repositories {
maven { url 'https://repo.spring.io/plugins-release' }
gradlePluginPortal()
mavenCentral()
gradlePluginPortal()
maven { url 'https://repo.spring.io/plugins-release' }
}

plugins.withType(JavaPlugin) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ protected void commitChanges(NodeChangeInfo info) {
commit.setDocId(cmjs.getId());
commit.setTimestamp(now);
commit.setComment(cmjs.getComment());

this.commitIndex.index(cmjs);

this.commitRepository.save(commit);
this.commitIndex.index(cmjs);
this.nodeRepository.getTransactionManager().commit(status);
} catch (Exception e) {
logger.error("commitChanges error: ", e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ public abstract class BaseElasticDAOImpl<E extends Map<String, Object>> {
protected int resultLimit;
@Value("${elasticsearch.limit.term}")
protected int termLimit;
@Value("${elasticsearch.limit.get}")
protected int getLimit;
protected static int readTimeout = 1000000000;
protected RestHighLevelClient client;
private static final RequestOptions REQUEST_OPTIONS;
Expand Down Expand Up @@ -121,28 +123,41 @@ public List<E> findAllById(String index, Set<String> docIds) {
if (docIds.isEmpty()) {
return listOfResponses;
}
int cur = 0;
MultiGetRequest request = new MultiGetRequest();
for (String eid : docIds) {
request.add(index, eid);
}
MultiGetResponse response = client.mget(request, REQUEST_OPTIONS);

for (MultiGetItemResponse res : response.getResponses()) {
GetResponse item = res.getResponse();
if (item != null && item.isExists()) {
E ob = newInstance();
ob.putAll(item.getSourceAsMap());
listOfResponses.add(ob);
} else {
continue;
cur++;
if (cur == getLimit) {
getResponses(request, listOfResponses);
cur = 0;
request = new MultiGetRequest();
}
}
if (cur > 0) {
getResponses(request, listOfResponses);
}
return listOfResponses;
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private void getResponses(MultiGetRequest request, List<E> listOfResponses) throws IOException {
MultiGetResponse response = client.mget(request, REQUEST_OPTIONS);

for (MultiGetItemResponse res : response.getResponses()) {
GetResponse item = res.getResponse();
if (item != null && item.isExists()) {
E ob = newInstance();
ob.putAll(item.getSourceAsMap());
listOfResponses.add(ob);
} else {
continue;
}
}
}

public void indexAll(String index, Collection<? extends BaseJson> jsons) {
BulkProcessor bulkProcessor = getBulkProcessor(client);
for (BaseJson json : jsons) {
Expand Down
1 change: 1 addition & 0 deletions example/src/main/resources/application-test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ elasticsearch.limit.insert=80
elasticsearch.limit.result=10000
elasticsearch.limit.term=1000
elasticsearch.limit.scrollTimeout=1000
elasticsearch.limit.get=10000

#Configuration for TWC
#port is for REST interface
Expand Down
1 change: 1 addition & 0 deletions example/src/main/resources/application.properties.example
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ elasticsearch.limit.insert=80
elasticsearch.limit.result=10000
elasticsearch.limit.term=1000
elasticsearch.limit.scrollTimeout=1000
elasticsearch.limit.get=100000

#Configuration for TWC
#port is for REST interface
Expand Down