You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/03/29 04:57:54 UTC
[geode-native] 08/09: sqlite warning free
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-4946-msvc-warn
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 68ae3a84414e5b54200f0de4cfc4a23d01c18f2c
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Mar 28 21:14:50 2018 +0000
sqlite warning free
---
sqliteimpl/CMakeLists.txt | 6 ++++--
sqliteimpl/SqLiteHelper.cpp | 11 +++++------
sqliteimpl/SqLiteHelper.hpp | 10 +++++-----
sqliteimpl/SqLiteImpl.cpp | 26 ++++++++++++++++----------
4 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/sqliteimpl/CMakeLists.txt b/sqliteimpl/CMakeLists.txt
index 33cee04..c8c8a72 100644
--- a/sqliteimpl/CMakeLists.txt
+++ b/sqliteimpl/CMakeLists.txt
@@ -16,15 +16,17 @@
cmake_minimum_required(VERSION 3.10)
project(SqLiteImpl LANGUAGES CXX)
-add_library(${PROJECT_NAME} SHARED
+add_library(SqLiteImpl SHARED
SqLiteHelper.cpp
SqLiteHelper.hpp
SqLiteImpl.cpp
SqLiteImpl.hpp
)
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(SqLiteImpl
PUBLIC
apache-geode
sqlite
+ PRIVATE
+ _WarningsAsError
)
diff --git a/sqliteimpl/SqLiteHelper.cpp b/sqliteimpl/SqLiteHelper.cpp
index 324056a..45621b5 100644
--- a/sqliteimpl/SqLiteHelper.cpp
+++ b/sqliteimpl/SqLiteHelper.cpp
@@ -23,7 +23,6 @@
int SqLiteHelper::initDB(const char *regionName, int maxPageCount, int pageSize,
const char *regionDBfile, int busy_timeout_ms) {
-
// open the database
int retCode = sqlite3_open(regionDBfile, &m_dbHandle);
if (retCode == SQLITE_OK) {
@@ -65,8 +64,8 @@ int SqLiteHelper::createTable() {
return retCode == SQLITE_DONE ? 0 : retCode;
}
-int SqLiteHelper::insertKeyValue(void *keyData, uint32_t keyDataSize,
- void *valueData, uint32_t valueDataSize) {
+int SqLiteHelper::insertKeyValue(void *keyData, int keyDataSize,
+ void *valueData, int valueDataSize) {
// construct query
char query[QUERY_SIZE];
SNPRINTF(query, QUERY_SIZE, "REPLACE INTO %s VALUES(?,?);", m_tableName);
@@ -85,7 +84,7 @@ int SqLiteHelper::insertKeyValue(void *keyData, uint32_t keyDataSize,
return retCode == SQLITE_DONE ? 0 : retCode;
}
-int SqLiteHelper::removeKey(void *keyData, uint32_t keyDataSize) {
+int SqLiteHelper::removeKey(void *keyData, int keyDataSize) {
// construct query
char query[QUERY_SIZE];
SNPRINTF(query, QUERY_SIZE, "DELETE FROM %s WHERE key=?;", m_tableName);
@@ -103,8 +102,8 @@ int SqLiteHelper::removeKey(void *keyData, uint32_t keyDataSize) {
return retCode == SQLITE_DONE ? 0 : retCode;
}
-int SqLiteHelper::getValue(void *keyData, uint32_t keyDataSize,
- void *&valueData, uint32_t &valueDataSize) {
+int SqLiteHelper::getValue(void *keyData, int keyDataSize, void *&valueData,
+ int &valueDataSize) {
// construct query
char query[QUERY_SIZE];
SNPRINTF(query, QUERY_SIZE,
diff --git a/sqliteimpl/SqLiteHelper.hpp b/sqliteimpl/SqLiteHelper.hpp
index abef843..3815614 100644
--- a/sqliteimpl/SqLiteHelper.hpp
+++ b/sqliteimpl/SqLiteHelper.hpp
@@ -41,11 +41,11 @@ class SqLiteHelper {
public:
int initDB(const char* regionName, int maxPageCount, int pageSize,
const char* regionDBfile, int busy_timeout_ms = 5000);
- int insertKeyValue(void* keyData, uint32_t keyDataSize, void* valueData,
- uint32_t valueDataSize);
- int removeKey(void* keyData, uint32_t keyDataSize);
- int getValue(void* keyData, uint32_t keyDataSize, void*& valueData,
- uint32_t& valueDataSize);
+ int insertKeyValue(void* keyData, int keyDataSize, void* valueData,
+ int valueDataSize);
+ int removeKey(void* keyData, int keyDataSize);
+ int getValue(void* keyData, int keyDataSize, void*& valueData,
+ int& valueDataSize);
int closeDB();
private:
diff --git a/sqliteimpl/SqLiteImpl.cpp b/sqliteimpl/SqLiteImpl.cpp
index 2208e8e..e0c24a2 100644
--- a/sqliteimpl/SqLiteImpl.cpp
+++ b/sqliteimpl/SqLiteImpl.cpp
@@ -111,12 +111,14 @@ void SqLiteImpl::write(const std::shared_ptr<CacheableKey>& key,
keyDataBuffer->writeObject(key);
valueDataBuffer->writeObject(value);
- void* keyData = const_cast<uint8_t*>(keyDataBuffer->getBuffer(&keyBufferSize));
+ void* keyData =
+ const_cast<uint8_t*>(keyDataBuffer->getBuffer(&keyBufferSize));
void* valueData =
const_cast<uint8_t*>(valueDataBuffer->getBuffer(&valueBufferSize));
- if (m_sqliteHelper->insertKeyValue(keyData, keyBufferSize, valueData,
- valueBufferSize) != 0) {
+ if (m_sqliteHelper->insertKeyValue(keyData, static_cast<int>(keyBufferSize),
+ valueData,
+ static_cast<int>(valueBufferSize)) != 0) {
throw IllegalStateException("Failed to write key value in SQLITE.");
}
}
@@ -128,12 +130,13 @@ std::shared_ptr<Cacheable> SqLiteImpl::read(
auto keyDataBuffer = m_regionPtr->getCache().createDataOutput();
size_t keyBufferSize;
keyDataBuffer->writeObject(key);
- void* keyData = const_cast<uint8_t*>(keyDataBuffer->getBuffer(&keyBufferSize));
+ void* keyData =
+ const_cast<uint8_t*>(keyDataBuffer->getBuffer(&keyBufferSize));
void* valueData;
- uint32_t valueBufferSize;
+ int valueBufferSize;
- if (m_sqliteHelper->getValue(keyData, keyBufferSize, valueData,
- valueBufferSize) != 0) {
+ if (m_sqliteHelper->getValue(keyData, static_cast<int>(keyBufferSize),
+ valueData, valueBufferSize) != 0) {
throw IllegalStateException("Failed to read the value from SQLITE.");
}
@@ -166,13 +169,16 @@ void SqLiteImpl::destroyRegion() {
#endif
}
-void SqLiteImpl::destroy(const std::shared_ptr<CacheableKey>& key, void*& dbHandle) {
+void SqLiteImpl::destroy(const std::shared_ptr<CacheableKey>& key,
+ void*& dbHandle) {
// Serialize key and value.
auto keyDataBuffer = m_regionPtr->getCache().createDataOutput();
size_t keyBufferSize;
keyDataBuffer->writeObject(key);
- void* keyData = const_cast<uint8_t*>(keyDataBuffer->getBuffer(&keyBufferSize));
- if (m_sqliteHelper->removeKey(keyData, keyBufferSize) != 0) {
+ void* keyData =
+ const_cast<uint8_t*>(keyDataBuffer->getBuffer(&keyBufferSize));
+ if (m_sqliteHelper->removeKey(keyData, static_cast<int>(keyBufferSize)) !=
+ 0) {
throw IllegalStateException("Failed to destroy the key from SQLITE.");
}
}
--
To stop receiving notification emails like this one, please contact
jbarrett@apache.org.