- 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 !).
plombard · Aug 11, 2013 · f39817d · f39817d
1 parent 9bb2f3a
commit f39817d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git 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
@@ -14,19 +14,20 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:0.90.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-codecs:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:0.90.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-codecs:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.4.0" level="project" />
     <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.3" level="project" />
     <orderEntry type="library" name="Maven: org.tmatesoft.svnkit:svnkit:1.7.9" level="project" />
     <orderEntry type="library" name="Maven: org.tmatesoft.sqljet:sqljet:1.1.7" level="project" />

diff --git a/pom.xml b/pom.xml
@@ -4,15 +4,15 @@
 
     <groupId>org.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-river-subversion</artifactId>
-    <version>0.3.3</version>
+    <version>0.3.4</version>
     <packaging>jar</packaging>
 
     <name>elasticsearch-river-subversion</name>
     <url>http://maven.apache.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <elasticsearch.version>0.90.2</elasticsearch.version>
+        <elasticsearch.version>0.90.3</elasticsearch.version>
     </properties>
 
 

diff --git 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
@@ -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")