bzr commit into mysql-5.1-telco-7.0-spj branch (ole.john.aske:3182)

[Ole John Aske]

#At file:///export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj/ based on revid:ole.john.aske@stripped

 3182 Ole John Aske	2010-06-22
      Moved ha_ndbcluster::check_if_pushable() and ha_ndbcluster::check_is_pushed()
      together with rest of methods in ha_ndbcluster.cc used to determine
      pushability of a set of JOIN_TAB's - NO CODE CHANGE!

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-06-22 11:41:06 +0000
+++ b/sql/ha_ndbcluster.cc	2010-06-22 12:02:49 +0000
@@ -1409,6 +1409,100 @@ int ndbcluster_make_pushed_join(handlert
 } // ndbcluster_make_pushed_join
 
 
+/**
+ * C++98 does not allow forward declarations of enum types. By using this 
+ * class instead of using NdbQueryOperationDef::Type directly, 
+ * ha_ndbcluster.h avoids including NdbQueryBuilder.h.
+ */
+class NdbQueryOperationTypeWrapper
+{
+public:
+  /** Implcit conversion from NdbQueryOperationDef::Type.*/
+  NdbQueryOperationTypeWrapper(NdbQueryOperationDef::Type type)
+    :m_type(type)
+  {}
+
+  /** Implcit conversion to NdbQueryOperationDef::Type.*/
+  operator NdbQueryOperationDef::Type() const
+  { return m_type; }
+
+private:
+  const NdbQueryOperationDef::Type m_type;
+};
+
+
+/**
+ * Check if this table access operation (and a number of succeding operation)
+ * can be pushed to the cluster and executed there. This requires that there
+ * is an NdbQueryDefiniton and that it still matches the corresponds to the 
+ * type of operation that we intend to execute. (The MySQL server will 
+ * sometimes change its mind and replace a scan with a lookup or vice versa
+ * as it works its way into the nested loop join.)
+ *
+ * @param type This is the operation type that the server want to execute.
+ * @param idx  Index used whenever relevant for operation type
+ * @return True if the operation may be pushed.
+ */
+bool 
+ha_ndbcluster::check_if_pushable(const NdbQueryOperationTypeWrapper& type, uint idx) const
+{
+  bool pushable= FALSE;
+
+  if (m_pushed_join != NULL)
+  {
+    const NdbQueryOperationDef* const root_operation= 
+      m_pushed_join->get_query_def().getQueryOperation(0U);
+
+    const NdbQueryOperationTypeWrapper& query_def_type=  root_operation->getType();
+
+    if (query_def_type == type)
+    {
+      if (m_disable_pushed_join)
+      {
+        DBUG_PRINT("info", ("Push disabled (HA_EXTRA_KEYREAD)"));
+      }
+      else
+      {
+        const NdbDictionary::Index* const expected_index= root_operation->getIndex();
+        pushable= TRUE;
+
+        switch (type)
+        {
+          case NdbQueryOperationDef::PrimaryKeyAccess:
+            DBUG_ASSERT(idx==table->s->primary_key);
+            break;
+          case NdbQueryOperationDef::UniqueIndexAccess:
+            DBUG_ASSERT(idx<MAX_KEY);
+//          DBUG_ASSERT(m_index[idx].unique_index == expected_index);
+            pushable= (m_index[idx].unique_index == expected_index);
+            break;
+          case NdbQueryOperationDef::TableScan:
+            DBUG_ASSERT (idx==MAX_KEY);
+            break;
+          case NdbQueryOperationDef::OrderedIndexScan:
+            DBUG_ASSERT(idx<MAX_KEY);
+//          DBUG_ASSERT(m_index[idx].index == expected_index);
+            pushable= (m_index[idx].index == expected_index);
+            break;
+          default:
+            DBUG_ASSERT(false);
+            break;
+        }
+      }
+    }
+    else
+    {
+      DBUG_PRINT("info", 
+                 ("Cannot execute push join. Root operation prepared as %s "
+                  "not executable as %s w/ index %d",
+                  NdbQueryOperationDef::getTypeName(query_def_type),
+                  NdbQueryOperationDef::getTypeName(type), idx));
+    }
+  }
+  return pushable;
+}
+
+
 static
 bool
 is_shrinked_varchar(const Field *field)
@@ -1494,6 +1588,17 @@ ha_ndbcluster::create_pushed_join(NdbQue
 } // ha_ndbcluster::create_pushed_join
 
 
+/**
+ * Check if this table access operation is part if a pushed join operation
+ * which is actively executing.
+ */
+bool 
+ha_ndbcluster::check_is_pushed() const
+{
+  return (m_pushed_join_member && m_pushed_join_member->m_active_query);
+}
+
+
 uint 
 ha_ndbcluster::is_parent_of_pushed_join() const
 {
@@ -3808,111 +3913,6 @@ bool ha_ndbcluster::check_index_fields_i
 }
 
 /**
- * C++98 does not allow forward declarations of enum types. By using this 
- * class instead of using NdbQueryOperationDef::Type directly, 
- * ha_ndbcluster.h avoids including NdbQueryBuilder.h.
- */
-class NdbQueryOperationTypeWrapper
-{
-public:
-  /** Implcit conversion from NdbQueryOperationDef::Type.*/
-  NdbQueryOperationTypeWrapper(NdbQueryOperationDef::Type type)
-    :m_type(type)
-  {}
-
-  /** Implcit conversion to NdbQueryOperationDef::Type.*/
-  operator NdbQueryOperationDef::Type() const
-  { return m_type; }
-
-private:
-  const NdbQueryOperationDef::Type m_type;
-};
-
-
-/**
- * Check if this table access operation (and a number of succeding operation)
- * can be pushed to the cluster and executed there. This requires that there
- * is an NdbQueryDefiniton and that it still matches the corresponds to the 
- * type of operation that we intend to execute. (The MySQL server will 
- * sometimes change its mind and replace a scan with a lookup or vice versa
- * as it works its way into the nested loop join.)
- *
- * @param type This is the operation type that the server want to execute.
- * @param idx  Index used whenever relevant for operation type
- * @return True if the operation may be pushed.
- */
-bool 
-ha_ndbcluster::check_if_pushable(const NdbQueryOperationTypeWrapper& type, uint idx) const
-{
-  bool pushable= FALSE;
-
-  if (m_pushed_join != NULL)
-  {
-    const NdbQueryOperationDef* const root_operation= 
-      m_pushed_join->get_query_def().getQueryOperation(0U);
-
-    const NdbQueryOperationTypeWrapper& query_def_type=  root_operation->getType();
-
-    if (query_def_type == type)
-    {
-      if (m_disable_pushed_join)
-      {
-        DBUG_PRINT("info", ("Push disabled (HA_EXTRA_KEYREAD)"));
-      }
-      else
-      {
-        const NdbDictionary::Index* const expected_index= root_operation->getIndex();
-        pushable= TRUE;
-
-        switch (type)
-        {
-          case NdbQueryOperationDef::PrimaryKeyAccess:
-            DBUG_ASSERT(idx==table->s->primary_key);
-            break;
-          case NdbQueryOperationDef::UniqueIndexAccess:
-            DBUG_ASSERT(idx<MAX_KEY);
-//          DBUG_ASSERT(m_index[idx].unique_index == expected_index);
-            pushable= (m_index[idx].unique_index == expected_index);
-            break;
-          case NdbQueryOperationDef::TableScan:
-            DBUG_ASSERT (idx==MAX_KEY);
-            break;
-          case NdbQueryOperationDef::OrderedIndexScan:
-            DBUG_ASSERT(idx<MAX_KEY);
-//          DBUG_ASSERT(m_index[idx].index == expected_index);
-            pushable= (m_index[idx].index == expected_index);
-            break;
-          default:
-            DBUG_ASSERT(false);
-            break;
-        }
-      }
-    }
-    else
-    {
-      DBUG_PRINT("info", 
-                 ("Cannot execute push join. Root operation prepared as %s "
-                  "not executable as %s w/ index %d",
-                  NdbQueryOperationDef::getTypeName(query_def_type),
-                  NdbQueryOperationDef::getTypeName(type), idx));
-    }
-  }
-  return pushable;
-}
-
-
-/**
- * Check if this table access operation is part if a pushed join operation
- * which is actively executing.
- */
-bool 
-ha_ndbcluster::check_is_pushed() const
-{
-  return (m_pushed_join_member && m_pushed_join_member->m_active_query);
-}
-
-
-/**
   Read one record from NDB using primary key.
 */
 


Attachment: [text/bzr-bundle] bzr/[e-mail]