From 4065b45f3d10c3b730fe99355a625e5a8cfeeee7 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 24 Mar 2010 20:46:31 +0000
Subject: [PATCH] provide indexes for the new faceting code
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15963 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
.../Application/Storage/Driver/Pg/QueryParser.pm | 2 +-
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/030.schema.metabib.sql | 9 +++++++++
.../Pg/upgrade/0209.schema.metabib.indexing-facets.sql | 17 +++++++++++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0209.schema.metabib.indexing-facets.sql
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
index 60195a4364..da900d9e3a 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
@@ -622,7 +622,7 @@ sub flatten {
my $table = $node->table;
my $talias = $node->table_alias;
- $from .= "\n\tJOIN (\n\t\tSELECT * /* facet */\n\t\t FROM $table\n\t\t WHERE value IN (" . join(",", map { $self->QueryParser->quote_value($_) } @{$node->values}) . ")".
+ $from .= "\n\tJOIN (\n\t\tSELECT * /* facet */\n\t\t FROM $table\n\t\t WHERE SUBSTRING(value,1,1024) IN (" . join(",", map { $self->QueryParser->quote_value($_) } @{$node->values}) . ")".
"\n\t\t\tAND field IN (SELECT id FROM config.metabib_field WHERE field_class = ". $self->QueryParser->quote_value($node->classname) ." AND facet_field";
if (@{$node->fields} > 0) {
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 8d51d8a90b..da31d66232 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -59,7 +59,7 @@ CREATE TABLE config.upgrade_log (
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0208'); -- berick
+INSERT INTO config.upgrade_log (version) VALUES ('0209'); -- miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
index 9f5d713628..4e2c1bbb88 100644
--- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql
+++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
@@ -41,6 +41,8 @@ CREATE TRIGGER metabib_title_field_entry_fti_trigger
FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('title');
CREATE INDEX metabib_title_field_entry_index_vector_idx ON metabib.title_field_entry USING GIST (index_vector);
+CREATE INDEX metabib_title_field_entry_value_idx ON metabib.title_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_title_field_entry_source_idx ON metabib.title_field_entry (source);
CREATE TABLE metabib.author_field_entry (
@@ -55,6 +57,8 @@ CREATE TRIGGER metabib_author_field_entry_fti_trigger
FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('author');
CREATE INDEX metabib_author_field_entry_index_vector_idx ON metabib.author_field_entry USING GIST (index_vector);
+CREATE INDEX metabib_author_field_entry_value_idx ON metabib.author_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_author_field_entry_source_idx ON metabib.author_field_entry (source);
CREATE TABLE metabib.subject_field_entry (
@@ -69,6 +73,7 @@ CREATE TRIGGER metabib_subject_field_entry_fti_trigger
FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('subject');
CREATE INDEX metabib_subject_field_entry_index_vector_idx ON metabib.subject_field_entry USING GIST (index_vector);
+CREATE INDEX metabib_subject_field_entry_value_idx ON metabib.subject_field_entry (SUBSTRING(value,1,1024));
CREATE INDEX metabib_subject_field_entry_source_idx ON metabib.subject_field_entry (source);
@@ -84,6 +89,8 @@ CREATE TRIGGER metabib_keyword_field_entry_fti_trigger
FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('keyword');
CREATE INDEX metabib_keyword_field_entry_index_vector_idx ON metabib.keyword_field_entry USING GIST (index_vector);
+CREATE INDEX metabib_keyword_field_entry_value_idx ON metabib.keyword_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_keyword_field_entry_source_idx ON metabib.keyword_field_entry (source);
CREATE TABLE metabib.series_field_entry (
@@ -98,6 +105,8 @@ CREATE TRIGGER metabib_series_field_entry_fti_trigger
FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('series');
CREATE INDEX metabib_series_field_entry_index_vector_idx ON metabib.series_field_entry USING GIST (index_vector);
+CREATE INDEX metabib_series_field_entry_value_idx ON metabib.series_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_series_field_entry_source_idx ON metabib.series_field_entry (source);
CREATE TABLE metabib.rec_descriptor (
diff --git a/Open-ILS/src/sql/Pg/upgrade/0209.schema.metabib.indexing-facets.sql b/Open-ILS/src/sql/Pg/upgrade/0209.schema.metabib.indexing-facets.sql
new file mode 100644
index 0000000000..1deb2d564f
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0209.schema.metabib.indexing-facets.sql
@@ -0,0 +1,17 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0208');
+
+CREATE INDEX metabib_title_field_entry_value_idx ON metabib.title_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_author_field_entry_value_idx ON metabib.author_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_subject_field_entry_value_idx ON metabib.subject_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_keyword_field_entry_value_idx ON metabib.keyword_field_entry (SUBSTRING(value,1,1024));
+CREATE INDEX metabib_series_field_entry_value_idx ON metabib.series_field_entry (SUBSTRING(value,1,1024));
+
+CREATE INDEX metabib_author_field_entry_source_idx ON metabib.author_field_entry (source);
+CREATE INDEX metabib_keyword_field_entry_source_idx ON metabib.keyword_field_entry (source);
+CREATE INDEX metabib_title_field_entry_source_idx ON metabib.title_field_entry (source);
+CREATE INDEX metabib_series_field_entry_source_idx ON metabib.series_field_entry (source);
+
+COMMIT;
+
--
2.11.0