W-16093303: Implement staging file persisting metric name

salesforce · Jun 28, 2024 · 4cd4bc4 · 4cd4bc4
1 parent 1b49d7e
commit 4cd4bc4
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 16 deletions.
diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/db/index/MetricIndexImpl.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/db/index/MetricIndexImpl.java
@@ -425,6 +425,12 @@ public Metric forId( long metricId )
         return getMetric( metricId );
     }
 
+    @Override
+    public Metric forName( String metricName )
+    {
+        return getMetric( metricName );
+    }
+
     @Override
     public void dumpStats()
     {

diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/db/model/MetricProvider.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/db/model/MetricProvider.java
@@ -6,8 +6,8 @@
  */
 package com.demandware.carbonj.service.db.model;
 
-@FunctionalInterface
 public interface MetricProvider
 {
     Metric forId(long metricId);
+    Metric forName(String metricName);
 }
diff --git a/...service/src/main/java/com/demandware/carbonj/service/db/points/DataPointStagingStore.java b/...service/src/main/java/com/demandware/carbonj/service/db/points/DataPointStagingStore.java
@@ -183,12 +183,12 @@ public void dumpStats()
                         received.getCount(), drop.getCount(), saved.getCount()));
     }
 
-    public void add( String dbName, int from, long metricId, double val )
+    public void add( String dbName, int from, long metricId, double val, String metricName )
     {
         received.mark();
 
         StagingFileSet stagingFile = stagingFileSetProvider.get( dbName, from );
-        StagingFileRecord r = new StagingFileRecord( stagingFile, metricId, DataPoint.strValue(val) );
+        StagingFileRecord r = new StagingFileRecord( stagingFile, metricId, DataPoint.strValue(val), metricName );
 
         if ( queue.offer( r ) ) //TODO: slow down instead of dropping?
         {

diff --git a/...nj.service/src/main/java/com/demandware/carbonj/service/db/points/DataPointStoreImpl.java b/...nj.service/src/main/java/com/demandware/carbonj/service/db/points/DataPointStoreImpl.java
@@ -380,7 +380,7 @@ private void updateLowerResolutionArchive( Metric metric, int ts, double val, Re
         // from also identifies interval in nextArchive for this data point
         int from = nextPolicy.interval( ts );
         if (stagingStore != null) {
-            stagingStore.add(dbName, from, metric.id, val);
+            stagingStore.add(dbName, from, metric.id, val, metric.name);
         }
     }
 

diff --git a/...onj.service/src/main/java/com/demandware/carbonj/service/db/points/SortedStagingFile.java b/...onj.service/src/main/java/com/demandware/carbonj/service/db/points/SortedStagingFile.java
@@ -116,6 +116,7 @@ public Optional<IntervalValues> loadNeighbours()
         }
 
         long metricId = r.metricId;
+        String metricName = r.metricName;
         List<Double> vals = new ArrayList<>();
 
         while ( true )
@@ -136,7 +137,12 @@ public Optional<IntervalValues> loadNeighbours()
             r = nextRecord();
         }
 
-        Metric m = metricProvider.forId( metricId );
+        Metric m;
+        if (metricName == null) {
+            m = metricProvider.forId(metricId);
+        } else {
+            m = metricProvider.forName(metricName);
+        }
         if( m == null )
         {
             throw new RuntimeException(String.format("Failed to find metric with metricId [%s].", metricId));

diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/db/points/StagingFile.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/db/points/StagingFile.java
@@ -87,6 +87,8 @@ public synchronized boolean write( StagingFileRecord r )
             bw.append( String.valueOf( r.metricId ) );
             bw.write( " " );
             bw.write( r.strValue );
+            bw.write( " " );
+            bw.write( r.metricName );
             bw.write( "\n");
             return true;
         }

diff --git a/...onj.service/src/main/java/com/demandware/carbonj/service/db/points/StagingFileRecord.java b/...onj.service/src/main/java/com/demandware/carbonj/service/db/points/StagingFileRecord.java
@@ -11,12 +11,14 @@ public class StagingFileRecord
     public final StagingFileSet fileName;
     public final long metricId;
     public final String strValue;
+    public final String metricName;
 
-    StagingFileRecord( StagingFileSet fileName, long metricId, String strValue)
+    StagingFileRecord( StagingFileSet fileName, long metricId, String strValue, String metricName)
     {
         this.fileName = fileName;
         this.metricId = metricId;
         this.strValue = strValue;
+        this.metricName = metricName;
     }
 
     StagingFileRecord( StagingFileSet fileName, String line)
@@ -27,10 +29,16 @@ public class StagingFileRecord
         int idStart = 0;
         int idEnd = line.indexOf( ' ' );
 
-        int valueStart = idEnd + 1;
-
         metricId = Long.parseLong( line.substring( idStart, idEnd ) );
-        strValue = line.substring( valueStart );
+        idStart = idEnd + 1;
+        idEnd = line.indexOf(' ', idStart);
+        if (idEnd < 0) {
+            strValue = line.substring(idStart);
+            metricName = null;
+        } else {
+            strValue = line.substring(idStart, idEnd);
+            metricName = line.substring(idEnd + 1);
+        }
     }
 
     double val()
@@ -45,6 +53,7 @@ public String toString()
                         "fileName=" + fileName +
                         ", metricId=" + metricId +
                         ", strValue='" + strValue + '\'' +
+                        ", metricName=" + metricName +
                         '}';
     }
 }
diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/db/points/StagingFiles.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/db/points/StagingFiles.java
@@ -141,17 +141,18 @@ public void write(StagingFileRecord r)
     private StagingFile reopen( StagingFileSet fs, int seq)
     {
         File f = new File( dir, fs.nameForUnsorted(fs.id, seq) );
-        Preconditions.checkState( f.exists() );
-        StagingFile sf = new StagingFile(metricRegistry, f, sort, metricProvider, fs.dbName);
-        sf.open();
-        return sf;
+        return openStagingFile(f, fs.dbName);
     }
 
     private StagingFile open(StagingFileSet fs)
     {
         File f = new File( dir, fs.getNextUnsortedFileName( dir ) );
+        return openStagingFile(f, fs.dbName);
+    }
+
+    private StagingFile openStagingFile(File f, String dbName) {
         Preconditions.checkState( !f.exists() );
-        StagingFile sf = new StagingFile(metricRegistry, f, sort, metricProvider, fs.dbName);
+        StagingFile sf = new StagingFile(metricRegistry, f, sort, metricProvider, dbName);
         sf.open();
         return sf;
     }

diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/db/points/SystemSort.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/db/points/SystemSort.java
@@ -32,7 +32,7 @@ class SystemSort implements StagingFilesSort
 
     private final long timeoutInSeconds;
 
-    private long bufSizeKb = 256000;
+    private long bufSizeKb = 1048576;
     private String tmpDir = "/tmp";
     private int parallel = 2;
 

diff --git a/...ervice/src/test/java/com/demandware/carbonj/service/db/points/TestIntervalProcessors.java b/...ervice/src/test/java/com/demandware/carbonj/service/db/points/TestIntervalProcessors.java
@@ -68,5 +68,13 @@ public Metric forId(long metricId) {
                     Collections.emptyList(),
                     Collections.emptyList());
         }
+
+        @Override
+        public Metric forName(String metricName) {
+            return new Metric(metricName, 1,
+                    new AggregationPolicy(AggregationMethod.AVG, 1, null),
+                    Collections.emptyList(),
+                    Collections.emptyList());
+        }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.1.55-SNAPSHOT
+version=1.1.55-W-16093303
 org.gradle.jvmargs=--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
 org.gradle.daemon=true
 ccGradlePluginVersion=3.0.3