Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3F96C200C56 for ; Tue, 7 Mar 2017 02:20:45 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3E652160B76; Tue, 7 Mar 2017 01:20:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 892A3160B87 for ; Tue, 7 Mar 2017 02:20:44 +0100 (CET) Received: (qmail 51589 invoked by uid 500); 7 Mar 2017 01:20:43 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 50948 invoked by uid 99); 7 Mar 2017 01:20:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Mar 2017 01:20:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 22F33DFF5D; Tue, 7 Mar 2017 01:20:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Tue, 07 Mar 2017 01:20:46 -0000 Message-Id: <6b34d853f0514a5a9db99ca9970ae66c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Tue, 07 Mar 2017 01:20:45 -0000 Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f070f1e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f070f1e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f070f1e2 Branch: refs/heads/trunk Commit: f070f1e206e306a4b3ae5cca0cb780cb780357a1 Parents: 7f5dc69 1ba68a1 Author: Stefania Alborghetti Authored: Tue Mar 7 09:17:16 2017 +0800 Committer: Stefania Alborghetti Committed: Tue Mar 7 09:17:16 2017 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/lifecycle/LogRecord.java | 31 ++++++++++++++++---- .../db/lifecycle/LogTransactionTest.java | 4 +-- 3 files changed, 29 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f070f1e2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b91edb4,36f058b..3852a64 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,8 +1,19 @@@ -3.0.12 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * Address message coalescing regression (CASSANDRA-12676) +Merged from 3.0: + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294) * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233) * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071) - * Update c.yaml doc for offheap memtables (CASSANDRA-13179) + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Faster StreamingHistogram (CASSANDRA-13038) * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f070f1e2/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/lifecycle/LogRecord.java index 9c1ba31,ac6d6d0..eb8400d --- a/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java @@@ -123,16 -124,14 +124,16 @@@ final class LogRecor Type type = Type.fromPrefix(matcher.group(1)); return new LogRecord(type, - matcher.group(2), + matcher.group(2) + Component.separator, // see comment on CASSANDRA-13294 below - Long.valueOf(matcher.group(3)), - Integer.valueOf(matcher.group(4)), - Long.valueOf(matcher.group(5)), line); + Long.parseLong(matcher.group(3)), + Integer.parseInt(matcher.group(4)), + Long.parseLong(matcher.group(5)), + line); } - catch (Throwable t) + catch (IllegalArgumentException e) { - return new LogRecord(Type.UNKNOWN, null, 0, 0, 0, line).setError(t); + return new LogRecord(Type.UNKNOWN, null, 0, 0, 0, line) + .setError(String.format("Failed to parse line: %s", e.getMessage())); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f070f1e2/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java ----------------------------------------------------------------------