From 0310f5281abaad532385fbf8c3d3e721d2e2417a Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Sat, 1 Mar 2025 22:17:52 -0800 Subject: [PATCH 1/4] init --- core/dao/build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/dao/build.sbt b/core/dao/build.sbt index ef67354638..5edb0faf40 100644 --- a/core/dao/build.sbt +++ b/core/dao/build.sbt @@ -87,7 +87,6 @@ libraryDependencies ++= Seq( ///////////////////////////////////////////////////////////////////////////// libraryDependencies ++= Seq( - "mysql" % "mysql-connector-java" % "8.0.33", // MySQL connector "org.postgresql" % "postgresql" % "42.7.4", "org.yaml" % "snakeyaml" % "1.30", // for reading storage config yaml file ) \ No newline at end of file From 9e0de4b842ed3df84ae2eef855a78c79249ae586 Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Sat, 1 Mar 2025 22:33:23 -0800 Subject: [PATCH 2/4] update --- .../scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala index db59d4249c..a4082c5697 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala @@ -117,8 +117,6 @@ class DataProcessingSpec val table: String = "test" val username: String = "root" val password: String = "" - val driver = new com.mysql.cj.jdbc.Driver() - DriverManager.registerDriver(driver) val config = DBConfigurationBuilder.newBuilder .setPort(0) // 0 => automatically detect free port From fcb23c75b1df70e2311d912e018c17a42453e906 Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Sat, 1 Mar 2025 22:52:14 -0800 Subject: [PATCH 3/4] update --- .../ics/amber/engine/e2e/DataProcessingSpec.scala | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala index a4082c5697..715b873730 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala @@ -111,8 +111,6 @@ class DataProcessingSpec def initializeInMemoryMySQLInstance(): (String, String, String, String, String, String) = { import ch.vorburger.mariadb4j.{DB, DBConfigurationBuilder} - import java.sql.DriverManager - val database: String = "new" val table: String = "test" val username: String = "root" @@ -126,17 +124,6 @@ class DataProcessingSpec inMemoryMySQLInstance.get.start() inMemoryMySQLInstance.get.createDB(database) - // insert test data - val conn = DriverManager.getConnection(config.getURL(database), username, password) - var statement: PreparedStatement = conn.prepareStatement( - s"create table $table (id int primary key auto_increment, text VARCHAR(512), " + - s"point FLOAT, created_at DATE default NOW() not null)" - ) - statement.execute() - statement = conn.prepareStatement(s"insert into $table (text) values ('hello world')") - statement.execute() - statement.close() - conn.close() ("localhost", config.getPort.toString, database, table, username, password) } From 31690930e9fc5c0298629c6fb4463f8629bf7e14 Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Sat, 1 Mar 2025 23:01:00 -0800 Subject: [PATCH 4/4] update --- .../amber/engine/e2e/DataProcessingSpec.scala | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala index 715b873730..8cb4f49086 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala @@ -25,8 +25,6 @@ import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} - -import java.sql.PreparedStatement import scala.concurrent.duration.DurationInt class DataProcessingSpec @@ -108,25 +106,6 @@ class DataProcessingSpec results } - def initializeInMemoryMySQLInstance(): (String, String, String, String, String, String) = { - import ch.vorburger.mariadb4j.{DB, DBConfigurationBuilder} - - val database: String = "new" - val table: String = "test" - val username: String = "root" - val password: String = "" - - val config = DBConfigurationBuilder.newBuilder - .setPort(0) // 0 => automatically detect free port - .build() - - inMemoryMySQLInstance = Option(DB.newEmbeddedDB(config)) - inMemoryMySQLInstance.get.start() - inMemoryMySQLInstance.get.createDB(database) - - ("localhost", config.getPort.toString, database, table, username, password) - } - "Engine" should "execute headerlessCsv workflow normally" in { val headerlessCsvOpDesc = TestOperators.headerlessSmallCsvScanOpDesc() val workflow = buildWorkflow( @@ -327,37 +306,4 @@ class DataProcessingSpec ) executeWorkflow(workflow) } - - // TODO: use mock data to perform the test, remove dependency on the real AsterixDB - // "Engine" should "execute asterixdb workflow normally" in { - // - // val asterixDBOp = TestOperators.asterixDBSourceOpDesc() - // val (id, workflow) = buildWorkflow( - // List(asterixDBOp), - // List() - // ) - // executeWorkflow(id, workflow) - // } - - "Engine" should "execute mysql workflow normally" in { - val (host, port, database, table, username, password) = initializeInMemoryMySQLInstance() - val inMemoryMsSQLSourceOpDesc = TestOperators.inMemoryMySQLSourceOpDesc( - host, - port, - database, - table, - username, - password - ) - - val workflow = buildWorkflow( - List(inMemoryMsSQLSourceOpDesc), - List(), - workflowContext - ) - executeWorkflow(workflow) - - inMemoryMySQLInstance.get.stop() - } - }