[rhmessaging-commits] rhmessaging commits: r3534 - store/trunk/cpp/lib.

Author: kpvdr Date: 2009-07-31 14:25:15 -0400 (Fri, 31 Jul 2009) New Revision: 3534 Removed: store/trunk/cpp/lib/IdPairDbt.cpp store/trunk/cpp/lib/IdPairDbt.h Modified: store/trunk/cpp/lib/Makefile.am store/trunk/cpp/lib/MessageStoreImpl.cpp Log: Removed some unneeded BDB files from the build Deleted: store/trunk/cpp/lib/IdPairDbt.cpp =================================================================== --- store/trunk/cpp/lib/IdPairDbt.cpp 2009-07-31 15:06:34 UTC (rev 3533) +++ store/trunk/cpp/lib/IdPairDbt.cpp 2009-07-31 18:25:15 UTC (rev 3534) @@ -1,48 +0,0 @@ -/* - Copyright (c) 2007, 2008 Red Hat, Inc. - - This file is part of the Qpid async store library msgstore.so. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - - The GNU Lesser General Public License is available in the file COPYING. - */ - -#include "IdPairDbt.h" - -using namespace mrg::msgstore; - -IdPairDbt::IdPairDbt() : message(&ids[0], sizeof(ids[0])), queue(&ids[1], sizeof(ids[1])) -{ - ids[0] = 0; - ids[1] = 0; - init(); -} - -IdPairDbt::IdPairDbt(uint64_t _queue, uint64_t _message) : message(&ids[0], sizeof(ids[0])), queue(&ids[1], sizeof(ids[1])) -{ - ids[0] = _message; - ids[1] = _queue; - init(); -} - -void IdPairDbt::init() -{ - set_data(&ids); - set_size(sizeof(ids)); - set_ulen(sizeof(ids)); - set_flags(DB_DBT_USERMEM); -} Deleted: store/trunk/cpp/lib/IdPairDbt.h =================================================================== --- store/trunk/cpp/lib/IdPairDbt.h 2009-07-31 15:06:34 UTC (rev 3533) +++ store/trunk/cpp/lib/IdPairDbt.h 2009-07-31 18:25:15 UTC (rev 3534) @@ -1,50 +0,0 @@ -/* - Copyright (c) 2007, 2008 Red Hat, Inc. - - This file is part of the Qpid async store library msgstore.so. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - - The GNU Lesser General Public License is available in the file COPYING. - */ - -#ifndef _IdPairDbt_ -#define _IdPairDbt_ - -#include "db-inc.h" -#include <qpid/framing/amqp_types.h> - -namespace mrg{ -namespace msgstore{ - -class IdPairDbt : public Dbt -{ - uint64_t ids[2]; - - void init(); -public: - Dbt message; - Dbt queue; - - IdPairDbt(uint64_t queue, uint64_t message); - IdPairDbt(); - uint64_t queueId() { return ids[1]; } - uint64_t messageId() { return ids[0]; } -}; - -}} - -#endif Modified: store/trunk/cpp/lib/Makefile.am =================================================================== --- store/trunk/cpp/lib/Makefile.am 2009-07-31 15:06:34 UTC (rev 3533) +++ store/trunk/cpp/lib/Makefile.am 2009-07-31 18:25:15 UTC (rev 3534) @@ -43,7 +43,6 @@ BufferValue.cpp \ DataTokenImpl.cpp \ IdDbt.cpp \ - IdPairDbt.cpp \ IdSequence.cpp \ JournalImpl.cpp \ MessageStoreImpl.cpp \ @@ -55,7 +54,6 @@ Cursor.h \ DataTokenImpl.h \ IdDbt.h \ - IdPairDbt.h \ IdSequence.h \ JournalImpl.h \ MessageStoreImpl.h \ Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-07-31 15:06:34 UTC (rev 3533) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-07-31 18:25:15 UTC (rev 3534) @@ -25,7 +25,7 @@ #include "BindingDbt.h" #include "BufferValue.h" -#include "IdPairDbt.h" +#include "IdDbt.h" #include "jrnl/txn_map.hpp" #include "qpid/log/Statement.h" #include "qmf/com/redhat/rhm/store/Package.h"