Remove core Elasticsearch dependency #289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
analytically
approved these changes
May 29, 2017
amcp
approved these changes
May 30, 2017
| @@ -13,7 +13,7 @@ JanusGraph. | |||
| [options="header"] | |||
| |========================== | |||
| | JanusGraph | Cassandra | HBase | Bigtable | Elasticsearch | Solr | TinkerPop | |||
| | 0.1.0 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z | 2.z,5.z* | 5.2.z | 3.2.z | | |||
| | 0.1.0 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z | 1.z*,2.z,5.z | 5.2.z | 3.2.z | | |||
There was a problem hiding this comment.
was this an omission the first time we updated versions.txt? did we always support 1.z*?
There was a problem hiding this comment.
Version compatibility is different from ease of testing, so I think 1.z can stay in this list.
| import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_INLINE_KEY; | ||
| import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_LANG_KEY; | ||
| import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_SCRIPT_KEY; | ||
| import static org.janusgraph.diskstorage.es.ElasticSearchConstants.*; |
There was a problem hiding this comment.
please import the individual constants, unless the above were all of them.
| default: | ||
| throw new IllegalArgumentException("Unexpected relation: " + numRel); | ||
| } | ||
| } else if (value instanceof String) { | ||
| Mapping map = getStringMapping(informations.get(key)); | ||
| String fieldName = key; | ||
| if (map==Mapping.TEXT && !janusgraphPredicate.toString().startsWith("CONTAINS")) |
There was a problem hiding this comment.
externalize the CONTAINS constant here and everyhwere
| switch (shape.getType()) { | ||
| case CIRCLE: | ||
| Geoshape.Point center = shape.getPoint(); | ||
| sb = ShapeBuilder.newCircleBuilder().center(center.getLongitude(), center.getLatitude()).radius(shape.getRadius(), DistanceUnit.KILOMETERS); | ||
| geo = ImmutableMap.of(ES_TYPE_KEY, "circle", | ||
| "coordinates", ImmutableList.of(center.getLongitude(), center.getLatitude()), |
There was a problem hiding this comment.
externalize coordinates constant here and everyhwere
|
|
||
| @Override | ||
| public Map<String,Object> createKeywordMapping() { | ||
| return ImmutableMap.of(ES_TYPE_KEY, "string", ES_INDEX_KEY, "not_analyzed"); |
sjudeng
force-pushed
the
no-es
branch
4 times, most recently
from
986fa94
to
bc5790f
Compare
|
Please hold off on merging this until #233 is merged as I'd like to rebase and resolve conflicts here. |
|
@sjudeng ok to rebase and resolve conflicts here. |
…arch:elasticsearch dependency. Remove support for Transport client. Add compatibility shims to resolve deprecation warnings under ES5 and restore support for ES1. Support testing against an external ES instance. Signed-off-by: sjudeng <[email protected]>
bwatson-rti-org
pushed a commit
to bwatson-rti-org/janusgraph
that referenced
this pull request
Mar 9, 2019
Remove core Elasticsearch dependency
micpod
pushed a commit
to micpod/janusgraph
that referenced
this pull request
Nov 5, 2019
Remove core Elasticsearch dependency
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes support for the Elasticsearch Transport client and updates to manually build request objects instead of using the ES Java API. This allows for the removal of the
org.elasicsearch:elasticsearchdependency and the addition of compatibility shims that resolve deprecation warnings under Elasticsearch 5.x and also restores support for Elasticsearch 1.x without requiring custom builds.Related issue is #92.