From fe6980eb7d2df6cb53fd8a83226f91789beaced8 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Wed, 22 Feb 2012 15:10:56 +0100 Subject: [PATCH 1/3] Fix version, licences and changelog for 1.0.8 release --- .rat-excludes | 1 + CHANGES.txt | 12 +++++++++++ NEWS.txt | 5 +++++ build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/cql/jdbc/ClientUtilsTest.java | 21 +++++++++++++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/.rat-excludes b/.rat-excludes index 1ab279b4d7..963bb19751 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -14,6 +14,7 @@ build/** lib/licenses/*.txt .settings/** contrib/pig/example-script.pig +contrib/pig/test/** **/cassandra.yaml **/*.db redhat/apache-cassandra.spec diff --git a/CHANGES.txt b/CHANGES.txt index 966f940279..9cb9414255 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -24,6 +24,18 @@ * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767) * Fix short read protection (CASSANDRA-3934) + * Make sure infered and actual schema match (CASSANDRA-3371) + * Fix NPE during HH delivery (CASSANDRA-3677) + * Don't put boostrapping node in 'hibernate' status (CASSANDRA-3737) + * Fix double quotes in windows bat files (CASSANDRA-3744) + * Fix bad validator lookup (CASSANDRA-3789) + * Fix soft reset in EC2MultiRegionSnitch (CASSANDRA-3835) + * Don't leave zombie connections with THSHA thrift server (CASSANDRA-3867) + * (cqlsh) fix deserialization of data (CASSANDRA-3874) + * Fix removetoken force causing an inconsistent state (CASSANDRA-3876) + * Fix ahndling of some types with Pig (CASSANDRA-3886) + * Don't allow to drop the system keyspace (CASSANDRA-3759) + * Make Pig deletes disabled by default and configurable (CASSANDRA-3628) Merged from 0.8: * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily case (CASSANDRA-3251) diff --git a/NEWS.txt b/NEWS.txt index e36b9e87d6..d64c714557 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -11,10 +11,15 @@ by version X, but the inverse is not necessarily the case.) 1.0.8 ===== +Upgrading +--------- + - Nothing specific to 1.0.8 + Other ----- - Allow configuring socket timeout for streaming + 1.0.7 ===== diff --git a/build.xml b/build.xml index 07a8af6779..c2e8768b4d 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 70578c8ea1..4e96e0cf76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.0.8) unstable; urgency=low + + * New release + + -- Sylvain Lebresne Wed, 22 Feb 2012 15:09:54 +0100 + cassandra (1.0.7) unstable; urgency=low * New release diff --git a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java index 72240292e1..36fc004e68 100644 --- a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java +++ b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.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.BigDecimal; import java.math.BigInteger; From 4dcd15f48dd21062fbe3a2ac4b3debb10fbbd14a Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Thu, 23 Feb 2012 22:13:18 -0600 Subject: [PATCH 2/3] Fix typo in log message --- src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java index f6768d6213..ee44a1c443 100644 --- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java +++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java @@ -98,7 +98,7 @@ public class IncomingTcpConnection extends Thread { // save the endpoint so gossip will reconnect to it Gossiper.instance.addSavedEndpoint(from); - logger.info("Received " + (isStream ? "streaming " : "") + "connection from newer protocol version. Ignorning"); + logger.info("Received " + (isStream ? "streaming " : "") + "connection from newer protocol version. Ignoring"); } else if (msg != null) { @@ -160,7 +160,7 @@ public class IncomingTcpConnection extends Thread MessagingService.instance().receive(message, id); return message; } - logger.debug("Received connection from newer protocol version {}. Ignorning message", version); + logger.debug("Received connection from newer protocol version {}. Ignoring message", version); return null; } From 8ad7840b336f47cf4d6c33da3459121c98db2d48 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 24 Feb 2012 12:20:49 +0100 Subject: [PATCH 3/3] Remove dead code --- .../apache/cassandra/concurrent/Context.java | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/java/org/apache/cassandra/concurrent/Context.java diff --git a/src/java/org/apache/cassandra/concurrent/Context.java b/src/java/org/apache/cassandra/concurrent/Context.java deleted file mode 100644 index d55f0ba2ad..0000000000 --- a/src/java/org/apache/cassandra/concurrent/Context.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 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. - */ - -package org.apache.cassandra.concurrent; - -import java.util.HashMap; -import java.util.Map; - -/** - * Context object adding a collection of key/value pairs into ThreadLocalContext. - */ - -public class Context -{ - private Map ht_; - - public Context() - { - ht_ = new HashMap(); - } - - public Object put(Object key, Object value) - { - return ht_.put(key, value); - } - - public Object get(Object key) - { - return ht_.get(key); - } - - public void remove(Object key) - { - ht_.remove(key); - } -}