Page MenuHomePhabricator
Differential D12855

[SQLite] rename all QueryExecutor params to `camelCase`
ClosedPublic
Actions

Authored by kamil on Jul 23 2024, 3:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 23, 3:12 PM
Unknown Object (File)
Wed, Apr 23, 12:04 PM
Unknown Object (File)
Tue, Apr 22, 1:14 AM
Unknown Object (File)
Mon, Apr 21, 2:42 AM
Unknown Object (File)
Mar 17 2025, 2:58 AM
Unknown Object (File)
Mar 11 2025, 7:35 PM
Unknown Object (File)
Feb 24 2025, 12:04 PM
Unknown Object (File)
Feb 21 2025, 2:55 AM
View All 78 Files
Subscribers
ashoat

Details

Reviewers
tomek
inka
Commits
rCOMMdd5c4d502382: [SQLite] rename all QueryExecutor params to `camelCase`
Summary

There was a huge inconsistency in naming - using the same style for all.

Depends on D12854

Test Plan

yarn jest, build and run the native app

Diff Detail

Repository
rCOMM Comm
Branch
cpp-search-2
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Jul 23 2024, 3:18 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptJul 23 2024, 3:18 AM
Harbormaster completed remote builds in B30601: Diff 42675.Jul 23 2024, 4:00 AM
kamil published this revision for review.Jul 23 2024, 5:04 AM
tomek accepted this revision.Jul 23 2024, 6:38 AM
This revision is now accepted and ready to land.Jul 23 2024, 6:38 AM
tomek added a comment.Jul 23 2024, 6:39 AM

We can also build and run the native app as a part of the test plan.

kamil edited the test plan for this revision. (Show Details)Jul 23 2024, 8:06 AM
Closed by commit rCOMMdd5c4d502382: [SQLite] rename all QueryExecutor params to `camelCase` (authored by kamil). · Explain WhyJul 23 2024, 8:18 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMdd5c4d502382: [SQLite] rename all QueryExecutor params to `camelCase`.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
DatabaseManagers/
36 lines
38 lines
92 lines

Diff 42675

View Options

native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines