Implement formatted select

yeonwooKim · Nov 24, 2016 · b92ed1a · b92ed1a
1 parent 1380bd0
commit b92ed1a
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 26 deletions.
diff --git a/src/Berkeley.java b/src/Berkeley.java
@@ -5,6 +5,7 @@
 import com.sleepycat.je.*;
 
 import java.io.*;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -361,14 +362,18 @@ private boolean incrCursor(String[] tables, ArrayList<Cursor> cursors, ArrayList
     }
 
     public void select(String tablename, BooleanValueExpression bve, ArrayList<Integer> projection) {
+        Table t = DBManager.getDBManager().findTable(tablename);
+        ArrayList<String> names = t.getNames(projection);
+        MessagePrinter.selectionSucceeded(names);
+
         String[] tables = tablename.split("@");
         ArrayList<Cursor> cursors = new ArrayList<>();
         ArrayList<DatabaseEntry> datas = new ArrayList<>();
         try {
             for (int i = 0; i < tables.length; i++) {
                 Cursor cursor = db.openCursor(null, null);
                 DatabaseEntry key;
-                DatabaseEntry data = null;
+                DatabaseEntry data;
                 key = new DatabaseEntry(tables[i].getBytes("UTF-8"));
                 data = new DatabaseEntry();
                 OperationStatus os = cursor.getSearchKey(key, data, LockMode.DEFAULT);
@@ -387,20 +392,18 @@ public void select(String tablename, BooleanValueExpression bve, ArrayList<Integ
                 }
                 Record newRecord = new Record(arr);
                 if (bve == null || bve.eval(DBManager.getDBManager().findTable(tablename), newRecord)) {
-                    //TODO: print these values
                     ArrayList<Value> res = (projection == null) ? newRecord.getValues() : newRecord.getIndices(projection);
-                    Iterator<Value> itPrint = res.iterator();
-                    while (itPrint.hasNext()) {
-                        itPrint.next().print();
-                    }
-                    System.out.println();
+                    MessagePrinter.selectionRecordPrint(res);
                 }
             } while(incrCursor(tables, cursors, datas, tables.length));
+
+            MessagePrinter.selectionEnded(names);
             Iterator<Cursor> it = cursors.iterator();
             while (it.hasNext()) {
                 it.next().close();
             }
         } catch (Exception e) {
+            MessagePrinter.selectionEnded(names);
             Iterator<Cursor> it = cursors.iterator();
             while (it.hasNext()) {
                 it.next().close();

diff --git a/src/DBManager.java b/src/DBManager.java
@@ -38,16 +38,6 @@ public Table findTable(String tablename) {
         return null;
     }
 
-    public Table findTableAlias(String alias) {
-        Iterator<Table> it = tables.iterator();
-        while (it.hasNext()) {
-            Table n = it.next();
-            if (n.getAlias().equals(alias))
-                return n;
-        }
-        return null;
-    }
-
     public void addTable(Table t) {
         tables.add(t);
     } // Called when CREATE TABLE requested

diff --git a/src/MessagePrinter.java b/src/MessagePrinter.java
@@ -1,3 +1,6 @@
+import java.util.ArrayList;
+import java.util.Iterator;
+
 public class MessagePrinter
 {
     public static void printPrompt()
@@ -14,6 +17,33 @@ private static void dropTableFailed() {
     private static void selectionFailed() {
         System.out.print("Selection has failed: ");
     }
+    public static void selectionRecordPrint(ArrayList<Value> arr) {
+        Iterator<Value> it = arr.iterator();
+        while (it.hasNext()) {
+            System.out.printf("| %-19s", it.next().toString());
+        }
+        System.out.println("|");
+    }
+    public static void selectionSucceeded(ArrayList<String> projection) {
+        int size = projection.size();
+        for (int i = 0 ; i < size ; i ++)
+            System.out.print("+--------------------");
+        System.out.println("+");
+        Iterator<String> it = projection.iterator();
+        while (it.hasNext()) {
+            System.out.printf("| %-19s", it.next().toUpperCase());
+        }
+        System.out.println("|");
+        for (int i = 0 ; i < size ; i ++)
+            System.out.print("+--------------------");
+        System.out.println("+");
+    }
+    public static void selectionEnded(ArrayList<String> projection) {
+        int size = projection.size();
+        for (int i = 0 ; i < size ; i ++)
+            System.out.print("+--------------------");
+        System.out.println("+");
+    }
     public static void printMessage(Message m)
     {
         MessageName q = m.getMessagename();

diff --git a/src/Table.java b/src/Table.java
@@ -229,4 +229,28 @@ public void setAlias(String alias) {
     public String getAlias() {
         return alias;
     }
+
+    private String getName(int index) {
+        Attribute attr = attrList.get(index);
+        String name = attr.getAlias();
+        if (name != null)
+            return name;
+        return attr.getAttributeName();
+    }
+    public ArrayList<String> getNames(ArrayList<Integer> projection) {
+        ArrayList<String> names = new ArrayList<>();
+        if (projection == null) {
+            int size = attrList.size();
+            for (int i = 0 ; i < size ; i ++) {
+                names.add(getName(i));
+            }
+        }
+        else {
+            Iterator<Integer> it = projection.iterator();
+            while (it.hasNext()) {
+                names.add(getName(it.next()));
+            }
+        }
+        return names;
+    }
 }
diff --git a/src/Value.java b/src/Value.java
@@ -90,22 +90,19 @@ public boolean equals(Object o) {
         return false;
     }
 
-    public void print() {
+    public String toString() {
         if (typename == null) {
-            System.out.print("NULL ");
-            return;
+            return "NULL";
         }
         switch(typename) {
             case INT:
-                System.out.print(intVal + " ");
-                break;
+                return Integer.toString(intVal);
             case CHAR:
-                System.out.print(stringVal + " ");
-                break;
+                return stringVal;
             case DATE:
-                System.out.print(dateVal + " ");
-                break;
+                return dateVal;
         }
+        return null;
     }
 
     @Override