Compare commits
No commits in common. "71e8dd0202ebe710acf9f6f6f9b28c0e62de0b02" and "36a2a1d2c60f3088ff5b36c3b32f80b648fe9f3b" have entirely different histories.
71e8dd0202
...
36a2a1d2c6
@ -50,7 +50,6 @@ add_subdirectory(src/myx/redis)
|
|||||||
if(MYXLIB_BUILD_EXAMPLES OR MYXLIB_BUILD_EXAMPLES_HO)
|
if(MYXLIB_BUILD_EXAMPLES OR MYXLIB_BUILD_EXAMPLES_HO)
|
||||||
add_subdirectory(examples/filesystem)
|
add_subdirectory(examples/filesystem)
|
||||||
add_subdirectory(examples/qt)
|
add_subdirectory(examples/qt)
|
||||||
add_subdirectory(examples/redis)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Документация
|
# Документация
|
||||||
|
@ -1,82 +0,0 @@
|
|||||||
# Название основной цели в текущем каталоге
|
|
||||||
set(TRGT example-redis-client)
|
|
||||||
|
|
||||||
# Список файлов исходных текстов
|
|
||||||
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
|
|
||||||
|
|
||||||
set(TRGT_moc_hpp ${CMAKE_CURRENT_SOURCE_DIR}/client.hpp)
|
|
||||||
|
|
||||||
qt5_wrap_cpp(TRGT_moc_cpp ${TRGT_moc_hpp})
|
|
||||||
|
|
||||||
if(MYXLIB_BUILD_EXAMPLES)
|
|
||||||
|
|
||||||
# Путь поиска библиотек внутри проекта
|
|
||||||
link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
|
|
||||||
|
|
||||||
# Цель для создания исполняемого файла
|
|
||||||
add_executable(${TRGT} ${TRGT_cpp} ${TRGT_moc_cpp} ${TRGT_moc_hpp})
|
|
||||||
common_target_properties(${TRGT})
|
|
||||||
|
|
||||||
# Создание цели для проверки утилитой clang-tidy
|
|
||||||
add_clang_tidy_check(${TRGT} ${TRGT_cpp})
|
|
||||||
|
|
||||||
# Создание цели для проверки утилитой clang-analyze
|
|
||||||
add_clang_analyze_check(${TRGT} ${TRGT_cpp})
|
|
||||||
|
|
||||||
# Создание цели для проверки утилитой clazy
|
|
||||||
add_clazy_check(${TRGT} ${TRGT_cpp})
|
|
||||||
|
|
||||||
# Создание цели для проверки утилитой pvs-studio
|
|
||||||
add_pvs_check(${TRGT})
|
|
||||||
|
|
||||||
# Создание цели для автоматического форматирования кода
|
|
||||||
add_format_sources(${TRGT} ${TRGT_cpp})
|
|
||||||
|
|
||||||
# Qt5
|
|
||||||
target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
|
||||||
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
|
||||||
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Network_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY)
|
|
||||||
add_dependencies(${TRGT} base_static redis_static)
|
|
||||||
|
|
||||||
target_link_libraries(${TRGT} myx-redis)
|
|
||||||
target_link_libraries(${TRGT} Qt5::Core Qt5::Network)
|
|
||||||
|
|
||||||
# Имя выходного файла для цели
|
|
||||||
set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME redis-client)
|
|
||||||
|
|
||||||
add_sanitizers(${TRGT})
|
|
||||||
|
|
||||||
cotire(${TRGT})
|
|
||||||
|
|
||||||
add_dependencies(${TRGT} create_auxilary_symlinks)
|
|
||||||
|
|
||||||
# Правила для установки
|
|
||||||
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(MYXLIB_BUILD_EXAMPLES_HO)
|
|
||||||
# Цель для создания исполняемого файла
|
|
||||||
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_qrc})
|
|
||||||
common_target_properties(${TRGT}-ho)
|
|
||||||
|
|
||||||
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
|
||||||
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
add_dependencies(${TRGT}-ho base-header-only qt-header-only)
|
|
||||||
|
|
||||||
target_link_libraries(${TRGT}-ho Qt5::Core)
|
|
||||||
target_link_libraries(${TRGT}-ho Threads::Threads)
|
|
||||||
|
|
||||||
# Имя выходного файла для цели
|
|
||||||
set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME qt-translators-ho)
|
|
||||||
|
|
||||||
add_sanitizers(${TRGT}-ho)
|
|
||||||
cotire(${TRGT}-ho)
|
|
||||||
|
|
||||||
add_dependencies(${TRGT}-ho create_auxilary_symlinks)
|
|
||||||
|
|
||||||
# Правила для установки
|
|
||||||
install(TARGETS ${TRGT}-ho COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
||||||
endif()
|
|
@ -1,67 +0,0 @@
|
|||||||
#include <QObject>
|
|
||||||
#include <QDebug>
|
|
||||||
|
|
||||||
#include <myx/redis/client.hpp>
|
|
||||||
|
|
||||||
namespace MR = myx::redis;
|
|
||||||
|
|
||||||
class RedisClient : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
MR::Client m_client;
|
|
||||||
MR::Request* m_request;
|
|
||||||
|
|
||||||
public:
|
|
||||||
RedisClient()
|
|
||||||
{
|
|
||||||
connect(&m_client, &MR::Client::connected, this, &RedisClient::slotConnected);
|
|
||||||
m_client.connectToHost("127.0.0.1");
|
|
||||||
|
|
||||||
}
|
|
||||||
virtual ~RedisClient() {}
|
|
||||||
|
|
||||||
Q_SLOT void slotConnected()
|
|
||||||
{
|
|
||||||
m_request = m_client.sendCommand("PING");
|
|
||||||
connect(m_request, &MR::Request::reply, this, &RedisClient::slotPong);
|
|
||||||
}
|
|
||||||
|
|
||||||
Q_SLOT void slotPong( const MR::Reply& reply)
|
|
||||||
{
|
|
||||||
qDebug() << static_cast<int>(reply.type());
|
|
||||||
qDebug() << const_cast<MR::Reply&>(reply).value().toString();
|
|
||||||
m_request->disconnect();
|
|
||||||
m_request->deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Q_SLOT void slotSetValue( const MR::Reply& reply)
|
|
||||||
{
|
|
||||||
qDebug() << static_cast<int>(reply.type());
|
|
||||||
qDebug() << const_cast<MR::Reply&>(reply).value().toString();
|
|
||||||
m_request->disconnect();
|
|
||||||
m_request->deleteLater();
|
|
||||||
|
|
||||||
m_request = m_client.sendCommand( "GET value" );
|
|
||||||
connect(m_request, &MR::Request::reply, this, &RedisClient::slotGetValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Q_SLOT void slotGetValue( const MR::Reply& reply)
|
|
||||||
{
|
|
||||||
qDebug() << static_cast<int>(reply.type());
|
|
||||||
qDebug() << const_cast<MR::Reply&>(reply).value().toByteArray();
|
|
||||||
m_request->disconnect();
|
|
||||||
m_request->deleteLater();
|
|
||||||
|
|
||||||
m_request = m_client.sendCommand( "SUBSCRIBE test" );
|
|
||||||
connect(m_request, &MR::Request::reply, this, &RedisClient::slotSubscribeTest);
|
|
||||||
}
|
|
||||||
|
|
||||||
Q_SLOT void slotSubscribeTest( const MR::Reply& reply)
|
|
||||||
{
|
|
||||||
qDebug() << static_cast<int>(reply.type());
|
|
||||||
qDebug() << const_cast<MR::Reply&>(reply).value().toByteArray();
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,14 +0,0 @@
|
|||||||
#include "client.hpp"
|
|
||||||
|
|
||||||
#include <QCoreApplication>
|
|
||||||
#include <QDebug>
|
|
||||||
|
|
||||||
namespace MR = myx::redis;
|
|
||||||
|
|
||||||
int main( int argc, char** argv )
|
|
||||||
{
|
|
||||||
QCoreApplication app( argc, argv );
|
|
||||||
RedisClient client;
|
|
||||||
|
|
||||||
return( QCoreApplication::exec() );
|
|
||||||
} // main
|
|
@ -1 +0,0 @@
|
|||||||
add_subdirectory(01_client)
|
|
@ -15,14 +15,12 @@
|
|||||||
#else
|
#else
|
||||||
#define MYXLIB_API
|
#define MYXLIB_API
|
||||||
#endif
|
#endif
|
||||||
#define MYXLIB_INLINE inline // NOLINT
|
#define MYXLIB_INLINE inline
|
||||||
#else
|
#else
|
||||||
#ifndef MYXLIB_HEADER_ONLY
|
|
||||||
#define MYXLIB_HEADER_ONLY
|
#define MYXLIB_HEADER_ONLY
|
||||||
#endif
|
|
||||||
#define MYXLIB_API
|
#define MYXLIB_API
|
||||||
#define MYXLIB_INLINE inline
|
#define MYXLIB_INLINE inline
|
||||||
#endif // ifdef MYXLIB_BUILD_LIBRARIES
|
#endif
|
||||||
|
|
||||||
#ifdef MYXLIB_HEADER_ONLY
|
#ifdef MYXLIB_HEADER_ONLY
|
||||||
#include "config-inl.hpp"
|
#include "config-inl.hpp"
|
||||||
|
@ -14,10 +14,10 @@ set(TRGT_moc_hpp
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/client.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/client.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/lexer.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/lexer.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/parser.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/parser.hpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/reply.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/request.hpp)
|
${CMAKE_CURRENT_SOURCE_DIR}/request.hpp)
|
||||||
|
|
||||||
set(TRGT_hpp
|
set(TRGT_hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/reply.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/client-inl.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/client-inl.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/lexer-inl.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/lexer-inl.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/parser-inl.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/parser-inl.hpp
|
||||||
@ -26,15 +26,13 @@ set(TRGT_hpp
|
|||||||
set(TRGT_headers ${TRGT_moc_hpp} ${TRGT_hpp})
|
set(TRGT_headers ${TRGT_moc_hpp} ${TRGT_hpp})
|
||||||
# cmake-format: on
|
# cmake-format: on
|
||||||
|
|
||||||
qt5_wrap_cpp(TRGT_moc_cpp ${TRGT_moc_hpp})
|
|
||||||
|
|
||||||
add_library(${TRGT}-header-only INTERFACE)
|
add_library(${TRGT}-header-only INTERFACE)
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
${TRGT}-header-only SYSTEM INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
|
${TRGT}-header-only SYSTEM INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
|
||||||
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||||
|
|
||||||
if(MYXLIB_BUILD_LIBRARIES)
|
if(MYXLIB_BUILD_LIBRARIES)
|
||||||
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_moc_cpp} ${TRGT_cpp} ${TRGT_headers})
|
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_cpp} ${TRGT_headers})
|
||||||
common_target_properties(${TRGT})
|
common_target_properties(${TRGT})
|
||||||
|
|
||||||
# Создание цели для проверки утилитой clang-tidy
|
# Создание цели для проверки утилитой clang-tidy
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <myx/base/config.hpp>
|
||||||
#include <myx/redis/lexer.hpp>
|
#include <myx/redis/lexer.hpp>
|
||||||
#include <myx/redis/parser.hpp>
|
#include <myx/redis/parser.hpp>
|
||||||
#include <myx/redis/request.hpp>
|
#include <myx/redis/request.hpp>
|
||||||
@ -15,8 +16,6 @@ namespace myx {
|
|||||||
|
|
||||||
namespace redis {
|
namespace redis {
|
||||||
|
|
||||||
QT_FORWARD_DECLARE_CLASS( ClientPrivate )
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Provides access to a Redis server
|
* @brief Provides access to a Redis server
|
||||||
*/
|
*/
|
||||||
@ -112,11 +111,8 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
const QScopedPointer< ClientPrivate > d;
|
class ClientPrivate : public QObject
|
||||||
}; // class Client
|
{
|
||||||
|
|
||||||
class ClientPrivate : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
friend class Client;
|
friend class Client;
|
||||||
@ -140,7 +136,10 @@ class ClientPrivate : public QObject
|
|||||||
{
|
{
|
||||||
Q_EMIT m_queue.dequeue()->reply( reply );
|
Q_EMIT m_queue.dequeue()->reply( reply );
|
||||||
}
|
}
|
||||||
}; // class ClientPrivate
|
}; // class ClientPrivate
|
||||||
|
|
||||||
|
const QScopedPointer< ClientPrivate > d;
|
||||||
|
}; // class Client
|
||||||
|
|
||||||
} // namespace redis
|
} // namespace redis
|
||||||
|
|
||||||
|
@ -14,18 +14,6 @@ namespace myx {
|
|||||||
|
|
||||||
namespace redis {
|
namespace redis {
|
||||||
|
|
||||||
class Loop : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
friend class Request;
|
|
||||||
explicit Loop( QObject* parent = nullptr ) { Q_UNUSED( parent ) }
|
|
||||||
|
|
||||||
QEventLoop m_loop;
|
|
||||||
Q_SLOT void quitEventLoop() { m_loop.exit( 1 ); }
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Represents a Redis command and its response
|
* @brief Represents a Redis command and its response
|
||||||
*/
|
*/
|
||||||
@ -66,6 +54,17 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
class Loop : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
friend class Request;
|
||||||
|
explicit Loop( QObject* parent = nullptr );
|
||||||
|
|
||||||
|
QEventLoop m_loop;
|
||||||
|
Q_SLOT void quitEventLoop() { m_loop.exit( 1 ); }
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
const QScopedPointer< Loop > d;
|
const QScopedPointer< Loop > d;
|
||||||
}; // class Request
|
}; // class Request
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
#ifndef MYX_REDIS_REQUEST_INL_HPP_
|
|
||||||
#define MYX_REDIS_REQUEST_INL_HPP_
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <myx/base/config.hpp>
|
|
||||||
|
|
||||||
#ifndef MYXLIB_HEADER_ONLY
|
|
||||||
#include <myx/redis/request.hpp>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <QTimer>
|
|
||||||
|
|
||||||
namespace myx {
|
|
||||||
|
|
||||||
namespace redis {
|
|
||||||
|
|
||||||
MYXLIB_INLINE Request::Request( QObject* parent ) :
|
|
||||||
QObject( parent ),
|
|
||||||
d ( new Loop( parent ) )
|
|
||||||
{
|
|
||||||
connect( this, &Request::reply, this, &Request::deleteLater );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE bool Request::waitForReply( int msecs )
|
|
||||||
{
|
|
||||||
QTimer timer;
|
|
||||||
timer.setInterval( msecs );
|
|
||||||
timer.setSingleShot( true );
|
|
||||||
|
|
||||||
connect( &timer, &QTimer::timeout, &d->m_loop, &QEventLoop::quit );
|
|
||||||
connect( this, &Request::reply, d.data(), &Loop::quitEventLoop );
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If the timer fires, the return value will be 0.
|
|
||||||
* Otherwise, quitEventLoop() will terminate the loop with 1.
|
|
||||||
*/
|
|
||||||
return( ( d->m_loop.exec( QEventLoop::ExcludeUserInputEvents ) != 0 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace redis
|
|
||||||
|
|
||||||
} // namespace myx
|
|
||||||
|
|
||||||
#endif // ifndef MYX_REDIS_REQUEST_INL_HPP_
|
|
Loading…
Reference in New Issue
Block a user