merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1102059 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -12,6 +12,10 @@
 
 
 0.8.0-?
+* initialize local ep state prior to gossip startup if needed (CASSANDRA-2638)
+
+
+0.8.0-rc1
  * faster flushes and compaction from fixing excessively pessimistic 
    rebuffering in BRAF (CASSANDRA-2581)
  * fix merkle tree splitting exiting early (CASSANDRA-2605)

build.xml

@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) -->
-    <property name="base.version" value="0.8.0-beta2"/>
+    <property name="base.version" value="0.8.0-rc1"/>
     <property name="scm.default.path" value="cassandra/branches/cassandra-0.7"/>
     <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/>
     <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/>
@@ -64,7 +64,7 @@
     <property name="test.long.src" value="${test.dir}/long"/>
     <property name="test.distributed.src" value="${test.dir}/distributed"/>
     <property name="dist.dir" value="${build.dir}/dist"/>
-    <property name="cql.driver.version" value="1.0.1" />
+    <property name="cql.driver.version" value="1.0.2" />
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

debian/cassandra.install

@@ -6,7 +6,6 @@ debian/cassandra.conf etc/security/limits.d
 bin/cassandra usr/sbin
 bin/cassandra-cli usr/bin
 bin/nodetool usr/bin
-bin/clustertool usr/bin
 bin/json2sstable usr/bin
 bin/sstable2json usr/bin
 bin/sstablekeys usr/bin

debian/changelog

@@ -1,3 +1,9 @@
+cassandra (0.8.0~rc1) unstable; urgency=low
+
+  * Release candidate
+
+ -- Eric Evans <eevans@apache.org>  Tue, 10 May 2011 19:09:27 -0500
+
 cassandra (0.8.0~beta2) unstable; urgency=low
 
   * New beta release.

drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java

@@ -1,4 +1,25 @@
 package org.apache.cassandra.cql.jdbc;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
 
 import java.io.InputStream;
 import java.io.Reader;

drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java

@@ -182,11 +182,21 @@ public class CResultSet extends AbstractResultSet implements CassandraResultSet
     {
         // bit of a hack, this, but asking for getInt seems so common that we should accomodate it
         if (column.getValue() instanceof BigInteger)
+        {
+            wasNull = false;
             return getBigInteger(column).intValue();
+        }
         else if (column.getValue() instanceof Long)
+        {
+            wasNull = false;
             return getLong(column).intValue();
-        else
-            throw new SQLException("Non-integer value " + column.getValue());
+        }
+        else if (column.getValue() == null)
+        {
+            wasNull = true;
+            return 0;
+        }
+        throw new SQLException("Non-integer value " + column.getValue());
     }
 
     public int getInt(int index) throws SQLException

drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java

@@ -1,4 +1,25 @@
 package org.apache.cassandra.cql.jdbc;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
 
 import java.math.BigInteger;
 import java.sql.ResultSet;

src/java/org/apache/cassandra/db/commitlog/ReplayPosition.java

@@ -1,4 +1,25 @@
 package org.apache.cassandra.db.commitlog;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
 
 import java.io.DataInput;
 import java.io.DataOutput;

src/java/org/apache/cassandra/db/marshal/AbstractUUIDType.java

@@ -1,4 +1,25 @@
 package org.apache.cassandra.db.marshal;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
 
 import java.sql.Types;
 import java.util.UUID;