Skip to content

Commit

Permalink
Use Jest for Elasticsearch http JanusGraph#92
Browse files Browse the repository at this point in the history
Issue: JanusGraph#92

This adds http support to ElasticSearchIndex and removes support for the
Transport and Client modes. It also refactors the add/delete scripts to
use bindings since throwing a bunch of unique scripts at a Groovy
compiler isn't the best idea.

Signed-off-by: Keith Lohnes <krlohnes@us.ibm.com>
  • Loading branch information
Keith Lohnes committed Mar 8, 2017
1 parent 8c34655 commit 32c0391
Show file tree
Hide file tree
Showing 7 changed files with 516 additions and 791 deletions.
19 changes: 18 additions & 1 deletion janusgraph-es/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,24 @@
<artifactId>antlr-runtime</artifactId>
<version>${antlr.version}</version>
</dependency>

<!--Bit of a hack here. Jest relies on a later version of gson. This
should be fine though. -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>io.searchbox</groupId>
<artifactId>jest</artifactId>
<version>2.0.4</version><!-- change this to appropriate jar for ES 1.x -->
<exclusions>
<exclusion> <!-- declare the exclusion here -->
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Logging backends.
Enforce a classpath ordering constraint to ensure log4j is used for logging.
See comment in janusgraph-cassandra POM for more information. -->
Expand Down

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public WriteConfiguration getConfiguration() {
//Add index
config.set(INDEX_BACKEND,"elasticsearch",INDEX);
config.set(LOCAL_MODE,true,INDEX);
config.set(CLIENT_ONLY,false,INDEX);
config.set(INDEX_DIRECTORY, StorageSetup.getHomeDir("es"), INDEX);
return config.getConfiguration();

Expand Down
Loading

0 comments on commit 32c0391

Please sign in to comment.