turn off string interning in json2sstable, take 2 patch by jbellis; tested by George Ciubotaru for CASSANDRA-2189
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1211976 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d5c1325 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d5c1325 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d5c1325 Branch: refs/heads/cassandra-1.0 Commit: 4d5c1325d5f92e1674bce232ecb94e1329a7002a Parents: 09a6ee1 2b0859f Author: Jonathan Ellis <[email protected]> Authored: Thu Dec 8 16:54:37 2011 +0000 Committer: Jonathan Ellis <[email protected]> Committed: Thu Dec 8 16:54:37 2011 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/SSTableImport.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d5c1325/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f17f2ea,83f698d..c7a9834 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,139 -1,13 +1,140 @@@ -0.7.10 - * Fix divide by zero error in GCInspector (CASSANDRA-3164) - * revert CASSANDRA-2388 +0.8.9 + * use cannonical host for local node in nodetool info (CASSANDRA-3556) + * 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 + * avoid dropping tombstones when they might still be needed to shadow + data in a different sstable (CASSANDRA-2786) + * fix truncate allowing data to be replayed post-restart (CASSANDRA-3297) + * make iwriter final in IndexWriter to avoid NPE (CASSANDRA-2863) + * (CQL) update grammar to require key clause in DELETE statement + (CASSANDRA-3349) + * (CQL) allow numeric keyspace names in USE statement (CASSANDRA-3350) + * Fix handling of tombstone by SSTableExport/Import (CASSANDRA-3357) * fix ColumnIndexer to use long offsets (CASSANDRA-3358) - * fix cfhistograms (CASSANDRA-3222) - - -0.7.9 - * don't include tmp files as sstable when create cfs (CASSANDRA-2929) - * log Java classpath on startup (CASSANDRA-2895) + * Display CLI version string on startup (CASSANDRA-3196) + * Only count compaction as active (for throttling) when they have + successfully acquired the compaction lock (CASSANDRA-3344) + * (Hadoop) make CFIF try rpc_address or fallback to listen_address + (CASSANDRA-3214) + * (Hadoop) accept comma delimited lists of initial thrift connections + (CASSANDRA-3185) + * ColumnFamily min_compaction_threshold should be >= 2 (CASSANDRA-3342) + * (Pig) add 0.8+ types and key validation type in schema (CASSANDRA-3280) + * Fix completely removing column metadata using CLI (CASSANDRA-3126) + * (CQL) Fix internal application error specifying 'using consistency ...' + in lower case (CASSANDRA-3366) + * CLI `describe cluster;` output should be on separate lines for separate versions + (CASSANDRA-3170) + * fix changing durable_writes keyspace option during CF creation + (CASSANDRA-3292) + * correct dropped messages logging (CASSANDRA-3377) + * CLI `describe keyspace <ks>` to show "Row Cache Provider" (CASSANDRA-3384) + * avoid locking on update when no indexes are involved (CASSANDRA-3386) + * fix assertionError during repair with ordered partitioners (CASSANDRA-3369) + * correctly serialize key_validation_class for avro (CASSANDRA-3391) + * don't expire counter tombstone after streaming (CASSANDRA-3394) + * prevent nodes that failed to join from hanging around forever + (CASSANDRA-3351) + * remove incorrect optimization from slice read path (CASSANDRA-3390) + * Fix race in AntiEntropyService (CASSANDRA-3400) + * fix updating CF row_cache_provider (CASSANDRA-3414) + * CFMetaData.convertToThrift method to set RowCacheProvider (CASSANDRA-3405) + * acquire compactionlock during truncate (CASSANDRA-3399) + * fix displaying cfdef entries for super columnfamilies (CASSANDRA-3415) + * Make counter shard merging thread safe (CASSANDRA-3178, -3514) + * Fix bug preventing the use of efficient cross-DC writes (CASSANDRA-3472) + * (Hadoop) skip empty rows when entire row is requested, redux (CASSANDRA-2855) + * fix concurrence issue in the FailureDetector (CASSANDRA-3519) + * shutdown CL after having flushed non-durable CF (CASSANDRA-3520) + + +0.8.7 + * Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201) + * Allow using quotes in "USE <keyspace>;" CLI command (CASSANDRA-3208) + * Log message when a full repair operation completes (CASSANDRA-3207) + * Don't allow any cache loading exceptions to halt startup (CASSANDRA-3218) + * Fix sstableloader --ignores option (CASSANDRA-3247) + * File descriptor limit increased in packaging (CASSANDRA-3206) + * Log a meaningfull warning when a node receive a message for a repair session + that doesn't exist anymore (CASSANDRA-3256) + * Fix FD leak when internode encryption is enabled (CASSANDRA-3257) + * FBUtilities.hexToBytes(String) to throw NumberFormatException when string + contains non-hex characters (CASSANDRA-3231) + * Keep SimpleSnitch proximity ordering unchanged from what the Strategy + generates, as intended (CASSANDRA-3262) + * remove Scrub from compactionstats when finished (CASSANDRA-3255) + * Fix tool .bat files when CASSANDRA_HOME contains spaces (CASSANDRA-3258) + * Evict gossip state immediately when a token is taken over by a new IP + (CASSANDRA-3259) + * (Hadoop) allow wrapping ranges in queries (CASSANDRA-3137) + * (Hadoop) check all interfaces for a match with split location + before falling back to random replica (CASSANDRA-3211) + * Fix bug where the failure detector can take too long to mark a host + down (CASSANDRA-3273) + * Fix stress COUNTER_GET option (CASSANDRA-3301) + * Nodetool no longer leaks threads and closes JMX connections (CASSANDRA-3309) + * Fix exception during PIG 'dump' (CASSANDRA-2810) + * Fix transposition in cfHistograms (CASSANDRA-3222) + * Allow using number as DC name when creating keyspace in CQL (CASSANDRA-3239) + * Force flush of system table after updating/removing a token (CASSANDRA-3243) + * Make Pig storage handle implements LoadMetadata (CASSANDRA-2777) + * Improved CLI exceptions (CASSANDRA-3312) + + +0.8.6 + * revert CASSANDRA-2388 + * change TokenRange.endpoints back to listen/broadcast address to match + pre-1777 behavior, and add TokenRange.rpc_endpoints instead (CASSANDRA-3187) + * avoid trying to watch cassandra-topology.properties when loaded from jar + (CASSANDRA-3138) + * prevent users from creating keyspaces with LocalStrategy replication + (CASSANDRA-3139) + * fix CLI `show schema;` to output correct keyspace definition statement + (CASSANDRA-3129) + * CustomTThreadPoolServer to log TTransportException at DEBUG level + (CASSANDRA-3142) + * allow topology sort to work with non-unique rack names between + datacenters (CASSANDRA-3152) + * Improve caching of same-version Messages on digest and repair paths + (CASSANDRA-3158) + * Randomize choice of first replica for counter increment (CASSANDRA-2890) + * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202) + * Avoid streaming data to nodes that already have it, on move as well as + decommission (CASSANDRA-3041) + * Fix divide by zero error in GCInspector (CASSANDRA-3164) + * allow quoting of the ColumnFamily name in CLI `create column family` + statement (CASSANDRA-3195) + * Fix rolling upgrade from 0.7 to 0.8 problem (CASANDRA-3166) + * Accomodate missing encryption_options in IncomingTcpConnection.stream + (CASSANDRA-3212) + + +0.8.5 + * fix NPE when encryption_options is unspecified (CASSANDRA-3007) + * include column name in validation failure exceptions (CASSANDRA-2849) + * make sure truncate clears out the commitlog so replay won't re- + populate with truncated data (CASSANDRA-2950) + * fix NPE when debug logging is enabled and dropped CF is present + in a commitlog segment (CASSANDRA-3021) + * fix cassandra.bat when CASSANDRA_HOME contains spaces (CASSANDRA-2952) + * fix to SSTableSimpleUnsortedWriter bufferSize calculation (CASSANDRA-3027) + * add a 'load new SSTables' functionality to JMX and corresponding "refresh" + command to the nodetool (CASSANDRA-2991) + * make cleanup and normal compaction able to skip empty rows + (rows containing nothing but expired tombstones) (CASSANDRA-3039) + * work around native memory leak in com.sun.management.GarbageCollectorMXBean + (CASSANDRA-2868) + * validate that column names in column_metadata are not equal to key_alias + on create/update of the ColumnFamily and CQL 'ALTER' statement (CASSANDRA-3036) + * return an InvalidRequestException if an indexed column is assigned + a value larger than 64KB (CASSANDRA-3057) + * fix of numeric-only and string column names handling in CLI "drop index" + (CASSANDRA-3054) * prune index scan resultset back to original request for lazy resultset expansion case (CASSANDRA-2964) * (Hadoop) fail jobs when Cassandra node has failed but TaskTracker http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d5c1325/src/java/org/apache/cassandra/tools/SSTableImport.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java index 2f16108,ebdc90c..114b11a --- a/src/java/org/apache/cassandra/tools/SSTableImport.java +++ b/src/java/org/apache/cassandra/tools/SSTableImport.java @@@ -61,7 -57,7 +61,7 @@@ public class SSTableImpor 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 -360,7 +418,7 @@@ */ 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)); } /**
