Fix regex escaping and rerun

AdamGS · AdamGS · commit eddf527276c8 · 2025-04-19T16:21:07.000+01:00
diff --git a/datafusion/queries.sql b/datafusion/queries.sql
@@ -26,7 +26,7 @@ SELECT "SearchPhrase" FROM hits WHERE "SearchPhrase" <> '' ORDER BY "EventTime"
 SELECT "SearchPhrase" FROM hits WHERE "SearchPhrase" <> '' ORDER BY "SearchPhrase" LIMIT 10;
 SELECT "SearchPhrase" FROM hits WHERE "SearchPhrase" <> '' ORDER BY "EventTime", "SearchPhrase" LIMIT 10;
 SELECT "CounterID", AVG(length("URL")) AS l, COUNT(*) AS c FROM hits WHERE "URL" <> '' GROUP BY "CounterID" HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;
-SELECT REGEXP_REPLACE("Referer", '^https?://(?:www\\.)?([^/]+)/.*$', '\\1') AS k, AVG(length("Referer")) AS l, COUNT(*) AS c, MIN("Referer") FROM hits WHERE "Referer" <> '' GROUP BY k HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;
+SELECT REGEXP_REPLACE("Referer", '^https?://(?:www\.)?([^/]+)/.*$', '\1') AS k, AVG(length("Referer")) AS l, COUNT(*) AS c, MIN("Referer") FROM hits WHERE "Referer" <> '' GROUP BY k HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;
 SELECT SUM("ResolutionWidth"), SUM("ResolutionWidth" + 1), SUM("ResolutionWidth" + 2), SUM("ResolutionWidth" + 3), SUM("ResolutionWidth" + 4), SUM("ResolutionWidth" + 5), SUM("ResolutionWidth" + 6), SUM("ResolutionWidth" + 7), SUM("ResolutionWidth" + 8), SUM("ResolutionWidth" + 9), SUM("ResolutionWidth" + 10), SUM("ResolutionWidth" + 11), SUM("ResolutionWidth" + 12), SUM("ResolutionWidth" + 13), SUM("ResolutionWidth" + 14), SUM("ResolutionWidth" + 15), SUM("ResolutionWidth" + 16), SUM("ResolutionWidth" + 17), SUM("ResolutionWidth" + 18), SUM("ResolutionWidth" + 19), SUM("ResolutionWidth" + 20), SUM("ResolutionWidth" + 21), SUM("ResolutionWidth" + 22), SUM("ResolutionWidth" + 23), SUM("ResolutionWidth" + 24), SUM("ResolutionWidth" + 25), SUM("ResolutionWidth" + 26), SUM("ResolutionWidth" + 27), SUM("ResolutionWidth" + 28), SUM("ResolutionWidth" + 29), SUM("ResolutionWidth" + 30), SUM("ResolutionWidth" + 31), SUM("ResolutionWidth" + 32), SUM("ResolutionWidth" + 33), SUM("ResolutionWidth" + 34), SUM("ResolutionWidth" + 35), SUM("ResolutionWidth" + 36), SUM("ResolutionWidth" + 37), SUM("ResolutionWidth" + 38), SUM("ResolutionWidth" + 39), SUM("ResolutionWidth" + 40), SUM("ResolutionWidth" + 41), SUM("ResolutionWidth" + 42), SUM("ResolutionWidth" + 43), SUM("ResolutionWidth" + 44), SUM("ResolutionWidth" + 45), SUM("ResolutionWidth" + 46), SUM("ResolutionWidth" + 47), SUM("ResolutionWidth" + 48), SUM("ResolutionWidth" + 49), SUM("ResolutionWidth" + 50), SUM("ResolutionWidth" + 51), SUM("ResolutionWidth" + 52), SUM("ResolutionWidth" + 53), SUM("ResolutionWidth" + 54), SUM("ResolutionWidth" + 55), SUM("ResolutionWidth" + 56), SUM("ResolutionWidth" + 57), SUM("ResolutionWidth" + 58), SUM("ResolutionWidth" + 59), SUM("ResolutionWidth" + 60), SUM("ResolutionWidth" + 61), SUM("ResolutionWidth" + 62), SUM("ResolutionWidth" + 63), SUM("ResolutionWidth" + 64), SUM("ResolutionWidth" + 65), SUM("ResolutionWidth" + 66), SUM("ResolutionWidth" + 67), SUM("ResolutionWidth" + 68), SUM("ResolutionWidth" + 69), SUM("ResolutionWidth" + 70), SUM("ResolutionWidth" + 71), SUM("ResolutionWidth" + 72), SUM("ResolutionWidth" + 73), SUM("ResolutionWidth" + 74), SUM("ResolutionWidth" + 75), SUM("ResolutionWidth" + 76), SUM("ResolutionWidth" + 77), SUM("ResolutionWidth" + 78), SUM("ResolutionWidth" + 79), SUM("ResolutionWidth" + 80), SUM("ResolutionWidth" + 81), SUM("ResolutionWidth" + 82), SUM("ResolutionWidth" + 83), SUM("ResolutionWidth" + 84), SUM("ResolutionWidth" + 85), SUM("ResolutionWidth" + 86), SUM("ResolutionWidth" + 87), SUM("ResolutionWidth" + 88), SUM("ResolutionWidth" + 89) FROM hits;
 SELECT "SearchEngineID", "ClientIP", COUNT(*) AS c, SUM("IsRefresh"), AVG("ResolutionWidth") FROM hits WHERE "SearchPhrase" <> '' GROUP BY "SearchEngineID", "ClientIP" ORDER BY c DESC LIMIT 10;
 SELECT "WatchID", "ClientIP", COUNT(*) AS c, SUM("IsRefresh"), AVG("ResolutionWidth") FROM hits WHERE "SearchPhrase" <> '' GROUP BY "WatchID", "ClientIP" ORDER BY c DESC LIMIT 10;
diff --git a/datafusion/results/partitioned.json b/datafusion/results/partitioned.json
@@ -8,48 +8,48 @@
     "load_time": 0,
     "data_size": 14737666736,
     "result": [
-[0.062, 0.021, 0.021],
-[0.120, 0.037, 0.036],
-[0.212, 0.084, 0.084],
-[0.388, 0.089, 0.082],
-[1.037, 0.875, 0.879],
-[1.002, 0.863, 0.864],
-[0.082, 0.033, 0.032],
-[0.117, 0.039, 0.038],
-[1.120, 0.950, 0.961],
-[1.319, 1.056, 1.058],
-[0.509, 0.267, 0.261],
-[0.612, 0.290, 0.289],
-[1.105, 0.919, 0.922],
-[2.552, 1.418, 1.415],
-[1.100, 0.859, 0.877],
-[1.155, 1.016, 1.018],
-[2.650, 1.852, 1.855],
-[2.553, 1.718, 1.738],
-[5.359, 3.667, 3.813],
-[0.263, 0.084, 0.085],
-[9.892, 1.113, 1.136],
-[11.274, 1.352, 1.349],
-[21.836, 2.640, 2.605],
-[55.533, 9.673, 9.740],
-[2.690, 0.462, 0.462],
-[0.812, 0.381, 0.368],
-[2.697, 0.539, 0.533],
-[9.607, 1.547, 1.526],
-[10.160, 9.670, 9.757],
-[0.530, 0.432, 0.430],
-[2.388, 0.810, 0.836],
-[5.962, 0.921, 0.946],
-[4.766, 3.673, 3.741],
-[10.197, 3.789, 3.811],
-[10.207, 3.851, 3.917],
-[1.392, 1.259, 1.251],
-[0.331, 0.148, 0.150],
-[0.229, 0.085, 0.085],
-[0.323, 0.146, 0.162],
-[0.479, 0.222, 0.233],
-[0.215, 0.079, 0.079],
-[0.201, 0.073, 0.074],
-[0.182, 0.065, 0.064]
+[0.059, 0.020, 0.020],
+[0.117, 0.035, 0.035],
+[0.209, 0.086, 0.079],
+[0.385, 0.088, 0.096],
+[1.009, 0.867, 0.877],
+[1.017, 0.852, 0.856],
+[0.088, 0.031, 0.032],
+[0.129, 0.038, 0.039],
+[1.113, 0.950, 0.953],
+[1.329, 1.036, 1.046],
+[0.504, 0.268, 0.259],
+[0.610, 0.284, 0.284],
+[1.095, 0.895, 0.900],
+[2.546, 1.359, 1.371],
+[1.089, 0.869, 0.851],
+[1.117, 1.004, 0.990],
+[2.606, 1.808, 1.835],
+[2.547, 1.681, 1.683],
+[5.335, 3.695, 3.710],
+[0.252, 0.082, 0.080],
+[9.956, 1.101, 1.101],
+[11.266, 1.306, 1.279],
+[21.829, 2.602, 2.560],
+[55.527, 9.548, 9.435],
+[2.696, 0.458, 0.449],
+[0.808, 0.365, 0.355],
+[2.703, 0.534, 0.506],
+[9.639, 1.475, 1.485],
+[10.099, 9.803, 9.646],
+[0.530, 0.436, 0.443],
+[2.379, 0.813, 0.798],
+[5.949, 0.879, 0.886],
+[4.779, 3.684, 3.607],
+[10.204, 3.673, 3.732],
+[10.217, 3.722, 3.728],
+[1.340, 1.237, 1.231],
+[0.308, 0.145, 0.146],
+[0.196, 0.104, 0.086],
+[0.303, 0.152, 0.148],
+[0.455, 0.212, 0.231],
+[0.206, 0.096, 0.077],
+[0.194, 0.074, 0.073],
+[0.177, 0.065, 0.065]
 ]
 }
diff --git a/datafusion/results/single.json b/datafusion/results/single.json
@@ -8,48 +8,48 @@
     "load_time": 0,
     "data_size": 14779976446,
     "result": [
-[0.103, 0.067, 0.060],
-[0.137, 0.083, 0.074],
-[0.228, 0.116, 0.118],
-[0.341, 0.124, 0.122],
-[1.033, 0.907, 0.936],
-[1.097, 0.981, 0.982],
-[0.118, 0.086, 0.083],
-[0.150, 0.082, 0.081],
-[1.141, 1.053, 1.024],
-[1.312, 1.103, 1.145],
-[0.483, 0.297, 0.300],
-[0.577, 0.330, 0.323],
-[1.157, 1.007, 1.004],
-[2.772, 1.420, 1.393],
-[1.115, 0.959, 0.973],
-[1.177, 1.081, 1.070],
-[2.626, 1.971, 1.971],
-[2.513, 1.802, 1.812],
-[5.277, 3.894, 3.846],
-[0.260, 0.124, 0.122],
-[9.730, 1.190, 1.210],
-[11.254, 1.453, 1.484],
-[22.102, 3.639, 3.597],
-[55.988, 10.171, 10.220],
-[2.557, 0.589, 0.577],
-[0.811, 0.536, 0.518],
-[2.574, 0.652, 0.657],
-[9.604, 1.652, 1.635],
-[10.793, 10.454, 10.628],
-[0.572, 0.448, 0.480],
-[2.283, 0.933, 0.961],
-[5.690, 1.038, 1.046],
-[4.496, 3.738, 3.841],
-[10.294, 3.946, 3.940],
-[10.197, 3.949, 4.030],
-[1.416, 1.289, 1.272],
-[0.382, 0.195, 0.212],
-[0.274, 0.184, 0.168],
-[0.369, 0.200, 0.196],
-[0.533, 0.296, 0.285],
-[0.243, 0.111, 0.111],
-[0.216, 0.112, 0.127],
-[0.193, 0.103, 0.102]
+[0.106, 0.057, 0.057],
+[0.142, 0.072, 0.072],
+[0.212, 0.119, 0.115],
+[0.341, 0.132, 0.120],
+[0.993, 0.892, 0.899],
+[1.081, 0.961, 0.958],
+[0.125, 0.076, 0.078],
+[0.159, 0.092, 0.083],
+[1.134, 0.990, 0.999],
+[1.306, 1.108, 1.068],
+[0.480, 0.291, 0.298],
+[0.583, 0.314, 0.317],
+[1.170, 0.989, 0.969],
+[2.625, 1.568, 1.491],
+[1.108, 0.940, 0.941],
+[1.155, 1.050, 1.052],
+[2.631, 1.924, 1.944],
+[2.517, 1.772, 1.777],
+[5.173, 3.765, 3.733],
+[0.422, 0.115, 0.117],
+[9.540, 1.131, 1.131],
+[11.292, 1.457, 1.445],
+[22.116, 3.578, 3.502],
+[55.971, 9.908, 9.810],
+[2.567, 0.584, 0.577],
+[0.805, 0.512, 0.533],
+[2.582, 0.646, 0.650],
+[9.643, 1.626, 1.602],
+[10.635, 10.439, 10.218],
+[0.547, 0.485, 0.479],
+[2.288, 0.927, 0.942],
+[5.684, 1.036, 1.000],
+[4.545, 3.741, 3.723],
+[10.211, 3.884, 3.853],
+[10.251, 3.871, 3.879],
+[1.405, 1.281, 1.282],
+[0.360, 0.198, 0.211],
+[0.280, 0.182, 0.169],
+[0.345, 0.199, 0.209],
+[0.508, 0.281, 0.296],
+[0.214, 0.110, 0.114],
+[0.206, 0.112, 0.110],
+[0.190, 0.103, 0.103]
 ]
 }
