final commit before deadline

README.md

@@ -1,7 +1,23 @@
 # Application-Development-for-Information-Systems
 
-## TODO:
-1. Read the damn pdf already
+## Contributors:
 
-## NOTICE:
-1. TLB misses on build and probe phase
+* Vasileios Sioros - 1115201500144
+* Ioannis Maliaras - 1115201500084
+* Ioannis Cheilaris - 1115201500176
+
+---
+
+## Usage:
+
+    ./harness.sh
+or
+
+    ./harness.sh {number_of_threads}
+
+---
+
+## More information
+
+For more information look into ./harness.sh and ./inc and ./src folders.  
+The test program is ./test/executioner_unit.cpp  

harness.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+yes "yes" | ./cpp-build --makefile;
+if [ -z "$1" ]; then
+    ./cpp-build -q;
+else
+    ./cpp-build -q -t=$1;
+fi
+
+
+yes "yes" | ./igenerate.sh workload/small/small.work input.txt workload/small/r*;
+
+cd ./workload/small;
+
+echo;
+echo;
+echo "Harness completed in (ms):";
+../../bin/harness.exe small.init small.work small.result ../../bin/executioner_unit.exe;
+
+cd ../../;
+

inc/executioner.hpp

@@ -28,6 +28,9 @@ namespace RHJ
 
         };
 
+        // Intermediate Results is a list of map of vectors
+        // each vector represents a relation and contains rowIDs.
+        // so we need a map of vectors to address our relation by name.
         struct IntermediateResults : public utility::list<Entity> {
 
             IntermediateResults();

result

@@ -1,12 +1,3 @@
-26468015 32533054
-5446 1009 1009
-31831879 99876596 96864400
-27314139 10766320
-901496306
-NULL NULL NULL
-281654532 282357938 841559324
-187822 1036243 187822
-1771710026
 22766314 22766314
 4634779503 627329747 627329747
 41316024 267394881 9912745

src/executioner.cpp

@@ -177,13 +177,11 @@ std::vector<std::string> RHJ::Executioner::execute(const Query& query) {
 
 bool RHJ::Executioner::executeFilter(const Query& query, Query::Predicate pred) {
 
-
     std::size_t relation = pred.left.rel;
     std::size_t column = pred.left.col;
     tuple_payload_t immediate = pred.right.constraint;
     Query::Predicate::Type op = pred.type;
 
-
     IntermediateResults::iterator node = inteResults.find(pred.left.rel);
 
     #if !defined (__QUIET__)
@@ -266,6 +264,14 @@ bool RHJ::Executioner::executeFilter(const Query& query, Query::Predicate pred)
 
 bool RHJ::Executioner::executeJoin(const Query& query, Query::Predicate pred) {
 
+    // External Join:       2 relations that do not exist in intermediate results
+    // Internal Join:       2 relations that BOTH exist in intermediate results
+    // Semi-Internal Join:  1 relation in intermediate results. 1 relation not in intermediate results.
+    // Internal Self Join:  1 relation self join that exists in intermediate results
+    // External Self Join:  1 relation self join that does not exist in intermediate results
+    // 
+    // Practically, the only difference here is the source of the data used for joins.
+
     #if !defined (__QUIET__)
         std::cerr << "\tExecuting Join..  " << pred << std::endl;
     #endif

src/histhash.cpp

@@ -12,6 +12,10 @@
     #include <fstream>
 #endif
 
+#if !defined(__THREADS__)
+    #define __THREADS__ (4UL)
+#endif
+
 #define HASH(value, radix) (value & ((1UL << radix) - 1UL))
 
 #if defined (__PSUM_DEBUG__)
@@ -133,7 +137,7 @@ RHJ::PsumTable::PsumTable(const Relation& rel, radix_t _radix, std::size_t _psum
     // std::size_t *hashes = new std::size_t[rel.size];
     // </SINGLE THREAD IMPLEMENTATION> //
 
-    std::size_t num_threads = 4;
+    std::size_t num_threads = __THREADS__;
     thread_pool::create(num_threads);
 
     std::size_t curOffset = 0;