cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1211976 - in /cassandra/branches/cassandra-0.8: ./ CHANGES.txt src/java/org/apache/cassandra/tools/SSTableImport.java
Date Thu, 08 Dec 2011 16:54:38 GMT
Author: jbellis
Date: Thu Dec  8 16:54:37 2011
New Revision: 1211976

URL: http://svn.apache.org/viewvc?rev=1211976&view=rev
Log:
turn off string interning in json2sstable, take 2
patch by jbellis; tested by George Ciubotaru for CASSANDRA-2189

Modified:
    cassandra/branches/cassandra-0.8/   (props changed)
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/SSTableImport.java

Propchange: cassandra/branches/cassandra-0.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 16:54:37 2011
@@ -1,5 +1,5 @@
 /cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1183000
+/cassandra/branches/cassandra-0.7:1026516-1211709
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0:1125021-1130369

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1211976&r1=1211975&r2=1211976&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Dec  8 16:54:37 2011
@@ -3,6 +3,7 @@
  * remove nonlocal DC write optimization since it only worked with
    CL.ONE or CL.LOCAL_QUORUM (CASSANDRA-3577)
  * detect misuses of CounterColumnType (CASSANDRA-3422)
+ * turn off string interning in json2sstable, take 2 (CASSANDRA-2189)
 
 
 0.8.8

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/SSTableImport.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=1211976&r1=1211975&r2=1211976&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/SSTableImport.java
(original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/SSTableImport.java
Thu Dec  8 16:54:37 2011
@@ -61,7 +61,7 @@ public class SSTableImport
     private static Integer keyCountToImport = null;
     private static boolean isSorted = false;
 
-    private static JsonFactory factory = new MappingJsonFactory();
+    private static JsonFactory factory = new MappingJsonFactory().configure(JsonParser.Feature.INTERN_FIELD_NAMES,
false);
 
     static
     {
@@ -418,7 +418,7 @@ public class SSTableImport
      */
     private static JsonParser getParser(String fileName) throws IOException
     {
-        return factory.createJsonParser(new File(fileName)).configure(JsonParser.Feature.INTERN_FIELD_NAMES,
false);
+        return factory.createJsonParser(new File(fileName));
     }
 
     /**



Mime
View raw message