Skip to content

Commit

Permalink
Update ElasticSearch to 8.10.4
Browse files Browse the repository at this point in the history 
Signed-off-by: Oleksandr Porunov <[email protected]>
  • Loading branch information
@porunov
porunov committed Oct 20, 2023
1 parent 73dd956 commit b61d2b3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ compile "org.janusgraph:janusgraph-core:1.0.0"
* Apache HBase 2.5.0
* Oracle BerkeleyJE 7.5.11
* ScyllaDB 5.1.4
* Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.6.0
* Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.10.4
* Apache Lucene 8.11.1
* Apache Solr 8.11.1
* Apache TinkerPop 3.7.0
Expand Down
2 changes: 2 additions & 0 deletions janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/ElasticsearchIndexTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ public void testErrorInBatch() throws Exception {

switch (JanusGraphElasticsearchContainer.getEsMajorVersion().value){
case 8:
assertTrue(message.contains("document_parsing_exception"));
break;
case 7:
case 6:
assertTrue(message.contains("mapper_parsing_exception"));
Expand Down
2 changes: 1 addition & 1 deletion ...raph-es/src/test/java/org/janusgraph/diskstorage/es/JanusGraphElasticsearchContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public class JanusGraphElasticsearchContainer extends ElasticsearchContainer {

private static final Integer ELASTIC_PORT = 9200;
private static final String DEFAULT_VERSION = "8.6.0";
private static final String DEFAULT_VERSION = "8.10.4";
private static final String DEFAULT_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch";

public static ElasticMajorVersion getEsMajorVersion() {
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@
<!-- align with org.apache.spark:spark-core_2.12 -->
<jackson2.version>2.15.3</jackson2.version>
<lucene-solr.version>8.11.2</lucene-solr.version>
<!-- When this version updated please also update sha512 -->
<elasticsearch.version>8.6.0</elasticsearch.version>
<elasticsearch.version>8.10.4</elasticsearch.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.collections.version>3.2.2</commons.collections.version>
<zookeeper.version>3.8.1</zookeeper.version>
Expand Down

1 comment on commit b61d2b3

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: b61d2b3 Previous: 68f49a1 Ratio
org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete 14788.50615687614 ms/op 14750.912757292574 ms/op 1.00
org.janusgraph.GraphCentricQueryBenchmark.getVertices 1405.142287657223 ms/op 1346.1948471823591 ms/op 1.04
org.janusgraph.MgmtOlapJobBenchmark.runClearIndex 221.1990374869565 ms/op 221.0470166869565 ms/op 1.00
org.janusgraph.MgmtOlapJobBenchmark.runReindex 475.4532840357575 ms/op 463.2053476121212 ms/op 1.03
org.janusgraph.JanusGraphSpeedBenchmark.basicCount 499.86697852582245 ms/op 473.90261975756744 ms/op 1.05
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 8799.448707257368 ms/op 8776.908210320456 ms/op 1.00
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingEmitRepeatSteps 34621.38129317738 ms/op 29926.15626700794 ms/op 1.16
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithSmallBatch 32535.716128925 ms/op 32526.844515654997 ms/op 1.00
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.vertexCentricPropertiesFetching 67484.0053837 ms/op 59550.41166966667 ms/op 1.13
org.janusgraph.CQLMultiQueryBenchmark.getAllElementsTraversedFromOuterVertex 17106.23011575791 ms/op 15006.601503888596 ms/op 1.14
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithDoubleUnion 592.0647055810018 ms/op 610.4456304918209 ms/op 0.97
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithUnlimitedBatch 8793.639851860717 ms/op 8351.21971247489 ms/op 1.05
org.janusgraph.CQLMultiQueryBenchmark.getNames 16588.36030938643 ms/op 14737.422644903432 ms/op 1.13
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesThreePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 11351.12453534784 ms/op 10903.708326936881 ms/op 1.04
org.janusgraph.CQLMultiQueryBenchmark.getLabels 14742.0651580307 ms/op 13305.68422999396 ms/op 1.11
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFilteredByAndStep 645.2401494582042 ms/op 672.9530191288869 ms/op 0.96
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFromMultiNestedRepeatStepStartingFromSingleVertex 22919.221948365717 ms/op 21151.69997790227 ms/op 1.08
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithCoalesceUsage 587.0477267311514 ms/op 566.2220666199714 ms/op 1.04
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 29090.95459243701 ms/op 25822.55861829052 ms/op 1.13
org.janusgraph.CQLMultiQueryBenchmark.getIdToOutVerticesProjection 395.8866029912414 ms/op 411.4887692411499 ms/op 0.96
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithUnlimitedBatch 32146.85873104121 ms/op 29794.881563733332 ms/op 1.08
org.janusgraph.CQLMultiQueryBenchmark.getNeighborNames 16415.80113406238 ms/op 14451.119747276667 ms/op 1.14
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingRepeatUntilSteps 17828.593008919168 ms/op 16086.213028835715 ms/op 1.11
org.janusgraph.CQLMultiQueryBenchmark.getAdjacentVerticesLocalCounts 16919.516791266666 ms/op 14981.480702516508 ms/op 1.13

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.