You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/07/23 11:03:27 UTC
[1/2] kylin git commit: KYLIN-1797 when use beeline,
must specify HIVE_CONF
Repository: kylin
Updated Branches:
refs/heads/v1.5.3-release-rc2 9d48273a4 -> 543e9f900
KYLIN-1797 when use beeline, must specify HIVE_CONF
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3e553c0e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3e553c0e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3e553c0e
Branch: refs/heads/v1.5.3-release-rc2
Commit: 3e553c0e944c4f61d5df7f7ee69315a2916654b6
Parents: 9d48273
Author: shaofengshi <sh...@apache.org>
Authored: Sat Jul 23 18:51:26 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sat Jul 23 18:51:26 2016 +0800
----------------------------------------------------------------------
build/bin/find-hive-dependency.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/3e553c0e/build/bin/find-hive-dependency.sh
----------------------------------------------------------------------
diff --git a/build/bin/find-hive-dependency.sh b/build/bin/find-hive-dependency.sh
index 5b748fc..067a852 100644
--- a/build/bin/find-hive-dependency.sh
+++ b/build/bin/find-hive-dependency.sh
@@ -16,12 +16,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+dir=$(dirname ${0})
+source ${dir}/check-env.sh
client_mode=`sh ${KYLIN_HOME}/bin/get-properties.sh kylin.hive.client`
hive_env=
if [ "${client_mode}" == "beeline" ]
then
+ # when use beeline, need explicitly provide HIVE_CONF
+ if [ -z "$HIVE_CONF" ]
+ then
+ echo "Please set HIVE_CONF to the path which has hive-site.xml."
+ exit 1
+ fi
beeline_params=`sh ${KYLIN_HOME}/bin/get-properties.sh kylin.hive.beeline.params`
hive_env=`beeline ${beeline_params} --outputformat=dsv -e set | grep 'env:CLASSPATH'`
else
@@ -60,7 +67,7 @@ done
if [ -z "$hive_conf_path" ]
then
- echo "Couldn't find hive configuration directory. Please set HIVE_CONF to the path which contains hive-site.xml."
+ echo "Couldn't find hive configuration directory. Please set HIVE_CONF to the path which has hive-site.xml."
exit 1
fi
[2/2] kylin git commit: KYLIN-1918 UnsupportedOperationException when
unload hive table
Posted by sh...@apache.org.
KYLIN-1918 UnsupportedOperationException when unload hive table
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/543e9f90
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/543e9f90
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/543e9f90
Branch: refs/heads/v1.5.3-release-rc2
Commit: 543e9f90018fdca1c03720a0cc863ab2d15727aa
Parents: 3e553c0
Author: shaofengshi <sh...@apache.org>
Authored: Sat Jul 23 19:03:04 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sat Jul 23 19:03:04 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/rest/controller/TableController.java | 4 ++--
.../main/java/org/apache/kylin/rest/service/CacheService.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/543e9f90/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
index 1c3377b..95df27d 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
@@ -169,8 +169,8 @@ public class TableController extends BasicController {
unLoadFail.add(tableName);
}
}
- result.put("result.unload.success", (String[]) unLoadSuccess.toArray(new String[unLoadSuccess.size()]));
- result.put("result.unload.fail", (String[]) unLoadFail.toArray(new String[unLoadFail.size()]));
+ result.put("result.unload.success", unLoadSuccess.toArray(new String[unLoadSuccess.size()]));
+ result.put("result.unload.fail", unLoadFail.toArray(new String[unLoadFail.size()]));
return result;
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/543e9f90/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java b/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
index 02efe70..7b1e2b7 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
@@ -244,7 +244,8 @@ public class CacheService extends BasicService {
ProjectManager.clearCache();
break;
case TABLE:
- throw new UnsupportedOperationException(log);
+ MetadataManager.clearCache();
+ break;
case EXTERNAL_FILTER:
throw new UnsupportedOperationException(log);
case DATA_MODEL: