Merge branch 'master' into dependabot/go_modules/test/qryn_test_env/l…

…ongtest/go_modules-83829034f7

.gitignore

@@ -11,3 +11,4 @@ node_modules
 /wasm_parts/wasm_parts.iml
 /test/qryn_test_env/clickhouse/_data/
 /test/qryn_test_env/grafana/_data/
+/test/qryn_test_cluster_env/grafana/_data/

lib/db/maintain/scripts.js

@@ -198,7 +198,7 @@ module.exports.traces = [
 ]
 
 module.exports.overall_dist = [
-  `CREATE TABLE {{DB}}.metrics_15s_dist {{{OnCluster}}} (
+  `CREATE TABLE IF NOT EXISTS {{DB}}.metrics_15s_dist {{{OnCluster}}} (
     \`fingerprint\` UInt64,
     \`timestamp_ns\` Int64 CODEC(DoubleDelta),
     \`last\` AggregateFunction(argMax, Float64, Int64),

lib/handlers/push.js

@@ -71,7 +71,7 @@ function processStream (stream, labels, bulkLabels, bulk, toJSON, fingerPrint) {
       values.push([
         finger,
         ts,
-        (typeof entry.value === 'undefined') ? null : entry.value,
+        (typeof entry.value !== 'number') ? 0 : entry.value,
         entry.line || '',
         type === 3 ? bothType : type
       ])
@@ -98,7 +98,7 @@ function processStream (stream, labels, bulkLabels, bulk, toJSON, fingerPrint) {
       values.push([
         finger,
         BigInt(value[0]),
-        (typeof value[2] === 'undefined') ? null : value[2],
+        (typeof value[2] !== 'number') ? 0 : value[2],
         value[1] || '',
         type === 3 ? bothType : type
       ])

parser/registry/common.js

@@ -445,7 +445,7 @@ module.exports.preJoinLabels = (token, query, dist) => {
   dist = dist || ''
   const timeSeriesReq = new Sql.Select()
     .select('fingerprint', 'labels')
-    .from([`${DATABASE_NAME()}.time_series${dist}`, 'time_series'])
+    .from([`${DATABASE_NAME()}.time_series`, 'time_series'])
     .where(new Sql.And(
       new Sql.In('time_series.fingerprint', 'in', inRightSide),
       Sql.Gte(new Sql.Raw('date'), sqlFrom),

pyroscope/pprof-bin/Cargo.toml

@@ -27,9 +27,15 @@ flate2 = "1.0"
 # code size when deploying.
 console_error_panic_hook = { version = "0.1.7", optional = true }
 base64 = "0.22.1"
+memchr = "2.7.4"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.34"
+criterion = { version = "0.5.1", features = ["html_reports"] }
+
+[[bench]]
+name = "my_benchmark"
+harness = false
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.

pyroscope/pprof-bin/benches/my_benchmark.rs

@@ -0,0 +1,18 @@
+use pprof_bin::merge_prof;
+use pprof_bin::utest::get_test_pprof_data;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
+fn merge_bench(pprofs: &Vec<Vec<u8>>) {
+
+    for pprof in pprofs {
+        merge_prof(0, pprof.as_slice(), "process_cpu:samples:count:cpu:nanoseconds".to_string());
+    }
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let pprofs = get_test_pprof_data();
+    c.bench_function("merge", |b| b.iter(|| merge_bench(&pprofs)));
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);