Bug fix: SQL result tab header marks:

  Fixed performance problem when the SQL editor contained SQLs that were longer than 8000Bug fix:  characters.
  For SQLs that are longer than 8000 characters marking of result tab headers is skipped.

Author: GWA

sql12/core/doc/changes.txt

@@ -99,6 +99,10 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+SQL result tab header marks:
+  Fixed performance problem when the SQL editor contained SQLs that were longer than 8000 characters.
+  For SQLs that are longer than 8000 characters marking of result tab headers is skipped.
+
 Improved the performance of SQL result tab header marking for large SQL editor content.
 
 SQL result tab header marks:

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/resulttabheader/ResultTabMatchingCurrentSqlHandler.java

@@ -1,5 +1,12 @@
 package net.sourceforge.squirrel_sql.client.session.mainpanel.resulttabheader;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.swing.JTabbedPane;
+import javax.swing.Timer;
+
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
 import net.sourceforge.squirrel_sql.client.session.editorpaint.TextAreaPaintListener;
@@ -8,17 +15,14 @@
 import net.sourceforge.squirrel_sql.client.session.sqlbounds.BoundsOfSqlHandler;
 import net.sourceforge.squirrel_sql.fw.sql.querytokenizer.IQueryTokenizer;
 import net.sourceforge.squirrel_sql.fw.sql.querytokenizer.QueryTokenizePurpose;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.swing.JTabbedPane;
-import javax.swing.Timer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 public class ResultTabMatchingCurrentSqlHandler
 {
+   private static final ILogger s_log = LoggerController.createLogger(ResultTabMatchingCurrentSqlHandler.class);
+
    private boolean _resultTabHeaderMarkingActive;
 
    private BoundsOfSqlHandler _boundsOfSqlHandler;
@@ -29,6 +33,7 @@ public class ResultTabMatchingCurrentSqlHandler
    private Timer _paintTimer;
 
    private NormalizedSqlCompareCache _normalizedSqlCompareCache = new NormalizedSqlCompareCache();
+   private long _lastEditorSqlToLongWarningMillis = 0;
 
    public ResultTabMatchingCurrentSqlHandler(ISQLEntryPanel entryPanel, SQLResultExecutorPanel sqlExecPanel)
    {
@@ -81,7 +86,19 @@ private void onTextAreaPaint(boolean activateLastMarked)
       {
          boolean tabMatchesSqlToBeExecuted;
 
-         if(Main.getApplication().getSquirrelPreferences().isResultTabHeaderCompareSqlsNormalized())
+         if( null != sqlToBeExecuted && 8000 < sqlToBeExecuted.length() )
+         {
+            // Editor-SQL to long. Will skip search for matching result tab
+            long currentTimeMillis = System.currentTimeMillis();
+            if( currentTimeMillis - _lastEditorSqlToLongWarningMillis > 5000L)
+            {
+               _lastEditorSqlToLongWarningMillis = currentTimeMillis;
+               s_log.warn("Editor SQL too long (" + sqlToBeExecuted.length()  + " chars) to perform matching result tab search without severe editor performance impact.");
+            }
+
+            tabMatchesSqlToBeExecuted = false;
+         }
+         else if(Main.getApplication().getSquirrelPreferences().isResultTabHeaderCompareSqlsNormalized())
          {
 
             IQueryTokenizer qt = _entryPanel.getSession().getNewQueryTokenizer();