diff --git a/README.md b/README.md index 79c3deb..4782c16 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # AQuery++ Database ## Introduction -AQuery++ Database is a cross-platform, In-Memory Column-Store Database that incorporates compiled query execution. +AQuery++ Database is a cross-platform, In-Memory Column-Store Database that incorporates compiled query execution. (**Note**: If you encounter any problems, feel free to contact me via ys3540@nyu.edu) ## Docker (Recommended): - See installation instructions from [docker.com](https://www.docker.com). Run **docker desktop** to start docker engine. @@ -16,6 +16,11 @@ AQuery++ Database is a cross-platform, In-Memory Column-Store Database that inco 2. Download the [patch](https://drive.google.com/file/d/1YkykhM6u0acZ-btQb4EUn4jAEXPT81cN/view?usp=sharing) 3. Decompress the patch to any directory and execute script inside by typing (`source ./cims.sh`). Please use the source command or `. ./cims.sh` (dot space) to execute the script because it contains configurations for environment variables. 4. Execute `python3 ./prompt.py` + +## Singularity Container + 1. build container `singularity build aquery.sif aquery.def` + 2. execute container `singularity exec aquery.sif sh` + 3. run AQuery `python3 ./prompt.py` # Native Installation: ## Requirements 1. Recent version of Linux, Windows or MacOS, with recent C++ compiler that has C++17 (1z) support. (however c++20 is recommended if available for heterogeneous lookup on unordered containers) diff --git a/engine/str.sql b/engine/str.sql deleted file mode 100644 index 96b97c2..0000000 --- a/engine/str.sql +++ /dev/null @@ -1 +0,0 @@ -create table strtest(a: string, b: string); diff --git a/singularity.def b/singularity.def new file mode 100644 index 0000000..aa219f2 --- /dev/null +++ b/singularity.def @@ -0,0 +1,22 @@ +Bootstrap: docker +From: ubuntu:latest + +%post + apt update && apt install -y wget + export OS_VER=`cat /etc/os-release | grep VERSION_CODENAME` &&\ + export OS_VER=${OS_VER#*=} &&\ + printf "deb https://dev.monetdb.org/downloads/deb/ "${OS_VER}" monetdb \ndeb-src https://dev.monetdb.org/downloads/deb/ "${OS_VER}" monetdb\n">/etc/apt/sources.list.d/monetdb.list + wget --output-document=/etc/apt/trusted.gpg.d/monetdb.gpg https://dev.monetdb.org/downloads/MonetDB-GPG-KEY.gpg + apt update && apt install -y python3 python3-pip clang-14 libmonetdbe-dev git + git clone https://github.com/sunyinqi0508/AQuery2 + python3 -m pip install -r AQuery2/requirements.txt + export IS_DOCKER_IMAGE=1 &&\ + export CXX=clang++-14 &&\ + cd AQuery2 && python3 prompt.py + +%environment + export IS_DOCKER_IMAGE=1 + export CXX=clang++-14 + +%runscript + cd AQuery2 && python3 prompt.py