cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Mon, 24 Apr 2017 16:13:11 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/1a37992e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a37992e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a37992e

Branch: refs/heads/trunk
Commit: 1a37992e9b4516f3d83394bda27d280ffb8b9255
Parents: 44eb797 032a8cc
Author: Jeff Jirsa <jeff@jeffjirsa.net>
Authored: Mon Apr 24 09:10:50 2017 -0700
Committer: Jeff Jirsa <jeff@jeffjirsa.net>
Committed: Mon Apr 24 09:11:18 2017 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/cassandra/service/MigrationManager.java | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a37992e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2ae052e,19cd39c..c0aceb3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,28 -24,9 +52,29 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * 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)
 + * 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)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
++ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a37992e/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index f9e4aff,aacb769..45558cb
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -340,8 -344,8 +345,8 @@@ public class MigrationManage
          else if (throwOnDuplicate && ksm.getTableOrViewNullable(cfm.cfName) != null)
              throw new AlreadyExistsException(cfm.ksName, cfm.cfName);
  
 -        logger.info(String.format("Create new table: %s", cfm));
 +        logger.info("Create new table: {}", cfm);
-         announce(SchemaKeyspace.makeCreateTableMutation(ksm, cfm, FBUtilities.timestampMicros()),
announceLocally);
+         announce(SchemaKeyspace.makeCreateTableMutation(ksm, cfm, timestamp), announceLocally);
      }
  
      public static void announceNewView(ViewDefinition view, boolean announceLocally) throws
ConfigurationException


Mime
View raw message