relase 0.4.2

strapdata · Nov 21, 2015 · dd263e2 · dd263e2
1 parent ef881ab
commit dd263e2
Show file tree

Hide file tree

Showing 14 changed files with 461 additions and 137 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -20,4 +20,10 @@
 
  0.4 - 2015-11-11 (Based on cassandra-2.1.8 + elasticsearch 1.5.1)
   * Fix various bugs
-  * New tarball package.
+  * New tarball package.
+
+0.4.1 - 2015-11-17
+  * Bug fix when indexing inet type (Internet Address).
+
+0.4.2 - 2015-11-23
+  * Improve automatic mapping from an existing CQL3 table.
diff --git a/README.md b/README.md
@@ -611,12 +611,23 @@ cql_partial_update | true or **false** | Elasticsearch index full document. For
 
 ## Elasticsearch mapping from an existing cassandra table.
 
-A new put mapping parameter `column_regexp` allow to create Elasticsearch mapping from an existing cassandra table for columns whose name match the provided regular expression. The following command create the elasticsearch mapping for all columns starting by 'a' of the cassandra table *my.keyspace.my_table*. 
+A new put mapping parameter `column_regexp` allow to create Elasticsearch mapping from an existing cassandra table for columns whose name match the provided regular expression. The following command create the elasticsearch mapping for all columns starting by 'a' of the cassandra table *my.keyspace.my_table*.and set a specific analyzer for column *name*. 
 
 ```
-curl -XPUT "http://localhost:9200/my_keyspace/_mapping/my_table" -d '{ "my_table" : { "columns_regexp" : "a.*" }}'
+curl -XPUT "http://localhost:9200/my_keyspace/_mapping/my_table" -d '{ 
+    "my_table" : { 
+        "columns_regexp" : "a.*",
+        "properties" : {
+            "name" : {
+                "type" : "string",
+                "index" : "not_analyzed"
+            }
+        }
+    }
+}'
 ```
 
+If you need to set specific mapping for some columns, you can 
 ##  Compound primary key support
 
 When mapping an existing cassandra table to an Elasticsearch index.type, primary key is mapped to the `_id` field. 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elassandra</groupId>
     <artifactId>elassandra</artifactId>
-    <version>0.4</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <description>Elassandra - ElasticSearch for Cassandra</description>
     <inceptionYear>2015</inceptionYear>

diff --git a/src/main/assemblies/common-bin.xml b/src/main/assemblies/common-bin.xml
@@ -0,0 +1,212 @@
+<component>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+
+
+            <!--  
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <includes>
+                <include>org.apache.lucene:lucene*</include>
+                <include>log4j:log4j</include>
+                <include>log4j:apache-log4j-extras</include>
+                <include>net.java.dev.jna:jna</include>
+                <include>com.spatial4j:spatial4j</include>
+                <include>com.vividsolutions:jts</include>
+                <include>org.codehaus.groovy:groovy-all</include>
+                <include>com.google.guava:guava</include>
+                
+                <include>com.carrotsearch:hppc</include>
+                <include>org.codehaus.jackson:jackson-core-asl</include>
+                <include>org.codehaus.jackson:jackson-mapper-asl</include>
+                <include>org.apache.commons:commons-math3</include>
+                <include>org.apache.commons:commons-lang3</include>
+                <include>commons-cli:commons-cli</include>
+                <include>commons-codec:commons-codec</include>
+                <include>com.ning:compress-lzf</include>
+                <include>ch.qos.logback:logback-classic</include>
+                <include>org.javassist:javassist</include>
+            </includes>
+            -->
+            <useProjectArtifact>true</useProjectArtifact>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <excludes>
+                <exclude>org.apache.cassandra:cassandra-all</exclude>
+            </excludes>
+        </dependencySet>
+
+        <!--  
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.cassandra:cassandra-all</include>
+            </includes>
+            <scope>runtime</scope>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <filtered>true</filtered>
+                <excludes>
+                    <exclude>org/apache/cassandra/cql3/QueryOptions*.*</exclude>
+                    <exclude>org/apache/cassandra/service/CassandraDaemon.class</exclude>
+                    <exclude>org/apache/cassandra/service/CassandraDaemon*.class</exclude>
+                    <exclude>org/apache/cassandra/service/StorageService*.*</exclude>
+                    <exclude>org/apache/locator/TokenMetadata*.*</exclude>
+                </excludes>
+            </unpackOptions>
+        </dependencySet>
+    
+        
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <includes>
+                <include>org.elassandra:elassandra</include>
+                <include>com.carrotsearch:hppc</include>
+                <include>org.codehaus.jackson:jackson-core-asl</include>
+                <include>org.codehaus.jackson:jackson-mapper-asl</include>
+                <include>org.apache.commons:commons-math3</include>
+                <include>org.apache.commons:commons-lang3</include>
+                <include>commons-cli:commons-cli</include>
+                <include>commons-codec:commons-codec</include>
+                <include>com.ning:compress-lzf</include>
+                <include>ch.qos.logback:logback-classic</include>
+                <include>org.javassist:javassist</include>
+            </includes>
+        </dependencySet>
+            -->
+
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <directory>conf</directory>
+            <outputDirectory>conf</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${cassandra.home}/conf</directory>
+            <outputDirectory>conf</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <includes>
+                <include>*</include>
+                <include>*/*</include>
+            </includes>
+            <excludes>
+                <exclude>logback.xml</exclude>
+                <exclude>cassandra.yml</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+            <lineEnding>unix</lineEnding>
+            <includes>
+                <include>cassandra</include>
+                <include>plugin</include>
+                <include>shortcuts-env.sh</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>${cassandra.home}/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+            <lineEnding>unix</lineEnding>
+            <includes>
+                <include>cqlsh</include>
+                <include>debug-cql</include>
+                <include>sst*</include>
+                <include>stop-server</include>
+                <include>cassandra.in.sh</include>
+                <include>nodetool</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>${cassandra.home}/pylib</directory>
+            <outputDirectory>pylib</outputDirectory>
+            <includes>
+                <include>*</include>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>${cassandra.home}/tools</directory>
+            <outputDirectory>tools</outputDirectory>
+            <includes>
+                <include>*</include>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>lib/sigar</directory>
+            <outputDirectory>lib/sigar</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+        <directory>./</directory>
+        <outputDirectory>/logs</outputDirectory>
+        <excludes>
+            <exclude>*/**</exclude>
+        </excludes>
+    </fileSet>
+
+    <fileSet>
+        <directory>./</directory>
+        <outputDirectory>/data</outputDirectory>
+        <excludes>
+            <exclude>*/**</exclude>
+        </excludes>
+    </fileSet>
+    <fileSet>
+        <directory>./</directory>
+        <outputDirectory>/work</outputDirectory>
+        <excludes>
+            <exclude>*/**</exclude>
+        </excludes>
+    </fileSet>
+    <fileSet>
+        <directory>./</directory>
+        <outputDirectory>/plugins</outputDirectory>
+        <excludes>
+            <exclude>*/**</exclude>
+        </excludes>
+    </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>README.md</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>LICENSE.txt</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>NOTICE.txt</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+    </files>
+
+
+</component>
diff --git a/src/main/assemblies/targz-bin.xml b/src/main/assemblies/targz-bin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<assembly>
+    <id>targz</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <componentDescriptors>
+        <componentDescriptor>src/main/assemblies/common-bin.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>
diff --git a/src/main/assemblies/zip-bin.xml b/src/main/assemblies/zip-bin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<assembly>
+    <id>zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <componentDescriptors>
+        <componentDescriptor>src/main/assemblies/common-bin.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>