Merge pull request #3053 from idodeclare/feature/redirect_1_result

Feature/redirect 1 result

Author: tarzanek

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/CtagsReader.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2018, 2020, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.analysis;
@@ -395,9 +395,9 @@ private CpatIndex bestIndexOfTag(int lineno, String whole, String str) {
 
         int woff = strictIndexOf(whole, str);
         if (woff < 0) {
-            /**
+            /*
              * When a splitter is available, search the entire line.
-             * (N.b. use 0-offset vs ctags's 1-offset.)
+             * (N.b. use 0-based indexing vs ctags's 1-based.)
              */
             String cut = trySplitterCut(lineno - 1, 1);
             if (cut == null || !cut.startsWith(whole)) {
@@ -512,9 +512,9 @@ private CpatIndex bestIndexOfArg(int lineno, String whole, String arg) {
             return new CpatIndex(lineno, s, e);
         }
 
-        /**
+        /*
          * When a splitter is available, search the next several lines.
-         * (N.b. use 0-offset vs ctags's 1-offset.)
+         * (N.b. use 0-based indexing vs ctags's 1-based.)
          */
         String cut = trySplitterCut(lineno - 1, MAX_CUT_LINES);
         if (cut == null || !cut.startsWith(whole)) {
@@ -640,22 +640,22 @@ private PatResult strictMatch(String whole, String substr, Pattern pat) {
     }
 
     /**
-     * Finds the line with the longest content from {@code midx}.
+     * Finds the line with the longest content from {@code cut}.
      * <p>
      * The {@link Definitions} tag model is based on a match within a line.
      * "signature" fields, however, can be condensed from multiple lines; and a
      * fuzzy match can therefore span multiple lines.
      */
     private CpatIndex bestLineOfMatch(int lineno, PatResult pr, String cut) {
-        // (N.b. use 0-offset vs ctags's 1-offset.)
-        int lpos = splitter.getPosition(lineno - 1);
-        int mpos = lpos + pr.start;
-        int moff = splitter.findLineOffset(mpos);
-        int zpos = lpos + pr.end - 1;
-        int zoff = splitter.findLineOffset(zpos);
+        // (N.b. use 0-based indexing vs ctags's 1-based.)
+        int lineOff = splitter.getOffset(lineno - 1);
+        int mOff = lineOff + pr.start;
+        int mIndex = splitter.findLineIndex(mOff);
+        int zOff = lineOff + pr.end - 1;
+        int zIndex = splitter.findLineIndex(zOff);
 
         int t = tabSize;
-        int resoff = moff;
+        int resIndex = mIndex;
         int contentLength = 0;
         /**
          * Initialize the following just to silence warnings but with values
@@ -664,31 +664,31 @@ private CpatIndex bestLineOfMatch(int lineno, PatResult pr, String cut) {
         String whole = "";
         int s = 0;
         int e = 1;
-        /**
-         * Iterate to determine the length of the portion of `midx' that
-         * is contained within each line.
+        /*
+         * Iterate to determine the length of the portion of cut that is
+         * contained within each line.
          */
-        for (int ioff = moff; ioff <= zoff; ++ioff) {
-            String iwhole = splitter.getLine(ioff);
-            int ioffpos = splitter.getPosition(ioff);
-            int iendpos = ioffpos + iwhole.length();
-            int i_s = pr.start + lpos < ioffpos ? ioffpos : pr.start + lpos;
-            int i_e = pr.end + lpos > iendpos ? iendpos : pr.end + lpos;
-            if (i_e - i_s > contentLength) {
-                contentLength = i_e - i_s;
-                resoff = ioff;
+        for (int lIndex = mIndex; lIndex <= zIndex; ++lIndex) {
+            String iwhole = splitter.getLine(lIndex);
+            int lOff = splitter.getOffset(lIndex);
+            int lOffZ = lOff + iwhole.length();
+            int offStart = Math.max(pr.start + lineOff, lOff);
+            int offEnd = Math.min(pr.end + lineOff, lOffZ);
+            if (offEnd - offStart > contentLength) {
+                contentLength = offEnd - offStart;
+                resIndex = lIndex;
                 whole = iwhole;
                 // (The following are not yet adjusted for tabs.)
-                s = i_s - ioffpos;
-                e = i_e - ioffpos;
+                s = offStart - lOff;
+                e = offEnd - lOff;
             }
         }
 
         if (s >= 0 && s < whole.length() && e >= 0 && e <= whole.length()) {
             s = ExpandTabsReader.translate(whole, s, t);
             e = ExpandTabsReader.translate(whole, e, t);
-            // (N.b. use ctags's 1-offset.)
-            return new CpatIndex(resoff + 1, s, e);
+            // (N.b. use ctags's 1-based indexing.)
+            return new CpatIndex(resIndex + 1, s, e);
         }
 
         /**

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/DefinitionsTokenStream.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.analysis.plain;
@@ -118,7 +118,7 @@ private void createTokens(Definitions defs, LineBreaker brk) {
 
             if (lineno >= 0 && lineno < brk.count() && tag.symbol != null &&
                     tag.text != null) {
-                int lineoff = brk.getPosition(lineno);
+                int lineoff = brk.getOffset(lineno);
                 if (tag.lineStart >= 0) {
                     PendingToken tok = new PendingToken(tag.symbol, lineoff +
                         tag.lineStart, lineoff + tag.lineEnd);

opengrok-indexer/src/main/java/org/opengrok/indexer/search/Results.java

@@ -151,8 +151,7 @@ private static Reader getXrefReader(
      * <li>{@link SearchHelper#historyContext} (ignored if {@code null})</li>
      * <li>{@link SearchHelper#sourceContext} (ignored if {@code null})</li>
      * <li>{@link SearchHelper#summarizer} (if sourceContext is not
-     * {@code null})</li> <li>{@link SearchHelper#compressed} (if sourceContext
-     * is not {@code null})</li> <li>{@link SearchHelper#sourceRoot} (if
+     * {@code null})</li> <li>{@link SearchHelper#sourceRoot} (if
      * sourceContext or historyContext is not {@code null})</li> </ul>
      *
      * @param out write destination
@@ -232,7 +231,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
                     AbstractAnalyzer.Genre genre = AbstractAnalyzer.Genre.get(
                             doc.get(QueryBuilder.T));
                     if (AbstractAnalyzer.Genre.XREFABLE == genre && sh.summarizer != null) {
-                        String xtags = getTags(xrefDataDir, rpath, sh.compressed);
+                        String xtags = getTags(xrefDataDir, rpath, env.isCompressXref());
                         // FIXME use Highlighter from lucene contrib here,
                         // instead of summarizer, we'd also get rid of
                         // apache lucene in whole source ...

opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/Context.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 Jens Elkner.
- * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.search.context;
 
@@ -56,15 +56,14 @@
  */
 public class Context {
 
+    static final int MAXFILEREAD = 1024 * 1024;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(Context.class);
 
     private final Query query;
     private final QueryBuilder qbuilder;
     private final LineMatcher[] m;
-    static final int MAXFILEREAD = 1024 * 1024;
-    private char[] buffer;
-    PlainLineTokenizer tokens;
-    String queryAsURI;
+    private final String queryAsURI;
 
     /**
      * Map whose keys tell which fields to look for in the source file, and
@@ -96,10 +95,9 @@ public Context(Query query, QueryBuilder qbuilder) {
         QueryMatchers qm = new QueryMatchers();
         m = qm.getMatchers(query, TOKEN_FIELDS);
         if (m != null) {
-            buildQueryAsURI(qbuilder.getQueries());
-            //System.err.println("Found Matchers = "+ m.length + " for " + query);
-            buffer = new char[MAXFILEREAD];
-            tokens = new PlainLineTokenizer((Reader) null);
+            queryAsURI = buildQueryAsURI(qbuilder.getQueries());
+        } else {
+            queryAsURI = "";
         }
     }
 
@@ -212,7 +210,7 @@ public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
 
         try {
             List<String> fieldList = qbuilder.getContextFields();
-            String[] fields = fieldList.toArray(new String[fieldList.size()]);
+            String[] fields = fieldList.toArray(new String[0]);
 
             String res = uhi.highlightFieldsUnion(fields, query, docId,
                 linelimit);
@@ -236,10 +234,9 @@ public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
      *
      * @param subqueries a map containing the query text for each field
      */
-    private void buildQueryAsURI(Map<String, String> subqueries) {
+    private String buildQueryAsURI(Map<String, String> subqueries) {
         if (subqueries.isEmpty()) {
-            queryAsURI = "";
-            return;
+            return "";
         }
         StringBuilder sb = new StringBuilder();
         for (Map.Entry<String, String> entry : subqueries.entrySet()) {
@@ -249,7 +246,7 @@ private void buildQueryAsURI(Map<String, String> subqueries) {
                 .append('&');
         }
         sb.setLength(sb.length() - 1);
-        queryAsURI = sb.toString();
+        return sb.toString();
     }
 
     private boolean alt = true;
@@ -298,7 +295,8 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
                             if (scopes != null) {
                                 Scope scp = scopes.getScope(tag.line);
                                 scope = scp.getName() + "()";
-                                scopeUrl = "<a href=\"" + urlPrefixE + pathE + "#" + Integer.toString(scp.getLineFrom()) + "\">" + scope + "</a>";
+                                scopeUrl = "<a href=\"" + urlPrefixE + pathE + "#" +
+                                        scp.getLineFrom() + "\">" + scope + "</a>";
                             }
 
                             /* desc[0] is matched symbol
@@ -367,16 +365,18 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
         if (in == null) {
             return anything;
         }
-        int charsRead = 0;
-        boolean truncated = false;
 
+        PlainLineTokenizer tokens = new PlainLineTokenizer(null);
+        boolean truncated = false;
         boolean lim = limit;
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         if (!env.isQuickContextScan()) {
             lim = false;
         }
 
         if (lim) {
+            char[] buffer = new char[MAXFILEREAD];
+            int charsRead;
             try {
                 charsRead = in.read(buffer);
                 if (charsRead == MAXFILEREAD) {

opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/ContextFormatter.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.search.context;
@@ -323,7 +323,7 @@ private void writeScope(int lineOffset, Appendable dest)
             throws IOException {
         Scopes.Scope scope = null;
         if (scopes != null) {
-            // N.b. use ctags 1-offset vs 0-offset.
+            // N.b. use ctags 1-based indexing vs 0-based.
             scope = scopes.getScope(lineOffset + 1);
         }
         if (scope != null && scope != scopes.getScope(-1)) {
@@ -340,7 +340,7 @@ private void writeScope(int lineOffset, Appendable dest)
     private void writeTag(int lineOffset, Appendable dest, List<String> marks)
             throws IOException {
         if (defs != null) {
-            // N.b. use ctags 1-offset vs 0-offset.
+            // N.b. use ctags 1-based indexing vs 0-based.
             List<Tag> linetags =  defs.getTags(lineOffset + 1);
             if (linetags != null) {
                 Tag pickedTag = findTagForMark(linetags, marks);

opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/PassageConverter.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.search.context;
@@ -75,11 +75,11 @@ public SortedMap<Integer, LineHighlight> convert(Passage[] passages,
                 continue;
             }
 
-            int m = splitter.findLineOffset(start);
+            int m = splitter.findLineIndex(start);
             if (m < 0) {
                 continue;
             }
-            int n = splitter.findLineOffset(end - 1);
+            int n = splitter.findLineIndex(end - 1);
             if (n < 0) {
                 continue;
             }
@@ -97,23 +97,23 @@ public SortedMap<Integer, LineHighlight> convert(Passage[] passages,
             // Create LineHighlight entries for passage matches.
             for (int i = 0; i < passage.getNumMatches(); ++i) {
                 int mstart = passage.getMatchStarts()[i];
-                int mm = splitter.findLineOffset(mstart);
+                int mm = splitter.findLineIndex(mstart);
                 int mend = passage.getMatchEnds()[i];
-                int nn = splitter.findLineOffset(mend - 1);
+                int nn = splitter.findLineIndex(mend - 1);
                 if (mstart < mend && mm >= m && mm <= n && nn >= m && nn <= n) {
                     if (mm == nn) {
-                        int lbeg = splitter.getPosition(mm);
+                        int lbeg = splitter.getOffset(mm);
                         int lstart = mstart - lbeg;
                         int lend = mend - lbeg;
                         LineHighlight lhigh = res.get(mm);
                         lhigh.addMarkup(PhraseHighlight.create(lstart, lend));
                     } else {
-                        int lbeg = splitter.getPosition(mm);
+                        int lbeg = splitter.getOffset(mm);
                         int loff = mstart - lbeg;
                         LineHighlight lhigh = res.get(mm);
                         lhigh.addMarkup(PhraseHighlight.createStarter(loff));
 
-                        lbeg = splitter.getPosition(nn);
+                        lbeg = splitter.getOffset(nn);
                         loff = mend - lbeg;
                         lhigh = res.get(nn);
                         lhigh.addMarkup(PhraseHighlight.createEnder(loff));