From a094d07925f33bf30a028ee77bd8c28417ed3301 Mon Sep 17 00:00:00 2001 From: Marko Topolnik Date: Fri, 5 Jan 2024 22:39:28 +0100 Subject: [PATCH] Move attribution into weather_stations.csv --- data/weather_stations.csv | 1 + src/main/java/dev/morling/onebrc/CreateMeasurements3.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/weather_stations.csv b/data/weather_stations.csv index b5cbdcd..4822109 100644 --- a/data/weather_stations.csv +++ b/data/weather_stations.csv @@ -1,3 +1,4 @@ +# Adapted from https://simplemaps.com/data/world-cities Tokyo;35.6897 Jakarta;-6.1750 Delhi;28.6100 diff --git a/src/main/java/dev/morling/onebrc/CreateMeasurements3.java b/src/main/java/dev/morling/onebrc/CreateMeasurements3.java index 65589da..23b1b74 100644 --- a/src/main/java/dev/morling/onebrc/CreateMeasurements3.java +++ b/src/main/java/dev/morling/onebrc/CreateMeasurements3.java @@ -69,8 +69,8 @@ public class CreateMeasurements3 { // Use a public list of city names and concatenate them all into a long string, // which we'll use as a "source of city name randomness" var bigName = new StringBuilder(1 << 20); - // Source: https://simplemaps.com/data/world-cities try (var rows = new BufferedReader(new FileReader("data/weather_stations.csv"));) { + rows.readLine(); // Skip the attribution line while (true) { var row = rows.readLine(); if (row == null) { @@ -84,6 +84,7 @@ public class CreateMeasurements3 { var minLen = Integer.MAX_VALUE; var maxLen = Integer.MIN_VALUE; try (var rows = new BufferedReader(new FileReader("data/weather_stations.csv"))) { + rows.readLine(); // Skip the attribution line final var nameSource = new StringReader(bigName.toString()); final var buf = new char[MAX_NAME_LEN]; final var rnd = ThreadLocalRandom.current();