cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Tue, 07 Mar 2017 01:20:46 GMT
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 <stefania.alborghetti@datastax.com>
Authored: Tue Mar 7 09:17:16 2017 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
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
----------------------------------------------------------------------


Mime
View raw message