Rename energy_used->execution_budget_used generally

Author: coolreader18

crates/client-api/src/routes/database.rs

@@ -200,7 +200,7 @@ pub async fn call<S: ControlStateDelegate + NodeDelegate>(
             let (status, body) = reducer_outcome_response(&owner_identity, &reducer, result.outcome);
             Ok((
                 status,
-                TypedHeader(SpacetimeEnergyUsed(result.energy_used)),
+                TypedHeader(SpacetimeEnergyUsed(result.execution_budget_used)),
                 TypedHeader(SpacetimeExecutionDurationMicros(result.execution_duration)),
                 body,
             )

crates/core/src/client/message_handlers_v1.rs

@@ -139,7 +139,7 @@ impl MessageExecutionError {
             },
             status: EventStatus::FailedInternal(format!("{:#}", err)),
             reducer_return_value: None,
-            execution_energy_used: FunctionBudget::ZERO,
+            execution_budget_used: FunctionBudget::ZERO,
             host_execution_duration: Duration::ZERO,
             request_id: Some(RequestId::default()),
             timer: None,

crates/core/src/client/messages.rs

@@ -440,7 +440,7 @@ impl ToProtocol for TransactionUpdateMessage {
                 // elsewhere. So, we just pretend that this is `EnergyQuanta` when it's actually
                 // a different unit, and it doesn't really matter to the client anyway.
                 // TODO(noa): maybe we could just have this be zero, unconditionally?
-                energy_quanta_used: EnergyQuanta::new(event.execution_energy_used.get().into()),
+                energy_quanta_used: EnergyQuanta::new(event.execution_budget_used.get().into()),
                 total_host_execution_duration: event.host_execution_duration.into(),
                 caller_connection_id: event.caller_connection_id.unwrap_or(ConnectionId::ZERO),
             };

crates/core/src/energy.rs

@@ -17,7 +17,7 @@ pub trait EnergyMonitor: Send + Sync + 'static {
     fn record_reducer(
         &self,
         fingerprint: &FunctionFingerprint<'_>,
-        energy_used: FunctionBudget,
+        execution_budget_used: FunctionBudget,
         execution_duration: Duration,
     );
     fn record_disk_usage(&self, database: &Database, replica_id: u64, disk_usage: u64, period: Duration);
@@ -36,7 +36,7 @@ impl EnergyMonitor for NullEnergyMonitor {
     fn record_reducer(
         &self,
         _fingerprint: &FunctionFingerprint<'_>,
-        _energy_used: FunctionBudget,
+        _execution_budget_used: FunctionBudget,
         _execution_duration: Duration,
     ) {
     }

crates/core/src/host/host_controller.rs

@@ -148,7 +148,7 @@ impl HostRuntimes {
 #[derive(Clone, Debug)]
 pub struct ReducerCallResult {
     pub outcome: ReducerOutcome,
-    pub energy_used: FunctionBudget,
+    pub execution_budget_used: FunctionBudget,
     pub execution_duration: Duration,
 }
 

crates/core/src/host/instance_env.rs

@@ -793,7 +793,7 @@ impl InstanceEnv {
             request_id: None,
             timer: None,
             // The procedure will pick up the tab for the energy.
-            execution_energy_used: FunctionBudget::ZERO,
+            execution_budget_used: FunctionBudget::ZERO,
             host_execution_duration: Duration::from_millis(0),
         };
         // Commit the tx and broadcast it.

crates/core/src/host/module_host.rs

@@ -210,7 +210,7 @@ pub struct ModuleEvent {
     pub function_call: ModuleFunctionCall,
     pub status: EventStatus,
     pub reducer_return_value: Option<Bytes>,
-    pub execution_energy_used: FunctionBudget,
+    pub execution_budget_used: FunctionBudget,
     pub host_execution_duration: Duration,
     pub request_id: Option<RequestId>,
     pub timer: Option<Instant>,
@@ -1473,7 +1473,7 @@ impl From<EventStatus> for ViewOutcome {
 pub struct ViewCallResult {
     pub outcome: ViewOutcome,
     pub tx: MutTxId,
-    pub energy_used: FunctionBudget,
+    pub execution_budget_used: FunctionBudget,
     pub total_duration: Duration,
     pub abi_duration: Duration,
 }
@@ -1482,7 +1482,7 @@ impl fmt::Debug for ViewCallResult {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("ViewCallResult")
             .field("outcome", &self.outcome)
-            .field("energy_used", &self.energy_used)
+            .field("execution_budget_used", &self.execution_budget_used)
             .field("total_duration", &self.total_duration)
             .field("abi_duration", &self.abi_duration)
             .finish()
@@ -1493,7 +1493,7 @@ impl ViewCallResult {
     pub fn default(tx: MutTxId) -> Self {
         Self {
             outcome: ViewOutcome::Success,
-            energy_used: FunctionBudget::ZERO,
+            execution_budget_used: FunctionBudget::ZERO,
             total_duration: Duration::ZERO,
             abi_duration: Duration::ZERO,
             tx,
@@ -2888,7 +2888,7 @@ impl ModuleHost {
             // Increment execution stats
             tx = result.tx;
             outcome = result.outcome;
-            energy_used += result.energy_used;
+            energy_used += result.execution_budget_used;
             total_duration += result.total_duration;
             abi_duration += result.abi_duration;
             trapped |= trap;
@@ -2902,7 +2902,7 @@ impl ModuleHost {
             ViewCallResult {
                 outcome,
                 tx,
-                energy_used,
+                execution_budget_used: energy_used,
                 total_duration,
                 abi_duration,
             },

crates/core/src/host/scheduler.rs

@@ -693,7 +693,7 @@ fn refresh_views_then_commit_and_broadcast(
         status,
         reducer_return_value: None,
         //Keeping them 0 as it is internal transaction, not by reducer
-        execution_energy_used: FunctionBudget::ZERO,
+        execution_budget_used: FunctionBudget::ZERO,
         host_execution_duration: Duration::from_millis(0),
         request_id: None,
         timer: None,

crates/core/src/host/wasm_common/module_host_actor.rs

@@ -238,7 +238,7 @@ pub struct ExecutionStats {
 }
 
 impl ExecutionStats {
-    fn energy_used(&self) -> FunctionBudget {
+    fn execution_budget_used(&self) -> FunctionBudget {
         self.energy.used()
     }
 
@@ -661,7 +661,7 @@ impl InstanceCommon {
                 log::info!("Database updated, {} host-type={}", stdb.database_identity(), host_type);
 
                 let succeed = |info: Arc<ModuleInfo>,
-                               execution_energy_used: FunctionBudget,
+                               execution_budget_used: FunctionBudget,
                                host_execution_duration: Duration,
                                tx: MutTxId|
                  -> TransactionOffset {
@@ -672,7 +672,7 @@ impl InstanceCommon {
                         function_call: ModuleFunctionCall::update(),
                         status: EventStatus::Committed(DatabaseUpdate::default()),
                         reducer_return_value: None,
-                        execution_energy_used,
+                        execution_budget_used,
                         host_execution_duration,
                         request_id: None,
                         timer: None,
@@ -708,7 +708,8 @@ impl InstanceCommon {
                             stdb.report_mut_tx_metrics(reducer, tx_metrics, None);
                             UpdateDatabaseResult::ErrorExecutingMigration(anyhow::anyhow!(msg))
                         } else {
-                            let tx_offset = succeed(self.info.clone(), out.energy_used, out.total_duration, tx);
+                            let tx_offset =
+                                succeed(self.info.clone(), out.execution_budget_used, out.total_duration, tx);
                             UpdateDatabaseResult::UpdatePerformed {
                                 tx_offset,
                                 durable_offset,
@@ -963,7 +964,7 @@ impl InstanceCommon {
         };
 
         // Account for view execution in reducer reporting metrics
-        vm_metrics.report_energy_used(out.energy_used);
+        vm_metrics.report_execution_budget_used(out.execution_budget_used);
         vm_metrics.report_total_duration(out.total_duration);
         vm_metrics.report_abi_duration(out.abi_duration);
 
@@ -976,7 +977,7 @@ impl InstanceCommon {
             reducer_return_value = None;
         }
 
-        let execution_energy_used = result.stats.energy_used();
+        let execution_budget_used = result.stats.execution_budget_used();
         let total_duration = result.stats.total_duration();
 
         let event = ModuleEvent {
@@ -990,7 +991,7 @@ impl InstanceCommon {
             },
             status,
             reducer_return_value,
-            execution_energy_used,
+            execution_budget_used,
             host_execution_duration: total_duration,
             request_id,
             timer,
@@ -999,7 +1000,7 @@ impl InstanceCommon {
 
         let res = ReducerCallResult {
             outcome: ReducerOutcome::from(&event.status),
-            energy_used: execution_energy_used,
+            execution_budget_used,
             execution_duration: total_duration,
         };
 
@@ -1042,12 +1043,12 @@ impl InstanceCommon {
         let result = vm_call_function(budget);
 
         let stats: &ExecutionStats = result.as_ref();
-        let energy_used = stats.energy.used();
+        let execution_budget_used = stats.energy.used();
         let timings = &stats.timings;
         let memory_allocation = stats.memory_allocation;
 
         self.energy_monitor
-            .record_reducer(&energy_fingerprint, energy_used, timings.total_duration);
+            .record_reducer(&energy_fingerprint, execution_budget_used, timings.total_duration);
         if self.allocated_memory != memory_allocation {
             self.metric_wasm_memory_bytes.set(memory_allocation as i64);
             self.allocated_memory = memory_allocation;
@@ -1057,7 +1058,7 @@ impl InstanceCommon {
 
         function_span
             .record("timings.total_duration", tracing::field::debug(timings.total_duration))
-            .record("energy.used", tracing::field::debug(energy_used));
+            .record("energy.used", tracing::field::debug(execution_budget_used));
 
         result
     }
@@ -1313,7 +1314,7 @@ impl InstanceCommon {
         let res = ViewCallResult {
             outcome,
             tx,
-            energy_used: result.stats.energy_used(),
+            execution_budget_used: result.stats.execution_budget_used(),
             total_duration: result.stats.total_duration(),
             abi_duration: result.stats.abi_duration(),
         };
@@ -1365,7 +1366,7 @@ impl InstanceCommon {
 
             out.tx = result.tx;
             out.outcome = result.outcome;
-            out.energy_used += result.energy_used;
+            out.execution_budget_used += result.execution_budget_used;
             out.total_duration += result.total_duration;
             out.abi_duration += result.abi_duration;
 
@@ -1568,8 +1569,8 @@ impl VmMetrics {
         self.reducer_plus_query_duration.clone().with_timer(start)
     }
 
-    fn report_energy_used(&self, energy_used: FunctionBudget) {
-        self.reducer_fuel_used.inc_by(energy_used.get());
+    fn report_execution_budget_used(&self, execution_budget_used: FunctionBudget) {
+        self.reducer_fuel_used.inc_by(execution_budget_used.get());
     }
 
     fn report_total_duration(&self, duration: Duration) {
@@ -1582,10 +1583,10 @@ impl VmMetrics {
 
     /// Reports some VM metrics.
     fn report(&self, stats: &ExecutionStats) {
-        let energy_used = stats.energy.used();
+        let execution_budget_used = stats.energy.used();
         let reducer_duration = stats.timings.total_duration;
         let abi_time = stats.timings.wasm_instance_env_call_times.sum();
-        self.report_energy_used(energy_used);
+        self.report_execution_budget_used(execution_budget_used);
         self.report_total_duration(reducer_duration);
         self.report_abi_duration(abi_time);
     }

crates/core/src/sql/execute.rs

@@ -204,7 +204,7 @@ fn run_inner<I: WasmInstance>(
                 },
                 status: EventStatus::Committed(DatabaseUpdate::default()),
                 reducer_return_value: None,
-                execution_energy_used: FunctionBudget::ZERO,
+                execution_budget_used: FunctionBudget::ZERO,
                 host_execution_duration: Duration::ZERO,
                 request_id: None,
                 timer: None,