Merge oopsla20_revision into master

.gitignore

@@ -30,7 +30,6 @@ build/distributions/
 tags
 .python-version
 .DS_Store
-HooglePlus.cabal
 webapp/static/tmp/*
 logs/
 stack.yaml.lock
@@ -44,3 +43,46 @@ benchmark/suites/working.yml
 .elasticbeanstalk/*
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
+
+node_modules/
+.yarn
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# flask
+venv/
+
+*.pyc
+__pycache__/
+
+instance/
+
+.pytest_cache/
+.coverage
+htmlcov/
+
+dist/
+build/
+*.egg-info/
+output/

Dockerfile

@@ -2,6 +2,7 @@
 FROM ubuntu:18.04
 ARG port=3000
 EXPOSE ${port}
+EXPOSE 5000
 
 # install locales
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
@@ -23,30 +24,27 @@ RUN apt-get install -y libtinfo-dev zlib1g-dev haskell-stack
 RUN stack upgrade
 ENV PATH="/root/.local/bin:${PATH}"
 
-# Get tools for the evaluation
-RUN apt-get install -y python3 python3-pip
-RUN pip3 install --user PyYAML numpy tabulate matplotlib argparse
+# install curl
+RUN apt-get install -y build-essential curl git
+
+# install yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt update && apt install -y yarn
 
 # Get HooglePlus
-RUN cd /home; git clone https://github.com/davidmrdavid/hoogle_plus.git
-RUN cd /home/hoogle_plus && git checkout origin/master
+RUN cd /home; git clone https://github.com/TyGuS/hoogle_plus.git
+RUN cd /home/hoogle_plus && git checkout origin/oopsla20_artifact
 RUN cd /home/hoogle_plus && stack build
+RUN cd /home/hoogle_plus && stack install hoogle && hoogle generate
+RUN cd /home/hoogle_plus/new_webapp && yarn install
 
-# Start with bash
+# Generate the database
 RUN cd /home/hoogle_plus && stack exec -- hplus generate --preset=partialfunctions
-RUN mkdir -p /var/log/hplus
-
 
-CMD cd /home/hoogle_plus && stack run webapp -p ${port} >> /var/log/hplus/run.log
-
-HEALTHCHECK CMD curl --fail http://localhost:${port}/ || exit 1
-
-# To start the image, please mount the source file directory to /home/hoogle_plus
-# docker run -v PATH_TO_HOOGLE_PLUS_SOURCE:/home/hoogle_plus -it hoogle_plus
-# After the docker image is started
-# run `cd /home/hoogle_plus; stack build`
+# Get tools for the evaluation
+RUN apt-get install -y python3 python3-pip
+RUN pip3 install --user PyYAML numpy tabulate matplotlib argparse colorama pandas==1.0.1
 
-#
-# REMEMBER TO TAG CHANGES WITH LATEST.
-# LATEST TAG IS NOT UPDATED AUTOMATICALLY
-#
+# Start with bash
+CMD /bin/bash

HOSTING.md

@@ -0,0 +1,40 @@
+# Running Hoogleplus
+
+So you want to host and run Hoogle+?
+The setup is done in two parts.
+First, there's the backend, which runs on port 5000 by default.
+Then there's the frontend, which runs on port 3000 by default.
+Apache connects these two parts
+
+## Apache Redirects
+On goto, in the file /etc/apache2/sites-enabled/102-hoogleplus.conf:
+```
+<VirtualHost *:80>
+        ServerName hoogleplus.goto.ucsd.edu
+        # ServerAdmin ...?
+
+        ProxyPass /api/ http://localhost:5000/
+        ProxyPassReverse /api/ http://localhost:5000/
+
+        ProxyPass / http://localhost:3000/
+        ProxyPassReverse / http://localhost:3000/
+</VirtualHost>
+```
+We have a similar file for https, which sends the port 443 traffic to the same internal addresses as above.
+
+## Backend
+Note the directory, `web_server`:
+```
+web_server/$ ./start_server.sh
+```
+If you wish to tweak the backend's port, edit the above file.
+
+
+## Frontend
+Note the directory, `new_webapp`:
+```
+new_webapp$ REACT_APP_DEVELOPMENT_HOST=api/ yarn start
+```
+
+The `REACT_APP_DEVELOPMENT_HOST` environment variable indicates the path prefix for all requests to the backend.
+For Goto, this is `api/` because it sends requests to the API backend via the apache redirect.