[Tora-cvs] SF.net SVN: tora: [2453] branches/tora-1.4/tora/src/toanalyze.cpp

[<mrj...@us...>]

Revision: 2453
          http://tora.svn.sourceforge.net/tora/?rev=2453&view=rev
Author:   mrjohnson0
Date:     2008-01-19 10:41:33 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
correct column data, fix parallel sql handling

Modified Paths:
--------------
    branches/tora-1.4/tora/src/toanalyze.cpp

Modified: branches/tora-1.4/tora/src/toanalyze.cpp
===================================================================
--- branches/tora-1.4/tora/src/toanalyze.cpp	2008-01-19 17:47:52 UTC (rev 2452)
+++ branches/tora-1.4/tora/src/toanalyze.cpp	2008-01-19 18:41:33 UTC (rev 2453)
@@ -512,9 +512,9 @@
                     break;
                 }
                 toPush(ret,
-                       sql.arg(Statistics->model()->data((*it).row(), 1).toString())
-                       .arg(Statistics->model()->data((*it).row(), 2).toString())
-                       .arg(Statistics->model()->data((*it).row(), 0).toString()));
+                       sql.arg(Statistics->model()->data((*it).row(), 2).toString())
+                       .arg(Statistics->model()->data((*it).row(), 3).toString())
+                       .arg(Statistics->model()->data((*it).row(), 1).toString()));
 
             }
             else {
@@ -527,7 +527,7 @@
                     sql = QString::fromLatin1("OPTIMIZE TABLE %1.%2 ");
                     break;
                 }
-                QString owner = Statistics->model()->data((*it).row(), 0).toString();
+                QString owner = Statistics->model()->data((*it).row(), 2).toString();
                 if (toUnnull(owner).isNull())
                     owner = Schema->selected();
                 toPush(ret,
@@ -556,7 +556,7 @@
 
     try {
         toQList par;
-        for (int i = 0;i < Parallel->value();i++) {
+        for (int i = 0; i < Parallel->value() + 1; i++) {
             QString sql = toShift(Pending);
             if (!sql.isEmpty())
                 toPush(Running, new toNoBlockQuery(connection(), sql, par));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.