From f39817d5ed69566e032e49e82fe030b9a4b05042 Mon Sep 17 00:00:00 2001 From: Pascal Lombard Date: Sun, 11 Aug 2013 17:31:38 +0200 Subject: [PATCH] - Removing parent/child relations from the mapping. I wonder if they were really that useful... - Bump to 0.90.3 (yay no more annoying plugin alert message !). --- README.md | 10 +++---- elasticsearch-river-subversion.iml | 27 ++++++++++--------- pom.xml | 4 +-- .../river/subversion/SubversionRiver.java | 1 - .../mapping/SubversionDocumentMapping.java | 4 --- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index ffb7ae1..0522819 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ After downloading the sources, run the task `mvn package`. Use the elasticsearch plugin manager to install the plugin : - $ /path-to/elasticsearch/bin/plugin -url file:./target/release/elasticsearch-river-subversion-0.3.3.zip -install river-subversion + $ /path-to/elasticsearch/bin/plugin -url https://github.com/plombard/SubversionRiver/releases/download/0.3.4/elasticsearch-river-subversion-0.3.4.zip -install river-subversion ### Creating a Subversion river ### Just create a new river of type "svn" and give it at least a repository and a path to index ("/" for the entire repos) : @@ -30,13 +30,13 @@ Except "repos" and "path", there are other parameters to the creation of the riv "password", the password to use to connect to the repository (default "password") -"updateRate", in ms, the time interval between every tick of the river (default 900000, so 15 mn) +"update_rate", in ms, the time interval between every tick of the river (default 900000, so 15 mn) -"typeName", if you want your subversion information to use another type or mapping (default "svn") +"type", if you want your subversion information to use another type for the river (default "svn") -"bulkSize", the size of the bulks sent to the indexer (default 200) +"bulk_size", the size of the bulks sent to the indexer (default 200) -"startRevision", in long format, the starting revision for the indexing (default "1L") +"start_revision", in long format, the starting revision for the indexing (default "1L") ### Data indexed ### diff --git a/elasticsearch-river-subversion.iml b/elasticsearch-river-subversion.iml index 01c9eaa..db4d73f 100644 --- a/elasticsearch-river-subversion.iml +++ b/elasticsearch-river-subversion.iml @@ -14,19 +14,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 32ba002..2a8d138 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.elasticsearch.plugin elasticsearch-river-subversion - 0.3.3 + 0.3.4 jar elasticsearch-river-subversion @@ -12,7 +12,7 @@ UTF-8 - 0.90.2 + 0.90.3 diff --git a/src/main/java/org/elasticsearch/river/subversion/SubversionRiver.java b/src/main/java/org/elasticsearch/river/subversion/SubversionRiver.java index bb84500..44240d5 100644 --- a/src/main/java/org/elasticsearch/river/subversion/SubversionRiver.java +++ b/src/main/java/org/elasticsearch/river/subversion/SubversionRiver.java @@ -263,7 +263,6 @@ public void run() { for (SubversionDocument svnDocument : svnRevision.getDocuments()) { bulk.add(indexRequest(indexName) .type(SubversionDocument.TYPE_NAME) - .parent(svnRevision.id()) .source(svnDocument.json()) ); } diff --git a/src/main/java/org/elasticsearch/river/subversion/mapping/SubversionDocumentMapping.java b/src/main/java/org/elasticsearch/river/subversion/mapping/SubversionDocumentMapping.java index 4ff1ad1..e9aaee5 100644 --- a/src/main/java/org/elasticsearch/river/subversion/mapping/SubversionDocumentMapping.java +++ b/src/main/java/org/elasticsearch/river/subversion/mapping/SubversionDocumentMapping.java @@ -18,7 +18,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.river.subversion.bean.SubversionDocument; -import org.elasticsearch.river.subversion.bean.SubversionRevision; import java.io.IOException; @@ -36,9 +35,6 @@ public static XContentBuilder getInstance() throws IOException { if( instance == null) { instance = jsonBuilder().startObject() .startObject(SubversionDocument.TYPE_NAME) - .startObject("_parent") - .field("type", SubversionRevision.TYPE_NAME) - .endObject() .startObject("properties") .startObject("path") .field("type", "multi_field")