merge from master

hector-client · Sep 28, 2010 · f0c9063 · f0c9063
2 parents 8b4b71b + 028ec12
commit f0c9063
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 80 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,13 +5,24 @@ Changes by version:
 
 0.6.0-* work well with cassandra's 0.6.*
 
-0.6.0-16
+0.7.0-17
 ========
 Add CountQuery, SuperCountQuery and SubCountQuery
 Move all the API stuff to me.prettyprint.hector.api.*. Extract interfaces and prepare the ground for more avro good.
  - Move all the queries and extract their interfaces
  - Rename KeyspaceOperator and extract a Keyspace interface from it
 Rename a few exceptions to begin with HSomething so they are hard to unintentionally mix with their thrift doubles.
+Bug fixes:
+ CassandraClientPoolByHostImpl can throw NoSuchElementException 
+ KeyspaceImpl.toString returns super.toString()
+ API V2 has no means of getting all columns from a row.
+ KeyspaceOperator throws NPE that masks real exceptions
+ Timestamp (and Clock in 0.7.0) are not set on HColumn in the constructor
+ Friendlier API and spring integration
+ Error in failover - incorrect operation when borrowClient throws an 
+ batchMutate doesn't work with null predicate in deletion. Cannot batch-delete rows.
+ getSuperColumn() does not return null
+ KeyspaceImpl.getSuperColumn() should use cassandra.get() and not cassandra.get_slice()
 
 
 

diff --git a/pom.xml b/pom.xml
@@ -245,7 +245,7 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    
+
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -298,7 +298,7 @@
       <artifactId>spring-beans</artifactId>
       <version>${org.springframework.version}</version>
       <scope>provided</scope>
-     </dependency>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -310,48 +310,48 @@
           <artifactId>commons-logging</artifactId>
         </exclusion>
       </exclusions>
-     </dependency>
-     <dependency>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
       <version>${org.springframework.version}</version>   
       <scope>test</scope>               
     </dependency>
-	<dependency>
-	    <groupId>com.google.guava</groupId>
-	    <artifactId>guava</artifactId>
-	    <version>r06</version>
-        <scope>test</scope>               
-	</dependency>
-	<dependency>
-		<groupId>org.apache.hadoop</groupId>
-		<artifactId>avro</artifactId>
-		<version>1.4.0-rc4</version>
-		<scope>test</scope>
-	</dependency>
-    <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
-        <version>1.4.0</version>
-        <scope>test</scope>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r06</version>
+      <scope>test</scope>               
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.4.0-rc4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
     </dependency>    	
     <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
-        <version>1.4.0</version>
-        <scope>test</scope>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>6.1.21</version>
-        <scope>test</scope>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.21</version>
+      <scope>test</scope>
     </dependency>	
     <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>6.1.21</version>
-        <scope>test</scope>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.21</version>
+      <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>snakeyaml</groupId>
@@ -405,38 +405,38 @@
       </plugin>      
     </plugins>
   </reporting>
-	<profiles>
-		<profile>
-			<id>outbrain</id>
-			<distributionManagement>
-				<repository>
-					<id>nexus</id>
-					<name>nexus</name>
-					<url>http://obweb.il.outbrain.com:8081/nexus/content/repositories/releases/</url>
-				</repository>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>riptano</id>
-			<distributionManagement>
-				<repository>
-					<id>riptano</id>
-					<name>riptano</name>
-					<url>http://mvn.riptano.com/content/repositories/public/</url>
-				</repository>
-			</distributionManagement>
-		</profile>
-	</profiles>
-	<repositories>
-		<repository>
-			<id>riptano</id>
-			<name>riptano</name>
-			<url>http://mvn.riptano.com/content/repositories/public/</url>
-		</repository>
-		<repository>
-		    <id>codehaus</id>
-		    <name>codehaus</name>
-		    <url>http://repository.codehaus.org/</url>
-		</repository>
-	</repositories>
+  <profiles>
+    <profile>
+      <id>outbrain</id>
+      <distributionManagement>
+        <repository>
+          <id>nexus</id>
+          <name>nexus</name>
+          <url>http://obweb.il.outbrain.com:8081/nexus/content/repositories/releases/</url>
+        </repository>
+      </distributionManagement>
+    </profile>
+    <profile>
+      <id>riptano</id>
+      <distributionManagement>
+        <repository>
+          <id>riptano</id>
+          <name>riptano</name>
+          <url>http://mvn.riptano.com/content/repositories/public/</url>
+        </repository>
+      </distributionManagement>
+    </profile>
+  </profiles>
+  <repositories>
+    <repository>
+      <id>riptano</id>
+      <name>riptano</name>
+      <url>http://mvn.riptano.com/content/repositories/public/</url>
+    </repository>
+    <repository>
+      <id>codehaus</id>
+      <name>codehaus</name>
+      <url>http://repository.codehaus.org/</url>
+    </repository>
+  </repositories>
 </project>
diff --git a/release.sh b/release.sh
@@ -4,26 +4,19 @@ set -e
 # Require variable declaration
 set -u
 
-echo Running mvn install
-mvn clean install -DskipTests
-
-
 # read the version from pom.xml
 version=$(sed -n "s/<version>\(.*\)<\/version>/\1/p" pom.xml | head -1)
 # remove whitespace
 version=$(echo $version)
-
 echo Version is: $version
-
-echo Copying artifacts
 target="releases/hector-$version"
 rm -rf $target*
 mkdir -p $target
-cp target/hector-$version* $target
 
-echo Copying lib jars
-cp lib/* $target
-cp antlib/* $target
+echo Running mvn install and copy-dependencies
+mvn clean install -DskipTests dependency:copy-dependencies -DincludeScope=runtime -DexcludeTransitive=true -DexcludeArtifactIds=properties-maven-plugin -DoutputDirectory=$target
+
+cp target/hector-$version* $target
 
 echo Copying CHANGELOG
 cp CHANGELOG $target

diff --git a/src/main/java/me/prettyprint/cassandra/service/CassandraClientPoolImpl.java b/src/main/java/me/prettyprint/cassandra/service/CassandraClientPoolImpl.java
@@ -60,7 +60,7 @@ public CassandraClientPoolImpl(CassandraClientMonitor clientMonitor,
   public CassandraClientPoolImpl(CassandraClientMonitor clientMonitor,
       CassandraHostConfigurator cassandraHostConfigurator) {
     this(clientMonitor, cassandraHostConfigurator.buildCassandraHosts());
-    this.cassandraHostConfigurator = cassandraHostConfigurator;    
+    this.cassandraHostConfigurator = cassandraHostConfigurator;
   }