Brig schema fold

cassandra-schema.cql

@@ -1085,7 +1085,7 @@ CREATE TABLE brig_test.provider (
 CREATE TABLE brig_test.user_keys (
     key text PRIMARY KEY,
     user uuid
-) WITH bloom_filter_fp_chance = 0.01
+) WITH bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''
     AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
@@ -1126,7 +1126,7 @@ CREATE TABLE brig_test.invitee_info (
     invitee uuid PRIMARY KEY,
     conv uuid,
     inviter uuid
-) WITH bloom_filter_fp_chance = 0.01
+) WITH bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''
     AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
@@ -1292,7 +1292,7 @@ CREATE TABLE brig_test.user (
     sso_id text,
     status int,
     team uuid
-) WITH bloom_filter_fp_chance = 0.01
+) WITH bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''
     AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
@@ -1400,7 +1400,7 @@ CREATE TABLE brig_test.password_reset (
     retries int,
     timeout timestamp,
     user uuid
-) WITH bloom_filter_fp_chance = 0.01
+) WITH bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''
     AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
@@ -1515,7 +1515,7 @@ CREATE TABLE brig_test.connection (
     status int,
     PRIMARY KEY (left, right)
 ) WITH CLUSTERING ORDER BY (right ASC)
-    AND bloom_filter_fp_chance = 0.01
+    AND bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''
     AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
@@ -1586,7 +1586,7 @@ CREATE TABLE brig_test.activation_keys (
     key_type ascii,
     retries int,
     user uuid
-) WITH bloom_filter_fp_chance = 0.01
+) WITH bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''
     AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}

changelog.d/5-internal/brig-schema-init

@@ -0,0 +1 @@
+Make brig-schema a little faster by merging the first 34 schema migrations on fresh installations.

services/brig/brig.cabal

@@ -621,37 +621,6 @@ executable brig-schema
   -- cabal-fmt: expand schema/src
   other-modules:
     Main
-    V10
-    V11
-    V12
-    V13
-    V14
-    V15
-    V16
-    V17
-    V18
-    V19
-    V20
-    V21
-    V22
-    V23
-    V24
-    V25
-    V28
-    V29
-    V30
-    V31
-    V32
-    V33
-    V34
-    V35
-    V36
-    V37
-    V38
-    V39
-    V40
-    V41
-    V42
     V43
     V44
     V45
@@ -683,7 +652,6 @@ executable brig-schema
     V71_AddTableVCodesThrottle
     V72_AddNonceTable
     V73_ReplaceNonceTable
-    V9
     V_FUTUREWORK
 
   hs-source-dirs:     schema/src

services/brig/schema/src/Main.hs

@@ -22,36 +22,6 @@ import Control.Exception (finally)
 import Imports
 import qualified System.Logger.Extended as Log
 import Util.Options
-import qualified V10
-import qualified V11
-import qualified V12
-import qualified V13
-import qualified V14
-import qualified V15
-import qualified V16
-import qualified V17
-import qualified V18
-import qualified V19
-import qualified V20
-import qualified V21
-import qualified V22
-import qualified V23
-import qualified V24
-import qualified V28
-import qualified V29
-import qualified V30
-import qualified V31
-import qualified V32
-import qualified V33
-import qualified V34
-import qualified V35
-import qualified V36
-import qualified V37
-import qualified V38
-import qualified V39
-import qualified V40
-import qualified V41
-import qualified V42
 import qualified V43
 import qualified V44
 import qualified V45
@@ -83,7 +53,6 @@ import qualified V70_UserEmailUnvalidated
 import qualified V71_AddTableVCodesThrottle
 import qualified V72_AddNonceTable
 import qualified V73_ReplaceNonceTable
-import qualified V9
 
 main :: IO ()
 main = do
@@ -94,38 +63,7 @@ main = do
   migrateSchema
     l
     o
-    [ V9.migration,
-      V10.migration,
-      V11.migration,
-      V12.migration,
-      V13.migration,
-      V14.migration,
-      V15.migration,
-      V16.migration,
-      V17.migration,
-      V18.migration,
-      V19.migration,
-      V20.migration,
-      V21.migration,
-      V22.migration,
-      V23.migration,
-      V24.migration,
-      V28.migration,
-      V29.migration,
-      V30.migration,
-      V31.migration,
-      V32.migration,
-      V33.migration,
-      V34.migration,
-      V35.migration,
-      V36.migration,
-      V37.migration,
-      V38.migration,
-      V39.migration,
-      V40.migration,
-      V41.migration,
-      V42.migration,
-      V43.migration,
+    [ V43.migration,
       V44.migration,
       V45.migration,
       V46.migration,