SELECT got you down? Try JOIN today!

oxidecomputer · Dec 6, 2023 · 9859e12 · bnaecker · Dec 6, 2023 · smklein
1 parent 7e779a0
commit 9859e12
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 11 deletions.
diff --git a/nexus/db-queries/src/db/queries/virtual_provisioning_collection_update.rs b/nexus/db-queries/src/db/queries/virtual_provisioning_collection_update.rs
@@ -21,7 +21,8 @@ use diesel::query_builder::{AstPass, Query, QueryFragment, QueryId};
 use diesel::result::Error as DieselError;
 use diesel::{
     sql_types, BoolExpressionMethods, CombineDsl, ExpressionMethods, IntoSql,
-    NullableExpressionMethods, QueryDsl, RunQueryDsl, SelectableHelper,
+    JoinOnDsl, NullableExpressionMethods, QueryDsl, RunQueryDsl,
+    SelectableHelper,
 };
 use nexus_db_model::queries::virtual_provisioning_collection_update::{
     all_collections, do_update, parent_silo, quotas, silo_provisioned,
@@ -272,12 +273,10 @@ impl Quotas {
         Self {
             query: Box::new(
                 dsl::silo_quotas
-                    .filter(
-                        dsl::silo_id.eq(parent_silo
+                    .inner_join(
+                        parent_silo
                             .query_source()
-                            .select(parent_silo::id)
-                            .single_value()
-                            .assume_not_null()),
+                            .on(dsl::silo_id.eq(parent_silo::id)),
                     )
                     .select((
                         dsl::silo_id,
@@ -306,12 +305,10 @@ impl SiloProvisioned {
         Self {
             query: Box::new(
                 dsl::virtual_provisioning_collection
-                    .filter(
-                        dsl::id.eq(parent_silo
+                    .inner_join(
+                        parent_silo
                             .query_source()
-                            .select(parent_silo::id)
-                            .single_value()
-                            .assume_not_null()),
+                            .on(dsl::id.eq(parent_silo::id)),
                     )
                     .select((
                         dsl::id,

diff --git a/nexus/preprocessed_configs/config.xml b/nexus/preprocessed_configs/config.xml
@@ -0,0 +1,41 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <mlock_executable>true</mlock_executable>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>