diff --git a/code/eval/queries/cypher/memgraph/memgraph_queries.py b/code/eval/queries/cypher/memgraph/memgraph_queries.py
index 0cd61a931e0941576e243abefa4fc9688ff0bc51..c88d8d0fb6cb03ad39fe6081bdad8e65884ed4b0 100644
--- a/code/eval/queries/cypher/memgraph/memgraph_queries.py
+++ b/code/eval/queries/cypher/memgraph/memgraph_queries.py
@@ -137,4 +137,4 @@ if __name__ == "__main__":
logging.info("Script interrupted by user")
finally:
driver.close()
- logging.info("Database connection closed.")
+ logging.info("Database connection closed.")
\ No newline at end of file
diff --git a/code/infrastructure/docker-compose_memgraph.yml b/code/infrastructure/docker-compose_memgraph.yml
index 611e5a9ccc2e1d55ed37fe3753717744eff5999d..f0a3f9f9e6fca02258ae9d0a83cca9679f4dcc64 100644
--- a/code/infrastructure/docker-compose_memgraph.yml
+++ b/code/infrastructure/docker-compose_memgraph.yml
@@ -24,6 +24,7 @@ services:
- ./monitoring/prometheus/config:/etc/prometheus
- ./monitoring/prometheus/data:/prometheus
+
# Container Advisor - Docker Compose Metriken zu scrapen
cadvisor:
image: gcr.io/cadvisor/cadvisor:v0.47.0
diff --git a/code/infrastructure/eval/query/memgraph/queries/queries copy.txt b/code/infrastructure/eval/query/memgraph/queries/queries copy.txt
index 7748ae73849161f954ee82b7594f2deab5b5a4d0..b712a70eee084944b1337e0c0e23969cdfbb22a6 100644
--- a/code/infrastructure/eval/query/memgraph/queries/queries copy.txt
+++ b/code/infrastructure/eval/query/memgraph/queries/queries copy.txt
@@ -7,7 +7,6 @@ path|MATCH path = ((a {uuid: 'A6A7C956-0132-5506-96D1-2A7DE97CB400'})-[*ALLSHORT
Above Original queries
-
Own Query
2-hop|MATCH (a)-[*1]-(b) WHERE a.uuid='9FF334BB-9072-D756-B290-556656D73728' WITH COLLECT(DISTINCT b) as nodes_at_hop_1 RETURN nodes_at_hop_1 AS nodes UNION MATCH (a)-[*2]-(b) WHERE a.uuid='9FF334BB-9072-D756-B290-556656D73728' WITH COLLECT(DISTINCT b) as nodes_at_hop_2 RETURN nodes_at_hop_2 AS nodes;
diff --git a/code/infrastructure/eval/query/memgraph/queries/queries.txt b/code/infrastructure/eval/query/memgraph/queries/queries.txt
index e6ce4402c2dbbac240c0f56c3a0665db58abd3c7..ee3041c90b696a98d54ed0e1e114ed9877282202 100644
--- a/code/infrastructure/eval/query/memgraph/queries/queries.txt
+++ b/code/infrastructure/eval/query/memgraph/queries/queries.txt
@@ -1 +1 @@
-count|MATCH (n) return count(n);
\ No newline at end of file
+count|MATCH (n) return count(n);
diff --git a/code/infrastructure/streaming/broker/mosquitto.conf b/code/infrastructure/streaming/broker/mosquitto.conf
index 3da38063beb41ce75ed32e03c999e7d61969cbd2..d25773ab0171b8c1a51c283f6ad6bfb1cd0288cc 100644
--- a/code/infrastructure/streaming/broker/mosquitto.conf
+++ b/code/infrastructure/streaming/broker/mosquitto.conf
@@ -2,4 +2,4 @@
log_dest file /mosquitto/log/mosquitto.log
allow_anonymous true
listener 1883 0.0.0.0
-max_queued_messages 40000000
\ No newline at end of file
+max_queued_messages 40000000
\ No newline at end of file
diff --git a/code/infrastructure/streaming/clients/pub/pub_cdm.py b/code/infrastructure/streaming/clients/pub/pub_cdm.py
index 7879c60e69e1ad2ad4ee9ba715b7f2cb60df960e..2b6bac42cf35b4bdc5e098680473c332ffee540f 100755
--- a/code/infrastructure/streaming/clients/pub/pub_cdm.py
+++ b/code/infrastructure/streaming/clients/pub/pub_cdm.py
@@ -74,7 +74,6 @@ def process_window_lines(window_data, window_nr):
values = [json.loads(line) for line in window_data]
send_message(window_data)
-
def send_message(messages):
msg_count = 1
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Merge/sub_mem_whole_batch_kind_oriented_using_Merge_no_label.py b/code/infrastructure/streaming/clients/sub/memgraph/Merge/sub_mem_whole_batch_kind_oriented_using_Merge_no_label.py
index 704b190af0747faa2058f7c03c12b52480d056ba..8a4abdd1a84ca3ca2cb904a41d81ddd4b054bd21 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Merge/sub_mem_whole_batch_kind_oriented_using_Merge_no_label.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Merge/sub_mem_whole_batch_kind_oriented_using_Merge_no_label.py
@@ -59,9 +59,6 @@ def flatten_obj(key, val, target):
target[key] = val
-
-
-
# BatchDataHolder: holds Data for the whole Batch and manages following variables
# knownNodes: holds a dictionary with all known nodes, uses uuid as key and identifier as value
# create_Nodes: holds a list of Cypher string parts to create the new nodes
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Procedure_for_module_in_memgraph.py b/code/infrastructure/streaming/clients/sub/memgraph/Procedure_for_module_in_memgraph.py
index 16dedb4231a1dcdfa13b7462be561d6f232c97e2..3299814309570cf731b368d7134654e6decb52f9 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Procedure_for_module_in_memgraph.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Procedure_for_module_in_memgraph.py
@@ -11,7 +11,6 @@
import mgp
-
@mgp.read_proc
def bfs_non_only_host_neighbors(context: mgp.ProcCtx, start_node: mgp.Vertex, max_depth: int) -> mgp.Record(result=mgp.List[mgp.Vertex]):
queue = [(start_node, 0)] # Queue of tuples (node, current_depth)
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/SOH_sub_mem.py b/code/infrastructure/streaming/clients/sub/memgraph/SOH_sub_mem.py
index b431ff023972aec9749a85586a0989d9ab1db212..8edb219a153791faf6925de9988190b680c19243 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/SOH_sub_mem.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/SOH_sub_mem.py
@@ -50,7 +50,6 @@ def parse_json_to_cypher(input) :
,hasLocalPrincipal=""
)
-
# create relationships
try:
if nodeType == 'Subject':
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind.py b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind.py
index 94f818a6135d667a359a2792160cf0683fe21800..3598f0b861288d88e2f23fe3b89ff88b338dc09e 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind.py
@@ -109,9 +109,6 @@ class BatchDataHolder:
-
-
-
def parse_json_to_cypher(data_list) :
'''
Create Cypher Query and parameters from publisher message
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_edges_in_Thread.py b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_edges_in_Thread.py
index a0dce6208d7b278ba164301b1ed8484fe23fb8b5..448fe14f0c44dc18a6028d07706e64aa2e298447 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_edges_in_Thread.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_edges_in_Thread.py
@@ -58,7 +58,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
# BatchDataHolder: holds Data for a whole batch
# nodes: dictionary with the labels as keys to a list of value_flat, the properties of nodes,
# each element (dictionary) of the list represents one node
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_two_label.py b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_two_label.py
index 4691b275004ee5301182d6b056321ce7112c3975..efc74dfd6a1f54bc29c5faa82ec1bf60e78b3548 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_two_label.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_two_label.py
@@ -58,7 +58,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
# BatchDataHolder: holds Data for a whole batch
# nodes: dictionary with the labels as keys to a list of value_flat, the properties of nodes,
# each element (dictionary) of the list represents one node
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_node.py b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_node.py
index cb9e1818dbaca0d7a41eed6b5f457e05bc4998d2..bf8a44a3d2e4cefe9346403d80c7dd92bbf95662 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_node.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_node.py
@@ -57,7 +57,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
# BatchDataHolder: holds Data for a whole batch
# nodes: list of dictionaries, each represents one node, with the label (type) and properties of this node
# edges: dictionary with labels of edges as key and as value another dictionary
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_nodes.py b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_nodes.py
index 069fbaaee0030a16f27b78fb3bfedf18ea31f1ae..c81496f598a4d39a669507324c3b2763de961fa7 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_nodes.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/Unwind/sub_mem_whole_batch_using_unwind_using_procedure_nodes.py
@@ -56,7 +56,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
# BatchDataHolder: holds Data for a whole batch
# nodes: dictionary with the labels as keys to a list of value_flat, the properties of nodes,
# each element (dictionary) of the list represents one node
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented.py b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented.py
index a8aeaee2f609fb36684af286389231be9ecd8c98..b912df163f368fabd08a3346a31287411cbff7af 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented.py
@@ -56,10 +56,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
-
-
-
# BatchDataHolder: holds Data for the whole Batch and manages following variables
# knownNodes: holds a dictionary with all known nodes, uses uuid as key and identifier as value
# create_Nodes: holds a list of Cypher string parts to create the new nodes
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Label.py b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Label.py
index 7ad872ed5a85bd885be2d67d5725667555da4e01..5a385370143671b247059a8fa8d2198cea6b179e 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Label.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Label.py
@@ -57,10 +57,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
-
-
-
# BatchDataHolder: holds Data for the whole Batch and manages following variables
# knownNodes: holds a dictionary with all known nodes, uses uuid as key and identifier as value
# create_Nodes: holds a list of Cypher string parts to create the new nodes
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Params.py b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Params.py
index 0103195514ab1dfc745f79e8b622d2654f723f55..c661d486e7bb5644a829a2c7fd2fc8ef8877122a 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Params.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_no_Params.py
@@ -55,10 +55,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
-
-
-
# BatchDataHolder: holds Data for the whole Batch and manages following variables
# knownNodes: holds a dictionary with all known nodes, uses uuid as key and identifier as value
# create_Nodes: holds a list of Cypher string parts to create the new nodes
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label.py b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label.py
index 1cc8e56c05d85a3edae33993a040d9edf1efaa70..c778c642491ca1381244b1bb298b676b9ea094f8 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label.py
@@ -57,10 +57,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
-
-
-
# BatchDataHolder: holds Data for the whole Batch and manages following variables
# knownNodes: holds a dictionary with all known nodes, uses uuid as key and identifier as value
# create_Nodes: holds a list of Cypher string parts to create the new nodes
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label_internal_collision_handle.py b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label_internal_collision_handle.py
index f6eba1dbb6215887747cd9e4cd51b9d66df70520..0f13583b5807544a904377306e782e6cd85b9cfe 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label_internal_collision_handle.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/kind_oriented/sub_mem_whole_batch_kind_oriented_two_label_internal_collision_handle.py
@@ -61,9 +61,6 @@ def flatten_obj(key, val, target):
target[key] = val
-
-
-
# BatchDataHolder: holds Data for the whole Batch and manages following variables
# knownNodes: holds a dictionary with all known nodes, uses uuid as key and identifier as value
# create_Nodes: holds a list of Cypher string parts to create the new nodes
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/sub_mem_original_sub_used_as_a_basis.py b/code/infrastructure/streaming/clients/sub/memgraph/sub_mem_original_sub_used_as_a_basis.py
index e765c547ba883e49dc890bcdea36e14c901f463b..223c64f4c47ddbe64a27217d248a648892634ecd 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/sub_mem_original_sub_used_as_a_basis.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/sub_mem_original_sub_used_as_a_basis.py
@@ -37,7 +37,6 @@ def parse_json_to_cypher(input) : #receives a message with one node. changed to
value = input["datum"][jsonType]
# variables to handle multiple nodes
-
relations = dict(
runsOn=""
,isGeneratedBy=""
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented.py b/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented.py
index f8ab3eda8fb067b07a40fc1b11083c585283cfe3..10cc898aa1fde9348fa7ecaf661966823ccb1ad6 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented.py
@@ -57,7 +57,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
# subgraphNodeRelation: Holds Data for each separated Query, for each node creation
# lookup_nodes: Holds a list of nodes to match
# insert_relations: Holds the Cypher string parts to create the edges
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params.py b/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params.py
index 1066888b509d18e20d4684dbae8a5ad2cd127c57..0eab71a3ba16ced2e33a2ddf7bb8a7841c8425c0 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params.py
@@ -58,7 +58,6 @@ def flatten_obj(key, val, target):
else:
target[key] = val
-
class subgraphNodeRelation:
'''
Holds Data for each with WITH separated Query, for each node and its relations
diff --git a/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params_two_label.py b/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params_two_label.py
index 64d63189652239a9efee713365d793ecbb8a1143..60c269e98194d9602fec5f664bad92874334591c 100644
--- a/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params_two_label.py
+++ b/code/infrastructure/streaming/clients/sub/memgraph/subgraph_oriented/sub_mem_whole_batch_subgraph_oriented_using_Params_two_label.py
@@ -128,7 +128,6 @@ class subgraphNodeRelation:
else:
return True
-
# BatchDataHolder: holds Data for the whole Batch
# knownNodes: Holds a list with all known identifier as a dictonary to look up if the node is already known
# with_list_identifier: Holds a list of identifiers, used to append a WITH at batch_query with all identifiers