You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/07/12 10:43:50 UTC
cassandra git commit: switch the metadata commponents map to an
EnumMap
Repository: cassandra
Updated Branches:
refs/heads/trunk 91392edbe -> 7abae2b3f
switch the metadata commponents map to an EnumMap
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7abae2b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7abae2b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7abae2b3
Branch: refs/heads/trunk
Commit: 7abae2b3fd0f8464b8f1bb0efef59009348c2360
Parents: 91392ed
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Jul 12 06:43:34 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Jul 12 06:43:34 2016 -0400
----------------------------------------------------------------------
.../cassandra/io/sstable/metadata/LegacyMetadataSerializer.java | 2 +-
.../apache/cassandra/io/sstable/metadata/MetadataCollector.java | 3 ++-
.../apache/cassandra/io/sstable/metadata/MetadataSerializer.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7abae2b3/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java
index 505de49..253b4f6 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java
@@ -81,7 +81,7 @@ public class LegacyMetadataSerializer extends MetadataSerializer
@Override
public Map<MetadataType, MetadataComponent> deserialize(Descriptor descriptor, EnumSet<MetadataType> types) throws IOException
{
- Map<MetadataType, MetadataComponent> components = Maps.newHashMap();
+ Map<MetadataType, MetadataComponent> components = new EnumMap<>(MetadataType.class);
File statsFile = new File(descriptor.filenameFor(Component.STATS));
if (!statsFile.exists() && types.contains(MetadataType.STATS))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7abae2b3/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index 299bc87..be064f1 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.io.sstable.metadata;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.EnumMap;
import java.util.List;
import java.util.Map;
@@ -295,7 +296,7 @@ public class MetadataCollector implements PartitionStatisticsCollector
public Map<MetadataType, MetadataComponent> finalizeMetadata(String partitioner, double bloomFilterFPChance, long repairedAt, SerializationHeader header)
{
- Map<MetadataType, MetadataComponent> components = Maps.newHashMap();
+ Map<MetadataType, MetadataComponent> components = new EnumMap<>(MetadataType.class);
components.put(MetadataType.VALIDATION, new ValidationMetadata(partitioner, bloomFilterFPChance));
components.put(MetadataType.STATS, new StatsMetadata(estimatedPartitionSize,
estimatedCellPerPartitionCount,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7abae2b3/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
index ae1787a..85a71ed 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
@@ -84,7 +84,7 @@ public class MetadataSerializer implements IMetadataSerializer
if (!statsFile.exists())
{
logger.trace("No sstable stats for {}", descriptor);
- components = Maps.newHashMap();
+ components = new EnumMap<>(MetadataType.class);
components.put(MetadataType.STATS, MetadataCollector.defaultStatsMetadata());
}
else
@@ -104,7 +104,7 @@ public class MetadataSerializer implements IMetadataSerializer
public Map<MetadataType, MetadataComponent> deserialize(Descriptor descriptor, FileDataInput in, EnumSet<MetadataType> types) throws IOException
{
- Map<MetadataType, MetadataComponent> components = Maps.newHashMap();
+ Map<MetadataType, MetadataComponent> components = new EnumMap<>(MetadataType.class);
// read number of components
int numComponents = in.readInt();
// read toc