Merge branch 'master' into jhwang/fix-viewdashboard-action

* master:
  Revert "Add Vitess Sharded Key Range Support for SqlDelight" (#540)
  Increasing the number of variants per service (#539)

Author: jeffhwang-sq

client-sqldelight-gradle-plugin/src/main/kotlin/app/cash/backfila/client/sqldelight/plugin/GenerateBackfilaRecordSourceQueriesTask.kt

@@ -163,18 +163,6 @@ abstract class GenerateBackfilaRecordSourceQueriesTask : DefaultTask() {
               .addStatement("return database.%L.%LGetBatch(start, end)", queriesFunctionName, lowerName)
               .addModifiers(OVERRIDE)
               .build(),
-          ).addFunction(
-            FunSpec.builder("tableName")
-              .returns(String::class)
-              .addStatement("return %S", backfillConfig.tableName)
-              .addModifiers(OVERRIDE)
-              .build(),
-          ).addFunction(
-            FunSpec.builder("primaryKeyColumn")
-              .returns(String::class)
-              .addStatement("return %S", backfillConfig.keyName)
-              .addModifiers(OVERRIDE)
-              .build(),
           ).build(),
       ).build()
 

client-sqldelight-gradle-plugin/src/test/kotlin/app/cash/backfila/client/sqldelight/plugin/BackfilaSqlDelightGradlePluginTest.kt

@@ -33,30 +33,6 @@ class BackfilaSqlDelightGradlePluginTest {
       .contains(result.task(taskName)!!.outcome)
   }
 
-  @Test
-  fun `generated config includes tableName and primaryKeyColumn methods`() {
-    val projectDir = File("src/test/projects/happyPath")
-
-    // Build the project
-    val taskName = ":lib:compileKotlin"
-    createRunner(projectDir, "clean", taskName).build()
-
-    // Check the generated file contains the expected methods
-    val generatedFile = File(
-      projectDir,
-      "lib/build/backfilaSqlDelight/hockeyPlayerOrigin/kotlin/app/cash/backfila/client/sqldelight/hockeydata/HockeyPlayerOriginRecordSourceConfig.kt",
-    )
-    assertThat(generatedFile).exists()
-
-    val content = generatedFile.readText()
-
-    // Verify tableName() method is generated with correct value
-    assertThat(content).contains("override fun tableName(): String = \"hockeyPlayer\"")
-
-    // Verify primaryKeyColumn() method is generated with correct value
-    assertThat(content).contains("override fun primaryKeyColumn(): String = \"player_number\"")
-  }
-
   private fun createRunner(
     projectDir: File,
     vararg taskNames: String,

client-sqldelight-test/build.gradle.kts

@@ -57,4 +57,19 @@ dependencies {
   testImplementation(libs.assertj)
   testImplementation(libs.junitEngine)
   testImplementation(libs.kotlinTest)
+
+  testImplementation(project(":backfila-embedded"))
+  testImplementation(project(":client-testing"))
+
+  // ****************************************
+  // For TESTING purposes only. We only want Misk for easy testing.
+  // DO NOT turn these into regular dependencies.
+  // ****************************************
+  testImplementation(libs.misk)
+  testImplementation(libs.miskActions)
+  testImplementation(libs.miskInject)
+  testImplementation(libs.miskJdbc)
+  testImplementation(testFixtures(libs.miskJdbc))
+  testImplementation(libs.miskTesting)
+  testImplementation(project(":client-misk"))
 }

…t/sqldelight/PlayerOriginBackfillTest.kt …t/sqldelight/PlayerOriginBackfillTest.ktclient-sqldelight/src/test/kotlin/app/cash/backfila/client/sqldelight/PlayerOriginBackfillTest.kt renamed to client-sqldelight-test/src/test/kotlin/app/cash/backfila/client/sqldelight/PlayerOriginBackfillTest.kt client-sqldelight/src/test/kotlin/app/cash/backfila/client/sqldelight/PlayerOriginBackfillTest.kt renamed to client-sqldelight-test/src/test/kotlin/app/cash/backfila/client/sqldelight/PlayerOriginBackfillTest.kt

@@ -15,15 +15,28 @@ import javax.inject.Provider
 import javax.inject.Singleton
 import javax.sql.DataSource
 import misk.inject.KAbstractModule
+import misk.jdbc.DataSourceConfig
+import misk.jdbc.DataSourceType
+import misk.jdbc.JdbcModule
 
 /**
  * Simulates a Backfills module where all the relevant backfills are registered.
  */
-class TestBackfillsModule(
-  private val useVitess: Boolean = false,
-  private val vitessPort: Int = 27003,
-) : KAbstractModule() {
+class TestBackfillsModule : KAbstractModule() {
   override fun configure() {
+    install(
+      JdbcModule(
+        HockeyDataDb::class,
+        DataSourceConfig(
+          type = DataSourceType.MYSQL,
+          username = "root",
+          password = "",
+          database = "hockeydata_testing",
+          migrations_resource = "classpath:/migrations",
+        ),
+      ),
+    )
+
     install(
       MiskBackfillModule(
         BackfilaHttpClientConfig(

…client/sqldelight/TestBackfillsModule.kt …client/sqldelight/TestBackfillsModule.ktclient-sqldelight/src/test/kotlin/app/cash/backfila/client/sqldelight/TestBackfillsModule.kt renamed to client-sqldelight-test/src/test/kotlin/app/cash/backfila/client/sqldelight/TestBackfillsModule.kt client-sqldelight/src/test/kotlin/app/cash/backfila/client/sqldelight/TestBackfillsModule.kt renamed to client-sqldelight-test/src/test/kotlin/app/cash/backfila/client/sqldelight/TestBackfillsModule.kt

@@ -0,0 +1,26 @@
+package app.cash.backfila.client.sqldelight
+
+import app.cash.backfila.client.sqldelight.persistence.HockeyDataDb
+import app.cash.backfila.embedded.EmbeddedBackfilaModule
+import misk.MiskTestingServiceModule
+import misk.environment.DeploymentModule
+import misk.inject.KAbstractModule
+import misk.jdbc.JdbcTestingModule
+import misk.logging.LogCollectorModule
+import wisp.deployment.TESTING
+
+/**
+ * Simulates a specific service implementation module
+ */
+class TestingModule : KAbstractModule() {
+  override fun configure() {
+    install(DeploymentModule(TESTING))
+    install(LogCollectorModule())
+    install(MiskTestingServiceModule())
+    install(JdbcTestingModule(HockeyDataDb::class))
+
+    install(EmbeddedBackfilaModule())
+
+    install(TestBackfillsModule())
+  }
+}

client-sqldelight-test/src/test/kotlin/app/cash/backfila/client/sqldelight/TestingModule.kt

@@ -24,32 +24,9 @@ dependencies {
   implementation(libs.retrofitWire)
   implementation(libs.wireMoshiAdapter)
 
-  // Misk dependencies for Vitess support
-  implementation(libs.miskJdbc)
-  implementation(libs.miskVitess)
-
   api(project(":client"))
   // We do not want to leak client-base implementation details to customers.
   implementation(project(":client-base"))
-
-  testImplementation(libs.assertj)
-  testImplementation(libs.junitEngine)
-  testImplementation(libs.kotlinTest)
-
-  testImplementation(project(":client-sqldelight-test"))  // Test fixtures
-  testImplementation(project(":backfila-embedded"))
-  testImplementation(project(":client-testing"))
-  testImplementation(project(":client-misk"))
-
-  // Misk testing framework (for @MiskTest)
-  testImplementation(libs.misk)
-  testImplementation(libs.miskActions)
-  testImplementation(libs.miskInject)
-  testImplementation(libs.miskJdbc)
-  testImplementation(testFixtures(libs.miskJdbc))
-  testImplementation(libs.miskVitess)
-  testImplementation(testFixtures(libs.miskVitess))
-  testImplementation(libs.miskTesting)
 }
 
 configure<MavenPublishBaseExtension> {

client-sqldelight/build.gradle.kts

@@ -5,53 +5,15 @@ import app.cash.backfila.client.BackfillConfig
 import app.cash.backfila.client.PrepareBackfillConfig
 
 /**
- * Base class for SqlDelight-based backfills.
+ * K - Key type
+ * R - Row type
+ * P - Parameters type
  *
- * K - Key type (primary key type, must be Comparable for Vitess strategies)
- * R - Row type (the record returned by SqlDelight queries)
- * P - Parameters type (user-defined parameters for the backfill)
- *
- * For unsharded databases, simply extend this class:
- * ```kotlin
- * class MyBackfill @Inject constructor(
- *   myDatabase: MyDatabase,
- * ) : SqlDelightDatasourceBackfill<Long, MyRecord, NoParameters>(
- *   MyRecordSourceConfig(myDatabase),
- * )
- * ```
- *
- * For Vitess sharded databases, override [partitionProvider]:
- * ```kotlin
- * class MyBackfill @Inject constructor(
- *   myDatabase: MyDatabase,
- *   @MyDb dataSourceService: DataSourceService,
- * ) : SqlDelightDatasourceBackfill<Long, MyRecord, NoParameters>(
- *   MyRecordSourceConfig(myDatabase),
- * ) {
- *   override fun partitionProvider() = VitessShardedPartitionProvider(
- *     dataSourceService,
- *     Keyspace("my_keyspace"),
- *   )
- * }
- * ```
- *
- * @param recordSourceConfig The SqlDelight query config for this backfill.
  */
 abstract class SqlDelightDatasourceBackfill<K : Any, R : Any, P : Any>(
   val recordSourceConfig: SqlDelightRecordSourceConfig<K, R>,
 ) : Backfill {
 
-  /**
-   * Returns the partition provider for this backfill.
-   *
-   * Override this to use Vitess-aware partition providers like [VitessShardedPartitionProvider]
-   * or [VitessSingleCursorPartitionProvider].
-   *
-   * The partition provider also determines the [BoundingRangeStrategy] via its
-   * [PartitionProvider.boundingRangeStrategy] method.
-   */
-  open fun partitionProvider(): PartitionProvider = UnshardedPartitionProvider()
-
   /**
    * Override this and throw an exception to prevent the backfill from being created.
    * This is also a good place to do any prep work before batches are run.