updated docu

README.md

@@ -21,3 +21,7 @@ To use the SQL Parser in your own code, you only need to include `SQLParser.h` a
 * [Developer Documentation](docs/documentation.md)
 * [Integration in Hyrise](docs/integration.md)
 * [Known Issues](docs/issues.md)
+
+**Doxygen:**
+
+Run `make docs` to create the doxygen documentation.

benchmark/benchmark.py

@@ -89,34 +89,4 @@ if __name__ == '__main__':
 
 	print hyrise.executeSQL("SELECT name, city FROM students WHERE grade <= 2.0", 50)
 
-	print hyrise.executeJSON("""{
+	print hyrise.executeJSON("""{"operators":{"0":{"type":"GetTable","name":"students"},"1":{"type":"SimpleTableScan","predicates":[{"type":"LTE_V","in":0,"f":"grade","value":2,"vtype":1}]},"2":{"type":"ProjectionScan","fields":["name","city"]}},"edges":[["0","1"],["1","2"]]}""", 50)
-        "operators": {
-            "0": {
-                "type": "GetTable",
-                "name": "students"
-            },
-            "1": {
-            	"type": "SimpleTableScan",
-            	"predicates": [
-       				{"type" : "LTE_V", "in" : 0, "f" : "grade", "value" : 2, "vtype": 1}
-            	]
-            },
-            "2": {
-                "type": "ProjectionScan",
-                "fields": [
-                    "name",
-                    "city"
-                ]
-            }
-        },
-        "edges": [
-            [
-                "0",
-                "1"
-            ],
-            [
-                "1",
-                "2"
-            ]
-        ]
-    }""", 50)

docs/integration.md

@@ -1,9 +1,8 @@
 Integration in Hyrise
 =====================
 
+On this page we describe how to integrate changes to the parser into Hyrise.
 
-
+## Update the Parser code in Hyrise
-
-## Update the Parser in Hyrise
 
 Run `./deploy_to_hyrise.sh path/to/hyrise` to update the SQL parser code within Hyrise.

docs/issues.md

@@ -1,11 +1,10 @@
 Known Issues
 ============
 
-
+Here we will keep track of issues with the parser and the integration in Hyrise.
 
 ## Missing Functionality
 
- * Having clause
  * Union clauses
  * Create anything other than tables
  * Alter/Rename statements