Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DFC0118D4E for ; Sun, 21 Jun 2015 05:25:40 +0000 (UTC) Received: (qmail 82210 invoked by uid 500); 21 Jun 2015 05:25:28 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 81412 invoked by uid 500); 21 Jun 2015 05:25:28 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 79137 invoked by uid 99); 21 Jun 2015 05:25:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Jun 2015 05:25:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E0879E3632; Sun, 21 Jun 2015 05:25:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xuefu@apache.org To: commits@hive.apache.org Date: Sun, 21 Jun 2015 05:26:15 -0000 Message-Id: In-Reply-To: <8b5ddf5e238a45498fc293d82199240e@git.apache.org> References: <8b5ddf5e238a45498fc293d82199240e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/61] [abbrv] hive git commit: update MetaStoreSchemaInfo for 1.2.1 update MetaStoreSchemaInfo for 1.2.1 Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/49d8414d Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/49d8414d Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/49d8414d Branch: refs/heads/spark Commit: 49d8414d0e0f220a8924120c75a4013b942a4612 Parents: 9503357 Author: Thejas Nair Authored: Thu Jun 18 12:57:19 2015 -0700 Committer: Thejas Nair Committed: Thu Jun 18 12:58:01 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/49d8414d/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java ---------------------------------------------------------------------- diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java index c4062e9..a5eed6d 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java @@ -48,7 +48,11 @@ public class MetaStoreSchemaInfo { // that has a corresponding schema. eg "0.13.1" is equivalent to "0.13.0" private static final Map EQUIVALENT_VERSIONS = ImmutableMap.of("0.13.1", "0.13.0", - "1.0.0", "0.14.0", "1.0.1", "1.0.0", "1.1.1", "1.1.0"); + "1.0.0", "0.14.0", + "1.0.1", "1.0.0", + "1.1.1", "1.1.0", + "1.2.1", "1.2.0" + ); public MetaStoreSchemaInfo(String hiveHome, HiveConf hiveConf, String dbType) throws HiveMetaException { this.hiveHome = hiveHome;