You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2015/03/26 08:25:00 UTC
phoenix git commit: PHOENIX-1776 The literal -1.0 (floating point)
should not be converted to -1 (Integer) (Dave Hacker)
Repository: phoenix
Updated Branches:
refs/heads/4.3 f977ac6f3 -> 1011488dc
PHOENIX-1776 The literal -1.0 (floating point) should not be converted to -1 (Integer) (Dave Hacker)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1011488d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1011488d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1011488d
Branch: refs/heads/4.3
Commit: 1011488dcbcbb89370dde63bacf65e8c1d387867
Parents: f977ac6
Author: Samarth <sa...@salesforce.com>
Authored: Thu Mar 26 00:25:33 2015 -0700
Committer: Samarth <sa...@salesforce.com>
Committed: Thu Mar 26 00:25:33 2015 -0700
----------------------------------------------------------------------
.../phoenix/end2end/ArithmeticQueryIT.java | 28 ++++++++++++++++++++
.../apache/phoenix/parse/ParseNodeFactory.java | 4 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1011488d/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index 2df1827..72eb016 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -957,4 +957,32 @@ public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
assertTrue(rs.next());
assertEquals(1.333333333, rs.getDouble(1), 0.001);
}
+
+ @Test
+ public void testFloatingPointUpsert() throws Exception {
+ Connection conn = DriverManager.getConnection(getUrl());
+ String ddl = "CREATE TABLE test (id VARCHAR not null primary key, name VARCHAR, lat FLOAT)";
+ conn.createStatement().execute(ddl);
+ String dml = "UPSERT INTO test(id,name,lat) VALUES ('testid', 'testname', -1.00)";
+ conn.createStatement().execute(dml);
+ conn.commit();
+
+ ResultSet rs = conn.createStatement().executeQuery("SELECT lat FROM test");
+ assertTrue(rs.next());
+ assertEquals(-1.0f, rs.getFloat(1), 0.001);
+ }
+
+ @Test
+ public void testFloatingPointMultiplicationUpsert() throws Exception {
+ Connection conn = DriverManager.getConnection(getUrl());
+ String ddl = "CREATE TABLE test (id VARCHAR not null primary key, name VARCHAR, lat FLOAT)";
+ conn.createStatement().execute(ddl);
+ String dml = "UPSERT INTO test(id,name,lat) VALUES ('testid', 'testname', -1.00 * 1)";
+ conn.createStatement().execute(dml);
+ conn.commit();
+
+ ResultSet rs = conn.createStatement().executeQuery("SELECT lat FROM test");
+ assertTrue(rs.next());
+ assertEquals(-1.0f, rs.getFloat(1), 0.001);
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1011488d/phoenix-core/src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java b/phoenix-core/src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java
index e6560d7..cab44fd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java
@@ -47,6 +47,7 @@ import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TypeMismatchException;
import org.apache.phoenix.schema.stats.StatisticsCollectionScope;
import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PLong;
import org.apache.phoenix.schema.types.PTimestamp;
import org.apache.phoenix.util.SchemaUtil;
@@ -577,7 +578,8 @@ public class ParseNodeFactory {
public ParseNode negate(ParseNode child) {
// Prevents reparsing of -1 from becoming 1*-1 and 1*1*-1 with each re-parsing
- if (LiteralParseNode.ONE.equals(child)) {
+ if (LiteralParseNode.ONE.equals(child) && ((LiteralParseNode)child).getType().isCoercibleTo(
+ PLong.INSTANCE)) {
return LiteralParseNode.MINUS_ONE;
}
return new MultiplyParseNode(Arrays.asList(child,LiteralParseNode.MINUS_ONE));