GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits: 194c7838 by Claus Köll at 2018-01-09T12:43:50+00:00 Debug Log git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820653 13f79535-47bb-0310-9956-ffa450edef68 - - - - - bd2d06ef by Claus Köll at 2018-01-09T12:44:24+00:00 Debug Log git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820654 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 63137d1f by Claus Köll at 2018-01-09T12:46:48+00:00 Debug Log git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820656 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 407bd5c7 by Claus Köll at 2018-01-09T12:47:47+00:00 Debug Log on LinkageError git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820657 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 4 changed files: - jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java - jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java - jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java - jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SortedLuceneQueryHits.java Changes: ===================================== jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java ===================================== --- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java +++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java @@ -240,6 +240,7 @@ public abstract class AbstractJournal implements Journal { * @throws JournalException if an error occurs */ protected void doSync(long startRevision) throws JournalException { + log.debug("Synchronize contents from journal. StartRevision: " + startRevision); RecordIterator iterator = getRecords(startRevision); long stopRevision = Long.MIN_VALUE; @@ -289,6 +290,7 @@ public abstract class AbstractJournal implements Journal { * @throws JournalException if an error occurs */ public void lockAndSync() throws JournalException { + log.debug("Lock the journal revision and synchronize to the latest change."); if (internalVersionManager != null) { VersioningLock.ReadLock lock = internalVersionManager.acquireReadLock(); @@ -314,6 +316,7 @@ public abstract class AbstractJournal implements Journal { try { // lock + log.debug("internalLockAndSync.doLock()"); doLock(); try { // and sync @@ -321,6 +324,7 @@ public abstract class AbstractJournal implements Journal { succeeded = true; } finally { if (!succeeded) { + log.debug("internalLockAndSync.doUnlock(false)"); doUnlock(false); } } @@ -338,7 +342,9 @@ public abstract class AbstractJournal implements Journal { * successful */ public void unlock(boolean successful) { + log.debug("Unlock the journal revision. Successful: " + successful); try { + log.debug("unlock.doUnlock("+successful+")"); doUnlock(successful); } finally { //Should not happen that a RuntimeException will be thrown in subCode, but it's safer ===================================== jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java ===================================== --- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java +++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java @@ -495,6 +495,7 @@ public class DatabaseJournal extends AbstractJournal implements DatabaseAware { } finally { DbUtility.close(rs); if (!succeeded) { + log.debug("doLock.doUnlock(false)"); doUnlock(false); } } @@ -516,7 +517,7 @@ public class DatabaseJournal extends AbstractJournal implements DatabaseAware { private void endBatch(boolean successful) { if (--lockLevel == 0) { try { - conHelper.endBatch(successful);; + conHelper.endBatch(successful); } catch (SQLException e) { log.error("failed to end batch", e); } ===================================== jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java ===================================== --- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java +++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java @@ -187,6 +187,14 @@ public class LazyTextExtractorField extends AbstractField { // not being present. This is equivalent to disabling // selected media types in configuration, so we can simply // ignore these errors. + if (!writeOutContentHandler.isWriteLimitReached(e)) { + log.debug("Failed to extract text from a binary property." + + " This is a fairly common case, and nothing to" + + " worry about. The stack trace is included to" + + " help improve the text extraction feature.", e); + setExtractedText("TextExtractionError"); + return; + } } catch (Throwable t) { // Capture and report any other full text extraction problems. // The special STOP exception is used for normal termination. ===================================== jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SortedLuceneQueryHits.java ===================================== --- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SortedLuceneQueryHits.java +++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SortedLuceneQueryHits.java @@ -152,12 +152,15 @@ public final class SortedLuceneQueryHits extends AbstractQueryHits { //-------------------------------< internal >------------------------------- private void getHits() throws IOException { + long time = System.nanoTime(); TopFieldCollector collector = TopFieldCollector.create(sort, numHits, false, true, false, false); searcher.search(query, collector); size = collector.getTotalHits(); offset += scoreDocs.length; scoreDocs = collector.topDocs(offset, numHits).scoreDocs; - log.debug("getHits() {}/{}", scoreDocs.length, numHits); + time = System.nanoTime() - time; + final long timeMs = time / 1000000; + log.debug("getHits() in {} ms. {}/{}/{}", new Object[] {timeMs, scoreDocs.length, numHits, size}); // double hits for next round numHits *= 2; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/compare/56b161f9b14fde06e4fb6055d64681f20baff586...407bd5c7803e8518531559d3bf6fa480197e6341 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/compare/56b161f9b14fde06e4fb6055d64681f20baff586...407bd5c7803e8518531559d3bf6fa480197e6341 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
