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 3C62810BA1 for ; Thu, 13 Feb 2014 22:17:47 +0000 (UTC) Received: (qmail 49332 invoked by uid 500); 13 Feb 2014 22:17:44 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 49068 invoked by uid 500); 13 Feb 2014 22:17:44 -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 48929 invoked by uid 99); 13 Feb 2014 22:17:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 22:17:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 22:17:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 77B2D23889DA; Thu, 13 Feb 2014 22:17:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1568067 - in /hive/trunk/jdbc/src/java/org/apache/hive/jdbc: HiveDatabaseMetaData.java Utils.java Date: Thu, 13 Feb 2014 22:17:19 -0000 To: commits@hive.apache.org From: prasadm@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140213221719.77B2D23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: prasadm Date: Thu Feb 13 22:17:19 2014 New Revision: 1568067 URL: http://svn.apache.org/r1568067 Log: HIVE-6372: getDatabaseMajor/Minor version returns wrong values (Szehon Ho via Prasad Mujumdar) Modified: hive/trunk/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java hive/trunk/jdbc/src/java/org/apache/hive/jdbc/Utils.java Modified: hive/trunk/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java?rev=1568067&r1=1568066&r2=1568067&view=diff ============================================================================== --- hive/trunk/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java (original) +++ hive/trunk/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java Thu Feb 13 22:17:19 2014 @@ -258,11 +258,11 @@ public class HiveDatabaseMetaData implem } public int getDatabaseMajorVersion() throws SQLException { - return Utils.getVersionPart(getDatabaseProductVersion(), 1); + return Utils.getVersionPart(getDatabaseProductVersion(), 0); } public int getDatabaseMinorVersion() throws SQLException { - return Utils.getVersionPart(getDatabaseProductVersion(), 2); + return Utils.getVersionPart(getDatabaseProductVersion(), 1); } public String getDatabaseProductName() throws SQLException { Modified: hive/trunk/jdbc/src/java/org/apache/hive/jdbc/Utils.java URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hive/jdbc/Utils.java?rev=1568067&r1=1568066&r2=1568067&view=diff ============================================================================== --- hive/trunk/jdbc/src/java/org/apache/hive/jdbc/Utils.java (original) +++ hive/trunk/jdbc/src/java/org/apache/hive/jdbc/Utils.java Thu Feb 13 22:17:19 2014 @@ -234,8 +234,8 @@ public class Utils { * @param fullVersion * version string. * @param tokenPosition - * position of version string to get starting at 1. eg, for a X.x.xxx - * string, 1 will return the major version, 2 will return minor + * position of version string to get starting at 0. eg, for a X.x.xxx + * string, 0 will return the major version, 1 will return minor * version. * @return version part, or -1 if version string was malformed. */