cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [4/10] git commit: merge from 1.1
Date Thu, 13 Dec 2012 16:53:15 GMT
merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34746137
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34746137
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34746137

Branch: refs/heads/trunk
Commit: 3474613757028b3841d199d7173dd29eaad45155
Parents: 1bb78b0 3e27a32
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Dec 13 10:52:54 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Dec 13 10:52:54 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |    4 +++-
 src/java/org/apache/cassandra/db/DefsTable.java |   13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d73849c,e6b1b95..e09e925
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,25 @@@
 -1.1.8
 +1.2.0
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
++Merged from 1.1:
+  * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
- Merged from 1.1
++Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/DefsTable.java
index 8569553,d564eaf..a9f6427
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@@ -241,8 -244,26 +241,21 @@@ public class DefsTabl
  
              mutation.apply();
          }
+         // flush immediately because we read schema before replaying the commitlog
+         try
+         {
+             cfs.forceBlockingFlush();
+         }
+         catch (ExecutionException e)
+         {
+             throw new RuntimeException("Could not flush after fixing schema timestamps",
e);
+         }
+         catch (InterruptedException e)
+         {
+             throw new AssertionError(e);
+         }
      }
  
 -    private static boolean invalidSchemaRow(Row row)
 -    {
 -        return row.cf == null || (row.cf.isMarkedForDelete() && row.cf.isEmpty());
 -    }
 -
      public static ByteBuffer searchComposite(String name, boolean start)
      {
          assert name != null;


Mime
View raw message