Skip to content

Commit b0fc663

Browse files
plensingplensing
committed
3.0.0 API changes to blocking and nonblocking connection types.
1 parent f76d29e commit b0fc663

14 files changed

+521
-287
lines changed

‎include/kinetic/blocking_kinetic_connection.h‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ class BlockingKineticConnection : public BlockingKineticConnectionInterface {
8686
int32_t max_results,
8787
unique_ptr<vector<string>>& keys);
8888

89-
9089
KeyRangeIterator IterateKeyRange(const shared_ptr<const string> start_key,
9190
bool start_key_inclusive,
9291
const shared_ptr<const string> end_key,
@@ -128,31 +127,36 @@ class BlockingKineticConnection : public BlockingKineticConnectionInterface {
128127

129128
KineticStatus Delete(const string& key, const string& version, WriteMode mode);
130129

131-
KineticStatus InstantSecureErase(const shared_ptr<string> pin);
132-
133-
KineticStatus InstantSecureErase(const string& pin);
134-
135-
KineticStatus SetClusterVersion(int64_t cluster_version);
136-
137130
KineticStatus GetLog(unique_ptr<DriveLog>& drive_log);
138131

139132
KineticStatus GetLog(const vector<Command_GetLog_Type>& types, unique_ptr<DriveLog>& drive_log);
140133

141-
KineticStatus UpdateFirmware(const shared_ptr<const string> new_firmware);
142-
143-
KineticStatus SetACLs(const shared_ptr<const list<ACL>> acls);
144-
145-
KineticStatus SetPin(const shared_ptr<const string> new_pin,
146-
const shared_ptr<const string> current_pin = make_shared<string>());
147-
148-
KineticStatus SetPin(const string& new_pin, const string& current_pin);
149-
150134
KineticStatus P2PPush(const P2PPushRequest& push_request,
151135
unique_ptr<vector<KineticStatus>>& operation_statuses);
152136

153137
KineticStatus P2PPush(const shared_ptr<const P2PPushRequest> push_request,
154138
unique_ptr<vector<KineticStatus>>& operation_statuses);
155139

140+
KineticStatus SetClusterVersion(int64_t cluster_version);
141+
KineticStatus UpdateFirmware(const shared_ptr<const string> new_firmware);
142+
KineticStatus SetACLs(const shared_ptr<const list<ACL>> acls);
143+
144+
KineticStatus SetErasePIN(const shared_ptr<const string> new_pin,
145+
const shared_ptr<const string> current_pin = make_shared<string>());
146+
KineticStatus SetErasePIN(const string& new_pin, const string& current_pin);
147+
KineticStatus SetLockPIN(const shared_ptr<const string> new_pin,
148+
const shared_ptr<const string> current_pin = make_shared<string>());
149+
KineticStatus SetLockPIN(const string& new_pin, const string& current_pin);
150+
KineticStatus InstantErase(const shared_ptr<string> pin);
151+
KineticStatus InstantErase(const string& pin);
152+
KineticStatus SecureErase(const shared_ptr<string> pin);
153+
KineticStatus SecureErase(const string& pin);
154+
KineticStatus LockDevice(const shared_ptr<string> pin);
155+
KineticStatus LockDevice(const string& pin);
156+
KineticStatus UnlockDevice(const shared_ptr<string> pin);
157+
KineticStatus UnlockDevice(const string& pin);
158+
159+
156160
private:
157161
KineticStatus RunOperation(shared_ptr<BlockingCallbackState> callback, HandlerKey handler_key);
158162

‎include/kinetic/blocking_kinetic_connection_interface.h‎

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -48,118 +48,98 @@ class BlockingKineticConnectionInterface {
4848
virtual void SetClientClusterVersion(int64_t cluster_version) = 0;
4949

5050
virtual KineticStatus NoOp() = 0;
51-
5251
virtual KineticStatus Get(
5352
const shared_ptr<const string> key,
5453
unique_ptr<KineticRecord>& record) = 0;
55-
5654
virtual KineticStatus Get(const string& key, unique_ptr<KineticRecord>& record) = 0;
57-
5855
virtual KineticStatus GetNext(
5956
const shared_ptr<const string> key,
6057
unique_ptr<string>& actual_key,
6158
unique_ptr<KineticRecord>& record) = 0;
62-
6359
virtual KineticStatus GetNext(
6460
const string& key,
6561
unique_ptr<string>& actual_key,
6662
unique_ptr<KineticRecord>& record) = 0;
67-
6863
virtual KineticStatus GetPrevious(const shared_ptr<const string> key,
6964
unique_ptr<string>& actual_key,
7065
unique_ptr<KineticRecord>& record) = 0;
71-
7266
virtual KineticStatus GetPrevious(const string& key,
7367
unique_ptr<string>& actual_key,
7468
unique_ptr<KineticRecord>& record) = 0;
75-
7669
virtual KineticStatus GetVersion(const shared_ptr<const string> key,
7770
unique_ptr<string>& version) = 0;
78-
7971
virtual KineticStatus GetVersion(const string& key, unique_ptr<string>& version) = 0;
80-
8172
virtual KineticStatus GetKeyRange(const shared_ptr<const string> start_key,
8273
bool start_key_inclusive,
8374
const shared_ptr<const string> end_key,
8475
bool end_key_inclusive,
8576
bool reverse_results,
8677
int32_t max_results,
8778
unique_ptr<vector<string>>& keys) = 0;
88-
8979
virtual KineticStatus GetKeyRange(const string& start_key,
9080
bool start_key_inclusive,
9181
const string& end_key,
9282
bool end_key_inclusive,
9383
bool reverse_results,
9484
int32_t max_results,
9585
unique_ptr<vector<string>>& keys) = 0;
96-
97-
9886
virtual KeyRangeIterator IterateKeyRange(const shared_ptr<const string> start_key,
9987
bool start_key_inclusive,
10088
const shared_ptr<const string> end_key,
10189
bool end_key_inclusive,
10290
unsigned int frame_size) = 0;
103-
10491
virtual KeyRangeIterator IterateKeyRange(const string& start_key,
10592
bool start_key_inclusive,
10693
const string& end_key,
10794
bool end_key_inclusive,
10895
unsigned int frame_size) = 0;
109-
11096
virtual KineticStatus Put(const shared_ptr<const string> key,
11197
const shared_ptr<const string> current_version, WriteMode mode,
11298
const shared_ptr<const KineticRecord> record,
11399
PersistMode persistMode) = 0;
114-
115100
virtual KineticStatus Put(const string& key,
116101
const string& current_version, WriteMode mode,
117102
const KineticRecord& record,
118103
PersistMode persistMode) = 0;
119-
120104
virtual KineticStatus Put(const shared_ptr<const string> key,
121105
const shared_ptr<const string> current_version, WriteMode mode,
122106
const shared_ptr<const KineticRecord> record) = 0;
123-
124107
virtual KineticStatus Put(const string& key,
125108
const string& current_version, WriteMode mode,
126109
const KineticRecord& record) = 0;
127-
128110
virtual KineticStatus Delete(const shared_ptr<const string> key,
129111
const shared_ptr<const string> version, WriteMode mode, PersistMode persistMode) = 0;
130-
131112
virtual KineticStatus Delete(const string& key, const string& version,
132113
WriteMode mode, PersistMode persistMode) = 0;
133-
134114
virtual KineticStatus Delete(const shared_ptr<const string> key,
135115
const shared_ptr<const string> version, WriteMode mode) = 0;
136-
137116
virtual KineticStatus Delete(const string& key, const string& version, WriteMode mode) = 0;
138-
139-
virtual KineticStatus InstantSecureErase(const shared_ptr<string> pin) = 0;
140-
141-
virtual KineticStatus InstantSecureErase(const string& pin) = 0;
142-
143-
virtual KineticStatus SetClusterVersion(int64_t cluster_version) = 0;
144-
145117
virtual KineticStatus GetLog(unique_ptr<DriveLog>& drive_log) = 0;
146-
147118
virtual KineticStatus GetLog(const vector<Command_GetLog_Type>& types, unique_ptr<DriveLog>& drive_log) = 0;
119+
virtual KineticStatus P2PPush(const P2PPushRequest& push_request,
120+
unique_ptr<vector<KineticStatus>>& operation_statuses) = 0;
121+
virtual KineticStatus P2PPush(const shared_ptr<const P2PPushRequest> push_request,
122+
unique_ptr<vector<KineticStatus>>& operation_statuses) = 0;
148123

124+
virtual KineticStatus SetClusterVersion(int64_t cluster_version) = 0;
149125
virtual KineticStatus UpdateFirmware(const shared_ptr<const string> new_firmware) = 0;
150-
151126
virtual KineticStatus SetACLs(const shared_ptr<const list<ACL>> acls) = 0;
152127

153-
virtual KineticStatus SetPin(const shared_ptr<const string> new_pin,
128+
virtual KineticStatus SetErasePIN(const shared_ptr<const string> new_pin,
154129
const shared_ptr<const string> current_pin = make_shared<string>()) = 0;
130+
virtual KineticStatus SetErasePIN(const string& new_pin, const string& current_pin) = 0;
131+
virtual KineticStatus SetLockPIN(const shared_ptr<const string> new_pin,
132+
const shared_ptr<const string> current_pin = make_shared<string>()) = 0;
133+
virtual KineticStatus SetLockPIN(const string& new_pin, const string& current_pin) = 0;
134+
virtual KineticStatus InstantErase(const shared_ptr<string> pin) = 0;
135+
virtual KineticStatus InstantErase(const string& pin) = 0;
136+
virtual KineticStatus SecureErase(const shared_ptr<string> pin) = 0;
137+
virtual KineticStatus SecureErase(const string& pin) = 0;
138+
virtual KineticStatus LockDevice(const shared_ptr<string> pin) = 0;
139+
virtual KineticStatus LockDevice(const string& pin) = 0;
140+
virtual KineticStatus UnlockDevice(const shared_ptr<string> pin) = 0;
141+
virtual KineticStatus UnlockDevice(const string& pin) = 0;
155142

156-
virtual KineticStatus SetPin(const string& new_pin, const string& current_pin) = 0;
157-
158-
virtual KineticStatus P2PPush(const P2PPushRequest& push_request,
159-
unique_ptr<vector<KineticStatus>>& operation_statuses) = 0;
160-
161-
virtual KineticStatus P2PPush(const shared_ptr<const P2PPushRequest> push_request,
162-
unique_ptr<vector<KineticStatus>>& operation_statuses) = 0;
163143
};
164144

165145
} // namespace kinetic

‎include/kinetic/nonblocking_kinetic_connection.h‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,33 @@ class NonblockingKineticConnection : public NonblockingKineticConnectionInterfac
6666
const shared_ptr<SimpleCallbackInterface> callback);
6767
HandlerKey Delete(const string key, const string version, WriteMode mode,
6868
const shared_ptr<SimpleCallbackInterface> callback);
69-
HandlerKey InstantSecureErase(const shared_ptr<string> pin, const shared_ptr<SimpleCallbackInterface> callback);
70-
HandlerKey InstantSecureErase(const string pin, const shared_ptr<SimpleCallbackInterface> callback);
71-
HandlerKey SetClusterVersion(int64_t new_cluster_version, const shared_ptr<SimpleCallbackInterface> callback);
69+
HandlerKey P2PPush(const P2PPushRequest& push_request, const shared_ptr<P2PPushCallbackInterface> callback);
70+
HandlerKey P2PPush(const shared_ptr<const P2PPushRequest> push_request,
71+
const shared_ptr<P2PPushCallbackInterface> callback);
7272
HandlerKey GetLog(const shared_ptr<GetLogCallbackInterface> callback);
7373
HandlerKey GetLog(const vector<Command_GetLog_Type>& types, const shared_ptr<GetLogCallbackInterface> callback);
74+
75+
HandlerKey UpdateFirmware(const shared_ptr<const string> new_firmware, const shared_ptr<SimpleCallbackInterface> callback);
76+
HandlerKey SetClusterVersion(int64_t new_cluster_version, const shared_ptr<SimpleCallbackInterface> callback);
77+
78+
HandlerKey InstantErase(const shared_ptr<string> pin, const shared_ptr<SimpleCallbackInterface> callback);
79+
HandlerKey InstantErase(const string pin, const shared_ptr<SimpleCallbackInterface> callback);
80+
HandlerKey SecureErase(const shared_ptr<string> pin, const shared_ptr<SimpleCallbackInterface> callback);
81+
HandlerKey SecureErase(const string pin, const shared_ptr<SimpleCallbackInterface> callback);
82+
HandlerKey LockDevice(const shared_ptr<string> pin, const shared_ptr<SimpleCallbackInterface> callback);
83+
HandlerKey LockDevice(const string pin, const shared_ptr<SimpleCallbackInterface> callback);
84+
HandlerKey UnlockDevice(const shared_ptr<string> pin, const shared_ptr<SimpleCallbackInterface> callback);
85+
HandlerKey UnlockDevice(const string pin, const shared_ptr<SimpleCallbackInterface> callback);
86+
7487
HandlerKey SetACLs(const shared_ptr<const list<ACL>> acls, const shared_ptr<SimpleCallbackInterface> callback);
75-
HandlerKey SetPIN(const shared_ptr<const string> new_pin, const shared_ptr<const string> current_pin,
88+
HandlerKey SetErasePIN(const shared_ptr<const string> new_pin, const shared_ptr<const string> current_pin,
7689
const shared_ptr<SimpleCallbackInterface> callback);
77-
HandlerKey SetPIN(const string new_pin, const string current_pin, const shared_ptr<SimpleCallbackInterface> callback);
78-
HandlerKey P2PPush(const P2PPushRequest& push_request, const shared_ptr<P2PPushCallbackInterface> callback);
79-
HandlerKey P2PPush(const shared_ptr<const P2PPushRequest> push_request,
80-
const shared_ptr<P2PPushCallbackInterface> callback);
81-
HandlerKey UpdateFirmware(const shared_ptr<const string> new_firmware,
90+
HandlerKey SetErasePIN(const string new_pin, const string current_pin,
91+
const shared_ptr<SimpleCallbackInterface> callback);
92+
HandlerKey SetLockPIN(const shared_ptr<const string> new_pin, const shared_ptr<const string> current_pin,
8293
const shared_ptr<SimpleCallbackInterface> callback);
94+
HandlerKey SetLockPIN(const string new_pin, const string current_pin,
95+
const shared_ptr<SimpleCallbackInterface> callback);
8396

8497

8598
private:

‎include/kinetic/nonblocking_kinetic_connection_interface.h‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,29 +281,51 @@ class NonblockingKineticConnectionInterface {
281281
const shared_ptr<SimpleCallbackInterface> callback) = 0;
282282
virtual HandlerKey Delete(const string key, const string version, WriteMode mode,
283283
const shared_ptr<SimpleCallbackInterface> callback) = 0;
284-
virtual HandlerKey InstantSecureErase(const shared_ptr<string> pin,
285-
const shared_ptr<SimpleCallbackInterface> callback) = 0;
286-
virtual HandlerKey InstantSecureErase(const string pin,
287-
const shared_ptr<SimpleCallbackInterface> callback) = 0;
288-
virtual HandlerKey SetClusterVersion(int64_t new_cluster_version,
289-
const shared_ptr<SimpleCallbackInterface> callback) = 0;
284+
virtual HandlerKey P2PPush(const P2PPushRequest& push_request,
285+
const shared_ptr<P2PPushCallbackInterface> callback) = 0;
286+
virtual HandlerKey P2PPush(const shared_ptr<const P2PPushRequest> push_request,
287+
const shared_ptr<P2PPushCallbackInterface> callback) = 0;
290288
virtual HandlerKey GetLog(const shared_ptr<GetLogCallbackInterface> callback) = 0;
291289
virtual HandlerKey GetLog(const vector<Command_GetLog_Type>& types,
292290
const shared_ptr<GetLogCallbackInterface> callback) = 0;
291+
293292
virtual HandlerKey UpdateFirmware(const shared_ptr<const string> new_firmware,
294293
const shared_ptr<SimpleCallbackInterface> callback) = 0;
294+
virtual HandlerKey SetClusterVersion(int64_t new_cluster_version,
295+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
296+
295297
virtual HandlerKey SetACLs(const shared_ptr<const list<ACL>> acls,
296298
const shared_ptr<SimpleCallbackInterface> callback) = 0;
297-
virtual HandlerKey SetPIN(const shared_ptr<const string> new_pin,
299+
virtual HandlerKey SetErasePIN(const shared_ptr<const string> new_pin,
298300
const shared_ptr<const string> current_pin,
299301
const shared_ptr<SimpleCallbackInterface> callback) = 0;
300-
virtual HandlerKey SetPIN(const string new_pin,
302+
virtual HandlerKey SetErasePIN(const string new_pin,
301303
const string current_pin,
302304
const shared_ptr<SimpleCallbackInterface> callback) = 0;
303-
virtual HandlerKey P2PPush(const P2PPushRequest& push_request,
304-
const shared_ptr<P2PPushCallbackInterface> callback) = 0;
305-
virtual HandlerKey P2PPush(const shared_ptr<const P2PPushRequest> push_request,
306-
const shared_ptr<P2PPushCallbackInterface> callback) = 0;
305+
virtual HandlerKey SetLockPIN(const shared_ptr<const string> new_pin,
306+
const shared_ptr<const string> current_pin,
307+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
308+
virtual HandlerKey SetLockPIN(const string new_pin,
309+
const string current_pin,
310+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
311+
312+
virtual HandlerKey InstantErase(const shared_ptr<string> pin,
313+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
314+
virtual HandlerKey InstantErase(const string pin,
315+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
316+
virtual HandlerKey SecureErase(const shared_ptr<string> pin,
317+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
318+
virtual HandlerKey SecureErase(const string pin,
319+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
320+
virtual HandlerKey LockDevice(const shared_ptr<string> pin,
321+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
322+
virtual HandlerKey LockDevice(const string pin,
323+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
324+
virtual HandlerKey UnlockDevice(const shared_ptr<string> pin,
325+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
326+
virtual HandlerKey UnlockDevice(const string pin,
327+
const shared_ptr<SimpleCallbackInterface> callback) = 0;
328+
307329
};
308330

309331
} // namespace kinetic

0 commit comments

Comments
 (0)