From c7ce817bb32f7c3e3d3dee1829d531a2b49ae069 Mon Sep 17 00:00:00 2001 From: John Joyce Date: Wed, 30 Jun 2021 15:45:02 -0700 Subject: [PATCH] fix(quickstart): Fixing manual mysql quickstart (#2811) --- docker/docker-compose-without-neo4j.yml | 2 +- .../quickstart/generate_docker_quickstart.py | 3 +- .../quickstart/generate_docker_quickstart.sh | 2 + docker/quickstart/mysql/init.sql | 43 +++++++++++++++++++ 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 docker/quickstart/mysql/init.sql diff --git a/docker/docker-compose-without-neo4j.yml b/docker/docker-compose-without-neo4j.yml index feac8c00f3..a4ee832b63 100644 --- a/docker/docker-compose-without-neo4j.yml +++ b/docker/docker-compose-without-neo4j.yml @@ -116,7 +116,7 @@ services: context: ../ dockerfile: docker/datahub-gms/Dockerfile image: linkedin/datahub-gms:${DATAHUB_VERSION:-latest} - env_file: gms/env/docker-without-neo4j.env + env_file: datahub-gms/env/docker-without-neo4j.env hostname: datahub-gms container_name: datahub-gms ports: diff --git a/docker/quickstart/generate_docker_quickstart.py b/docker/quickstart/generate_docker_quickstart.py index 2a2b29d16f..abbdfacb32 100644 --- a/docker/quickstart/generate_docker_quickstart.py +++ b/docker/quickstart/generate_docker_quickstart.py @@ -1,8 +1,7 @@ import os -from collections.abc import Mapping - import click import yaml +from collections.abc import Mapping from dotenv import dotenv_values from yaml import Loader diff --git a/docker/quickstart/generate_docker_quickstart.sh b/docker/quickstart/generate_docker_quickstart.sh index 61e1bbc7bd..7682eaa760 100755 --- a/docker/quickstart/generate_docker_quickstart.sh +++ b/docker/quickstart/generate_docker_quickstart.sh @@ -8,6 +8,8 @@ set -euxo pipefail python3 -m venv venv source venv/bin/activate +cp $(pwd)/../mysql/init.sql $(pwd)/mysql/init.sql + pip install -r requirements.txt python generate_docker_quickstart.py ../docker-compose.yml ../docker-compose.override.yml docker-compose.quickstart.yml python generate_docker_quickstart.py ../docker-compose-without-neo4j.yml ../docker-compose-without-neo4j.override.yml docker-compose-without-neo4j.quickstart.yml diff --git a/docker/quickstart/mysql/init.sql b/docker/quickstart/mysql/init.sql new file mode 100644 index 0000000000..d5d82fd25a --- /dev/null +++ b/docker/quickstart/mysql/init.sql @@ -0,0 +1,43 @@ +-- create metadata aspect table +CREATE TABLE metadata_aspect_v2 ( + urn VARCHAR(500) NOT NULL, + aspect VARCHAR(200) NOT NULL, + version bigint(20) NOT NULL, + metadata longtext NOT NULL, + systemmetadata longtext, + createdon datetime(6) NOT NULL, + createdby VARCHAR(255) NOT NULL, + createdfor VARCHAR(255), + CONSTRAINT pk_metadata_aspect_v2 PRIMARY KEY (urn,aspect,version) +); + +INSERT INTO metadata_aspect_v2 (urn, aspect, version, metadata, createdon, createdby) VALUES( + 'urn:li:corpuser:datahub', + 'corpUserInfo', + 0, + '{"displayName":"Data Hub","active":true,"fullName":"Data Hub","email":"datahub@linkedin.com"}', + now(), + 'urn:li:principal:datahub' +), ( + 'urn:li:corpuser:datahub', + 'corpUserEditableInfo', + 0, + '{"skills":[],"teams":[],"pictureLink":"https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web/packages/data-portal/public/assets/images/default_avatar.png"}', + now(), + 'urn:li:principal:datahub' +); + +-- create metadata index table +CREATE TABLE metadata_index ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `urn` VARCHAR(200) NOT NULL, + `aspect` VARCHAR(150) NOT NULL, + `path` VARCHAR(150) NOT NULL, + `longVal` BIGINT, + `stringVal` VARCHAR(200), + `doubleVal` DOUBLE, + CONSTRAINT id_pk PRIMARY KEY (id), + INDEX longIndex (`urn`,`aspect`,`path`,`longVal`), + INDEX stringIndex (`urn`,`aspect`,`path`,`stringVal`), + INDEX doubleIndex (`urn`,`aspect`,`path`,`doubleVal`) +);