cleaning up

Author: slmyers

CompareResults.java

@@ -1,14 +1,33 @@
+import java.util.ArrayList;
 
 public class CompareResults{
-	public ResultSet set_1;
-	public ResultSet set_2;
+	public ResultSet hashSet;
+	public ResultSet treeSet;
+	public ArrayList<Result> difference;
 
-	public CompareResults(ResultSet set_1, ResultSet set_2){
-		this.set_1 = set_1;
-		this.set_2 = set_2;
+	public CompareResults(ResultSet hashSet, ResultSet treeSet){
+		this.hashSet = hashSet;
+		this.treeSet = treeSet;
+		this.difference = new ArrayList<Result>();
 	}
 
 	public final boolean eqv(){
+		for(Result r : treeSet.getResults()){
+			if(!hashSet.getResults().contains(r)){
+				difference.add(r);
+			}
+		}
+
+		if(difference.size() == 0){
+			return true;
+		}
+
+		System.out.println("=================================");
+		System.out.println("there are " + difference.size() + " results found in tree that are not in hash");		
+		
+		for(Result r : difference){
+			r.toString();
+		}
 		return false;
 	}
 }

DataBase.java

@@ -9,6 +9,7 @@
 
 public class DataBase{
 	private static final int NO_RECORDS = 100000;
+	private static final int NO_RECORDS_TEST = 10;
 	public static final String DATABASE_DIR = "./tmp/user_db";
 	public static final String PRIMARY_TABLE = "./tmp/user_db/primary_table_file1";
 
@@ -33,7 +34,7 @@ protected DataBase(){
 		}
 
 	}
-	
+	//TODO ensure that DataBase.getInstance() does not open create database when unwanted
 	public static DataBase getInstance(){
 		if(db == null){
 			db = new DataBase();
@@ -84,15 +85,46 @@ private final boolean createBase(){
 			return false;
 		}
 		System.out.println(PRIMARY_TABLE + " has been created of type: " + dbConfig.getType());
-		populateTable(this.database, NO_RECORDS);
-		
+		//TODO change to populateTable after testing		
+		int count = populateTable(this.database, NO_RECORDS);
+		//int count = populateTestTable(this.database, NO_RECORDS_TEST);
+		System.out.println(PRIMARY_TABLE + " has been inserted with: " + count + " records");
 		return true;
 	}	
+	
+	static int populateTestTable(Database my_table, int nrecs){
+		DatabaseEntry kdbt, ddbt;
+		int count = 0;
+		ddbt = new DatabaseEntry(new String("test").getBytes());
+		ddbt.setSize(4);
+
+		
+		try {
+			for(int i = 0; i < nrecs; i++){
+				kdbt = new DatabaseEntry(new Character((char)(i + 97)).toString().getBytes());
+				kdbt.setSize(1);
+				OperationStatus result;
+				result = my_table.exists(null, kdbt);
+				if (!result.toString().equals("OperationStatus.NOTFOUND"))
+					throw new RuntimeException("Key is already in the database!");
 
-	static void populateTable(Database my_table, int nrecs ) {
+				/* to insert the key/data pair into the database */
+		    	my_table.putNoOverwrite(null, kdbt, ddbt);
+				count++;
+			} 
+		}catch (DatabaseException dbe) {
+			System.err.println("Populate the table: "+dbe.toString());
+		  	System.exit(1);
+		}
+		return count;
+	}
+
+	static int populateTable(Database my_table, int nrecs ) {
 		int range;
 		DatabaseEntry kdbt, ddbt;
-		String s, key, data;
+
+		String s;
+
 		/*  
 		 *  generate a random string with the length between 64 and 127,
 		 *  inclusive.
@@ -102,8 +134,8 @@ static void populateTable(Database my_table, int nrecs ) {
 		Random random = new Random(1000000);
 
 		try {
-    	for (int i = 0; i < nrecs; i++) {
-			
+
+    		for (int i = 0; i < nrecs; i++) {
 				/* to generate a key string */
 				range = 64 + random.nextInt( 64 );
 				s = "";
@@ -114,7 +146,7 @@ static void populateTable(Database my_table, int nrecs ) {
 				kdbt = new DatabaseEntry(s.getBytes());
 				kdbt.setSize(s.length()); 
 
-		    	
+				 	
 
 				/* to generate a data string */
 				range = 64 + random.nextInt( 64 );
@@ -123,11 +155,7 @@ static void populateTable(Database my_table, int nrecs ) {
 					s+=(new Character((char)(97+random.nextInt(26)))).toString();
 				data = s;   
 
-				if(i <= 10){
-					System.out.println(key);
-					System.out.println(data);
-					System.out.println();
-				}
+		
 				/* to create a DBT for data */
 				ddbt = new DatabaseEntry(s.getBytes());
 				ddbt.setSize(s.length()); 
@@ -138,14 +166,16 @@ static void populateTable(Database my_table, int nrecs ) {
 				if (!result.toString().equals("OperationStatus.NOTFOUND"))
 					throw new RuntimeException("Key is already in the database!");
 
-				/* to insert the key/data pair into the database */
-		    my_table.putNoOverwrite(null, kdbt, ddbt);
+					/* to insert the key/data pair into the database */
+				my_table.putNoOverwrite(null, kdbt, ddbt);
+				count++;
 			}
 		}
 		catch (DatabaseException dbe) {
 			System.err.println("Populate the table: "+dbe.toString());
-		  System.exit(1);
+		  	System.exit(1);
 		}
+		return count;
 	}
 
 	public void close(){
@@ -162,6 +192,7 @@ public void close(){
 				fnfe.printStackTrace();
 			}
 			database = null;
+			db = null;
 		}
 
 	}

Interval.java

@@ -1,6 +1,8 @@
 
 public class Interval{
 	public static final String LOWER_LIMIT = "aaaapjjknhqcfdaoxdbghixrpkjnvautkjsjkqqbxhcgbgozowkpldjqnwfkhbveggqkbgtrnwruakhumnwguck";
-	public static final String UPPER_LIMIT = "abagbejpsnfdhfdjoqlombtlbzdkvxsbhatvndnurlvwirthlqfgprswqohspxgwxcpxeexldavtkmgvpqscwiocgnktencfuunmouaulaeexojxmeltffxmkxonmyh";
+	public static final String UPPER_LIMIT = "aaqumsxzjosfiqvtvtrnpncocpfcspahelkqvhraitrpcsmktpcvhdvjkzxozunocdoesndqffqqmjlrkfshnnpvzjycymnbtvrljhytirvpfzmwvnwfsmxuvoumlel";
+	public static final String TEST_LOWER_LIMIT = "a";
+	public static final String TEST_UPPER_LIMIT = "d";
 	public static final int KEYS_IN_INTERVAL = 150;
 }

Menu.java

@@ -1,3 +1,4 @@
+
 public class Menu{		
 	Scan scan;
 	public Menu(){
@@ -38,15 +39,14 @@ public void makeSelection(){
 						makeSelection();
 						break;
 			case 2 : 
-						System.out.println("Retrieving records with given key");
+						System.out.println("Option 2 executed");
 						KeyRetrieve kr = new KeyRetrieve();	
 						kr.getRecords();
 						printHeader();
 						makeSelection();
 						break;
 			case 3: 
-			      System.out.println("Option 3 executed");		
-						System.out.println(Pref.getDbType());		                        	    
+						System.out.println("Option 3 executed");				                        	   
 						DataRetrieve dr = new DataRetrieve();	
 						dr.getRecords();
 						printHeader();
@@ -55,12 +55,13 @@ public void makeSelection(){
 			case 4: 
 						System.out.println("Option 4 executed");	
 						RangeSearch rs = new RangeSearch();
+						//rs.compare();
 						rs.execute();
 						printHeader();
 						makeSelection();
 						break;
 			case 5:
-						System.out.println("Database is destroyed");	
+						System.out.println("Option 5 executed");	
 						IndexFile.getInstance().close();
 						if(DataBase.getInstance().getPrimaryDb() != null){
 							DataBase.getInstance().close();
@@ -69,6 +70,7 @@ public void makeSelection(){
 						this.makeSelection();
 						break;
 			case 6:
+						//TODO ensure that DataBase.getInstance() does not open create database when unwanted
 						System.out.println("Exiting data base");
 						IndexFile.getInstance().close();
 						DataBase.getInstance().close();