You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2018/06/06 15:25:37 UTC
qpid-cpp git commit: QPID-8200: Fix for legacystore compiling under
Fedora 28. Similar to that on linearstore,
plus some additional cleanup. Also fixed a linker issue on F28 through adding
the rec_hdr.cpp file.
Repository: qpid-cpp
Updated Branches:
refs/heads/master a3a77949e -> fcfd6759f
QPID-8200: Fix for legacystore compiling under Fedora 28. Similar to that on linearstore, plus some additional cleanup. Also fixed a linker issue on F28 through adding the rec_hdr.cpp file.
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/fcfd6759
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/fcfd6759
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/fcfd6759
Branch: refs/heads/master
Commit: fcfd6759f13419f1e74a5e7efd0c81fbd0c25e48
Parents: a3a7794
Author: Kim van der Riet <kv...@localhost.localdomain>
Authored: Wed Jun 6 11:25:17 2018 -0400
Committer: Kim van der Riet <kv...@localhost.localdomain>
Committed: Wed Jun 6 11:25:17 2018 -0400
----------------------------------------------------------------------
src/legacystore.cmake | 1 +
src/qpid/legacystore/jrnl/pmgr.cpp | 11 --------
src/qpid/legacystore/jrnl/pmgr.h | 1 -
src/qpid/legacystore/jrnl/rec_hdr.cpp | 36 +++++++++++++++++++++++++
src/tests/legacystore/CMakeLists.txt | 2 +-
src/tests/legacystore/jrnl/_ut_rec_hdr.cpp | 30 ++++++++++-----------
6 files changed, 53 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fcfd6759/src/legacystore.cmake
----------------------------------------------------------------------
diff --git a/src/legacystore.cmake b/src/legacystore.cmake
index ef5df28..f77eed9 100644
--- a/src/legacystore.cmake
+++ b/src/legacystore.cmake
@@ -89,6 +89,7 @@ if (BUILD_LEGACYSTORE)
qpid/legacystore/jrnl/lp_map.cpp
qpid/legacystore/jrnl/lpmgr.cpp
qpid/legacystore/jrnl/pmgr.cpp
+ qpid/legacystore/jrnl/rec_hdr.cpp
qpid/legacystore/jrnl/rmgr.cpp
qpid/legacystore/jrnl/rfc.cpp
qpid/legacystore/jrnl/rrfc.cpp
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fcfd6759/src/qpid/legacystore/jrnl/pmgr.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/legacystore/jrnl/pmgr.cpp b/src/qpid/legacystore/jrnl/pmgr.cpp
index 3dc61e2..752ac33 100644
--- a/src/qpid/legacystore/jrnl/pmgr.cpp
+++ b/src/qpid/legacystore/jrnl/pmgr.cpp
@@ -46,17 +46,6 @@ namespace mrg
namespace journal
{
-pmgr::page_cb::page_cb(u_int16_t index):
- _index(index),
- _state(UNUSED),
- _wdblks(0),
- _rdblks(0),
- _pdtokl(0),
- _wfh(0),
- _rfh(0),
- _pbuff(0)
-{}
-
const char*
pmgr::page_cb::state_str() const
{
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fcfd6759/src/qpid/legacystore/jrnl/pmgr.h
----------------------------------------------------------------------
diff --git a/src/qpid/legacystore/jrnl/pmgr.h b/src/qpid/legacystore/jrnl/pmgr.h
index 64115e2..2b291cb 100644
--- a/src/qpid/legacystore/jrnl/pmgr.h
+++ b/src/qpid/legacystore/jrnl/pmgr.h
@@ -93,7 +93,6 @@ namespace journal
fcntl* _rfh; ///< File handle for incrementing read compl counts
void* _pbuff; ///< Page buffer
- page_cb(u_int16_t index); ///< Convenience constructor
const char* state_str() const; ///< Return state as string for this pcb
};
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fcfd6759/src/qpid/legacystore/jrnl/rec_hdr.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/legacystore/jrnl/rec_hdr.cpp b/src/qpid/legacystore/jrnl/rec_hdr.cpp
new file mode 100644
index 0000000..99bb40c
--- /dev/null
+++ b/src/qpid/legacystore/jrnl/rec_hdr.cpp
@@ -0,0 +1,36 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+/**
+ * \file rec_hdr.cpp
+ *
+ */
+
+#include "qpid/legacystore/jrnl/rec_hdr.h"
+
+namespace mrg
+{
+namespace journal
+{
+
+ const u_int16_t rec_hdr::HDR_OVERWRITE_INDICATOR_MASK;
+
+}}
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fcfd6759/src/tests/legacystore/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/legacystore/CMakeLists.txt b/src/tests/legacystore/CMakeLists.txt
index 20a242b..3427caf 100644
--- a/src/tests/legacystore/CMakeLists.txt
+++ b/src/tests/legacystore/CMakeLists.txt
@@ -51,7 +51,7 @@ target_link_libraries (${testname}
if ("${ARGV1}" STREQUAL "LONG")
set_target_properties(${testname} PROPERTIES COMPILE_DEFINITIONS LONG_TEST)
endif ()
-add_test (NAME ${testname} COMMAND ${CMAKE_BINARY_DIR}/src/tests/run.sh $<TARGET_FILE:${testname}>)
+add_test (NAME ${testname} COMMAND ${CMAKE_BINARY_DIR}/src/tests/run.py $<TARGET_FILE:${testname}>)
unset (testname)
ENDMACRO (define_journal_test)
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fcfd6759/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
----------------------------------------------------------------------
diff --git a/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp b/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
index 099e576..7bbfb45 100644
--- a/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
+++ b/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
@@ -63,7 +63,7 @@ QPID_AUTO_TEST_CASE(hdr_class)
#else
BOOST_CHECK_EQUAL(h2._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(h2._uflag, (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(h2._uflag, rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(h2._rid, rid);
BOOST_CHECK_EQUAL(h2.get_owi(), owi);
h2._uflag = uflag;
@@ -73,7 +73,7 @@ QPID_AUTO_TEST_CASE(hdr_class)
BOOST_CHECK_EQUAL(h2._uflag, uflag);
h2.set_owi(false);
BOOST_CHECK(!h2.get_owi());
- BOOST_CHECK_EQUAL(h2._uflag, (uflag & ~(const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
+ BOOST_CHECK_EQUAL(h2._uflag, (uflag & ~rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
h2.set_owi(true);
BOOST_CHECK(h2.get_owi());
BOOST_CHECK_EQUAL(h2._uflag, uflag);
@@ -170,7 +170,7 @@ QPID_AUTO_TEST_CASE(file_hdr_class)
#else
BOOST_CHECK_EQUAL(fh2._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(fh2._uflag, (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(fh2._uflag, rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(fh2._rid, rid);
BOOST_CHECK_EQUAL(fh2._pfid, pfid );
BOOST_CHECK_EQUAL(fh2._lfid, lfid);
@@ -189,7 +189,7 @@ QPID_AUTO_TEST_CASE(file_hdr_class)
fh2.set_owi(false);
BOOST_CHECK(!fh2.get_owi());
BOOST_CHECK_EQUAL(fh2._uflag,
- (uflag & ~(const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
+ (uflag & ~rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
fh2.set_owi(true);
BOOST_CHECK(fh2.get_owi());
@@ -205,7 +205,7 @@ QPID_AUTO_TEST_CASE(file_hdr_class)
#else
BOOST_CHECK_EQUAL(fh3._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(fh3._uflag, (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(fh3._uflag, rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(fh3._rid, rid);
BOOST_CHECK_EQUAL(fh3._pfid, pfid);
BOOST_CHECK_EQUAL(fh3._lfid, lfid);
@@ -252,7 +252,7 @@ QPID_AUTO_TEST_CASE(enq_hdr_class)
#else
BOOST_CHECK_EQUAL(eh2._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(eh2._uflag, (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(eh2._uflag, rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(eh2._rid, rid);
BOOST_CHECK_EQUAL(eh2._xidsize, xidsize);
BOOST_CHECK_EQUAL(eh2._dsize, dsize);
@@ -270,7 +270,7 @@ QPID_AUTO_TEST_CASE(enq_hdr_class)
BOOST_CHECK(eh2.is_transient());
BOOST_CHECK(eh2.is_external());
BOOST_CHECK_EQUAL(eh2._uflag,
- (uflag & ~(const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
+ (uflag & ~rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
eh2.set_owi(true);
BOOST_CHECK(eh2.get_owi());
@@ -282,7 +282,7 @@ QPID_AUTO_TEST_CASE(enq_hdr_class)
BOOST_CHECK(eh2.get_owi());
BOOST_CHECK(!eh2.is_transient());
BOOST_CHECK(eh2.is_external());
- BOOST_CHECK_EQUAL(eh2._uflag, uflag & ~(const u_int16_t)enq_hdr::ENQ_HDR_TRANSIENT_MASK);
+ BOOST_CHECK_EQUAL(eh2._uflag, uflag & ~enq_hdr::ENQ_HDR_TRANSIENT_MASK);
eh2.set_transient(true);
BOOST_CHECK(eh2.get_owi());
@@ -294,7 +294,7 @@ QPID_AUTO_TEST_CASE(enq_hdr_class)
BOOST_CHECK(eh2.get_owi());
BOOST_CHECK(eh2.is_transient());
BOOST_CHECK(!eh2.is_external());
- BOOST_CHECK_EQUAL(eh2._uflag, uflag & ~(const u_int16_t)enq_hdr::ENQ_HDR_EXTERNAL_MASK);
+ BOOST_CHECK_EQUAL(eh2._uflag, uflag & ~enq_hdr::ENQ_HDR_EXTERNAL_MASK);
eh2.set_external(true);
BOOST_CHECK(eh2.get_owi());
@@ -312,8 +312,8 @@ QPID_AUTO_TEST_CASE(enq_hdr_class)
#else
BOOST_CHECK_EQUAL(eh3._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(eh3._uflag, (const u_int16_t)enq_hdr::ENQ_HDR_TRANSIENT_MASK |
- (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(eh3._uflag, enq_hdr::ENQ_HDR_TRANSIENT_MASK |
+ rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(eh3._rid, rid);
BOOST_CHECK_EQUAL(eh3._xidsize, xidsize);
BOOST_CHECK_EQUAL(eh3._dsize, dsize);
@@ -360,7 +360,7 @@ QPID_AUTO_TEST_CASE(deq_hdr_class)
#else
BOOST_CHECK_EQUAL(dh2._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(dh2._uflag, (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(dh2._uflag, rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(dh2._rid, rid);
BOOST_CHECK_EQUAL(dh2._deq_rid, drid);
BOOST_CHECK_EQUAL(dh2._xidsize, xidsize);
@@ -372,7 +372,7 @@ QPID_AUTO_TEST_CASE(deq_hdr_class)
dh2.set_owi(false);
BOOST_CHECK(!dh2.get_owi());
BOOST_CHECK_EQUAL(dh2._uflag,
- (uflag & ~(const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
+ (uflag & ~rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
dh2.set_owi(true);
BOOST_CHECK(dh2.get_owi());
@@ -415,7 +415,7 @@ QPID_AUTO_TEST_CASE(txn_hdr_class)
#else
BOOST_CHECK_EQUAL(th2._eflag, RHM_BENDIAN_FLAG);
#endif
- BOOST_CHECK_EQUAL(th2._uflag, (const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
+ BOOST_CHECK_EQUAL(th2._uflag, rec_hdr::HDR_OVERWRITE_INDICATOR_MASK);
BOOST_CHECK_EQUAL(th2._rid, rid);
BOOST_CHECK_EQUAL(th2._xidsize, xidsize);
BOOST_CHECK(th2.get_owi());
@@ -426,7 +426,7 @@ QPID_AUTO_TEST_CASE(txn_hdr_class)
th2.set_owi(false);
BOOST_CHECK(!th2.get_owi());
BOOST_CHECK_EQUAL(th2._uflag,
- (uflag & ~(const u_int16_t)rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
+ (uflag & ~rec_hdr::HDR_OVERWRITE_INDICATOR_MASK));
th2.set_owi(true);
BOOST_CHECK(th2.get_owi());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org