[mb-commits] r13744 - in search_server/trunk/index/src: main/java/org/musicbrainz/search/index test/java/org/musicbrainz/search/index
[email protected] Mon, 28 Apr 2014 12:27:12 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1WekeO-0002rk-Fh@wiley> |
Author: ijabz
Date: 2014-04-28 12:27:12 +0000 (Mon, 28 Apr 2014)
New Revision: 13744
Added:
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/SeriesIndex.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/SeriesIndexField.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/SeriesIndexTest.java
Modified:
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
Log:
SEARCH-357:Added basic indexing of series
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2014-04-28 11:04:49 UTC (rev 13743)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2014-04-28 12:27:12 UTC (rev 13744)
@@ -125,6 +125,7 @@
new AnnotationIndex(mainDbConn),
new UrlIndex(mainDbConn),
new InstrumentIndex(mainDbConn),
+ new SeriesIndex(mainDbConn),
new TagIndex(mainDbConn),
new CDStubIndex(mainDbConn), //Note different db
};
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java 2014-04-28 11:04:49 UTC (rev 13743)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java 2014-04-28 12:27:12 UTC (rev 13744)
@@ -68,8 +68,8 @@
public String getFreeDBDump() { return freeDBDump; }
// Selection of indexes to build
- @Option(name="--indexes", usage="A comma-separated list of indexes to build (annotation,area,artist,instrument,label,place,releasegroup,release,recording,work,tag,url,cdstub,freedb)")
- private String indexes = "annotation,area,artist,instrument,label,place,release,recording,releasegroup,work,tag,url,cdstub,freedb";
+ @Option(name="--indexes", usage="A comma-separated list of indexes to build (annotation,area,artist,instrument,label,place,releasegroup,release,recording,series,work,tag,url,cdstub,freedb)")
+ private String indexes = "annotation,area,artist,instrument,label,place,release,recording,releasegroup,series,work,tag,url,cdstub,freedb";
public ArrayList<String> selectedIndexes() { return new ArrayList<String>(Arrays.asList(indexes.split(","))); }
public boolean buildIndex(String indexName) { return selectedIndexes().contains(indexName); }
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java 2014-04-28 11:04:49 UTC (rev 13743)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java 2014-04-28 12:27:12 UTC (rev 13744)
@@ -226,6 +226,14 @@
stmt.addBatch("DROP TABLE instrument_alias_type");
stmt.addBatch("DROP TABLE instrument_alias");
+ stmt.addBatch("DROP TABLE series_type");
+ stmt.addBatch("DROP TABLE series");
+ stmt.addBatch("DROP TABLE series_alias_type");
+ stmt.addBatch("DROP TABLE series_alias");
+ stmt.addBatch("DROP TABLE series_ordering_type");
+ stmt.addBatch("DROP TABLE series_deletion");
+
+
stmt.addBatch("DROP TABLE replication_control");
stmt.addBatch("DROP TABLE dbmirror_pending");
stmt.addBatch("DROP TABLE dbmirror_pendingdata");
@@ -256,6 +264,7 @@
setupPlaceTables(stmt);
setupUrlTables(stmt);
setupInstrumentTables(stmt);
+ setupSeriesTables(stmt);
setupReplicationTables(stmt);
insertReferenceData(stmt);
@@ -1081,6 +1090,81 @@
}
+ protected void setupSeriesTables(Statement stmt) throws Exception {
+
+ stmt.addBatch("CREATE TABLE series" +
+ "(\n" +
+ " id SERIAL,\n" +
+ " gid UUID ,\n" +
+ " name VARCHAR,\n" +
+ " comment VARCHAR(255) ,\n" +
+ " type INTEGER,\n" +
+ " ordering_attribute INTEGER,\n" +
+ " ordering_type INTEGER,\n" +
+ " edits_pending INTEGER,\n" +
+ " last_updated TIMESTAMP\n" +
+ ")");
+
+ stmt.addBatch("CREATE TABLE series_type" +
+ "(\n" +
+ " id SERIAL,\n" +
+ " name VARCHAR(255) ,\n" +
+ " entity_type VARCHAR(50),\n" +
+ " parent INTEGER,\n" +
+ " child_order INTEGER,\n" +
+ " description TEXT\n" +
+ ")");
+
+
+ stmt.addBatch("CREATE TABLE series_ordering_type" +
+ "(\n" +
+ " id SERIAL,\n" +
+ " name VARCHAR(255),\n" +
+ " parent INTEGER,\n" +
+ " child_order INTEGER,\n" +
+ " description TEXT\n" +
+ ")");
+
+ stmt.addBatch("CREATE TABLE series_deletion\n" +
+ "(\n" +
+ " gid UUID,\n" +
+ " last_known_name VARCHAR,\n" +
+ " last_known_comment TEXT,\n" +
+ " deleted_at timestamp \n" +
+ ")");
+
+
+ stmt.addBatch("CREATE TABLE series_alias_type\n" +
+ "(\n" +
+ " id SERIAL, \n" +
+ " name TEXT ,\n" +
+ " parent INTEGER,\n" +
+ " child_order INTEGER,\n" +
+ " description TEXT\n" +
+ ")");
+
+ stmt.addBatch("CREATE TABLE series_alias\n" +
+ "(\n" +
+ " id SERIAL,\n" +
+ " series INTEGER,\n" +
+ " name VARCHAR,\n" +
+ " locale TEXT,\n" +
+ " edits_pending INTEGER,\n" +
+ " last_updated TIMESTAMP,\n" +
+ " type INTEGER,\n" +
+ " sort_name VARCHAR ,\n" +
+ " begin_date_year SMALLINT,\n" +
+ " begin_date_month SMALLINT,\n" +
+ " begin_date_day SMALLINT,\n" +
+ " end_date_year SMALLINT,\n" +
+ " end_date_month SMALLINT,\n" +
+ " end_date_day SMALLINT,\n" +
+ " primary_for_locale BOOLEAN DEFAULT FALSE,\n" +
+ " ended BOOLEAN \n" +
+ ")");
+
+ }
+
protected void setupInstrumentTables(Statement stmt) throws Exception {
stmt.addBatch("CREATE TABLE instrument_type (\n" +
" id SERIAL, -- PK\n" +