From 12f49bdb518ab9cb4dbbd09e0f260bd54e343b6f Mon Sep 17 00:00:00 2001
From: Dnomd343 <dnomd343@163.com>
Date: Tue, 21 Jul 2020 14:21:43 +0800
Subject: [PATCH] update release.sh

---
 build/load.sql   | 12 ++++--------
 build/release.sh | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/build/load.sql b/build/load.sql
index 91d3bc5..c7db53a 100644
--- a/build/load.sql
+++ b/build/load.sql
@@ -30,19 +30,17 @@ CREATE TABLE farthest_temp (
 	code CHAR(9) NOT NULL,
 	farthest_step SMALLINT unsigned NOT NULL,
 	farthest_num SMALLINT unsigned NOT NULL,
-	farthest_case MEDIUMTEXT,
 	PRIMARY KEY (code)
-) DEFAULT CHARSET = utf8;
+);
 
 -- 创建solution_temp表：
 CREATE TABLE solution_temp (
 	code CHAR(9) NOT NULL,
 	min_solution_step SMALLINT NOT NULL,
 	min_solution_num SMALLINT unsigned NOT NULL,
-	min_solution_case MEDIUMTEXT,
 	solution_num SMALLINT unsigned NOT NULL,
 	PRIMARY KEY (code)
-) DEFAULT CHARSET = utf8;
+);
 
 -- 创建farthest表：
 CREATE TABLE farthest (
@@ -50,7 +48,7 @@ CREATE TABLE farthest (
 	farthest_step SMALLINT unsigned NOT NULL,
 	farthest_num SMALLINT unsigned NOT NULL,
 	PRIMARY KEY (id)
-) auto_increment = 1 DEFAULT CHARSET = utf8;
+) auto_increment = 1;
 
 -- 创建solution表：
 CREATE TABLE solution (
@@ -59,7 +57,7 @@ CREATE TABLE solution (
 	min_solution_num SMALLINT unsigned NOT NULL,
 	solution_num SMALLINT unsigned NOT NULL,
 	PRIMARY KEY (id)
-) auto_increment = 1 DEFAULT CHARSET = utf8;
+) auto_increment = 1;
 
 -- 载入main.csv的数据
 SELECT 'Loading main.csv...' AS ' ';
@@ -77,7 +75,6 @@ LINES TERMINATED BY '\n';
 
 -- 整理数据到farthest表中
 SELECT 'Collating farthest table...' AS ' ';
-ALTER TABLE farthest_temp DROP COLUMN farthest_case;
 INSERT INTO farthest (farthest_step, farthest_num)
 SELECT farthest_step, farthest_num FROM farthest_temp;
 DROP TABLE farthest_temp;
@@ -91,7 +88,6 @@ LINES TERMINATED BY '\n';
 
 -- 整理数据到solution表中
 SELECT 'Collating solution table...' AS ' ';
-ALTER TABLE solution_temp DROP COLUMN min_solution_case;
 INSERT INTO solution (min_solution_step, min_solution_num, solution_num)
 SELECT min_solution_step, min_solution_num, solution_num FROM solution_temp;
 DROP TABLE solution_temp;
diff --git a/build/release.sh b/build/release.sh
index e5af025..d23851e 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -1,7 +1,17 @@
 #!/bin/sh
 
 echo "merge farthest..."
-cat ./farthest/* > ./release/farthest.csv
+cat ./farthest/* > ./farthest_raw.csv
 
 echo "merge solution..."
-cat ./solution/* > ./release/solution.csv
\ No newline at end of file
+cat ./solution/* > ./solution_raw.csv
+
+g++ -O3 ../tools/streamline_csv.cpp -o ./streamline_csv
+./streamline_csv
+
+mv ./farthest.csv ./release/farthest.csv
+mv ./solution.csv ./release/solution.csv
+
+rm ./farthest_raw.csv
+rm ./solution_raw.csv
+rm ./streamline_csv
\ No newline at end of file