From e5be5eb490969508e08123cfe052c02cc6072743 Mon Sep 17 00:00:00 2001
From: Ashwin <ashwin2007ray@gmail.com>
Date: Mon, 8 Feb 2016 14:13:46 +1100
Subject: [PATCH] Formatting changes
---
server/.main.go.swp | Bin 0 -> 16384 bytes
tools/merge/merge.cc | 4 +++-
tools/merge/merge_heap.cc | 18 ++++++++++--------
3 files changed, 13 insertions(+), 9 deletions(-)
create mode 100644 server/.main.go.swp
diff --git a/server/.main.go.swp b/server/.main.go.swp
new file mode 100644
index 0000000000000000000000000000000000000000..b352f12bcc113b678e301aca5251bc18b53d51a2
GIT binary patch
literal 16384
zcmeHOUx*|}8Sk9&�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
literal 0
HcmV?d00001
diff --git a/tools/merge/merge.cc b/tools/merge/merge.cc
index 52d31003..01fced01 100644
--- a/tools/merge/merge.cc
+++ b/tools/merge/merge.cc
@@ -1,4 +1,6 @@
/*
+ * Copyright 2015 Manish R Jain <manishrjain@gmail.com>
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -32,7 +34,7 @@ namespace fs = std::experimental::filesystem;
int main(int argc, char* argv[]) {
if(argc != 3) {
std::cerr << "Wrong number of arguments\nusage : ./<executable>\
- <folder_having_rocksDB_directories_to_be_merged> <destination_folder>\n";
+ <folder_having_rocksDB_directories_to_be_merged> <destination_folder>\n";
exit(0);
}
diff --git a/tools/merge/merge_heap.cc b/tools/merge/merge_heap.cc
index 121b3931..9550aefa 100644
--- a/tools/merge/merge_heap.cc
+++ b/tools/merge/merge_heap.cc
@@ -1,4 +1,6 @@
/*
+ * Copyright 2015 Manish R Jain <manishrjain@gmail.com>
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -53,10 +55,10 @@ class compare {
int main(int argc, char* argv[]) {
if(argc != 3) {
std::cerr << "Wrong number of arguments\nusage : ./<executable>\
- <folder_having_rocksDB_directories_to_be_merged> <destination_folder>\n";
+ <folder_having_rocksDB_directories_to_be_merged> <destination_folder>\n";
exit(0);
}
-
+
int counter = 0;
std::priority_queue<struct node, std::vector<node>, compare> pq;
std::vector<rocksdb::Iterator*> itVec;
@@ -68,7 +70,7 @@ int main(int argc, char* argv[]) {
options.OptimizeLevelStyleCompaction();
// create the DB if it's not already present
options.create_if_missing = true;
-
+
// open DB
Status s = DB::Open(options, destinationDB, &db);
assert(s.ok());
@@ -81,7 +83,7 @@ int main(int argc, char* argv[]) {
options.OptimizeLevelStyleCompaction();
// Don't create the DB if it's not already present
options.create_if_missing = false;
-
+
// open DB
Status s1 = DB::Open(options, dirEntry.path().c_str(), &cur_db);
assert(s1.ok());
@@ -101,7 +103,7 @@ int main(int argc, char* argv[]) {
while(!pq.empty()) {
const struct node &top = pq.top();
pq.pop();
-
+
if(top.key == lastKey) {
assert(top.value == lastValue);
} else {
@@ -110,15 +112,15 @@ int main(int argc, char* argv[]) {
lastKey = top.key;
lastValue = top.value;
}
-
+
itVec[top.idx]->Next();
- if(!itVec[top.idx]->Valid()) {
+ if(!itVec[top.idx]->Valid()) {
continue;
}
struct node tnode(itVec[top.idx]->key(), itVec[top.idx]->value(), top.idx);
pq.push(tnode);
}
- delete db;
+ delete db;
return 0;
}
--
GitLab