[mb-commits] r13708 - in search_server/trunk: index/src/main/java/org/musicbrainz/search/index index/src/test/java/org/musicbrainz/search/index servlet/src/test/java/org/musicbrainz/search/servlet
[email protected] Thu, 26 Sep 2013 15:27:09 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1VPDTB-00060l-2B@wiley> |
Author: ijabz
Date: 2013-09-26 15:27:04 +0000 (Thu, 26 Sep 2013)
New Revision: 13708
Modified:
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/CommonTables.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
Log:
SEARCH-320:Remove Puid Support
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/CommonTables.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/CommonTables.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/CommonTables.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -94,40 +94,6 @@
clock.reset();
}
- /**
- * Create table mapping a release to all that puids that tracks within the release contain, then create index
- * for the table..
- *
- * @throws SQLException
- */
- private void createReleasePuidTableUsingDb() throws SQLException
- {
- System.out.println("tmp_release_puid:Started at:" + Utils.formatCurrentTimeForOutput());
- StopWatch clock = new StopWatch();
- clock.start();
- getDbConnection().createStatement().execute(
- "CREATE TEMPORARY TABLE tmp_release_puid AS " +
- " SELECT m.release, rp.recording, p.puid " +
- " FROM medium m " +
- " INNER JOIN track t ON t.medium = m.id " +
- " INNER JOIN recording_puid rp ON rp.recording = t.recording " +
- " INNER JOIN puid p ON rp.puid = p.id");
- clock.stop();
- System.out.println("tmp_release_puid:Finished:"+ Utils.formatClock(clock));
- clock.reset();
-
- clock.start();
- getDbConnection().createStatement().execute(
- "CREATE INDEX tmp_release_puid_idx_release ON tmp_release_puid (release) ");
- getDbConnection().createStatement().execute(
- "CREATE INDEX tmp_release_puid_idx_recording ON tmp_release_puid (recording) ");
-
- clock.stop();
- System.out.println("tmp_release_puid:Created Indexes:"+ Utils.formatClock(clock));
- clock.reset();
- }
-
-
private void createReleaseTableUsingDb() throws SQLException {
System.out.println("tmp_release :Started at:" + Utils.formatCurrentTimeForOutput());
StopWatch clock = new StopWatch();
@@ -242,11 +208,6 @@
(indexesToBeBuilt.contains(RecordingIndex.INDEX_NAME))
)
{
- if(!isUpdater)
- {
- createReleasePuidTableUsingDb();
- }
-
createReleaseTableUsingDb();
createReleaseEventsTableUsingDb();
}
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -45,7 +45,6 @@
private StopWatch trackClock = new StopWatch();
private StopWatch isrcClock = new StopWatch();
- private StopWatch puidClock = new StopWatch();
private StopWatch artistClock = new StopWatch();
private StopWatch trackArtistClock = new StopWatch();
private StopWatch releaseClock = new StopWatch();
@@ -60,7 +59,6 @@
super(dbConnection);
trackClock.start();
isrcClock.start();
- puidClock.start();
artistClock.start();
trackArtistClock.start();
releaseClock.start();
@@ -69,7 +67,6 @@
storeClock.start();
trackClock.suspend();
isrcClock.suspend();
- puidClock.suspend();
artistClock.suspend();
releaseClock.suspend();
recordingClock.suspend();
@@ -120,23 +117,12 @@
public void init(IndexWriter indexWriter, boolean isUpdater) throws SQLException {
if (!isUpdater) {
- addPreparedStatement("PUIDS",
- "SELECT DISTINCT recording as recordingId, puid " +
- " FROM tmp_release_puid " +
- " WHERE recording between ? AND ?");
-
addPreparedStatement("TRACKS",
"SELECT id, gid, track_name, length as duration, recording, track_position, track_number, track_count, " +
" release_id, medium_position, format " +
" FROM tmp_track " +
" WHERE recording between ? AND ?");
} else {
- addPreparedStatement("PUIDS",
- "SELECT recording as recordingId, puid.puid " +
- " FROM recording_puid " +
- " INNER JOIN puid ON recording_puid.puid = puid.id " +
- " AND recording between ? AND ?");
-
addPreparedStatement("TRACKS",
"SELECT t.id, t.gid, t.name as track_name, t.length as duration, t.recording, t.position as track_position, t.number as track_number, m.track_count, " +
" m.release as release_id, m.position as medium_position,mf.name as format " +
@@ -226,7 +212,6 @@
System.out.println(this.getName() + ":Track Queries " + Utils.formatClock(trackClock));
System.out.println(this.getName() + ":Artists Queries " + Utils.formatClock(artistClock));
System.out.println(this.getName() + ":Track Artists Queries " + Utils.formatClock(trackArtistClock));
- System.out.println(this.getName() + ":Puids Queries " + Utils.formatClock(puidClock));
System.out.println(this.getName() + ":Releases Queries " + Utils.formatClock(releaseClock));
System.out.println(this.getName() + ":Recording Queries " + Utils.formatClock(recordingClock));
System.out.println(this.getName() + ":Build Index " + Utils.formatClock(buildClock));
@@ -235,42 +220,6 @@
}
/**
- * Get puids for the recordings
- *
- * @param min min recording id
- * @param max max recording id
- * @return A map of matches
- * @throws SQLException
- * @throws IOException
- */
- private Map<Integer, List<String>> loadPUIDs(int min, int max) throws SQLException, IOException {
-
- //PUID
- puidClock.resume();
- Map<Integer, List<String>> puidWrapper = new HashMap<Integer, List<String>>();
- PreparedStatement st = getPreparedStatement("PUIDS");
- st.setInt(1, min);
- st.setInt(2, max);
- ResultSet rs = st.executeQuery();
- while (rs.next()) {
- int recordingId = rs.getInt("recordingId");
- List<String> list;
- if (!puidWrapper.containsKey(recordingId)) {
- list = new LinkedList<String>();
- puidWrapper.put(recordingId, list);
- } else {
- list = puidWrapper.get(recordingId);
- }
- String puid = new String(rs.getString("puid"));
- list.add(puid);
- }
- rs.close();
- puidClock.suspend();
- return puidWrapper;
- }
-
-
- /**
* Get tag information
*
* @param min min recording id
@@ -639,7 +588,6 @@
public void indexData(IndexWriter indexWriter, int min, int max) throws SQLException, IOException {
Map<Integer, List<Tag>> tags = loadTags(min, max);
- Map<Integer, List<String>> puids = loadPUIDs(min, max);
Map<Integer, List<String>> isrcs = loadISRCs(min, max);
Map<Integer, ArtistCreditWrapper> artistCredits = loadArtists(min, max);
Map<Integer, ArtistCreditWrapper> trackArtistCredits = loadTrackArtists(min, max);
@@ -653,14 +601,13 @@
ResultSet rs = st.executeQuery();
recordingClock.suspend();
while (rs.next()) {
- indexWriter.addDocument(documentFromResultSet(rs, puids, tags, isrcs, artistCredits, trackArtistCredits, tracks, releases));
+ indexWriter.addDocument(documentFromResultSet(rs, tags, isrcs, artistCredits, trackArtistCredits, tracks, releases));
}
rs.close();
}
public Document documentFromResultSet(ResultSet rs,
- Map<Integer, List<String>> puids,
Map<Integer, List<Tag>> tags,
Map<Integer, List<String>> isrcs,
Map<Integer, ArtistCreditWrapper> artistCredits,
@@ -704,18 +651,6 @@
recording.setDisambiguation(comment);
}
- if (puids.containsKey(id)) {
- PuidList puidList = of.createPuidList();
- // Add each puid for recording
- for (String nextPuid : puids.get(id)) {
- doc.addField(RecordingIndexField.PUID, nextPuid);
- Puid puid = of.createPuid();
- puid.setId(nextPuid);
- puidList.getPuid().add(puid);
- }
- recording.setPuidList(puidList);
- }
-
if (isrcs.containsKey(id)) {
IsrcList isrcList = of.createIsrcList();
for (String nextIsrc : isrcs.get(id)) {
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -28,6 +28,7 @@
NUM_TRACKS_RELEASE ("tracksrelease", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
POSITION ("position", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
NUMBER ("number", MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS),
+ //TODO This does nothing but cannot remove yet for backwards compatability
PUID ("puid", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
QUANTIZED_DURATION ("qdur", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
RECORDING_ID ("rid", MusicBrainzFieldTypes.TEXT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -106,21 +106,6 @@
@Override
public void init(IndexWriter indexWriter, boolean isUpdater) throws SQLException {
- if(!isUpdater) {
- addPreparedStatement("PUIDS",
- "SELECT release, puid " +
- "FROM tmp_release_puid " +
- "WHERE release BETWEEN ? AND ? ");
- }
- else {
- addPreparedStatement("PUIDS",
- "SELECT m.release, p.puid " +
- "FROM medium m " +
- " INNER JOIN track t ON (t.medium=m.id AND m.release BETWEEN ? AND ?) " +
- " INNER JOIN recording_puid rp ON rp.recording = t.recording " +
- " INNER JOIN puid p ON rp.puid=p.id");
- }
-
addPreparedStatement("LABELINFOS",
"SELECT rl.release as releaseId, l.gid as labelId, l.name as labelName, catalog_number " +
" FROM release_label rl " +
@@ -330,31 +315,6 @@
rs.close();
mediumClock.suspend();
-
- //Puids
- Map<Integer, List<String>> puidWrapper = new HashMap<Integer, List<String>>();
- puidClock.resume();
- st = getPreparedStatement("PUIDS");
- st.setInt(1, min);
- st.setInt(2, max);
- rs = st.executeQuery();
- while (rs.next()) {
- int releaseId = rs.getInt("release");
- List<String> list;
- if (!puidWrapper.containsKey(releaseId)) {
- list = new LinkedList<String>();
- puidWrapper.put(releaseId, list);
- } else {
- list = puidWrapper.get(releaseId);
- }
- String puid = new String(rs.getString("puid"));
- list.add(puid);
- }
- rs.close();
- puidClock.suspend();
-
-
-
//Artist Credits
artistClock.resume();
st = getPreparedStatement("ARTISTCREDITS");
@@ -384,18 +344,17 @@
rs = st.executeQuery();
releaseClock.suspend();
while (rs.next()) {
- indexWriter.addDocument(documentFromResultSet(rs, secondaryTypes, tags, releaseEvents, labelInfo, mediums, puidWrapper, artistCredits));
+ indexWriter.addDocument(documentFromResultSet(rs, secondaryTypes, tags, releaseEvents, labelInfo, mediums, artistCredits));
}
rs.close();
}
public Document documentFromResultSet(ResultSet rs,
Map<Integer, List<String>> secondaryTypes,
- Map<Integer,List<Tag>> tags,
- Map<Integer,List<ReleaseEvent>> releaseEvents,
- Map<Integer,List<List<String>>> labelInfo,
- Map<Integer,List<List<String>>> mediums,
- Map<Integer, List<String>> puids,
+ Map<Integer, List<Tag>> tags,
+ Map<Integer, List<ReleaseEvent>> releaseEvents,
+ Map<Integer, List<List<String>>> labelInfo,
+ Map<Integer, List<List<String>>> mediums,
Map<Integer, ArtistCreditWrapper> artistCredits) throws SQLException {
buildClock.resume();
@@ -582,13 +541,6 @@
doc.addNumericField(ReleaseIndexField.NUM_MEDIUMS, 0);
}
- if (puids.containsKey(id)) {
- for (String puid : puids.get(id)) {
- doc.addField(ReleaseIndexField.PUID, puid);
- }
- }
-
-
ArtistCreditWrapper ac = artistCredits.get(id);
if(ac!=null) {
ArtistCreditHelper.buildIndexFieldsOnlyFromArtistCredit
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -32,6 +32,7 @@
NUM_TRACKS ("tracks", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
NUM_TRACKS_MEDIUM ("tracksmedium", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
PRIMARY_TYPE ("primarytype", MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS, new CaseInsensitiveKeywordAnalyzer()),
+ //TODO This does nothing but cannot remove yet for backwards compatability
PUID ("puid", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
RELEASE ("release", MusicBrainzFieldTypes.TEXT_STORED_ANALYZED, new TitleAnalyzer()),
RELEASE_ACCENT ("releaseaccent", MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzKeepAccentsAnalyzer()),
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -631,46 +631,6 @@
* @throws Exception exception
*/
@Test
- public void testPuid() throws Exception {
-
- addTrackOne();
- RAMDirectory ramDir = new RAMDirectory();
- createIndex(ramDir);
-
- IndexReader ir = DirectoryReader.open(ramDir);
- assertEquals(2, ir.numDocs());
- {
- checkTerm(ir, RecordingIndexField.PUID, "efd2ace2-b3b9-305f-8a53-9803595c0e38");
- }
- ir.close();
- }
-
- /**
- * Test gives puid
- *
- * @throws Exception exception
- */
- @Test
- public void testPuidWithoutTemporaryTables() throws Exception {
-
- addTrackOne();
- RAMDirectory ramDir = new RAMDirectory();
- createIndex(ramDir, false);
-
- IndexReader ir = DirectoryReader.open(ramDir);
- assertEquals(2, ir.numDocs());
- {
- checkTerm(ir, RecordingIndexField.PUID, "efd2ace2-b3b9-305f-8a53-9803595c0e38");
- }
- ir.close();
- }
-
- /**
- * Test gives puid
- *
- * @throws Exception exception
- */
- @Test
public void testComment() throws Exception {
addTrackOne();
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -754,45 +754,9 @@
ir.close();
}
- /**
- * Tets Puid Indexed (not stored)
- * @throws Exception
- */
- @Test
- public void testIndexPuid() throws Exception {
- addReleaseOne();
- RAMDirectory ramDir = new RAMDirectory();
- createIndex(ramDir);
- IndexReader ir = DirectoryReader.open(ramDir);
- Fields fields = MultiFields.getFields(ir);
- Terms terms = fields.terms(ReleaseIndexField.PUID.getName());
- TermsEnum termsEnum = terms.iterator(null);
- termsEnum.next();
- assertEquals("efd2ace2-b3b9-305f-8a53-9803595c0e38", termsEnum.term().utf8ToString());
- }
-
/**
- * Tets Puid Indexed (not stored)
- * @throws Exception
- */
- @Test
- public void testIndexPuidWithoutTemporaryTables() throws Exception {
-
- addReleaseOne();
- RAMDirectory ramDir = new RAMDirectory();
- createIndex(ramDir, false);
-
- IndexReader ir = DirectoryReader.open(ramDir);
- Fields fields = MultiFields.getFields(ir);
- Terms terms = fields.terms(ReleaseIndexField.PUID.getName());
- TermsEnum termsEnum = terms.iterator(null);
- termsEnum.next();
- assertEquals("efd2ace2-b3b9-305f-8a53-9803595c0e38", termsEnum.term().utf8ToString());
- }
-
- /**
* @throws Exception exception
*/
@Test
Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -82,13 +82,6 @@
release.setId("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386");
release.setTitle("Our Glorious 5 Year Plan");
- doc.addField(RecordingIndexField.PUID, "1d9e8ed6-3893-4d3b-aa7d-72e79609e386");
- PuidList puidList = of.createPuidList();
- Puid puid = of.createPuid();
- puid.setId("1d9e8ed6-3893-4d3b-aa7d-72e79609e386");
- puidList.getPuid().add(puid);
- recording.setPuidList(puidList);
-
doc.addField(RecordingIndexField.ARTIST_ID, "4302e264-1cf0-4d1f-aca7-2a6f89e34b36");
doc.addField(RecordingIndexField.ARTIST, "Farming Incident");
doc.addField(RecordingIndexField.ARTIST_NAME, "Farming Incident");
@@ -467,13 +460,6 @@
}
@Test
- public void testFindRecordingByPuid() throws Exception {
- Results res = ss.search("puid:1d9e8ed6-3893-4d3b-aa7d-72e79609e386", 0, 10);
- assertEquals(1, res.getTotalHits());
- assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", getRecordingId(res.results.get(0).getDoc()));
- }
-
- @Test
public void testFindRecordingByTrackId() throws Exception {
Results res = ss.search("tid:2d9e8ed6-3893-4d3b-aa7d-72e79609e386", 0, 10);
assertEquals(1, res.getTotalHits());
@@ -549,7 +535,6 @@
assertTrue(output.contains("<artist-credit><name-credit><artist id=\"89ad4ac3-39f7-470e-963a-56509c546377\"><name>Various Artists</name></artist></name-credit></artist-credit>"));
assertTrue(output.contains("indie</name>"));
assertTrue(output.contains("<track id=\"c3b8dbc9-c1ff-4743-9015-8d762819134e\"><number>A4</number><title>Gravitational Lens</title><length>233000</length><artist-credit><name-credit><artist id=\"2302e264-1cf0-4d1f-aca7-2a6f89e34b36\"><name>Pig Incident</name><sort-name>Incident, Pig</sort-name></artist></name-credit></artist-credit></track>"));
- assertTrue(output.contains("<puid-list><puid id=\"1d9e8ed6-3893-4d3b-aa7d-72e79609e386\"/></puid-list>"));
assertTrue(output.contains("<area id=\"1fa8aa07-c688-1f7c-734b-4d82e528b09b\">"));
assertTrue(output.contains("<name>United Kingdom</name>"));
assertTrue(output.contains("<sort-name>Kingdom of United</sort-name>"));
@@ -587,7 +572,6 @@
assertTrue(output.contains("\"primary-type\":\"Album\""));
assertTrue(output.contains("{\"secondary-type\":[\"Compilation\"]}}"));
assertTrue(output.contains("\"tag\":[{\"count\":101,\"name\":\"indie\"}"));
- assertTrue(output.contains("\"puid-list\":{\"puid\":[{\"id\":\"1d9e8ed6-3893-4d3b-aa7d-72e79609e386\"}]}"));
assertTrue(output.contains("\"artist-credit\":{\"name-credit\":[{\"artist\":{\"id\":\"89ad4ac3-39f7-470e-963a-56509c546377\",\"name\":\"Various Artists\"}"));
assertTrue(output.contains("\"release-event-list\":{\"release-event\":[{\"date\":\"1970-01-01\""));
assertTrue(output.contains("\"id\":\"1fa8aa07-c688-1f7c-734b-4d82e528b09b\","));
@@ -621,7 +605,6 @@
assertTrue(output.contains("\"primary-type\":\"Album\""));
assertTrue(output.contains("\"secondary-types\":[\"Compilation\"]}"));
assertTrue(output.contains("\"tags\":[{\"count\":101,\"name\":\"indie\"}"));
- assertTrue(output.contains("puids\":[{\"id\":\"1d9e8ed6-3893-4d3b-aa7d-72e79609e386\"}"));
assertTrue(output.contains("\"artist-credit\":[{\"artist\":{\"id\":\"89ad4ac3-39f7-470e-963a-56509c546377\",\"name\":\"Various Artists\"}}"));
assertTrue(output.contains("\"count\":1"));
assertTrue(output.contains("\"offset\":0,"));
Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2013-09-26 14:45:34 UTC (rev 13707)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2013-09-26 15:27:04 UTC (rev 13708)
@@ -112,11 +112,7 @@
tagList.getTag().add(tag);
release.setTagList(tagList);
- doc.addField(ReleaseIndexField.PUID, "668f3a22-03e8-e3cd-55e4-2e9a0906419a");
- doc.addField(ReleaseIndexField.PUID, "1fa8aa07-c688-1f7c-734b-4d82e528b09a");
-
MediumList mediumList = of.createMediumList();
-
//Medium 1
{
doc.addNumericField(ReleaseIndexField.NUM_TRACKS_MEDIUM, 10);
@@ -693,12 +689,6 @@
assertEquals(2, res.getTotalHits());
}
- @Test
- public void testFindReleaseByPuid() throws Exception {
- Results res = ss.search("puid:668f3a22-03e8-e3cd-55e4-2e9a0906419a", 0, 10);
- assertEquals(1, res.getTotalHits());
- }
-
/**
* Tests get same results as
* http://musicbrainz.org/ws/1/release/?type=xml&query=%22Our%20Glorious%205%20Year%20Plan%22