Business intelligence made simple
DRY cache serialization [skip ci]
Andrew Kane69740eb02ac0
diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 692882f1..5f6923b8 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -77,7 +77,7 @@ module Blazerdef read_cache(cache_key)value = Blazer.cache.read(cache_key)if value- Blazer::Result.new(self, *Marshal.load(value), nil)+ Blazer::Result.new(self, *Blazer::Result.load(value), nil)endend@@ -245,7 +245,7 @@ module Blazercache_data = nilcache = !error && (cache_mode == "all" || (cache_mode == "slow" && duration >= cache_slow_threshold))if cache || run_id- cache_data = Marshal.dump([columns, rows, error, cache ? Time.now : nil]) rescue nil+ cache_data = Blazer::Result.dump([columns, rows, error, cache ? Time.now : nil]) rescue nilendif cache && cache_data && adapter_instance.cachable?(statement.bind_statement)@@ -255,7 +255,7 @@ module Blazerif run_idunless cache_dataerror = "Error storing the results of this query :("- cache_data = Marshal.dump([[], [], error, nil])+ cache_data = Blazer::Result.dump([[], [], error, nil])endBlazer.cache.write(run_cache_key(run_id), cache_data, expires_in: 30.seconds)enddiff --git a/lib/blazer/result.rb b/lib/blazer/result.rbindex e188a7e0..65bdcf1c 100644--- a/lib/blazer/result.rb+++ b/lib/blazer/result.rb@@ -198,5 +198,13 @@ module Blazerraise "Unknown anomaly detector"endend++ def self.load(*args)+ Marshal.load(*args)+ end++ def self.dump(*args)+ Marshal.dump(*args)+ endendenddiff --git a/lib/blazer/run_statement_job.rb b/lib/blazer/run_statement_job.rbindex 7d7bfef4..a4206293 100644--- a/lib/blazer/run_statement_job.rb+++ b/lib/blazer/run_statement_job.rb@@ -12,7 +12,7 @@ module Blazerendrescue Exception => eBlazer::Result.new(data_source, [], [], "Unknown error", nil, false)- Blazer.cache.write(data_source.run_cache_key(options[:run_id]), Marshal.dump([[], [], "Unknown error", nil]), expires_in: 30.seconds)+ Blazer.cache.write(data_source.run_cache_key(options[:run_id]), Blazer::Result.dump([[], [], "Unknown error", nil]), expires_in: 30.seconds)raise eendend