From d0093e54623299bc98eb6ee6c00fc7ca28d7f1b0 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Tue, 22 Sep 2015 17:50:12 +0900 Subject: [PATCH 1/4] TAJO-1827: JSON parsing error at storage-site.json while tajo master starts up --- tajo-dist/pom.xml | 1 + .../src/main/conf/storage-site.json.template | 23 +------------------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/tajo-dist/pom.xml b/tajo-dist/pom.xml index b0e9f64b7b..121622d277 100644 --- a/tajo-dist/pom.xml +++ b/tajo-dist/pom.xml @@ -46,6 +46,7 @@ src/main/conf/workers + src/main/conf/storage-site.json.template diff --git a/tajo-dist/src/main/conf/storage-site.json.template b/tajo-dist/src/main/conf/storage-site.json.template index 2d7b19d478..01d4af4b1d 100644 --- a/tajo-dist/src/main/conf/storage-site.json.template +++ b/tajo-dist/src/main/conf/storage-site.json.template @@ -1,23 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* HBase Storage Plugin and Tablespace Example */ -/* { "spaces": { "hbase-cluster1": { @@ -31,5 +11,4 @@ "default-format": "hbase" } } -} -*/ \ No newline at end of file +} \ No newline at end of file From 9967d44b7e431f014dc1b624992dd3960f3a3105 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 23 Sep 2015 10:17:35 +0900 Subject: [PATCH 2/4] Remove all contents from the template file --- tajo-dist/src/main/conf/storage-site.json.template | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tajo-dist/src/main/conf/storage-site.json.template b/tajo-dist/src/main/conf/storage-site.json.template index 01d4af4b1d..e69de29bb2 100644 --- a/tajo-dist/src/main/conf/storage-site.json.template +++ b/tajo-dist/src/main/conf/storage-site.json.template @@ -1,14 +0,0 @@ -{ - "spaces": { - "hbase-cluster1": { - "uri": "hbase://quorum1:port,quorum2:port/" - } - }, - - "storages": { - "hbase": { - "handler": "org.apache.tajo.storage.hbase.HBaseTablespace", - "default-format": "hbase" - } - } -} \ No newline at end of file From 200085b89aea685c7eb779a8a18d354e1d2a1a6a Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Thu, 24 Sep 2015 09:44:49 +0900 Subject: [PATCH 3/4] Add description element to JSON template file --- .../src/main/conf/storage-site.json.template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tajo-dist/src/main/conf/storage-site.json.template b/tajo-dist/src/main/conf/storage-site.json.template index e69de29bb2..932db9ed1c 100644 --- a/tajo-dist/src/main/conf/storage-site.json.template +++ b/tajo-dist/src/main/conf/storage-site.json.template @@ -0,0 +1,16 @@ +{ + "spaces": { + "hbase-cluster1": { + "uri": "hbase://quorum1:port,quorum2:port/", + "description:" "HBase Tablespace Example" + } + }, + + "storages": { + "hbase": { + "handler": "org.apache.tajo.storage.hbase.HBaseTablespace", + "default-format": "hbase", + "description:" "HBase Storage Plugin Example" + } + } +} \ No newline at end of file From 70538a51f07e7549a8bf18f2ac3153089d97958b Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Thu, 24 Sep 2015 14:22:06 +0900 Subject: [PATCH 4/4] Revert "Add description element to JSON template file" This reverts commit 200085b89aea685c7eb779a8a18d354e1d2a1a6a. --- .../src/main/conf/storage-site.json.template | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tajo-dist/src/main/conf/storage-site.json.template b/tajo-dist/src/main/conf/storage-site.json.template index 932db9ed1c..e69de29bb2 100644 --- a/tajo-dist/src/main/conf/storage-site.json.template +++ b/tajo-dist/src/main/conf/storage-site.json.template @@ -1,16 +0,0 @@ -{ - "spaces": { - "hbase-cluster1": { - "uri": "hbase://quorum1:port,quorum2:port/", - "description:" "HBase Tablespace Example" - } - }, - - "storages": { - "hbase": { - "handler": "org.apache.tajo.storage.hbase.HBaseTablespace", - "default-format": "hbase", - "description:" "HBase Storage Plugin Example" - } - } -} \ No newline at end of file