cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
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 GMT
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<String, Double> 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<String, String> columnMap = new HashMap<String, String>();
             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;



Mime
View raw message