Updated Branches: refs/heads/trunk e9c3ee979 -> 4063bcc85
OCD-ninja CFMetaData.BatchlogCF -> CFMetaData.BatchlogCf fix Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a43c39f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a43c39f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a43c39f Branch: refs/heads/trunk Commit: 5a43c39f38c8ea519b9be9c7ed9782035ecba383 Parents: 3f883bf Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Apr 3 22:52:57 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Apr 3 22:52:57 2013 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 2 +- .../org/apache/cassandra/config/KSMetaData.java | 2 +- .../org/apache/cassandra/db/BatchlogManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a43c39f/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 18cdd93..31720b2 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -214,7 +214,7 @@ public final class CFMetaData + " PRIMARY KEY (session_id, event_id)" + ");", Tracing.TRACE_KS); - public static final CFMetaData BatchlogCF = compile(16, "CREATE TABLE " + SystemTable.BATCHLOG_CF + " (" + public static final CFMetaData BatchlogCf = compile(16, "CREATE TABLE " + SystemTable.BATCHLOG_CF + " (" + "id uuid PRIMARY KEY," + "written_at timestamp," + "data blob" http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a43c39f/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java b/src/java/org/apache/cassandra/config/KSMetaData.java index 138e24b..a5bc4a0 100644 --- a/src/java/org/apache/cassandra/config/KSMetaData.java +++ b/src/java/org/apache/cassandra/config/KSMetaData.java @@ -78,7 +78,7 @@ public final class KSMetaData public static KSMetaData systemKeyspace() { - List<CFMetaData> cfDefs = Arrays.asList(CFMetaData.BatchlogCF, + List<CFMetaData> cfDefs = Arrays.asList(CFMetaData.BatchlogCf, CFMetaData.RangeXfersCf, CFMetaData.LocalCf, CFMetaData.PeersCf, http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a43c39f/src/java/org/apache/cassandra/db/BatchlogManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java b/src/java/org/apache/cassandra/db/BatchlogManager.java index 843cf44..9da9b2d 100644 --- a/src/java/org/apache/cassandra/db/BatchlogManager.java +++ b/src/java/org/apache/cassandra/db/BatchlogManager.java @@ -135,7 +135,7 @@ public class BatchlogManager implements BatchlogManagerMBean ByteBuffer writtenAt = LongType.instance.decompose(timestamp / 1000); ByteBuffer data = serializeRowMutations(mutations); - ColumnFamily cf = ColumnFamily.create(CFMetaData.BatchlogCF); + ColumnFamily cf = ColumnFamily.create(CFMetaData.BatchlogCf); cf.addColumn(new Column(WRITTEN_AT, writtenAt, timestamp)); cf.addColumn(new Column(DATA, data, timestamp)); RowMutation rm = new RowMutation(Table.SYSTEM_KS, UUIDType.instance.decompose(uuid)); @@ -253,7 +253,7 @@ public class BatchlogManager implements BatchlogManagerMBean private static ByteBuffer columnName(String name) { ByteBuffer raw = UTF8Type.instance.decompose(name); - return CFMetaData.BatchlogCF.getCfDef().getColumnNameBuilder().add(raw).build(); + return CFMetaData.BatchlogCf.getCfDef().getColumnNameBuilder().add(raw).build(); } private static List<Row> getRangeSlice(IDiskAtomFilter columnFilter)
