You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/05/16 15:45:08 UTC
git commit: Write row markers when serializing schema
Updated Branches:
refs/heads/cassandra-1.2 8986e8f9f -> 61567e7b4
Write row markers when serializing schema
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5572
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61567e7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61567e7b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61567e7b
Branch: refs/heads/cassandra-1.2
Commit: 61567e7b4676a7075979e005b54c3c1f7ff8d04b
Parents: 8986e8f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu May 16 16:43:45 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 16 16:43:45 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../org/apache/cassandra/config/CFMetaData.java | 3 ++-
.../apache/cassandra/config/ColumnDefinition.java | 2 ++
3 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61567e7b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2182768..6d5c117 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.6
+ * Write row markers when serializing schema (CASSANDRA-5572)
+
+
1.2.5
* make BytesToken.toString only return hex bytes (CASSANDRA-5566)
* Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61567e7b/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 0b2be66..81afd23 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1295,6 +1295,7 @@ public final class CFMetaData
ColumnFamily cf = rm.addOrGet(SystemTable.SCHEMA_COLUMNFAMILIES_CF);
int ldt = (int) (System.currentTimeMillis() / 1000);
+ cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, ""));
cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "id"));
cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "type"));
cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "comparator"));
@@ -1341,10 +1342,10 @@ public final class CFMetaData
int ldt = (int) (System.currentTimeMillis() / 1000);
Integer oldId = Schema.instance.convertNewCfId(cfId);
-
if (oldId != null) // keep old ids (see CASSANDRA-3794 for details)
cf.addColumn(Column.create(oldId, timestamp, cfName, "id"));
+ cf.addColumn(Column.create("", timestamp, cfName, ""));
cf.addColumn(Column.create(cfType.toString(), timestamp, cfName, "type"));
cf.addColumn(Column.create(comparator.toString(), timestamp, cfName, "comparator"));
if (subcolumnComparator != null)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61567e7b/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java
index 328d0ff..97f57e1 100644
--- a/src/java/org/apache/cassandra/config/ColumnDefinition.java
+++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java
@@ -150,6 +150,7 @@ public class ColumnDefinition
ColumnFamily cf = rm.addOrGet(SystemTable.SCHEMA_COLUMNS_CF);
int ldt = (int) (System.currentTimeMillis() / 1000);
+ cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), ""));
cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "validator"));
cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "index_type"));
cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "index_options"));
@@ -162,6 +163,7 @@ public class ColumnDefinition
ColumnFamily cf = rm.addOrGet(SystemTable.SCHEMA_COLUMNS_CF);
int ldt = (int) (System.currentTimeMillis() / 1000);
+ cf.addColumn(Column.create("", timestamp, cfName, comparator.getString(name), ""));
cf.addColumn(Column.create(validator.toString(), timestamp, cfName, comparator.getString(name), "validator"));
cf.addColumn(index_type == null ? DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "index_type")
: Column.create(index_type.toString(), timestamp, cfName, comparator.getString(name), "index_type"));