Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 55159 invoked from network); 23 Jul 2009 20:11:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Jul 2009 20:11:15 -0000 Received: (qmail 70707 invoked by uid 500); 23 Jul 2009 20:12:20 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 70682 invoked by uid 500); 23 Jul 2009 20:12:20 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 70672 invoked by uid 99); 23 Jul 2009 20:12:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2009 20:12:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2009 20:12:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A44A23888BD; Thu, 23 Jul 2009 20:11:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r797209 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: config/DatabaseDescriptor.java service/CassandraServer.java Date: Thu, 23 Jul 2009 20:11:58 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090723201158.5A44A23888BD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Thu Jul 23 20:11:57 2009 New Revision: 797209 URL: http://svn.apache.org/viewvc?rev=797209&view=rev Log: Return standard/super designation to introspection and fix typo in DD. patch by Michael Greene; reviewed by jbellis for CASSANDRA-314 Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=797209&r1=797208&r2=797209&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Thu Jul 23 20:11:57 2009 @@ -77,7 +77,7 @@ private static String d_columnMap_ = "COLUMN_MAP"; private static String d_columnKey_ = "COLUMN_KEY"; private static String d_columnValue_ = "COLUMN_VALUE"; - private static String d_columnTimestamp_ = "ColumnIMESTAMP"; + private static String d_columnTimestamp_ = "COLUMN_TIMESTAMP"; private static Map tableKeysCachedFractions_; /* Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java?rev=797209&r1=797208&r2=797209&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java Thu Jul 23 20:11:57 2009 @@ -474,18 +474,18 @@ Map columnMap = new HashMap(); desc = columnFamilyMetaData.n_columnMap + "(" + columnFamilyMetaData.n_columnKey + ", " + columnFamilyMetaData.n_columnValue + ", " + columnFamilyMetaData.n_columnTimestamp + ")"; if (columnFamilyMetaData.columnType.equals("Super")) { - columnMap.put("type", "Super"); + columnMap.put("Type", "Super"); desc = columnFamilyMetaData.n_superColumnMap + "(" + columnFamilyMetaData.n_superColumnKey + ", " + desc + ")"; } else { - columnMap.put("type", "Standard"); + columnMap.put("Type", "Standard"); } desc = columnFamilyMetaData.tableName + "." + columnFamilyMetaData.cfName + "(" + columnFamilyMetaData.n_rowKey + ", " + desc + ")"; - columnMap.put("desc", desc); - columnMap.put("type", columnFamilyMetaData.comparator.getClass().getName()); - columnMap.put("flushperiod", columnFamilyMetaData.flushPeriodInMinutes + ""); + columnMap.put("Desc", desc); + columnMap.put("CompareWith", columnFamilyMetaData.comparator.getClass().getName()); + columnMap.put("FlushPeriodInMinutes", columnFamilyMetaData.flushPeriodInMinutes + ""); columnFamiliesMap.put(columnFamilyMetaData.cfName, columnMap); } return columnFamiliesMap;