Update buckets schema
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/e4077071 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/e4077071 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/e4077071 Branch: refs/heads/feature/test_daewon Commit: e4077071155e0b78fa16a22dc3b6839c4c8d3816 Parents: 3a3dc2f Author: daewon <[email protected]> Authored: Mon Dec 28 11:41:33 2015 +0900 Committer: daewon <[email protected]> Committed: Mon Dec 28 11:41:33 2015 +0900 ---------------------------------------------------------------------- dev_support/graph_mysql/schema.sql | 5 ++- .../s2graph/core/mysqls/ExperimentSpec.scala | 33 ++------------------ 2 files changed, 4 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/e4077071/dev_support/graph_mysql/schema.sql ---------------------------------------------------------------------- diff --git a/dev_support/graph_mysql/schema.sql b/dev_support/graph_mysql/schema.sql index d9f1f8b..9190033 100644 --- a/dev_support/graph_mysql/schema.sql +++ b/dev_support/graph_mysql/schema.sql @@ -162,12 +162,10 @@ CREATE TABLE `experiments` ( -- ---------------------------- -- Table structure for `buckets` -- ---------------------------- -DROP TABLE IF EXISTS `buckets`; CREATE TABLE `buckets` ( `id` integer NOT NULL AUTO_INCREMENT, `experiment_id` integer NOT NULL, - `uuid_mods` varchar(64) NOT NULL, - `traffic_ratios` varchar(64) NOT NULL, + `modular` varchar(64) NOT NULL, `http_verb` varchar(8) NOT NULL, `api_path` text NOT NULL, `uuid_key` varchar(128), @@ -176,6 +174,7 @@ CREATE TABLE `buckets` ( `timeout` int NOT NULL DEFAULT 1000, `impression_id` varchar(64) NOT NULL, `is_graph_query` tinyint NOT NULL DEFAULT 1, + `is_empty` tinyint NOT NULL DEFAULT 0, PRIMARY KEY (`id`), UNIQUE KEY `ux_impression_id` (`impression_id`), INDEX `idx_experiment_id` (`experiment_id`), http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/e4077071/s2core/src/test/scala/com/kakao/s2graph/core/mysqls/ExperimentSpec.scala ---------------------------------------------------------------------- diff --git a/s2core/src/test/scala/com/kakao/s2graph/core/mysqls/ExperimentSpec.scala b/s2core/src/test/scala/com/kakao/s2graph/core/mysqls/ExperimentSpec.scala index 2bc764d..2e8cb50 100644 --- a/s2core/src/test/scala/com/kakao/s2graph/core/mysqls/ExperimentSpec.scala +++ b/s2core/src/test/scala/com/kakao/s2graph/core/mysqls/ExperimentSpec.scala @@ -19,37 +19,7 @@ class ExperimentSpec extends FlatSpec with Matchers with BeforeAndAfterAll { val props = new Properties() props.setProperty("cache.ttl.seconds", Ttl.toString) Model.apply(ConfigFactory.load(ConfigFactory.parseProperties(props))) - /* -CREATE TABLE `experiments` ( - `id` integer NOT NULL AUTO_INCREMENT, - `service_id` integer NOT NULL, - `service_name` varchar(128) NOT NULL, - `name` varchar(64) NOT NULL, - `description` varchar(255) NOT NULL, - `experiment_type` varchar(8) NOT NULL DEFAULT 'u', - `total_modular` int NOT NULL DEFAULT 100, - PRIMARY KEY (`id`), - UNIQUE KEY `ux_service_id_name` (`service_id`, `name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE `buckets` ( - `id` integer NOT NULL AUTO_INCREMENT, - `experiment_id` integer NOT NULL, - `uuid_mods` varchar(64) NOT NULL, - `traffic_ratios` varchar(64) NOT NULL, - `http_verb` varchar(8) NOT NULL, - `api_path` text NOT NULL, - `uuid_key` varchar(128), - `uuid_placeholder` varchar(64), - `request_body` text NOT NULL, - `timeout` int NOT NULL DEFAULT 1000, - `impression_id` varchar(64) NOT NULL, - `is_graph_query` tinyint NOT NULL DEFAULT 1, - PRIMARY KEY (`id`), - UNIQUE KEY `ux_impression_id` (`impression_id`), - INDEX `idx_experiment_id` (`experiment_id`), - INDEX `idx_impression_id` (`impression_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - */ + implicit val session = AutoSession sql"""DELETE FROM buckets""".update().apply() sql"""DELETE FROM experiments""".update().apply() @@ -58,6 +28,7 @@ CREATE TABLE `buckets` ( sql"""INSERT INTO buckets(experiment_id, modular, http_verb, api_path, request_body, impression_id) VALUES($expId, "1~100", "POST", "/a/b/c", "None", "imp1")""".update().apply() + } "Experiment" should "find bucket list" in {
