List:Internals« Previous MessageNext Message »
From:pekka Date:March 6 2005 1:09pm
Subject:bk commit into 5.0 tree (pekka:1.1778)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka 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.1778 05/03/06 14:09:28 pekka@stripped +6 -0
  ndb - remove obsolete attribute storage type ACC vs TUP

  ndb/test/src/NdbSchemaOp.cpp
    1.8 05/03/06 13:58:20 pekka@stripped +1 -1
    remove obsolete attribute storage type ACC vs TUP

  ndb/test/ndbapi/bench/userInterface.cpp
    1.3 05/03/06 13:58:20 pekka@stripped +3 -3
    remove obsolete attribute storage type ACC vs TUP

  ndb/test/include/NdbSchemaOp.hpp
    1.12 05/03/06 13:58:20 pekka@stripped +3 -46
    remove obsolete attribute storage type ACC vs TUP

  ndb/src/ndbapi/ndberror.c
    1.30 05/03/06 13:58:20 pekka@stripped +0 -1
    remove obsolete attribute storage type ACC vs TUP

  ndb/include/kernel/signaldata/CreateIndx.hpp
    1.6 05/03/06 13:58:20 pekka@stripped +0 -1
    remove obsolete attribute storage type ACC vs TUP

  ndb/include/kernel/signaldata/CreateEvnt.hpp
    1.7 05/03/06 13:58:20 pekka@stripped +0 -1
    remove obsolete attribute storage type ACC vs TUP

# 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:	pekka
# Host:	tuna.ndb.mysql.com
# Root:	/orca/space/pekka/ndb/version/my50-ndb

--- 1.2/ndb/test/ndbapi/bench/userInterface.cpp	2005-02-11 06:38:58 +01:00
+++ 1.3/ndb/test/ndbapi/bench/userInterface.cpp	2005-03-06 13:58:20 +01:00
@@ -173,7 +173,7 @@
       String, 
       MMBased,
       NotNullAttribute,
-      NormalStorageAttribute,
+      0,
       0,
       1,
       16);
@@ -376,7 +376,7 @@
       String, 
       MMBased,
       NotNullAttribute,
-      NormalStorageAttribute,
+      0,
       0,
       1,
       16);
@@ -494,7 +494,7 @@
 				       String, 
 				       MMBased,
 				       NotNullAttribute,
-				       NormalStorageAttribute,
+				       0,
 				       0,
 				       1,
 				       16);

--- 1.6/ndb/include/kernel/signaldata/CreateEvnt.hpp	2005-01-07 10:48:08 +01:00
+++ 1.7/ndb/include/kernel/signaldata/CreateEvnt.hpp	2005-03-06 13:58:20 +01:00
@@ -368,7 +368,6 @@
     EventNameTooLong = 4708,
     EventNameExists = 746,
     EventNotFound = 4731,
-    AttributeNotStored = 4245,
     AttributeNullable = 4246,
     BadRequestType = 4247,
     InvalidName = 4248,

--- 1.5/ndb/include/kernel/signaldata/CreateIndx.hpp	2005-03-03 08:50:34 +01:00
+++ 1.6/ndb/include/kernel/signaldata/CreateIndx.hpp	2005-03-06 13:58:20 +01:00
@@ -198,7 +198,6 @@
     IndexNameTooLong = 4241,
     TooManyIndexes = 4242,
     IndexExists = 4244,
-    AttributeNotStored = 4245,
     AttributeNullable = 4246,
     BadRequestType = 4247,
     InvalidName = 4248,

--- 1.11/ndb/test/include/NdbSchemaOp.hpp	2005-02-16 21:09:04 +01:00
+++ 1.12/ndb/test/include/NdbSchemaOp.hpp	2005-03-06 13:58:20 +01:00
@@ -79,29 +79,6 @@
   };
   
   /**
-   * Where attribute is stored.
-   *
-   * This is used to indicate whether a primary key
-   * should only be stored in the index storage and not in the data storage
-   * or if it should be stored in both places.
-   * The first alternative makes the attribute take less space, 
-   * but makes it impossible to scan using attribute.
-   *
-   * @note  Use NormalStorageAttribute for most cases.
-   *        (IndexStorageAttribute should only be used on primary key 
-   *        attributes and only if you do not want to scan using the attribute.)
-   */
-  enum StorageAttributeType { 
-    NoStorageAttributeTypeDefined = -1,  ///< <i>Missing explanation</i>
-    IndexStorageAttribute,               ///< Attribute is only stored in 
-                                         ///< index storage (ACC)
-    NormalStorageAttribute               ///< Attribute values are stored 
-                                         ///< both in the index (ACC) and 
-                                         ///< in the data storage (TUP)
-  };
-  
-  
-  /**
    *  Type of fragmentation used for a table
    */
   enum FragmentType { 
@@ -405,27 +382,7 @@
    *                     the attribute.
    *                     <br>
    *                     Legal values: true, false
-   * @param aStType      Stored in both index and data storage or 
-   *                     only store in index data storage.
-   *                     <br>
-   *                     This parameter is only of interest for tuple 
-   *                     key attributes.
-   * 			 All tuple key attributes values are always stored 
-   *                     in the index storage part.
-   *                     If this parameter is set to 
-   *                     IndexStorageAttribute, then the attribute values 
-   *                     will <em>only</em> be stored in the index 
-   *                     storage part and <em>not</em> in the data 
-   *                     storage part. 
-   *                     <br>
-   *                     If there will be no scans using the primary
-   *                     key attribute and if the size of the attribute 
-   *                     is large, then this might be of interest.
-   *                     A typical example is a table where 
-   *                     http-addresses are used as primary key.
-   *                     <br>
-   *                     Legal values: NormalStorageAttribute, 
-   *                                   IndexStorageAttribute
+   * @param aStType      Obsolete since wl-2066
    * @param aDistributionKey    Sometimes it is preferable to use a subset
    *                            of the primary key as the distribution key. 
    *                            An example is TPC-C where it might be
@@ -474,7 +431,7 @@
 		      AttrType aAttrType = UnSigned,
 		      StorageMode aStorageMode = MMBased,
 		      bool nullable = false,
-		      StorageAttributeType aStType= NormalStorageAttribute,
+		      int aStType= 0, // obsolete
 		      int aDistributionKey = 0,
 		      int aDistributionGroup = 0,
 		      int aDistributionGroupNoOfBits = 16,
@@ -491,7 +448,7 @@
 		      AttrType aAttrType,
 		      StorageMode aStorageMode,
 		      NullAttributeType aNullAttr,
-		      StorageAttributeType aStType = NormalStorageAttribute,
+		      int aStType, // obsolete
 		      int aDistributionKey = 0,
 		      int aDistributionGroup = 0,
 		      int aDistributionGroupNoOfBits = 16){

--- 1.7/ndb/test/src/NdbSchemaOp.cpp	2004-10-31 22:21:49 +01:00
+++ 1.8/ndb/test/src/NdbSchemaOp.cpp	2005-03-06 13:58:20 +01:00
@@ -113,7 +113,7 @@
                               AttrType anAttrType,      
                               StorageMode aStorageMode,
                               bool nullable,
-                              StorageAttributeType aStorageAttr,
+                              int aStorageAttr,
 			      int aDistributionKeyFlag,
 			      int aDistributionGroupFlag,
 			      int aDistributionGroupNoOfBits,

--- 1.29/ndb/src/ndbapi/ndberror.c	2005-01-10 16:02:32 +01:00
+++ 1.30/ndb/src/ndbapi/ndberror.c	2005-03-06 13:58:20 +01:00
@@ -494,7 +494,6 @@
   { 4242, AE, "Too many indexes" },
   { 4243, AE, "Index not found" },
   { 4244, OE, "Index or table with given name already exists" },
-  { 4245, AE, "Index attribute must be defined as stored, i.e. the StorageAttributeType must be defined as NormalStorageAttribute"},
   { 4247, AE, "Illegal index/trigger create/drop/alter request" },
   { 4248, AE, "Trigger/index name invalid" },
   { 4249, AE, "Invalid table" },
Thread
bk commit into 5.0 tree (pekka:1.1778)pekka6 Mar