From f5da60e4275ca1172128c3994298691e12d5e1f8 Mon Sep 17 00:00:00 2001 From: mjkwiatkowski Date: Fri, 20 Feb 2026 16:17:39 +0100 Subject: fix: changed the syntex to slowly get rid of the Config class --- resources/experiments/config.json | 3 ++- resources/experiments/config.toml | 11 +++++++++++ resources/experiments/experiment_scaling.json | 9 ++------- resources/experiments/schema.proto | 11 ----------- resources/experiments/sink-jdbc.properties | 5 +++-- resources/topologies/surf_small_solution.json | 25 ------------------------- 6 files changed, 18 insertions(+), 46 deletions(-) create mode 100644 resources/experiments/config.toml delete mode 100644 resources/experiments/schema.proto delete mode 100644 resources/topologies/surf_small_solution.json (limited to 'resources') diff --git a/resources/experiments/config.json b/resources/experiments/config.json index 9527923d..ae383f45 100644 --- a/resources/experiments/config.json +++ b/resources/experiments/config.json @@ -7,6 +7,7 @@ "username" : "matt", "password" : "admin", "database" : "opendc", - "topic" : "postgres-topic", + "topic" : "postgres_topic", "kafka" : "9092" } + diff --git a/resources/experiments/config.toml b/resources/experiments/config.toml new file mode 100644 index 00000000..b9ff2b38 --- /dev/null +++ b/resources/experiments/config.toml @@ -0,0 +1,11 @@ +// use a log4j to log your results in a form of a log + + +// Use check instead of require +// use type-aliases +// use higher-order +// annotation classes +// operator objects - Factory Design Pattern +// if it can be modeled as an instance then you do not need functions +// make your kotlin program write to standalone +// latex files that create figures themselves instead of using python diff --git a/resources/experiments/experiment_scaling.json b/resources/experiments/experiment_scaling.json index 1051389d..ce0b917c 100644 --- a/resources/experiments/experiment_scaling.json +++ b/resources/experiments/experiment_scaling.json @@ -3,13 +3,8 @@ "topologies": [ { "pathToFile": "resources/topologies/surf.json" - }, - { - "pathToFile": "resources/topologies/surf_medium.json" - }, - { - "pathToFile": "resources/topologies/surf_small.json" - }], + } + ], "workloads": [ { "pathToFile": "resources/workloads/surf_month", diff --git a/resources/experiments/schema.proto b/resources/experiments/schema.proto deleted file mode 100644 index 2a308edd..00000000 --- a/resources/experiments/schema.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto2"; - -package proto; - -option java_package = "org.opendc.common"; -option java_outer_classname = "ProtobufMetrics"; - -message ProtoExport { - required int32 id = 1; - required int32 tasksactive = 2; -} \ No newline at end of file diff --git a/resources/experiments/sink-jdbc.properties b/resources/experiments/sink-jdbc.properties index 4a78b2ed..a36dad31 100644 --- a/resources/experiments/sink-jdbc.properties +++ b/resources/experiments/sink-jdbc.properties @@ -25,7 +25,7 @@ value.converter=io.confluent.connect.protobuf.ProtobufConverter value.converter.schema.registry.url=http://localhost:8081 # The topics to consume from - required for sink connectors like this one -topics=postgres-topic +topics=postgres_topic # Configuration specific to the JDBC sink connector. # We want to connect to a Postgres database stored in the file test.db and auto-create tables. @@ -34,6 +34,7 @@ connection.url=jdbc:postgresql://127.0.0.1:5432/opendc connection.user=matt connection.password=admin auto.create=true +auto.evolve=true # Define when identifiers should be quoted in DDL and DML statements. # The default is 'always' to maintain backward compatibility with prior versions. @@ -43,4 +44,4 @@ auto.create=true # Here are some values that enable JSON formatted files to be ingested by Postgresql insert.mode=insert - +table.name.format=postgres_topic \ No newline at end of file diff --git a/resources/topologies/surf_small_solution.json b/resources/topologies/surf_small_solution.json deleted file mode 100644 index 8c3d8ce3..00000000 --- a/resources/topologies/surf_small_solution.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": { - "coreCount": 16, - "coreSpeed": 2100 - }, - "memory": { - "memorySize": 128000000 - }, - "count": 100 - } - ], - "powerSource": { - "carbonTracePath": "resources/carbon_traces/NL_2021-2024.parquet" - } - } - ] -} \ No newline at end of file -- cgit v1.2.3