Skip to content

Commit f2135fe

Browse files
sterlpsterlp
committed
added mariadb
1 parent 8fac8b8 commit f2135fe

File tree

11 files changed

+84
-62
lines changed

11 files changed

+84
-62
lines changed

‎RUN_AND_BUILD.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ mvn versions:display-dependency-updates
22
mvn versions:set -DnewVersion=1.2.1 -DgenerateBackupPoms=false
33
mvn versions:set -DnewVersion=1.2.2-SNAPSHOT -DgenerateBackupPoms=false
44

5+
## postgres
56
docker run --name pg-container -e POSTGRES_USER=sa -e POSTGRES_PASSWORD=veryStrong123 -p 5432:5432 -d postgres
67

8+
## azure-sql-edge
79
docker run --cap-add SYS_PTRACE -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=veryStrong123' -p 1433:1433 --name azuresqledge -d mcr.microsoft.com/azure-sql-edge
10+
11+
## MariaDB
12+
docker run -e MYSQL_ROOT_PASSWORD=veryStrong123 -e MYSQL_DATABASE=testdb -e MYSQL_USER=sa -e MYSQL_PASSWORD=veryStrong123 -p 3306:3306 -d mariadb:latest

‎core/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@
8989
<artifactId>postgresql</artifactId>
9090
<scope>test</scope>
9191
</dependency>
92+
<dependency>
93+
<groupId>com.mysql</groupId>
94+
<artifactId>mysql-connector-j</artifactId>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.mariadb.jdbc</groupId>
99+
<artifactId>mariadb-java-client</artifactId>
100+
<scope>test</scope>
101+
</dependency>
92102
</dependencies>
93103

94104
<build>

‎core/src/main/java/org/sterl/spring/persistent_tasks/history/model/TriggerHistoryDetailEntity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
* Just a copy of the trigger status but without any data/state.
2626
*/
2727
@Entity
28-
@Table(name = "PT_TRIGGER_HISTORY_DETAILS", indexes = {
29-
@Index(name = "IDX_PT_TRIGGERS_HISTORY_INSTANCE_ID", columnList = "instance_id"),
30-
@Index(name = "IDX_PT_TRIGGERS_HISTORY_TASK_NAME", columnList = "task_name"),
31-
@Index(name = "IDX_PT_TRIGGERS_HISTORY_TRIGGER_ID", columnList = "trigger_id"),
32-
@Index(name = "IDX_PT_TRIGGERS_HISTORY_STATUS", columnList = "status"),
33-
@Index(name = "IDX_PT_TRIGGERS_HISTORY_CREATED_TIME", columnList = "created_time"),
28+
@Table(name = "pt_trigger_history_details", indexes = {
29+
@Index(name = "idx_pt_triggers_history_instance_id", columnList = "instance_id"),
30+
@Index(name = "idx_pt_triggers_history_task_name", columnList = "task_name"),
31+
@Index(name = "idx_pt_triggers_history_trigger_id", columnList = "trigger_id"),
32+
@Index(name = "idx_pt_triggers_history_status", columnList = "status"),
33+
@Index(name = "idx_pt_triggers_history_created_time", columnList = "created_time"),
3434
})
3535
@Data
3636
@NoArgsConstructor
@@ -39,7 +39,7 @@
3939
@EqualsAndHashCode(of = "id")
4040
public class TriggerHistoryDetailEntity implements HasTriggerData {
4141

42-
@GeneratedValue(generator = "SEQ_PT_TRIGGER_HISTORY_DETAILS", strategy = GenerationType.SEQUENCE)
42+
@GeneratedValue(generator = "seq_pt_trigger_history_details", strategy = GenerationType.SEQUENCE)
4343
@Column(updatable = false)
4444
@Id
4545
private Long id;

‎core/src/main/java/org/sterl/spring/persistent_tasks/history/model/TriggerHistoryLastStateEntity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import lombok.NoArgsConstructor;
2121

2222
@Entity
23-
@Table(name = "PT_TRIGGER_HISTORY_LAST_STATES", indexes = {
24-
@Index(name = "IDX_PT_TRIGGER_HISTORY_LAST_STATES_TASK_NAME", columnList = "task_name"),
25-
@Index(name = "IDX_PT_TRIGGER_HISTORY_LAST_STATES_TRIGGER_ID", columnList = "trigger_id"),
26-
@Index(name = "IDX_PT_TRIGGER_HISTORY_LAST_STATES_STATUS", columnList = "status"),
27-
@Index(name = "IDX_PT_TRIGGER_HISTORY_LAST_STATES_CREATED_TIME", columnList = "created_time"),
23+
@Table(name = "pt_trigger_history_last_states", indexes = {
24+
@Index(name = "idx_pt_trigger_history_last_states_task_name", columnList = "task_name"),
25+
@Index(name = "idx_pt_trigger_history_last_states_trigger_id", columnList = "trigger_id"),
26+
@Index(name = "idx_pt_trigger_history_last_states_status", columnList = "status"),
27+
@Index(name = "idx_pt_trigger_history_last_states_created_time", columnList = "created_time"),
2828
})
2929
@Data
3030
@NoArgsConstructor

‎core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/entity/SchedulerEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import lombok.ToString;
1414

1515
@Entity
16-
@Table(name = "PT_SCHEDULER", indexes = @Index(name = "IDX_TASK_SCHEDULER_STATUS", columnList = "last_ping"))
16+
@Table(name = "pt_scheduler", indexes = @Index(name = "idx_task_scheduler_status", columnList = "last_ping"))
1717
@Data
1818
@ToString(of = { "id", "lastPing", "runnungTasks", "tasksSlotCount" })
1919
@EqualsAndHashCode(of = "id")

‎core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/TriggerEntity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import lombok.NoArgsConstructor;
2626

2727
@Entity
28-
@Table(name = "PT_TASK_TRIGGERS", indexes = {
29-
@Index(name = "UNQ_PT_TRIGGERS_KEY", columnList = "trigger_id, task_name", unique = true),
30-
@Index(name = "IDX_PT_TRIGGERS_PRIORITY", columnList = "priority"),
31-
@Index(name = "IDX_PT_TRIGGERS_RUN_AT", columnList = "run_at"),
32-
@Index(name = "IDX_PT_TRIGGERS_STATUS", columnList = "status"),
33-
@Index(name = "IDX_PT_TRIGGERS_PING", columnList = "last_ping"),
28+
@Table(name = "pt_task_triggers", indexes = {
29+
@Index(name = "unq_pt_triggers_key", columnList = "trigger_id, task_name", unique = true),
30+
@Index(name = "idx_pt_triggers_priority", columnList = "priority"),
31+
@Index(name = "idx_pt_triggers_run_at", columnList = "run_at"),
32+
@Index(name = "idx_pt_triggers_status", columnList = "status"),
33+
@Index(name = "idx_pt_triggers_ping", columnList = "last_ping"),
3434
})
3535
@Data
3636
@NoArgsConstructor
@@ -39,7 +39,7 @@
3939
@Builder
4040
public class TriggerEntity implements HasTriggerData {
4141

42-
@GeneratedValue(generator = "SEQ_PT_TASK_TRIGGERS", strategy = GenerationType.SEQUENCE)
42+
@GeneratedValue(generator = "seq_pt_task_triggers", strategy = GenerationType.SEQUENCE)
4343
@Column(updatable = false)
4444
@Id
4545
private Long id;

‎core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import uk.co.jemos.podam.api.PodamFactory;
3535
import uk.co.jemos.podam.api.PodamFactoryImpl;
3636

37-
//@ActiveProfiles("postgres") // postgres mssql
37+
@ActiveProfiles("maria") // postgres mssql maria
3838
@SpringBootTest(classes = SampleApp.class, webEnvironment = WebEnvironment.RANDOM_PORT)
3939
public class AbstractSpringTest {
4040

‎core/src/test/java/org/sterl/spring/persistent_tasks/TaskSchedulerServiceTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ void testLockTriggerInSchedulers() throws Exception {
5959
lockInvocations.add(() -> runNextTrigger());
6060
}
6161

62-
while (triggerService.hasPendingTriggers()) {
63-
schedulerService.triggerNextTasks();
64-
schedulerB.triggerNextTasks();
65-
Thread.sleep(10);
66-
}
62+
persistentTaskService.executeTriggersAndWait();
6763

6864
// THEN
6965
for (int i = 1; i <= 100; ++i) {

‎core/src/test/resources/application-maria.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
spring:
2+
datasource:
3+
username: root
4+
password: veryStrong123
5+
url: jdbc:mariadb://localhost:3306/testdb
6+
driver-class-name: org.mariadb.jdbc.Driver
7+
hikari:
8+
maximum-pool-size: 100
9+
jpa:
10+
hibernate:
11+
ddl-auto: none

‎core/src/test/resources/db/changelog/db.changelog-master.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
99

1010
<changeSet author="sterlp" id="2024-12-27-initial-test-db">
11-
<createTable tableName="PERSONBE">
11+
<createTable tableName="personbe">
1212
<column computed="false" name="id" type="bigint">
1313
<constraints nullable="false" primaryKey="true"
14-
primaryKeyName="PK_PERSONBE_ID" />
14+
primaryKeyName="pk_personbe_id" />
1515
</column>
1616
<column computed="false" name="name" type="varchar(255)" />
1717
</createTable>

0 commit comments

Comments
 (0)