Merge with zombieList and fix conflicts

Author: thanosgn

report.txt

@@ -0,0 +1,8 @@
+zombie_list:  5:15.52
+		   |  4GB
+
+σειριακη forget: 4:45.43
+			| 	 3GB
+			
+χωρις forget: 2:28.75
+			| 4.5GB

src/journal.c

@@ -222,7 +222,6 @@ uint64_t findRangeEnd(Journal_t* journal, uint64_t first, uint64_t last, uint64_
 	return first_appearance_end;
 }
 
-
 uint64_t findRangeStart(Journal_t* journal, uint64_t first, uint64_t last, uint64_t key, uint64_t* first_offset, bool* found){
 	uint64_t middle = (first+last)/2;
 	bool not_found = false;

src/journal.h

@@ -2,7 +2,6 @@
 #define __JOURNAL__
 #include <inttypes.h>
 #include <stdbool.h>
-#include <assert.h>
 #include "PKeyHash.h"
 #include "tidHash.h"
 #include "predicateHash.h"

src/parser.c

@@ -48,9 +48,11 @@ void processTransaction(Transaction_t *t, Journal_t** journal_array) {
 void processValidationQueries(ValidationQueries_t *v, Journal_t** journal_array, ValidationList_t* validation_list) {
 	ValidationQueries_t* val_query = v;
 	char* reader = v->queries;
-	uint32_t i;
+	uint32_t i,j;
 	for (i = 0; i < v->queryCount; i++) {
 		Query_t* query = (Query_t*)reader;
+		Journal_t* journal = journal_array[query->relationId];
+		/*Bring C0==X first*/
 		// uint32_t j;
 		// for(j = 0; j<query->columnCount; j++){
 		// 	if(query->columns[j].column == 0 && query->columns[j].op == Equal){
@@ -60,7 +62,18 @@ void processValidationQueries(ValidationQueries_t *v, Journal_t** journal_array,
 		// 		break;
 		// 	}
 		// }
+		/*Bring C0==X first*/
+
+
 		qsort(query->columns, query->columnCount, sizeof(Column_t), cmp_col);
+		if (journal->predicate_index != NULL) {
+			for(j = 0; j < query->columnCount; j++) {
+				Column_t* predicate = &query->columns[j];
+				// predicateSubBucket* predicateSubBucket = createPredicateSubBucket(val_query->from, val_query->to, predicate->column, predicate->op, predicate->value);
+				predicateInsertHashRecord(journal->predicate_index,val_query->from, val_query->to, predicate->column, predicate->op, predicate->value, val_query->validationId);
+			}	
+		}
+		
 		reader += sizeof(Query_t) + (sizeof(Column_t) * query->columnCount);
 	}
 	// printValidation(val_query);
@@ -94,7 +107,7 @@ void processFlush(Flush_t *fl, Journal_t** journal_array, ValidationList_t* vali
 }
 
 void processForget(Forget_t *fo, Journal_t** journal_array,int relation_count) {
-	// Unimplemented;
+	return;
 	uint32_t i;
 	for(i = 0; i < relation_count; i++){
 		Journal_t* journal = journal_array[i];
@@ -173,18 +186,40 @@ bool checkQueryHash(Journal_t** journal_array, Query_t* query, uint64_t from, ui
 			} else { /*Else check all the records in the range [from,to]*/
 				for(j = 0, offset = first_offset; j < record_count; j++, offset++){
 					JournalRecord_t* record = &journal->records[offset];
-					if(checkConstraint(record, predicate)){
+					// if(checkConstraint(record, predicate)){
+					uint32_t column = predicate->column;
+					Op_t operator = predicate->op;
+					uint64_t value = predicate->value;
+					bool cond = false;
+					switch(operator){
+						case Equal:
+							cond = (record->column_values[column] == value);
+							break;
+						case NotEqual:
+							cond = (record->column_values[column] != value);
+							break;
+						case Less:
+							cond = (record->column_values[column] < value);
+							break;
+						case LessOrEqual:
+							cond = (record->column_values[column] <= value);
+							break;
+						case Greater:
+							cond = (record->column_values[column] > value);
+							break;
+						case GreaterOrEqual:
+							cond = (record->column_values[column] >= value);
+							break;
+					}
+					if(cond){
 						setBit(j,predicate_bit_set);
 					}
 				}
 			}
 
-			//Insert predicate in the hash table.
-			predicateSubBucket* predicateSubBucket = createPredicateSubBucket(from, to, predicate->column, predicate->op, predicate->value);
-			predicateSubBucket->bit_set = predicate_bit_set;
-			predicateInsertHashRecord(journal->predicate_index,predicateSubBucket);
+			//Insert bit_set in the hash table.
+			predicateInsertBitSet(journal->predicate_index,from, to, predicate->column, predicate->op, predicate->value, predicate_bit_set);
 		}
-
 		if(i == 0) {
 			intersection = createBitSet(predicate_bit_set->bit_size);	/*Bit set of the whole query*/
 			copyBitSet(intersection, predicate_bit_set);
@@ -260,7 +295,31 @@ bool checkSingleQuery(Journal_t** journal_array, Query_t* query, uint64_t from,
 			bool record_result = true;
 			for (j = 1 ; j < query->columnCount ; j++) { 	/* check all column constraints */
 				Column_t* constraint = &query->columns[j];
-				bool partial_result = checkConstraint(record,constraint);
+				uint32_t column = constraint->column;
+				Op_t operator = constraint->op;
+				uint64_t value = constraint->value;
+				bool cond = false;
+				switch(operator){
+					case Equal:
+						cond = (record->column_values[column] == value);
+						break;
+					case NotEqual:
+						cond = (record->column_values[column] != value);
+						break;
+					case Less:
+						cond = (record->column_values[column] < value);
+						break;
+					case LessOrEqual:
+						cond = (record->column_values[column] <= value);
+						break;
+					case Greater:
+						cond = (record->column_values[column] > value);
+						break;
+					case GreaterOrEqual:
+						cond = (record->column_values[column] >= value);
+						break;
+				}
+				bool partial_result = cond;
 				record_result = record_result && partial_result;
 				if(partial_result == false){
 					break;
@@ -280,7 +339,31 @@ bool checkSingleQuery(Journal_t** journal_array, Query_t* query, uint64_t from,
 			bool record_result = true;
 			for(j = 0; j < query->columnCount; j++){
 				Column_t* constraint = &query->columns[j];
-				bool partial_result = checkConstraint(record,constraint);
+				uint32_t column = constraint->column;
+				Op_t operator = constraint->op;
+				uint64_t value = constraint->value;
+				bool cond = false;
+				switch(operator){
+					case Equal:
+						cond = (record->column_values[column] == value);
+						break;
+					case NotEqual:
+						cond = (record->column_values[column] != value);
+						break;
+					case Less:
+						cond = (record->column_values[column] < value);
+						break;
+					case LessOrEqual:
+						cond = (record->column_values[column] <= value);
+						break;
+					case Greater:
+						cond = (record->column_values[column] > value);
+						break;
+					case GreaterOrEqual:
+						cond = (record->column_values[column] >= value);
+						break;
+				}
+				bool partial_result = cond;
 				record_result = record_result && partial_result;
 				if(partial_result == false){
 					break;