tux - remove obsolete signals tux->tup

BitKeeper/deleted/.del-TupAccess.cpp~5273de82afd8d7d0:
  Delete: ndb/src/common/debugger/signaldata/TupAccess.cpp
BitKeeper/deleted/.del-TupAccess.hpp~a9b722c1d6fa1442:
  Delete: ndb/include/kernel/signaldata/TupAccess.hpp

4 files changed, 2 insertions, 139 deletions

diff --git a/ndb/src/common/debugger/signaldata/Makefile.am b/ndb/src/common/debugger/signaldata/Makefile.am
index 0d6ed45dcef..0a5806e1e00 100644
--- a/ndb/src/common/debugger/signaldata/Makefile.am
+++ b/ndb/src/common/debugger/signaldata/Makefile.am
@@ -22,7 +22,7 @@ libsignaldataprint_la_SOURCES = \
           CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp \
           FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
           SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
-	  UtilLock.cpp TuxMaint.cpp TupAccess.cpp AccLock.cpp \
+	  UtilLock.cpp TuxMaint.cpp AccLock.cpp \
           LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp
 
 include $(top_srcdir)/ndb/config/common.mk.am
@@ -30,3 +30,4 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
+
diff --git a/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp b/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
index d49e316ad38..e18ca18b632 100644
--- a/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
+++ b/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
@@ -73,7 +73,6 @@
 #include <signaldata/CntrStart.hpp>
 #include <signaldata/ReadNodesConf.hpp>
 #include <signaldata/TuxMaint.hpp>
-#include <signaldata/TupAccess.hpp>
 #include <signaldata/AccLock.hpp>
 
 bool printCONTINUEB(FILE *, const Uint32 *, Uint32, Uint16);
@@ -249,9 +248,6 @@ SignalDataPrintFunctions[] = {
   ,{ GSN_READ_NODESCONF,         printREAD_NODES_CONF }
 
   ,{ GSN_TUX_MAINT_REQ, printTUX_MAINT_REQ }
-  ,{ GSN_TUP_READ_ATTRS, printTUP_READ_ATTRS }
-  ,{ GSN_TUP_QUERY_TH, printTUP_QUERY_TH }
-  ,{ GSN_TUP_STORE_TH, printTUP_STORE_TH }
   ,{ GSN_ACC_LOCKREQ, printACC_LOCKREQ }
   ,{ GSN_LQH_TRANSCONF, printLQH_TRANSCONF }
 };
diff --git a/ndb/src/common/debugger/signaldata/SignalNames.cpp b/ndb/src/common/debugger/signaldata/SignalNames.cpp
index 377a588dbb0..5d74a7b785d 100644
--- a/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/ndb/src/common/debugger/signaldata/SignalNames.cpp
@@ -641,9 +641,6 @@ const GsnName SignalNames [] = {
   ,{ GSN_TUX_MAINT_REQ,  "TUX_MAINT_REQ" }
   ,{ GSN_TUX_MAINT_CONF, "TUX_MAINT_CONF" }
   ,{ GSN_TUX_MAINT_REF,  "TUX_MAINT_REF" }
-  ,{ GSN_TUP_READ_ATTRS,  "TUP_READ_ATTRS" }
-  ,{ GSN_TUP_QUERY_TH,  "TUP_QUERY_TH" }
-  ,{ GSN_TUP_STORE_TH,  "TUP_STORE_TH" }
   ,{ GSN_TUX_BOUND_INFO,  "TUX_BOUND_INFO" }
   ,{ GSN_ACC_LOCKREQ,  "ACC_LOCKREQ" }
   
diff --git a/ndb/src/common/debugger/signaldata/TupAccess.cpp b/ndb/src/common/debugger/signaldata/TupAccess.cpp
deleted file mode 100644
index e94d4636cf5..00000000000
--- a/ndb/src/common/debugger/signaldata/TupAccess.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#include <signaldata/TupAccess.hpp>
-#include <SignalLoggerManager.hpp>
-#include <AttributeHeader.hpp>
-
-bool
-printTUP_READ_ATTRS(FILE* output, const Uint32* theData, Uint32 len, Uint16 rbn)
-{
-  const TupReadAttrs* const sig = (const TupReadAttrs*)theData;
-  if (sig->errorCode == RNIL)
-    fprintf(output, " errorCode=RNIL flags=%x\n", sig->requestInfo);
-  else
-    fprintf(output, " errorCode=%u flags=%x\n", sig->errorCode, sig->requestInfo);
-  fprintf(output, " table: id=%u", sig->tableId);
-  fprintf(output, " fragment: id=%u ptr=0x%x\n", sig->fragId, sig->fragPtrI);
-  fprintf(output, " tuple: addr=0x%x version=%u", sig->tupAddr, sig->tupVersion);
-  fprintf(output, " realPage=0x%x offset=%u\n", sig->pageId, sig->pageOffset);
-  const Uint32* buffer = (const Uint32*)sig + TupReadAttrs::SignalLength;
-  Uint32 attrCount = buffer[0];
-  bool readKeys = (sig->requestInfo & TupReadAttrs::ReadKeys);
-  if (sig->errorCode == RNIL && ! readKeys ||
-      sig->errorCode == 0 && readKeys) {
-    fprintf(output, " input: attrCount=%u\n", attrCount);
-    for (unsigned i = 0; i < attrCount; i++) {
-      AttributeHeader ah(buffer[1 + i]);
-      fprintf(output, " %u: attrId=%u\n", i, ah.getAttributeId());
-    }
-  }
-  if (sig->errorCode == 0) {
-    fprintf(output, " output: attrCount=%u\n", attrCount);
-    Uint32 pos = 1 + attrCount;
-    for (unsigned i = 0; i < attrCount; i++) {
-      AttributeHeader ah(buffer[pos++]);
-      fprintf(output, " %u: attrId=%u dataSize=%u\n", i, ah.getAttributeId(), ah.getDataSize());
-      Uint32 next = pos + ah.getDataSize();
-      Uint32 printpos = 0;
-      while (pos < next) {
-        SignalLoggerManager::printDataWord(output, printpos, buffer[pos]);
-        pos++;
-      }
-      if (ah.getDataSize() > 0)
-        fprintf(output, "\n");
-    }
-  }
-  return true;
-}
-
-bool
-printTUP_QUERY_TH(FILE* output, const Uint32* theData, Uint32 len, Uint16 rbn)
-{
-  const TupQueryTh* const sig = (const TupQueryTh*)theData;
-  fprintf(output, "tableId = %u, fragId = %u ", sig->tableId, sig->fragId);
-  fprintf(output, "tuple: addr = 0x%x version = %u\n", sig->tupAddr,
-          sig->tupVersion);
-  fprintf(output, "transId1 = 0x%x, transId2 = 0x%x, savePointId = %u\n",
-          sig->transId1, sig->transId2, sig->savePointId);
-  return true;
-}
-
-bool
-printTUP_STORE_TH(FILE* output, const Uint32* theData, Uint32 len, Uint16 rbn)
-{
-  const TupStoreTh* const sig = (const TupStoreTh*)theData;
-  if (sig->errorCode == RNIL)
-    fprintf(output, " errorCode=RNIL\n");
-  else
-    fprintf(output, " errorCode=%u\n", sig->errorCode);
-  fprintf(output, " table: id=%u", sig->tableId);
-  fprintf(output, " fragment: id=%u ptr=0x%x\n", sig->fragId, sig->fragPtrI);
-  fprintf(output, " tuple: addr=0x%x", sig->tupAddr);
-  if ((sig->tupAddr & 0x1) == 0) {
-    fprintf(output, " fragPage=0x%x index=%u",
-        sig->tupAddr >> MAX_TUPLES_BITS,
-        (sig->tupAddr & ((1 <<MAX_TUPLES_BITS) - 1)) >> 1);
-    fprintf(output, " realPage=0x%x offset=%u\n", sig->pageId, sig->pageOffset);
-  } else {
-    fprintf(output, " cacheId=%u\n",
-        sig->tupAddr >> 1);
-  }
-  if (sig->tupVersion != 0) {
-    fprintf(output, " version=%u ***invalid***\n", sig->tupVersion);
-  }
-  bool showdata = true;
-  switch (sig->opCode) {
-  case TupStoreTh::OpRead:
-    fprintf(output, " operation=Read\n");
-    showdata = false;
-    break;
-  case TupStoreTh::OpInsert:
-    fprintf(output, " operation=Insert\n");
-    break;
-  case TupStoreTh::OpUpdate:
-    fprintf(output, " operation=Update\n");
-    break;
-  case TupStoreTh::OpDelete:
-    fprintf(output, " operation=Delete\n");
-    showdata = false;
-    break;
-  default:
-    fprintf(output, " operation=%u ***invalid***\n", sig->opCode);
-    break;
-  }
-  fprintf(output, " data: offset=%u size=%u", sig->dataOffset, sig->dataSize);
-  if (! showdata) {
-    fprintf(output, " [not printed]\n");
-  } else {
-    fprintf(output, "\n");
-    const Uint32* buffer = (const Uint32*)sig + TupStoreTh::SignalLength;
-    Uint32 pos = 0;
-    while (pos < sig->dataSize)
-      SignalLoggerManager::printDataWord(output, pos, buffer[sig->dataOffset + pos]);
-    if (sig->dataSize > 0)
-      fprintf(output, "\n");
-  }
-  return true;
-};