minor tweaks

Author: Yingjun Wu

rsync.sh

@@ -2,5 +2,7 @@ rsync -arv src/ yingjunw@cmu:~/peloton-client/src/
 ssh yingjunw@cmu "rsync -arv ~/peloton-client/src/ dev2.db.pdl.cmu.local:~/peloton-client/src/"
 rsync -arv include/ yingjunw@cmu:~/peloton-client/include/
 ssh yingjunw@cmu "rsync -arv ~/peloton-client/include/ dev2.db.pdl.cmu.local:~/peloton-client/include/"
+rsync -arv scripts/ yingjunw@cmu:~/peloton-client/scripts/
+ssh yingjunw@cmu "rsync -arv ~/peloton-client/scripts/ dev2.db.pdl.cmu.local:~/peloton-client/scripts/"
 scp Makefile yingjunw@cmu:~/peloton-client/Makefile
-ssh yingjunw@cmu "scp ~/peloton-client/Makefile dev2.db.pdl.cmu.local:~/peloton-client/"
+ssh yingjunw@cmu "scp ~/peloton-client/Makefile dev2.db.pdl.cmu.local:~/peloton-client/"

scripts/populate.sh

@@ -4,4 +4,8 @@ if [ "$#" -ne 2 ]; then
   echo "The table size will be scale_factor * 1000."
   exit 1;
 fi
-../peloton_client -y populate -i $1$ -k $2$
+if [ "$1" -ne 0 ]; then
+  ../peloton_client -y populate -i -k $2$  
+else
+  ../peloton_client -y populate -k $2$
+fi

src/client_program.cpp

@@ -11,7 +11,7 @@ void Populate(pqxx::connection &conn, const ClientConfig &config) {
 
   std::cout << ">>>>> Populate table \'employee\'. " << std::endl
             << "   -- Build index? : " << config.with_index_ << std::endl
-            << "   -- Table size : " << table_size << std::endl;
+            << "   -- Table size   : " << table_size << std::endl;
 
   pqxx::work txn(conn);
 
@@ -60,7 +60,7 @@ void ProcessClient(pqxx::connection &conn, const ClientConfig &config) {
       } else {
         // select
         pqxx::result R = txn.prepared("read")(key).exec();
-        printf("txn result set size = %lu\n", R.size());
+        printf("key = %lu, txn result set size = %lu\n", key, R.size());
       }
     }
   } else {
@@ -74,7 +74,7 @@ void ProcessClient(pqxx::connection &conn, const ClientConfig &config) {
       } else {
         // select
         pqxx::result R = txn.exec("SELECT name FROM employee WHERE id=" + std::to_string(key) + ";");
-        printf("txn result set size = %lu\n", R.size());
+        printf("key = %lu, txn result set size = %lu\n", key, R.size());
       }
     }
   }