Refactored code around index search for positional operations

The class for that has been moved to cppmini. The code is much cleaner
now. Maybe tiny bit faster and Stmt handle is a tiny bit smaller in base
case.

Author: lawrinn

driver/CMakeLists.txt

@@ -63,6 +63,7 @@ SET(MARIADB_CPPMINI_FILES
                           cppmini/class/ResultSetMetaData.cpp
                           cppmini/class/Parameter.cpp
                           cppmini/class/Protocol.cpp
+                          cppmini/class/unique_key.cpp
                           cppmini/interface/PreparedStatement.cpp
                           cppmini/interface/Row.cpp
                           cppmini/interface/ResultSet.cpp
@@ -82,6 +83,7 @@ SET(MARIADB_CPPMINI_HEADERS
                           cppmini/class/ClientSidePreparedStatement.h
                           cppmini/class/ServerSidePreparedStatement.h
                           cppmini/class/SSPSDirectExec.h
+                          cppmini/class/unique_key.h
                           cppmini/class/ClientPrepareResult.h
                           cppmini/class/ServerPrepareResult.h
                           cppmini/class/CmdInformationSingle.h

driver/ma_helper.cpp

@@ -19,6 +19,7 @@
 #include "ma_odbc.h"
 #include <stdint.h>
 #include "class/ResultSetMetaData.h"
+#include "class/unique_key.h"
 #include "interface/PreparedStatement.h"
 #include "Protocol.h"
 
@@ -73,48 +74,6 @@ int  MADB_GetWCharType(int Type)
   }
 }
 
-/* Returns total number of columns, and columns count in the primary key and in the unique key
-   TODO: if there are >1 of unique keys, this will go wrong */
-int MADB_KeyTypeCount(MADB_Dbc *Connection, char *TableName, int *PrimaryKeysCount, int *UniqueKeysCount)
-{
-  int         Count= -1;
-  int         i;
-  char        StmtStr[512];
-  char        *p= StmtStr;
-  char        Database[68]= {'\0'};
-  MYSQL_RES   *Res;
-  MYSQL_FIELD *Field;
-  
-  // It shouldn't be current but the one from the query
-  Connection->GetAttr(SQL_ATTR_CURRENT_CATALOG, Database, sizeof(Database), NULL, FALSE);
-  p+= _snprintf(p, sizeof(StmtStr), "SELECT * FROM ");
-  if (Database[0] != '\0')
-  {
-    p+= _snprintf(p, sizeof(StmtStr) - (p - StmtStr), "`%s`.", Database);
-  }
-  p+= _snprintf(p, sizeof(StmtStr) - (p - StmtStr), "%s LIMIT 0", TableName);
-  std::lock_guard<std::mutex> localScopeLock(Connection->guard->getLock());
-  Connection->guard->safeRealQuery({StmtStr, (std::size_t)(p - StmtStr)});
-  if ((Res= mysql_store_result(Connection->mariadb)) != nullptr)
-  {
-    Count= mysql_field_count(Connection->mariadb);
-    for (i= 0; i < Count; ++i)
-    {
-      Field= mysql_fetch_field_direct(Res, i);
-      if (Field->flags & PRI_KEY_FLAG)
-      {
-        ++*PrimaryKeysCount;
-      }
-      if (Field->flags & UNIQUE_KEY_FLAG)
-      {
-        ++*UniqueKeysCount;
-      }
-    }
-    mysql_free_result(Res);
-  }
-  return Count;
-}
-
 
 /* {{{ MADB_CheckODBCType */
 BOOL MADB_CheckODBCType(SQLSMALLINT Type)
@@ -1135,8 +1094,6 @@ size_t MADB_GetHexString(char *BinaryBuffer, size_t BinaryLength,
 
 SQLRETURN MADB_DaeStmt(MADB_Stmt *Stmt, SQLUSMALLINT Operation)
 {
-  char      *TableName=   MADB_GetTableName(Stmt);
-  char      *CatalogName= MADB_GetCatalogName(Stmt);
   SQLString Query;
 
   MADB_CLEAR_ERROR(&Stmt->Error);
@@ -1151,30 +1108,43 @@ SQLRETURN MADB_DaeStmt(MADB_Stmt *Stmt, SQLUSMALLINT Operation)
     return MADB_CopyError(&Stmt->Error, &Stmt->Connection->Error);
   }
 
-  Query.reserve(1024);
-  switch(Operation)
-  {
+  if (Operation != SQL_ADD && !Stmt->UniqueIndex) {
+    // For SQL_ADD we don't need index, and reading index means additional query(ies) to the server, i.e. rather expensive
+    Stmt->UniqueIndex.reset(new mariadb::unique_key(Stmt->Connection->guard.get(), Stmt->metadata));
+  }
+  Query.reserve(8192);
+
+  switch(Operation) {
+
   case SQL_ADD:
+  {
+    // This constructor does not read index info but only verifies that only one table is used
+    mariadb::unique_key tableInfo(Stmt->metadata);
     // Should it really be CatalogName
-    Query.assign("INSERT INTO `").append(CatalogName).append("`.`").append(TableName).append(1,'`');
+    Query.assign("INSERT INTO `").append(tableInfo.getSchema()).append("`.`").append(tableInfo.getTable()).append(1, '`');
     if (MADB_DynStrUpdateSet(Stmt, Query))
     {
       return Stmt->Error.ReturnValue;
     }
     Stmt->DataExecutionType= MADB_DAE_ADD;
+  }
     break;
+
   case SQL_DELETE:
-    Query.assign("DELETE FROM `").append(CatalogName).append("`.`").append(TableName).append(1, '`');
-    if (MADB_DynStrGetWhere(Stmt, Query, TableName, false))
+    Query.assign("DELETE FROM `").append(Stmt->UniqueIndex->getSchema()).append("`.`").
+      append(Stmt->UniqueIndex->getTable()).append(1, '`');
+    if (MADB_DynStrGetWhere(Stmt, Query, false))
     {
       return Stmt->Error.ReturnValue;
     }
 
     Stmt->DataExecutionType= MADB_DAE_DELETE;
     break;
+
   case SQL_UPDATE:
-    Query.assign("UPDATE `").append(CatalogName).append("`.`").append(TableName).append(1, '`');
-    if (MADB_DynStrUpdateSet(Stmt, Query) || MADB_DynStrGetWhere(Stmt, Query, TableName, false))
+    Query.assign("UPDATE `").append(Stmt->UniqueIndex->getSchema()).append("`.`").
+      append(Stmt->UniqueIndex->getTable()).append(1, '`');
+    if (MADB_DynStrUpdateSet(Stmt, Query) || MADB_DynStrGetWhere(Stmt, Query, false))
     {
       return Stmt->Error.ReturnValue;
     }

driver/ma_helper.h

@@ -22,7 +22,6 @@
 void CloseMultiStatements(MADB_Stmt *Stmt);
 bool QueryIsPossiblyMultistmt(MADB_QUERY *Query);
 int  SqlRtrim(char *StmtStr, int Length);
-int MADB_KeyTypeCount(MADB_Dbc *Connection, char *TableName, int *PrimaryKeysCount, int *UniqueKeysCount);
 MYSQL_RES* MADB_ReadDefaultValues(MADB_Dbc *Dbc, const char *Catalog, const char *TableName);
 int MADB_GetDefaultType(int SQLDataType);
 void MADB_CopyOdbcTsToMadbTime(SQL_TIMESTAMP_STRUCT *Src, MYSQL_TIME *Dst);

driver/ma_legacy_helpers.cpp

@@ -195,7 +195,7 @@ bool MADB_DynstrRealloc(MADB_DynString *str, size_t additional_size)
 
 bool MADB_DynstrAppend(MADB_DynString *str, const char *append)
 {
-  return MADB_DynstrAppendMem(str,append,strlen(append));
+  return MADB_DynstrAppendMem(str, append, strlen(append));
 }
 
 

driver/ma_odbc.h

@@ -287,7 +287,7 @@ struct MADB_Env {
 // Stmt has to know few things about connection and descriptor
 #include "ma_connection.h"
 #include "ma_desc.h"
-#define xxx sizeof(std::mutex)
+
 struct MADB_Stmt
 {
   MADB_QUERY                Query;
@@ -312,8 +312,6 @@ struct MADB_Stmt
   MYSQL_BIND                *params= nullptr;
   unsigned long             *CharOffset= nullptr;
   unsigned long             *Lengths= nullptr;
-  char                      *TableName= nullptr;
-  char                      *CatalogName= nullptr;
   MADB_ShortTypeInfo        *ColsTypeFixArr= nullptr;
   /* Application Descriptors */
   MADB_Desc *Apd= nullptr;
@@ -326,7 +324,8 @@ struct MADB_Stmt
   MADB_Desc *IIrd;
   MADB_Desc *IIpd;
 
-  unsigned short            *UniqueIndex= nullptr; /* Insdexes of columns that make best available unique identifier */
+  Unique::key               UniqueIndex; /* Insdexes of columns that make best available unique identifier
+                                            for positional operations */
   SQLSETPOSIROW             DaeRowNumber= 0;
   int32_t                   ArrayOffset= 0;
   uint32_t                  MultiStmtNr= 0;
@@ -340,9 +339,6 @@ struct MADB_Stmt
   bool                      PositionedCommand= false;
   bool                      RebindParams= false;
   bool                      bind_done= false;
-  char                      IndexType= 0; /* For positional operation - the type of index in the UniqueIndex(value of the
-                                            unique or pri flag) or > 0 if all columns in the table(UniqueIndex==NULL).
-                                            0 - no info, <0 - can't build index */
 
   MADB_Stmt(MADB_Dbc *Connection);
   SQLRETURN Prepare(const char* StatementText, SQLINTEGER TextLength, bool ServerSide= true, bool DirectExecution= false);

driver/ma_statement.cpp

@@ -24,6 +24,7 @@
 #include "ResultSetMetaData.h"
 #include "interface/Exception.h"
 #include "Protocol.h"
+#include "class/unique_key.h"
 
 #include "ma_odbc.h"
 
@@ -110,9 +111,6 @@ void MADB_DropStmt(MADB_Stmt *Stmt, bool external= true)
   MADB_FREE(Stmt->params);
   MADB_FREE(Stmt->result);
   MADB_FREE(Stmt->Cursor.Name);
-  MADB_FREE(Stmt->CatalogName);
-  MADB_FREE(Stmt->TableName);
-  MADB_FREE(Stmt->UniqueIndex);
   /* For explicit descriptors we only remove reference to the stmt*/
   if (Stmt->Apd->AppType)
   {
@@ -277,6 +275,8 @@ MADB_Stmt *MADB_FindCursor(MADB_Stmt *Stmt, const char *CursorName)
 ResultSetMetaData* FetchMetadata(MADB_Stmt *Stmt, bool early)
 {
   delete Stmt->metadata;
+  // unique_key references metadata. TODO: Need to do smth about this
+  Stmt->UniqueIndex.reset();
   /* TODO early probably is not needed here at all */
   if (early)
   {
@@ -324,9 +324,7 @@ SQLRETURN MADB_StmtReset(MADB_Stmt* Stmt)
     Stmt->PositionedCommand= 0;
     Stmt->State= MADB_SS_INITED;
     MADB_CLEAR_ERROR(&Stmt->Error);
-    MADB_FREE(Stmt->UniqueIndex);
-    Stmt->IndexType= 0;
-    MADB_FREE(Stmt->TableName);
+    Stmt->UniqueIndex.reset();
   }
   return SQL_SUCCESS;
 }
@@ -569,7 +567,6 @@ SQLRETURN MADB_Stmt::Prepare(const char *StatementText, SQLINTEGER TextLength, b
      */
   if ((CursorName= MADB_ParseCursorName(&Query, &WhereOffset)))
   {
-    char *TableName;
     /* Make sure we have a delete or update statement
        MADB_QUERY_DELETE and MADB_QUERY_UPDATE defined in the enum to have the same value
        as SQL_UPDATE and SQL_DELETE, respectively */
@@ -589,10 +586,9 @@ SQLRETURN MADB_Stmt::Prepare(const char *StatementText, SQLINTEGER TextLength, b
       goto cleanandexit;
     }
 
-    TableName= MADB_GetTableName(PositionedCursor);
-    SQLString StmtStr(Query.RefinedText.c_str(),WhereOffset);
+    SQLString StmtStr(Query.RefinedText.c_str(), WhereOffset);
     StmtStr.reserve(8192);
-    if (MADB_DynStrGetWhere(PositionedCursor, StmtStr, TableName, true))
+    if (MADB_DynStrGetWhere(PositionedCursor, StmtStr, true))
     {
       goto cleanandexit;
     }
@@ -834,8 +830,11 @@ SQLRETURN MADB_ExecutePositionedUpdate(MADB_Stmt *Stmt, bool ExecDirect)
 
   for (j= 1; j < MADB_STMT_COLUMN_COUNT(Stmt->PositionedCursor) + 1; ++j)
   {
-    if (Stmt->PositionedCursor->UniqueIndex == nullptr ||
-      (Stmt->PositionedCursor->UniqueIndex[0] != 0 && IndexIdx <= Stmt->PositionedCursor->UniqueIndex[0] && j == Stmt->PositionedCursor->UniqueIndex[IndexIdx] + 1))
+    // unique_key methods use 0 based indexes
+    if (!Stmt->PositionedCursor->UniqueIndex ||
+      (Stmt->PositionedCursor->UniqueIndex->exists() && 
+        IndexIdx <= static_cast<SQLSMALLINT>(Stmt->PositionedCursor->UniqueIndex->fieldCount()) &&
+        j == Stmt->PositionedCursor->UniqueIndex->fieldIndex(IndexIdx - 1) + 1))
     {
       SQLLEN Length;
       MADB_DescRecord* Rec= MADB_DescGetInternalRecord(Stmt->PositionedCursor->Ard, j, MADB_DESC_READ);
@@ -845,7 +844,7 @@ SQLRETURN MADB_ExecutePositionedUpdate(MADB_Stmt *Stmt, bool ExecDirect)
       if (Stmt->PositionedCursor->UniqueIndex != nullptr)
       {
         ParamNumber= /* Param ordnum in pos.cursor condition */IndexIdx +
-                     /* Num of params in main stmt */(Stmt->ParamCount - Stmt->PositionedCursor->UniqueIndex[0]);
+                     /* Num of params in main stmt */(Stmt->ParamCount - Stmt->PositionedCursor->UniqueIndex->fieldCount());
         ++IndexIdx;
       }
       else
@@ -3628,20 +3627,18 @@ SQLRETURN MADB_StmtSetPos(MADB_Stmt* Stmt, SQLSETPOSIROW RowNumber, SQLUSMALLINT
       /* Nothing else to do (at least for now) in this 2 cases */
       return SQL_SUCCESS;
   };
-
-  char* TableName= MADB_GetTableName(Stmt);
-  if (!TableName)
-  {
-    return MADB_SetError(&Stmt->Error, MADB_ERR_IM001, "Updatable Cursors with multiple tables are not supported", 0);
+  /*SQL_ADD does not need to know the index */
+  if (Operation != SQL_ADD && !Stmt->UniqueIndex) {
+    Stmt->UniqueIndex.reset(new mariadb::unique_key(Stmt->Connection->guard.get(), Stmt->metadata));
   }
-  char* CatalogName= MADB_GetCatalogName(Stmt);
-  
   switch (Operation) {
   case SQL_ADD:
     {
       MADB_DynString DynStmt;
       SQLRETURN      ret;
       int            column, param= 0;
+      // This constructor does not read index info but only verifies that only one table is used
+      mariadb::unique_key tableInfo(Stmt->metadata);
 
       Stmt->DaeRowNumber= RowNumber;
 
@@ -3654,9 +3651,9 @@ SQLRETURN MADB_StmtSetPos(MADB_Stmt* Stmt, SQLSETPOSIROW RowNumber, SQLUSMALLINT
         MADB_StmtInit(Stmt->Connection, (SQLHANDLE *)&Stmt->DaeStmt, false);
 
         if (MADB_InitDynamicString(&DynStmt, "INSERT INTO ", 8192, 1024) ||
-            MADB_DynStrAppendQuoted(&DynStmt, CatalogName) ||
+            MADB_DynStrAppendQuoted(&DynStmt, tableInfo.getSchema().c_str()) ||
             MADB_DynstrAppend(&DynStmt, ".") ||
-            MADB_DynStrAppendQuoted(&DynStmt, TableName)||
+            MADB_DynStrAppendQuoted(&DynStmt, tableInfo.getTable().c_str()) ||
             MADB_DynStrInsertSet(Stmt, &DynStmt))
         {
           MADB_DynstrFree(&DynStmt);
@@ -3852,7 +3849,7 @@ SQLRETURN MADB_StmtSetPos(MADB_Stmt* Stmt, SQLSETPOSIROW RowNumber, SQLUSMALLINT
   case SQL_DELETE:
     {
       SQLRETURN     result = SQL_INVALID_HANDLE; /* Just smth we cannot normally get */
-      SQLString     DynamicStmt("DELETE FROM ");
+      SQLString     DynamicStmt;
       std::size_t   baseStmtLen;
       SQLULEN       SaveArraySize= Stmt->Ard->Header.ArraySize;
       my_ulonglong  Start=         0,
@@ -3869,14 +3866,15 @@ SQLRETURN MADB_StmtSetPos(MADB_Stmt* Stmt, SQLSETPOSIROW RowNumber, SQLUSMALLINT
       {
         End= Start;
       }
-      DynamicStmt.reserve(8182);
-      DynamicStmt.append(TableName);
+      DynamicStmt.reserve(8192);
+      DynamicStmt.append("DELETE FROM `", 13).append(Stmt->UniqueIndex->getSchema()).append("`.`", 3).
+        append(Stmt->UniqueIndex->getTable()).append("`", 1);
       baseStmtLen= DynamicStmt.length();
       while (Start <= End)
       {
         MADB_StmtDataSeek(Stmt, Start);
 
-        if (MADB_DynStrGetWhere(Stmt, DynamicStmt, TableName, false))
+        if (MADB_DynStrGetWhere(Stmt, DynamicStmt, false))
         {
           MADB_SETPOS_AGG_RESULT(result, Stmt->Error.ReturnValue);
           /* Continuing to next row. If there is no key - we will get it for all rows and as aggregated result.

driver/ma_statement.h

@@ -113,8 +113,8 @@ void         MADB_CloseCursor       (MADB_Stmt *Stmt);
 #define MADB_RESET_COLUMT_COUNT(aStmt) (aStmt)->Ird->Header.Count= 0
 #define MADB_STMT_PARAM_COUNT(aStmt)  (aStmt)->ParamCount
 #define MADB_POSITIONED_COMMAND(aStmt) ((aStmt)->PositionedCommand && (aStmt)->PositionedCursor)
-#define MADB_STMT_HAS_UNIQUE_IDX(aStmt) (aStmt->UniqueIndex != NULL && aStmt->UniqueIndex[0] > 0)
-#define MADB_POS_COMM_IDX_FIELD_COUNT(aStmt) (MADB_STMT_HAS_UNIQUE_IDX((aStmt)->PositionedCursor)?(aStmt)->PositionedCursor->UniqueIndex[0]:MADB_STMT_COLUMN_COUNT((aStmt)->PositionedCursor))
+#define MADB_STMT_HAS_UNIQUE_IDX(aStmt) (aStmt->UniqueIndex && aStmt->UniqueIndex->isIndex())
+#define MADB_POS_COMM_IDX_FIELD_COUNT(aStmt) (MADB_STMT_HAS_UNIQUE_IDX((aStmt)->PositionedCursor)?(aStmt)->PositionedCursor->UniqueIndex->exists():MADB_STMT_COLUMN_COUNT((aStmt)->PositionedCursor))
 #define MADB_STMT_FORGET_NEXT_POS(aStmt) (aStmt)->Cursor.Next= -1
 #define MADB_STMT_RESET_CURSOR(aStmt) (aStmt)->Cursor.Position= 0; MADB_STMT_FORGET_NEXT_POS(aStmt)
 #define MADB_STMT_CLOSE_STMT(aStmt)  (aStmt)->stmt.reset()