List:Commits« Previous MessageNext Message »
From:jonas Date:January 20 2006 10:05am
Subject:bk commit into 5.1 tree (jonas:1.2083)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2083 06/01/20 11:05:02 jonas@stripped +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1.4
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  storage/ndb/src/ndbapi/ndberror.c
    1.48 06/01/20 11:05:00 jonas@stripped +0 -0
    merge

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.68 06/01/20 11:05:00 jonas@stripped +11 -10
    merge

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h
    1.24 06/01/20 11:05:00 jonas@stripped +1 -2
    merge

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.72 06/01/20 10:59:51 jonas@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new/RESYNC

--- 1.23/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-01-15 20:45:04 +01:00
+++ 1.24/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-01-20 11:05:00 +01:00
@@ -86,6 +86,7 @@
 #define CFG_DB_MAX_OPEN_FILES         159
 
 #define CFG_DB_DISK_PAGE_BUFFER_MEMORY 160
+#define CFG_DB_STRING_MEMORY          161
 
 #define CFG_NODE_ARBIT_RANK           200
 #define CFG_NODE_ARBIT_DELAY          201

--- 1.71/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-01-15 20:45:04 +01:00
+++ 1.72/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-01-20 10:59:51 +01:00
@@ -1214,6 +1214,18 @@
     "0",
     STR_VALUE(MAX_INT_RNIL) },
 
+  { 
+    CFG_DB_STRING_MEMORY,
+    "StringMemory",
+    DB_TOKEN,
+    "Default size of string memory (0 -> 5% of max 1-100 -> %of max, >100 -> actual bytes)",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "0",
+    "0",
+    STR_VALUE(MAX_INT_RNIL) },
+  
   /***************************************************************************
    * API
    ***************************************************************************/

--- 1.67/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-17 09:24:52 +01:00
+++ 1.68/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-20 11:05:00 +01:00
@@ -2056,8 +2056,30 @@
   c_schemaOp.setSize(8);
   //c_opDropObj.setSize(8);
   c_Trans.setSize(8);
-  c_rope_pool.setSize(100000/28);
 
+  Uint32 rps = 0;
+  rps += tablerecSize * (MAX_TAB_NAME_SIZE + MAX_FRM_DATA_SIZE);
+  rps += attributesize * (MAX_ATTR_NAME_SIZE + MAX_ATTR_DEFAULT_VALUE_SIZE);
+  rps += c_maxNoOfTriggers * MAX_TAB_NAME_SIZE;
+  rps += (10 + 10) * MAX_TAB_NAME_SIZE;
+
+  Uint32 sm = 5;
+  ndb_mgm_get_int_parameter(p, CFG_DB_STRING_MEMORY, &sm);
+  if (sm == 0)
+    sm = 5;
+  
+  Uint32 sb = 0;
+  if (sm < 100)
+  {
+    sb = (rps * sm) / 100;
+  }
+  else
+  {
+    sb = sm;
+  }
+  
+  c_rope_pool.setSize(sb/28 + 100);
+  
   // Initialize BAT for interface to file system
   NewVARIABLE* bat = allocateBat(2);
   bat[0].WA = &c_schemaPageRecordArray.getPtr(0)->word[0];
@@ -5866,7 +5888,8 @@
   
   { 
     Rope name(c_rope_pool, tablePtr.p->tableName);
-    ndbrequire(name.assign(c_tableDesc.TableName, tableNameLength, name_hash));
+    tabRequire(name.assign(c_tableDesc.tableDesc.TableName, tableNameLength, name_hash),
+	       CreateTableRef::OutOfStringBuffer);
   }
 
   Ptr<DictObject> obj_ptr;
@@ -5907,16 +5930,20 @@
   
   {
     Rope frm(c_rope_pool, tablePtr.p->frmData);
-    ndbrequire(frm.assign(c_tableDesc.FrmData, c_tableDesc.FrmLen));
+    tabRequire(frm.assign(c_tableDesc.FrmData, c_tableDesc.FrmLen),
+	       CreateTableRef::OutOfStringBuffer);
     Rope range(c_rope_pool, tablePtr.p->rangeData);
-    ndbrequire(range.assign(c_tableDesc.RangeListData,
-               c_tableDesc.RangeListDataLen));
+    tabRequire(range.assign(c_tableDesc.RangeListData,
+               c_tableDesc.RangeListDataLen),
+	      CreateTableRef::OutOfStringBuffer);
     Rope fd(c_rope_pool, tablePtr.p->ngData);
-    ndbrequire(fd.assign((const char*)c_tableDesc.FragmentData,
-                         c_tableDesc.FragmentDataLen));
+    tabRequire(fd.assign((const char*)c_tableDesc.FragmentData,
+                         c_tableDesc.FragmentDataLen),
+	       CreateTableRef::OutOfStringBuffer);
     Rope ts(c_rope_pool, tablePtr.p->tsData);
-    ndbrequire(ts.assign((const char*)c_tableDesc.TablespaceData,
-                         c_tableDesc.TablespaceDataLen));
+    tabRequire(ts.assign((const char*)c_tableDesc.TablespaceData,
+                         c_tableDesc.TablespaceDataLen),
+	       CreateTableRef::OutOfStringBuffer);
   }
   
   c_fragDataLen = c_tableDesc.FragmentDataLen;
@@ -6031,7 +6058,13 @@
      */
     {
       Rope name(c_rope_pool, attrPtr.p->attributeName);
-      name.assign(attrDesc.AttributeName, len, name_hash);
+      if (!name.assign(attrDesc.AttributeName, len, name_hash))
+      {
+	jam();
+	parseP->errorCode = CreateTableRef::OutOfStringBuffer;
+	parseP->errorLine = __LINE__;
+	return;
+      }
     }
     attrPtr.p->attributeId = i;
     //attrPtr.p->attributeId = attrDesc.AttributeId;
@@ -14763,7 +14796,7 @@
     {
       Rope name(c_rope_pool, obj_ptr.p->m_name);
       if(!name.assign(fg.FilegroupName, len, hash)){
-	op->m_errorCode = CreateTableRef::TableNameTooLong;
+	op->m_errorCode = CreateTableRef::OutOfStringBuffer;
 	break;
       }
     }
@@ -15002,7 +15035,7 @@
     {
       Rope name(c_rope_pool, obj_ptr.p->m_name);
       if(!name.assign(f.FileName, len, hash)){
-	op->m_errorCode = CreateTableRef::TableNameTooLong;
+	op->m_errorCode = CreateTableRef::OutOfStringBuffer;
 	break;
       }
     }

--- 1.47/storage/ndb/src/ndbapi/ndberror.c	2006-01-12 19:50:35 +01:00
+++ 1.48/storage/ndb/src/ndbapi/ndberror.c	2006-01-20 11:05:00 +01:00
@@ -411,7 +411,8 @@
   { 1512, DMEC, SE, "File read error" },
   { 1513, DMEC, IE, "Filegroup not online" },
   
-
+  { 773,  DMEC, SE, "Out of string memory, please modify StringMemory config parameter" },
+  
   /**
    * FunctionNotImplemented
    */
Thread
bk commit into 5.1 tree (jonas:1.2083)jonas20 Jan