List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 6 2007 9:15pm
Subject:Rev 283: Merged. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 283
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Thu 2007-12-06 13:15:14 -0800
message:
  Merged.
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  mgmpp/events.hpp               events.hpp-20071206045946-ugo2x6q480oerp8f-6
    ------------------------------------------------------------
    revno: 192.1.25.1.107.1.21
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Thu 2007-12-06 13:02:06 -0800
    message:
      Made constructors explicit to prevent unexpected type conversions.
    modified:
      mgmpp/events.hpp               events.hpp-20071206045946-ugo2x6q480oerp8f-6
    ------------------------------------------------------------
    revno: 192.1.25.1.107.1.20
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Thu 2007-12-06 13:01:46 -0800
    message:
      Added entries to CLEANFILES to clean up old files that might be lying around.
    modified:
      java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-12-06 09:25:43 +0000
+++ b/java/Makefile.am	2007-12-06 21:15:14 +0000
@@ -124,7 +124,7 @@
 # Files to remove to clean up after a rename
 DEPRECATED_FILES = ${package_builddir}/mgmj/NdbMgmEventSeverity.java \
 	${package_builddir}/mgmj/NdbMgmEventCategory.java
-CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar
${builddir}/mgmj.jar ${builddir}/*.h ${package_builddir}/ndbj/*class
${package_builddir}/mgmj/*class testsuite/*class testsuite/ndbj/*class 
${package_builddir}/ndbj/*Ref.java ${package_builddir}/examples $(DEPRECATED_FILES)
${package_builddir}/mgmj/events/*class ${package_builddir}/mgmj/listeners/*class 
events.cxx listeners.cxx
+CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar
${builddir}/mgmj.jar ${builddir}/*.h ${package_builddir}/ndbj/*class
${package_builddir}/mgmj/*class testsuite/*class testsuite/ndbj/*class 
${package_builddir}/ndbj/*Ref.java ${package_builddir}/examples $(DEPRECATED_FILES)
${package_builddir}/mgmj/events/*class ${package_builddir}/mgmj/listeners/*class 
events.cxx listeners.cxx ${package_builddir}/mgmj/*Event.java
${package_builddir}/mgmj/SWIG* ${package_builddir}/ndbj/SWIG*
${package_builddir}/mgmj/events/SWIG* ${package_builddir}/mgmj/listeners/SWIG*
 
 MGMAPI_JAVA_SRC = ${package_srcdir}/mgmj/NdbMgmException.java \
 	${package_srcdir}/mgmj/examples/SampleMGMJ.java \

=== modified file 'mgmpp/events.hpp'
--- a/mgmpp/events.hpp	2007-12-06 12:12:19 +0000
+++ b/mgmpp/events.hpp	2007-12-06 21:02:06 +0000
@@ -32,7 +32,7 @@
   BaseEvent();
 public: 
   ndb_logevent event; 
-  BaseEvent(const ndb_logevent & theEvent);
+  explicit BaseEvent(const ndb_logevent & theEvent);
   Ndb_logevent_type getType();
   int getSourceNodeId();
   Uint32 getEventTime();
@@ -44,31 +44,31 @@
 
 class Connected : public BaseEvent { 
 public:
-  Connected(const ndb_logevent & theEvent);
+  explicit Connected(const ndb_logevent & theEvent);
   unsigned node;
 };
 
 class Disconnected : public BaseEvent { 
 public:
-  Disconnected(const ndb_logevent & theEvent);
+  explicit Disconnected(const ndb_logevent & theEvent);
   unsigned node;
 };
 
 class CommunicationOpened : public BaseEvent { 
 public:
-  CommunicationOpened(const ndb_logevent & theEvent);
+  explicit CommunicationOpened(const ndb_logevent & theEvent);
   unsigned node;
 };
 
 class CommunicationClosed : public BaseEvent { 
 public:
-  CommunicationClosed(const ndb_logevent & theEvent);
+  explicit CommunicationClosed(const ndb_logevent & theEvent);
   unsigned node; 
   };
 
 class ConnectedApiVersion : public BaseEvent { 
 public:
-  ConnectedApiVersion(const ndb_logevent & theEvent);
+  explicit ConnectedApiVersion(const ndb_logevent & theEvent);
   unsigned node;
   unsigned version;
 };
@@ -79,7 +79,7 @@
   
   unsigned gci;
   
-  GlobalCheckpointStarted(const ndb_logevent & theEvent);
+  explicit GlobalCheckpointStarted(const ndb_logevent & theEvent);
 };
 
   class GlobalCheckpointCompleted : public BaseEvent { 
@@ -87,7 +87,7 @@
     
     unsigned gci;
 
-    GlobalCheckpointCompleted(const ndb_logevent & theEvent);
+    explicit GlobalCheckpointCompleted(const ndb_logevent & theEvent);
   };
 
 
@@ -98,7 +98,7 @@
     unsigned keepGci;
     unsigned restoreGci;
     
-    LocalCheckpointStarted(const ndb_logevent & theEvent);
+    explicit LocalCheckpointStarted(const ndb_logevent & theEvent);
   };
 
   class LocalCheckpointCompleted : public BaseEvent { 
@@ -106,14 +106,14 @@
 
     unsigned lci;
 
-    LocalCheckpointCompleted(const ndb_logevent & theEvent);
+    explicit LocalCheckpointCompleted(const ndb_logevent & theEvent);
   };
 
   class LCPStoppedInCalcKeepGci : public BaseEvent {
   public:
     unsigned data;
 
-    LCPStoppedInCalcKeepGci(const ndb_logevent & theEvent);
+    explicit LCPStoppedInCalcKeepGci(const ndb_logevent & theEvent);
   };
 
   class LCPFragmentCompleted : public BaseEvent { 
@@ -122,7 +122,7 @@
     unsigned tableId;
     unsigned fragmentId;
 
-    LCPFragmentCompleted(const ndb_logevent & theEvent);
+    explicit LCPFragmentCompleted(const ndb_logevent & theEvent);
   };
 
   class UndoLogBlocked : public BaseEvent { 
@@ -130,26 +130,26 @@
     unsigned accCount;
     unsigned tupCount;
     
-    UndoLogBlocked(const ndb_logevent & theEvent);
+    explicit UndoLogBlocked(const ndb_logevent & theEvent);
   };
 
   class NdbStartStarted : public BaseEvent { 
   public:
     unsigned version;
 
-    NdbStartStarted(const ndb_logevent & theEvent);
+    explicit NdbStartStarted(const ndb_logevent & theEvent);
   };
 
   class NdbStartCompleted : public BaseEvent { 
   public:
     unsigned version;
 
-    NdbStartCompleted(const ndb_logevent & theEvent);
+    explicit NdbStartCompleted(const ndb_logevent & theEvent);
   };
 
   class STTORRYRecieved : public BaseEvent { 
   public:
-    STTORRYRecieved(const ndb_logevent & theEvent);
+    explicit STTORRYRecieved(const ndb_logevent & theEvent);
   };
 
   class StartPhaseCompleted : public BaseEvent { 
@@ -157,7 +157,7 @@
     unsigned phase;
     unsigned startType;
 
-    StartPhaseCompleted(const ndb_logevent & theEvent);
+    explicit StartPhaseCompleted(const ndb_logevent & theEvent);
   };
 
   class CmRegConf : public BaseEvent { 
@@ -166,7 +166,7 @@
     unsigned presidentId;
     unsigned dynamicId;
 
-    CmRegConf(const ndb_logevent & theEvent);
+    explicit CmRegConf(const ndb_logevent & theEvent);
   };
 
   class CmRegRef : public BaseEvent { 
@@ -175,7 +175,7 @@
     unsigned otherId;
     unsigned cause;
 
-    CmRegRef(const ndb_logevent & theEvent);
+    explicit CmRegRef(const ndb_logevent & theEvent);
   };
 
   class FindNeighbours : public BaseEvent { 
@@ -185,14 +185,14 @@
     unsigned rightId;
     unsigned dynamicId;
 
-    FindNeighbours(const ndb_logevent & theEvent);
+    explicit FindNeighbours(const ndb_logevent & theEvent);
   };
 
   class NdbStopStarted : public BaseEvent { 
   public:
     unsigned stopType;
 
-    NdbStopStarted(const ndb_logevent & theEvent);
+    explicit NdbStopStarted(const ndb_logevent & theEvent);
   };
 
   class NdbStopCompleted : public BaseEvent { 
@@ -200,7 +200,7 @@
     unsigned action;
     unsigned sigNum;
 
-    NdbStopCompleted(const ndb_logevent & theEvent);
+    explicit NdbStopCompleted(const ndb_logevent & theEvent);
   };
 
   class NdbStopForced : public BaseEvent { 
@@ -211,13 +211,13 @@
     unsigned sphase;
     unsigned extra;
     
-    NdbStopForced(const ndb_logevent & theEvent);
+    explicit NdbStopForced(const ndb_logevent & theEvent);
   };
 
   class NdbStopAborted : public BaseEvent { 
   public:
 
-    NdbStopAborted(const ndb_logevent & theEvent);
+    explicit NdbStopAborted(const ndb_logevent & theEvent);
   };
 
   class StartREDOLog : public BaseEvent { 
@@ -227,7 +227,7 @@
     unsigned completedGci;
     unsigned restorableGci;
     
-    StartREDOLog(const ndb_logevent & theEvent);
+    explicit StartREDOLog(const ndb_logevent & theEvent);
   };
 
   class StartLog : public BaseEvent { 
@@ -237,7 +237,7 @@
     unsigned stopMb;
     unsigned gci;
 
-    StartLog(const ndb_logevent & theEvent);
+    explicit StartLog(const ndb_logevent & theEvent);
   };
 
   class UNDORecordsExecuted : public BaseEvent { 
@@ -254,26 +254,26 @@
     unsigned data9;
     unsigned data10;
   
-    UNDORecordsExecuted(const ndb_logevent & theEvent);
+    explicit UNDORecordsExecuted(const ndb_logevent & theEvent);
   };
 
   class NRCopyDict : public BaseEvent { 
   public:
   
-    NRCopyDict(const ndb_logevent & theEvent);
+   explicit  NRCopyDict(const ndb_logevent & theEvent);
   };
 
   class NRCopyDistr : public BaseEvent { 
   public:
   
-    NRCopyDistr(const ndb_logevent & theEvent);
+    explicit NRCopyDistr(const ndb_logevent & theEvent);
   };
 
   class NRCopyFragsStarted : public BaseEvent { 
   public:
     unsigned destNode;
 
-    NRCopyFragsStarted(const ndb_logevent & theEvent);
+    explicit NRCopyFragsStarted(const ndb_logevent & theEvent);
   };
 
   class NRCopyFragDone : public BaseEvent { 
@@ -282,7 +282,7 @@
     unsigned tableId;
     unsigned fragmentId;
 
-    NRCopyFragDone(const ndb_logevent & theEvent);
+    explicit NRCopyFragDone(const ndb_logevent & theEvent);
 
   };
 
@@ -290,7 +290,7 @@
   public:
     unsigned destNode;
 
-    NRCopyFragsCompleted(const ndb_logevent & theEvent);
+    explicit NRCopyFragsCompleted(const ndb_logevent & theEvent);
 
   };
 
@@ -300,7 +300,7 @@
     unsigned failedNode;
     unsigned completingNode; /* 0 = all */
 
-    NodeFailCompleted(const ndb_logevent & theEvent);
+    explicit NodeFailCompleted(const ndb_logevent & theEvent);
 
   };
 
@@ -309,7 +309,7 @@
     unsigned failedNode;
     unsigned failureState;
 
-    NodeFailReported(const ndb_logevent & theEvent);
+    explicit NodeFailReported(const ndb_logevent & theEvent);
 
   };
 
@@ -321,7 +321,7 @@
     unsigned ticket0;
     unsigned ticket1;
 
-    ArbitState(const ndb_logevent & theEvent);
+    explicit ArbitState(const ndb_logevent & theEvent);
     
   };
 
@@ -332,33 +332,33 @@
     unsigned ticket0;
     unsigned ticket1;
 
-    ArbitResult(const ndb_logevent & theEvent);
+    explicit ArbitResult(const ndb_logevent & theEvent);
 
   };
 
   class GCPTakeoverStarted : public BaseEvent { 
   public:
 
-    GCPTakeoverStarted(const ndb_logevent & theEvent);
+    explicit GCPTakeoverStarted(const ndb_logevent & theEvent);
   };
 
   class GCPTakeoverCompleted : public BaseEvent { 
   public:
 
-    GCPTakeoverCompleted(const ndb_logevent & theEvent);
+    explicit GCPTakeoverCompleted(const ndb_logevent & theEvent);
   };
 
   class LCPTakeoverStarted : public BaseEvent { 
   public:
 
-    LCPTakeoverStarted(const ndb_logevent & theEvent);
+    explicit LCPTakeoverStarted(const ndb_logevent & theEvent);
   };
 
   class LCPTakeoverCompleted : public BaseEvent { 
   public:
     unsigned state;
 
-    LCPTakeoverCompleted(const ndb_logevent & theEvent);
+    explicit LCPTakeoverCompleted(const ndb_logevent & theEvent);
   };
 
   class TransReportCounters : public BaseEvent { 
@@ -374,7 +374,7 @@
     unsigned scanCount;
     unsigned rangeScanCount;
   
-    TransReportCounters(const ndb_logevent & theEvent);
+    explicit TransReportCounters(const ndb_logevent & theEvent);
 
   };
 
@@ -382,7 +382,7 @@
   public:
     unsigned ops;
 
-    OperationReportCounters(const ndb_logevent & theEvent);
+    explicit OperationReportCounters(const ndb_logevent & theEvent);
 
   };
 
@@ -390,14 +390,14 @@
   public:
     unsigned tableId;
 
-    TableCreated(const ndb_logevent & theEvent);
+    explicit TableCreated(const ndb_logevent & theEvent);
   };
 
   class JobStatistic : public BaseEvent { 
   public:
     unsigned meanLoopCount;
 
-    JobStatistic(const ndb_logevent & theEvent);
+    explicit JobStatistic(const ndb_logevent & theEvent);
   };
 
   class SendBytesStatistic : public BaseEvent { 
@@ -405,7 +405,7 @@
     unsigned toNode;
     unsigned meanSentBytes;
 
-    SendBytesStatistic(const ndb_logevent & theEvent);
+    explicit SendBytesStatistic(const ndb_logevent & theEvent);
   };
 
   class ReceiveBytesStatistic : public BaseEvent { 
@@ -413,7 +413,7 @@
     unsigned fromNode;
     unsigned meanReceivedBytes;
 
-    ReceiveBytesStatistic(const ndb_logevent & theEvent);
+    explicit ReceiveBytesStatistic(const ndb_logevent & theEvent);
   };
 
   class MemoryUsage : public BaseEvent { 
@@ -424,7 +424,7 @@
     unsigned pagesTotal;
     unsigned block;
 
-    MemoryUsage(const ndb_logevent & theEvent);
+    explicit MemoryUsage(const ndb_logevent & theEvent);
   };
 
   class TransporterError : public BaseEvent { 
@@ -432,7 +432,7 @@
     unsigned toNode;
     unsigned code;
 
-    TransporterError(const ndb_logevent & theEvent);
+    explicit TransporterError(const ndb_logevent & theEvent);
   };
 
   class TransporterWarning : public BaseEvent { 
@@ -440,7 +440,7 @@
     unsigned toNode;
     unsigned code;
 
-    TransporterWarning(const ndb_logevent & theEvent);
+    explicit TransporterWarning(const ndb_logevent & theEvent);
   };
 
   class MissedHeartbeat : public BaseEvent { 
@@ -448,40 +448,40 @@
     unsigned node;
     unsigned count;
 
-    MissedHeartbeat(const ndb_logevent & theEvent);
+    explicit MissedHeartbeat(const ndb_logevent & theEvent);
   };
 
   class DeadDueToHeartbeat : public BaseEvent { 
   public:
     unsigned node;
 
-    DeadDueToHeartbeat(const ndb_logevent & theEvent);
+    explicit DeadDueToHeartbeat(const ndb_logevent & theEvent);
   };
 
   class Warning : public BaseEvent { 
   public:
 
-    Warning(const ndb_logevent & theEvent);
+    explicit Warning(const ndb_logevent & theEvent);
   };
 
   class SentHeartbeat : public BaseEvent { 
   public:
     unsigned node;
 
-    SentHeartbeat(const ndb_logevent & theEvent);
+    explicit SentHeartbeat(const ndb_logevent & theEvent);
   };
 
   class CreateLogBytes : public BaseEvent { 
   public:
     unsigned node;
 
-    CreateLogBytes(const ndb_logevent & theEvent);
+    explicit CreateLogBytes(const ndb_logevent & theEvent);
   };
 
   class InfoEvent : public BaseEvent { 
   public:
 
-    InfoEvent(const ndb_logevent & theEvent);
+    explicit InfoEvent(const ndb_logevent & theEvent);
   };
 
   class EventBufferStatus : public BaseEvent { 
@@ -494,7 +494,7 @@
     unsigned latestGciL;
     unsigned latestGciH;
 
-    EventBufferStatus(const ndb_logevent & theEvent);
+    explicit EventBufferStatus(const ndb_logevent & theEvent);
   };
 
 
@@ -503,7 +503,7 @@
     unsigned startingNode;
     unsigned backupId;
 
-    BackupStarted(const ndb_logevent & theEvent);
+    explicit BackupStarted(const ndb_logevent & theEvent);
   };
 
   class BackupFailedToStart : public BaseEvent { 
@@ -511,7 +511,7 @@
     unsigned startingNode;
     unsigned error;
 
-    BackupFailedToStart(const ndb_logevent & theEvent);
+    explicit BackupFailedToStart(const ndb_logevent & theEvent);
   };
 
   class BackupCompleted : public BaseEvent { 
@@ -525,7 +525,7 @@
     unsigned numBytes;
     unsigned numLogBytes;
 
-    BackupCompleted(const ndb_logevent & theEvent);
+    explicit BackupCompleted(const ndb_logevent & theEvent);
   };
 
   class BackupAborted : public BaseEvent { 
@@ -534,7 +534,7 @@
     unsigned backupId;
     unsigned error;
 
-    BackupAborted(const ndb_logevent & theEvent);
+    explicit BackupAborted(const ndb_logevent & theEvent);
   };
 
   class SingleUser : public BaseEvent { 
@@ -542,7 +542,7 @@
     unsigned eventType;
     unsigned nodeId;
 
-    SingleUser(const ndb_logevent & theEvent);
+    explicit SingleUser(const ndb_logevent & theEvent);
   };
 
   class StartReport : public BaseEvent { 
@@ -552,7 +552,7 @@
     unsigned bitmaskSize;
     //unsigned bitmaskData[1];
 
-    StartReport(const ndb_logevent & theEvent);
+    explicit StartReport(const ndb_logevent & theEvent);
   };
 
 

Thread
Rev 283: Merged. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor6 Dec