From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 19 Oct 2009 11:51:40 +0000 (-0400)
Subject: Added a unique index on the tiger_lines "tlid" column.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=456160ca20e132877327d2a0bf556449a8f84a3a;p=dead%2Fcensus-tools.git

Added a unique index on the tiger_lines "tlid" column.
Created a quick sed script to filter "BEGIN;" and "END;" from the shp2pgsql output.
Updated the makefile to import the tiger_lines data one row at a time, outside of a transaction.
---

diff --git a/bin/filter-transactions b/bin/filter-transactions
new file mode 100755
index 0000000..b0c14c3
--- /dev/null
+++ b/bin/filter-transactions
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Remove all occurrences of the strings "BEGIN;" and "END;" from the
+# input stream. As of Postgis v1.4.0, shp2pgsql inserts them once for
+# every 250 "INSERT" statements.
+
+sed s/"BEGIN;"//g |
+    sed s/"END;"//g
diff --git a/makefile b/makefile
index b7ef3c2..bfccc23 100644
--- a/makefile
+++ b/makefile
@@ -129,13 +129,15 @@ db: data newdb tiger_blocks_table tiger_lines_table sf1_blocks_table
 # and leave -I out.
 	for state in data/census2000/*; do                  	    \
 		for shapefile in $$state/lines/*.shp; do       	    \
+			echo "Importing $$shapefile.";		    \
 			$(PG_BINDIR)/shp2pgsql                      \
 				-a                                  \
 			        -s $(TIGER_SRID)                    \
-				-D		                    \
 		          	$$shapefile                         \
 		          	tiger_lines                         \
-				| psql -U $(DB_USER) -d $(DB_NAME); \
+				| bin/filter-transactions           \
+				| psql -U $(DB_USER) -d $(DB_NAME)  \
+				> /dev/null;			    \
 		done;						    \
 	done;
 
@@ -203,3 +205,8 @@ tiger_lines_table:
 		tiger_lines					       \
 		| psql -U postgres -d $(DB_NAME)                       \
                 > /dev/null
+
+# Add a unique index on the "tlid" column.
+	psql -U postgres \
+             -d census   \
+             -f sql/create_tlid_unique_index.sql
diff --git a/sql/create_tlid_unique_index.sql b/sql/create_tlid_unique_index.sql
new file mode 100644
index 0000000..3a0d385
--- /dev/null
+++ b/sql/create_tlid_unique_index.sql
@@ -0,0 +1,8 @@
+/*
+  The TIGER/Line ID (tlid) for each line is supposed to be
+  unique. If it isn't, problems, so we enforce it in the
+  database.
+*/
+
+CREATE UNIQUE INDEX idx_tiger_lines_tlid_unique
+       ON tiger_lines (tlid);