Merge 3d67b77 into a8ac5e2

rax-maas · Jan 20, 2015 · 72456d7 · 72456d7
2 parents a8ac5e2 + 3d67b77
commit 72456d7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/io/AstyanaxIO.java b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/io/AstyanaxIO.java
@@ -108,6 +108,10 @@ protected static Keyspace getKeyspace() {
     }
 
     protected AbstractSerializer serializerFor(RollupType rollupType, DataType dataType, Granularity gran) {
+        if (rollupType == null) {
+            rollupType = RollupType.BF_BASIC;
+        }
+
         if (dataType.equals(DataType.STRING)) {
             return StringSerializer.get();
         } else if (dataType.equals(DataType.BOOLEAN)) {

diff --git a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/io/AstyanaxReader.java b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/io/AstyanaxReader.java
@@ -328,6 +328,9 @@ public MetricData getDatapointsForRange(Locator locator, Range range, Granularit
         try {
             Object type = metaCache.get(locator, dataTypeCacheKey);
             RollupType rollupType = RollupType.fromString(metaCache.get(locator, rollupTypeCacheKey));
+            if (rollupType == null) {
+                rollupType = RollupType.BF_BASIC;
+            }
 
             if (type == null) {
                 return getNumericOrStringRollupDataForRange(locator, range, gran, rollupType);
@@ -365,6 +368,11 @@ public Map<Locator, MetricData> getDatapointsForRange(List<Locator> locators, Ra
             try {
                 RollupType rollupType = RollupType.fromString((String)
                         metaCache.get(locator, MetricMetadata.ROLLUP_TYPE.name().toLowerCase()));
+
+                if (rollupType == null) {
+                    rollupType = RollupType.BF_BASIC;
+                }
+
                 DataType dataType = new DataType((String)
                         metaCache.get(locator, MetricMetadata.TYPE.name().toLowerCase()));
                 ColumnFamily cf = CassandraModel.getColumnFamily(rollupType, dataType, gran);
@@ -473,6 +481,10 @@ private MetricData transformColumnsToMetricData(Locator locator, ColumnList<Long
                                                                        Granularity gran) {
         try {
             RollupType rollupType = RollupType.fromString(metaCache.get(locator, rollupTypeCacheKey));
+            if (rollupType == null) {
+                rollupType = RollupType.BF_BASIC;
+            }
+
             DataType dataType = new DataType(metaCache.get(locator, dataTypeCacheKey));
             String unit = getUnitString(locator);
             MetricData.Type outputType = MetricData.Type.from(rollupType, dataType);

diff --git a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/outputs/formats/MetricData.java b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/outputs/formats/MetricData.java
@@ -61,6 +61,10 @@ public String toString() {
         }
 
         public static Type from(RollupType rollupType, DataType dataType) {
+            if(rollupType == null) {
+                rollupType = RollupType.BF_BASIC;
+            }
+
             if (dataType.equals(DataType.STRING)) {
                 return STRING;
             } else if (dataType.equals(DataType.BOOLEAN)) {

diff --git a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/RollupRunnable.java b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/RollupRunnable.java
@@ -98,6 +98,11 @@ public void run() {
             Rollup rollup = null;
             RollupType rollupType = RollupType.fromString((String) rollupTypeCache.get(
                     singleRollupReadContext.getLocator(), MetricMetadata.ROLLUP_TYPE.name().toLowerCase()));
+
+            if (rollupType == null) {
+                rollupType = RollupType.BF_BASIC;
+            }
+
             Class<? extends Rollup> rollupClass = RollupType.classOf(rollupType, srcGran.coarser());
             ColumnFamily<Locator, Long> srcCF = CassandraModel.getColumnFamily(rollupClass, srcGran);
             ColumnFamily<Locator, Long> dstCF = CassandraModel.getColumnFamily(rollupClass, srcGran.coarser());

diff --git a/...rc/main/java/com/rackspacecloud/blueflood/inputs/handlers/HttpMetricsIngestionServer.java b/...rc/main/java/com/rackspacecloud/blueflood/inputs/handlers/HttpMetricsIngestionServer.java
@@ -172,7 +172,6 @@ private void buildProcessingChains() {
 
         this.defaultProcessorChain = AsyncChain
                 .withFunction(typeAndUnitProcessor)
-                .withFunction(rollupTypeCacher)
                 .withFunction(batchSplitter)
                 .withFunction(discoveryWriter)
                 .withFunction(batchWriter)