Merge branch 'master' into concepts-docs

theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml

@@ -27,7 +27,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml

@@ -23,7 +23,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml

@@ -28,7 +28,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications
               value: "100"
           resources:

theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml

@@ -22,7 +22,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml

@@ -22,7 +22,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml

@@ -21,7 +21,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications
               value: "100"
             - name: WINDOW_SIZE_IN_SECONDS

theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml

@@ -23,7 +23,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications

theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml

@@ -29,4 +29,4 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"

theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml

@@ -27,7 +27,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml

@@ -23,7 +23,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml

@@ -28,7 +28,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications
               value: "100"
           resources:

theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml

@@ -22,7 +22,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml

@@ -22,7 +22,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS
               value: "100"
             - name: CHECKPOINTING

theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml

@@ -21,7 +21,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications
               value: "100"
             - name: WINDOW_SIZE

theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml

@@ -23,7 +23,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications

theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml

@@ -29,7 +29,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: NUM_SENSORS
               value: "4"
             - name: NUM_NESTED_GROUPS

theodolite/examples/operator/example-configmap.yaml

@@ -26,7 +26,7 @@ data:
                 - name: KAFKA_BOOTSTRAP_SERVERS
                   value: "theodolite-kafka-kafka-bootstrap:9092"
                 - name: SCHEMA_REGISTRY_URL
-                  value: "http://theodolite-cp-schema-registry:8081"
+                  value: "http://theodolite-kafka-schema-registry:8081"
                 - name: JAVA_OPTS
                   value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
                 - name: COMMIT_INTERVAL_MS # Set as default for the applications
@@ -67,7 +67,7 @@ data:
                 - name: KAFKA_BOOTSTRAP_SERVERS
                   value: "theodolite-kafka-kafka-bootstrap:9092"
                 - name: SCHEMA_REGISTRY_URL
-                  value: "http://theodolite-cp-schema-registry:8081"
+                  value: "http://theodolite-kafka-schema-registry:8081"
   uc1-load-generator-service.yaml: |
     apiVersion: v1
     kind: Service

theodolite/examples/resources/uc1-kstreams-deployment.yaml

@@ -23,7 +23,7 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
             - name: COMMIT_INTERVAL_MS # Set as default for the applications

theodolite/examples/resources/uc1-load-generator-deployment.yaml

@@ -29,4 +29,4 @@ spec:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
-              value: "http://theodolite-cp-schema-registry:8081"
+              value: "http://theodolite-kafka-schema-registry:8081"

theodolite/src/main/kotlin/rocks/theodolite/core/IOHandler.kt

@@ -64,20 +64,46 @@ class IOHandler {
      * Write to CSV file
      *
      * @param fileURL the URL of the file
-     * @param data  the data to write in the file, as list of list, each subList corresponds to a row in the CSV file
-     * @param columns columns of the CSV file
+     * @param data the data to write in the csv, as list of list,
+     *             each sublist corresponds to a row in the CSV file
+     * @param columns name of the columns
      */
     fun writeToCSVFile(fileURL: String, data: List<List<String>>, columns: List<String>) {
         val outputFile = File("$fileURL.csv")
         PrintWriter(outputFile).use { pw ->
-            pw.println(columns.joinToString(separator = ","))
-            data.forEach {
-                pw.println(it.joinToString(separator = ","))
+
+            val writeColumns = addQuotationMarks(columns)
+            pw.println(writeColumns.joinToString(separator = ","))
+
+            data.forEach{ row ->
+                val writeRow = addQuotationMarks(row)
+                pw.println(writeRow.joinToString(separator = ","))
             }
         }
         logger.info { "Wrote CSV file: $fileURL to ${outputFile.absolutePath}." }
     }
 
+    /**
+     * For a list of Strings:
+     *  - adds additional quotation mark to existing one
+     *  - adds quotation marks around entries that contain a comma
+     */
+    private fun addQuotationMarks(stringList: List<String> ): List<String> {
+        val stringMutableList = stringList.toMutableList()
+        stringMutableList.forEachIndexed { index, entry ->
+            // add additional quotation marks to escape them in csv
+            if (entry.contains("\"")){
+                stringMutableList[index] = stringMutableList[index].replace('"'+"", "\"" + '"')
+            }
+
+            // add quotation marks around entries that contain a comma
+            if (entry.contains(",")){
+                stringMutableList[index] = '"' + stringMutableList[index] + '"'
+            }
+        }
+        return stringMutableList
+    }
+
     /**
      * Write to text file
      *