Ordering data so benchmark v2 will be comparable to v1 (data is ordered and pull from map)

Author: mzitnik

performance/src/test/com/clickhouse/benchmark/clients/Components.java

@@ -108,9 +108,11 @@ public void SerializerOutputStreamV2(DataState dataState) {
         try {
             RowBinaryFormatWriter w = new RowBinaryFormatWriter(empty, dataState.dataSet.getSchema(), ClickHouseFormat.RowBinary);
             List<ClickHouseColumn> columns = dataState.dataSet.getSchema().getColumns();
-            for (Map<String, Object> row : dataState.dataSet.getRows()) {
-                for (ClickHouseColumn column : columns) {
-                    w.setValue(column.getColumnName(),row.get(column.getColumnName()));
+            for (List<Object> row : dataState.dataSet.getRowsOrdered()) {
+                int index = 0;
+                for (Object value : row) {
+                    w.setValue(columns.get(index).getColumnName(), value);
+                    index++;
                 }
                 w.commitRow();
             }

performance/src/test/com/clickhouse/benchmark/data/DataSet.java

@@ -47,6 +47,7 @@ default InputStream getInputStream(int rowId, ClickHouseFormat format) {
     List<Map<String, Object>> getRowsLimit(int numRows);
 
     List<ClickHouseRecord> getClickHouseRecordsLimit(int numRows);
+    List<List<Object>> getRowsOrdered();
 
     void setClickHouseRecords(List<ClickHouseRecord> records);
 

performance/src/test/com/clickhouse/benchmark/data/FileDataSet.java

@@ -31,6 +31,7 @@ public class FileDataSet implements DataSet{
     private List<byte[]> lines =null;
 
     private List<Map<String, Object>> data;
+    private List<List<Object>> dataOrdered;
 
     public FileDataSet(String filePath, int limit) {
         LOGGER.info("Reading file {}", filePath);
@@ -125,7 +126,10 @@ public List<Map<String, Object>> getRowsLimit(int numRows) {
     public List<ClickHouseRecord> getClickHouseRecordsLimit(int numRows) {
         return clickHouseRecords.subList(0, numRows);
     }
-
+    @Override
+    public List<List<Object>> getRowsOrdered() {
+        return dataOrdered;
+    }
     @Override
     public ClickHouseFormat getFormat() {
         return ClickHouseFormat.CSV;
@@ -142,17 +146,24 @@ public List<ClickHouseRecord> getClickHouseRecords() {
     public void setClickHouseRecords(List<ClickHouseRecord> records) {
         this.clickHouseRecords = records;
         List<ClickHouseColumn> columns = schema.getColumns();
+        dataOrdered = new ArrayList<>(records.size());
         data = new ArrayList<>(records.size());
         for (ClickHouseRecord record : records) {
             Iterator<ClickHouseValue> vIter = record.iterator();
             int i = 0;
             Map<String, Object> row = new HashMap<>();
+            List<Object> rowOrdered = new ArrayList<>(columns.size());
             while (vIter.hasNext()) {
                 ClickHouseValue v = vIter.next();
                 row.put(columns.get(i++).getColumnName(), v.asObject());
+
+                rowOrdered.add(v.asObject());
             }
             data.add(row);
+            dataOrdered.add(rowOrdered);
+
         }
+
     }
 
     private ClickHouseDataProcessor dataProcessor;

performance/src/test/com/clickhouse/benchmark/data/SimpleDataSet.java

@@ -155,6 +155,10 @@ public List<Map<String, Object>> getRowsLimit(int numRows) {
         return data.subList(0, numRows);
     }
     @Override
+    public List<List<Object>> getRowsOrdered() {
+        return null;
+    }
+    @Override
     public List<ClickHouseRecord> getClickHouseRecordsLimit(int numRows) {
         return clickHouseRecords.subList(0, numRows);
     }