From c1db8a3f4e08c357869988424fc23d3e6601a110 Mon Sep 17 00:00:00 2001 From: Pedro Date: Mon, 26 Jan 2015 20:30:53 +0100 Subject: [PATCH] updated docu --- README.md | 6 +++++- benchmark/benchmark.py | 32 +------------------------------- docs/integration.md | 5 ++--- docs/issues.md | 3 +-- 4 files changed, 9 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 185fe29..6eb5011 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,8 @@ 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) \ No newline at end of file +* [Known Issues](docs/issues.md) + +**Doxygen:** + +Run `make docs` to create the doxygen documentation. \ No newline at end of file diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py index 3126b5e..4f9e332 100644 --- a/benchmark/benchmark.py +++ b/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("""{ - "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) + 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) diff --git a/docs/integration.md b/docs/integration.md index 84cfe78..b2173b1 100644 --- a/docs/integration.md +++ b/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 in Hyrise +## Update the Parser code in Hyrise Run `./deploy_to_hyrise.sh path/to/hyrise` to update the SQL parser code within Hyrise. \ No newline at end of file diff --git a/docs/issues.md b/docs/issues.md index 9154abb..90a3c3d 100644 --- a/docs/issues.md +++ b/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