Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion FDBLibTLS/FDBLibTLSPolicy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ struct stack_st_X509* FDBLibTLSPolicy::parse_cert_pem(const uint8_t* cert_pem, s
X509 *cert = NULL;
BIO *bio = NULL;
int errnum;
bool rc = false;

if (cert_pem_len > INT_MAX)
goto err;
Expand Down
2 changes: 0 additions & 2 deletions FDBLibTLS/FDBLibTLSSession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ bool match_extension_criteria(X509 *cert, NID nid, const std::string& value, Mat
return false;
}
int num_sans = sk_GENERAL_NAME_num( sans );
bool match_found = false;
bool rc = false;
for( int i = 0; i < num_sans && !rc; ++i ) {
GENERAL_NAME* altname = sk_GENERAL_NAME_value( sans, i );
Expand Down Expand Up @@ -232,7 +231,6 @@ bool match_criteria(X509* cert, X509_NAME* subject, NID nid, const std::string&
std::tuple<bool,std::string> FDBLibTLSSession::check_verify(Reference<FDBLibTLSVerify> verify, struct stack_st_X509 *certs) {
X509_STORE_CTX *store_ctx = NULL;
X509_NAME *subject, *issuer;
BIO *bio = NULL;
bool rc = false;
X509* cert = NULL;
// if returning false, give a reason string
Expand Down
5 changes: 3 additions & 2 deletions bindings/flow/tester/Tester.actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,10 @@ ACTOR static Future<Void> debugPrintRange(Reference<Transaction> tr, std::string
return Void();

Standalone<RangeResultRef> results = wait(getRange(tr, KeyRange(KeyRangeRef(subspace + '\x00', subspace + '\xff'))));
// printf("==================================================DB:%s:%s, count:%d\n", msg.c_str(), printable(subspace).c_str(), results.size());
printf("==================================================DB:%s:%s, count:%d\n", msg.c_str(),
Comment thread
atn34 marked this conversation as resolved.
printable(subspace).c_str(), results.size());
for (auto & s : results) {
// printf("=====key:%s, value:%s\n", printable(StringRef(s.key)).c_str(), printable(StringRef(s.value)).c_str());
printf("=====key:%s, value:%s\n", printable(StringRef(s.key)).c_str(), printable(StringRef(s.value)).c_str());
}

return Void();
Expand Down
1 change: 1 addition & 0 deletions cmake/ConfigureCompiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ else()
endif()
add_compile_options($<$<BOOL:${GCC}>:-Wno-pragmas>)
add_compile_options(-Wno-error=format
-Wunused-variable
-Wno-deprecated
-fvisibility=hidden
-Wreturn-type
Expand Down
1 change: 0 additions & 1 deletion fdbclient/BackupAgent.actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,6 @@ class BackupConfig : public KeyBackedConfig {
Future<Optional<Version>> getLatestRestorableVersion(Reference<ReadYourWritesTransaction> tr) {
tr->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
tr->setOption(FDBTransactionOptions::READ_LOCK_AWARE);
auto &copy = *this;
auto lastLog = latestLogEndVersion().get(tr);
auto firstSnapshot = firstSnapshotEndVersion().get(tr);
return map(success(lastLog) && success(firstSnapshot), [=](Void) -> Optional<Version> {
Expand Down
1 change: 0 additions & 1 deletion fdbclient/BackupAgentBase.actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,6 @@ ACTOR Future<Void> readCommitted(Database cx, PromiseStream<RCGroup> results, Fu
wait(lock->take(TaskDefaultYield, rangevalue.expectedSize() + rcGroup.items.expectedSize()));
releaser = FlowLock::Releaser(*lock, rangevalue.expectedSize() + rcGroup.items.expectedSize());

int index(0);
for (auto & s : rangevalue){
uint64_t groupKey = groupBy(s.key).first;
//TraceEvent("Log_ReadCommitted").detail("GroupKey", groupKey).detail("SkipGroup", skipGroup).detail("NextKey", nextKey.key).detail("End", end.key).detail("Valuesize", value.size()).detail("Index",index++).detail("Size",s.value.size());
Expand Down
5 changes: 0 additions & 5 deletions fdbclient/FileBackupAgent.actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1575,11 +1575,6 @@ namespace fileBackup {
countShardsExpectedPerNormalWindow = (double(dispatchWindow) / snapshotScheduledVersionInterval) * countAllShards;
}

// countShardsThisDispatch is how many total shards are to be dispatched by this dispatch cycle.
// Since this dispatch cycle can span many incrementally progressing separate executions of the BackupSnapshotDispatchTask
// instance, this is calculated as the number of shards dispatched so far in the dispatch batch plus the number of shards
// the current execution is going to attempt to do.
int countShardsThisDispatch = countShardsToDispatch + snapshotBatchSize.get();
// The number of shards 'behind' the snapshot is the count of how may additional shards beyond normal are being dispatched, if any.
int countShardsBehind = std::max<int64_t>(0, countShardsToDispatch + snapshotBatchSize.get() - countShardsExpectedPerNormalWindow);
Params.shardsBehind().set(task, countShardsBehind);
Expand Down
1 change: 0 additions & 1 deletion fdbclient/MultiVersionTransaction.actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,6 @@ void MultiVersionApi::loadEnvironmentVariableNetworkOptions() {
std::string valueStr;
try {
if(platform::getEnvironmentVar(("FDB_NETWORK_OPTION_" + option.second.name).c_str(), valueStr)) {
size_t index = 0;
for(auto value : parseOptionValues(valueStr)) {
Standalone<StringRef> currentValue = StringRef(value);
{ // lock scope
Expand Down
1 change: 0 additions & 1 deletion fdbclient/NativeAPI.actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ pair<KeyRange,Reference<LocationInfo>> DatabaseContext::getCachedLocation( const

bool DatabaseContext::getCachedLocations( const KeyRangeRef& range, vector<std::pair<KeyRange,Reference<LocationInfo>>>& result, int limit, bool reverse ) {
result.clear();
auto locRanges = locationCache.intersectingRanges(range);

auto begin = locationCache.rangeContaining(range.begin);
auto end = locationCache.rangeContainingKeyBefore(range.end);
Expand Down
5 changes: 2 additions & 3 deletions fdbmonitor/fdbmonitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1264,8 +1264,6 @@ int main(int argc, char** argv) {
fd_set srfds;
#endif

CSimpleIniA* ini = NULL;

if (daemonize) {
#ifdef __APPLE__
#pragma GCC diagnostic push
Expand Down Expand Up @@ -1323,7 +1321,8 @@ int main(int argc, char** argv) {
/* write our pid to the lockfile for convenience */
char pid_buf[16];
snprintf(pid_buf, sizeof(pid_buf), "%d\n", getpid());
ssize_t ign = write(lockfile_fd, pid_buf, strlen(pid_buf));
auto ign = write(lockfile_fd, pid_buf, strlen(pid_buf));
(void)ign;

#ifdef __linux__
/* attempt to do clean shutdown and remove lockfile when killed */
Expand Down
Loading