Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 33C5D200D4D for ; Sat, 18 Nov 2017 20:58:17 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 32507160BF7; Sat, 18 Nov 2017 19:58:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 78B02160BF8 for ; Sat, 18 Nov 2017 20:58:16 +0100 (CET) Received: (qmail 78250 invoked by uid 500); 18 Nov 2017 19:58:15 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 78241 invoked by uid 99); 18 Nov 2017 19:58:15 -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; Sat, 18 Nov 2017 19:58:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 644CEF3319; Sat, 18 Nov 2017 19:58:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Date: Sat, 18 Nov 2017 19:58:17 -0000 Message-Id: <88fe63c287c24851aeac7c379b137a4f@git.apache.org> In-Reply-To: <5dd56df199634302b03d72041ab3c858@git.apache.org> References: <5dd56df199634302b03d72041ab3c858@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] phoenix git commit: PHOENIX-4387 DefaultColumnValueIT failing in non-US build environments (Pedro Boado) archived-at: Sat, 18 Nov 2017 19:58:17 -0000 PHOENIX-4387 DefaultColumnValueIT failing in non-US build environments (Pedro Boado) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4a391290 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4a391290 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4a391290 Branch: refs/heads/5.x-HBase-2.0 Commit: 4a3912904f641d83e58308dbfc17a8f16cd2f680 Parents: a33b1f3 Author: James Taylor Authored: Sat Nov 18 11:36:53 2017 -0800 Committer: James Taylor Committed: Sat Nov 18 11:57:59 2017 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/DefaultColumnValueIT.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4a391290/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java index 62d79bc..59b15d8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java @@ -32,6 +32,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Time; import java.sql.Timestamp; +import java.text.DecimalFormatSymbols; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.util.ByteUtil; @@ -44,6 +45,8 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { private String sharedTable1; private String sharedTable2; + private String DEFAULT_CURRENCY_SYMBOL = DecimalFormatSymbols.getInstance().getCurrencySymbol(); + @Before public void init() { sharedTable1 = generateUniqueName(); @@ -583,7 +586,7 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { "pk INTEGER PRIMARY KEY," + "c1 INTEGER DEFAULT 1 + 9," + "c2 DOUBLE DEFAULT SQRT(91506.25)," - + "c3 DECIMAL DEFAULT TO_NUMBER('$123.33', '\u00A4###.##')," + + "c3 DECIMAL DEFAULT TO_NUMBER('" + DEFAULT_CURRENCY_SYMBOL + "123.33', '\u00A4###.##')," + "c4 VARCHAR DEFAULT 'AB' || 'CD'," + "c5 CHAR(5) DEFAULT 'E' || 'F'," + "c6 INTEGER DEFAULT \"MONTH\"(TO_TIMESTAMP('2015-6-05'))" @@ -599,7 +602,7 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { "pk INTEGER NOT NULL," + "c1 INTEGER NOT NULL DEFAULT 1 + 9," + "c2 DOUBLE NOT NULL DEFAULT SQRT(91506.25)," - + "c3 DECIMAL NOT NULL DEFAULT TO_NUMBER('$123.33', '\u00A4###.##')," + + "c3 DECIMAL NOT NULL DEFAULT TO_NUMBER('" + DEFAULT_CURRENCY_SYMBOL + "123.33', '\u00A4###.##')," + "c4 VARCHAR NOT NULL DEFAULT 'AB' || 'CD'," + "c5 CHAR(5) NOT NULL DEFAULT 'E' || 'F'," + "c6 INTEGER NOT NULL DEFAULT \"MONTH\"(TO_TIMESTAMP('2015-6-05'))," @@ -1045,7 +1048,7 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { "pk INTEGER PRIMARY KEY," + "c1 INTEGER DEFAULT 1 + 9," + "c2 DOUBLE DEFAULT SQRT(91506.25)," - + "c3 DECIMAL DEFAULT TO_NUMBER('$123.33', '\u00A4###.##')," + + "c3 DECIMAL DEFAULT TO_NUMBER('" + DEFAULT_CURRENCY_SYMBOL + "123.33', '\u00A4###.##')," + "c4 VARCHAR DEFAULT 'AB' || 'CD'," + "c5 CHAR(5) DEFAULT 'E' || 'F'," + "c6 INTEGER DEFAULT \"MONTH\"(TO_TIMESTAMP('2015-6-05'))"