You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/04/23 00:59:52 UTC

git commit: PHOENIX-915 Numeric functions ROUND, CEIL, FLOOR return incorrect results for DOUBLE (SamarthJain)

Repository: incubator-phoenix
Updated Branches:
  refs/heads/3.0 1c959358c -> 10642d84e


PHOENIX-915 Numeric functions ROUND, CEIL, FLOOR return incorrect results for DOUBLE (SamarthJain)


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/10642d84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/10642d84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/10642d84

Branch: refs/heads/3.0
Commit: 10642d84e25be2f305be4bcb607f4e439c088e6c
Parents: 1c95935
Author: James Taylor <ja...@apache.org>
Authored: Tue Apr 22 15:59:36 2014 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Tue Apr 22 15:59:36 2014 -0700

----------------------------------------------------------------------
 .../RoundFloorCeilFunctionsEnd2EndIT.java       | 144 ++++++++++++++++---
 .../function/RoundDecimalExpression.java        |   2 +-
 2 files changed, 122 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/10642d84/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
index 0f3953f..413d6a8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
@@ -38,6 +38,9 @@ import org.apache.phoenix.expression.function.FloorFunction;
 import org.apache.phoenix.expression.function.RoundFunction;
 import org.apache.phoenix.util.DateUtil;
 
+import com.google.common.primitives.Doubles;
+import com.google.common.primitives.Floats;
+
 /**
  * 
  * End to end tests for {@link RoundFunction}, {@link FloorFunction}, {@link CeilFunction} 
@@ -50,6 +53,10 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     private static long millisPart = 660;
     private static int nanosPart = 500100;
     private static BigDecimal decimalUpserted = BigDecimal.valueOf(1.264);
+    private static double doubleUpserted = 1.264d;
+    private static double unsignedDoubleUpserted = 1.264d;
+    private static float floatUpserted = 1.264f;
+    private static float unsignedFloatUpserted = 1.264f;
     
     @BeforeClass
     public static void initTable() throws Exception {
@@ -58,7 +65,7 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt = null;
         try {
             conn = DriverManager.getConnection(getUrl());
-            String ddl = "CREATE TABLE IF NOT EXISTS ROUND_DATE_TIME_TS_DECIMAL (s VARCHAR NOT NULL PRIMARY KEY, dt DATE, t TIME, ts TIMESTAMP, dec DECIMAL)";
+            String ddl = "CREATE TABLE IF NOT EXISTS t1 (s VARCHAR NOT NULL PRIMARY KEY, dt DATE, t TIME, ts TIMESTAMP, dec DECIMAL, doub DOUBLE, undoub UNSIGNED_DOUBLE, fl FLOAT, unfl UNSIGNED_FLOAT)";
             conn.createStatement().execute(ddl);
             
             Date dateUpserted = DateUtil.parseDate("2012-01-01 14:25:28");
@@ -68,12 +75,16 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
             Time timeUpserted = new Time(millis);
             Timestamp tsUpserted = DateUtil.getTimestamp(millis, nanosPart);
             
-            stmt =  conn.prepareStatement("UPSERT INTO ROUND_DATE_TIME_TS_DECIMAL VALUES (?, ?, ?, ?, ?)");
+            stmt =  conn.prepareStatement("UPSERT INTO t1 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
             stmt.setString(1, testString);
             stmt.setDate(2, dateUpserted);
             stmt.setTime(3, timeUpserted);
             stmt.setTimestamp(4, tsUpserted);
             stmt.setBigDecimal(5, decimalUpserted);
+            stmt.setDouble(6, doubleUpserted);
+            stmt.setDouble(7, unsignedDoubleUpserted);
+            stmt.setFloat(8, floatUpserted);
+            stmt.setFloat(9, unsignedFloatUpserted);
             stmt.executeUpdate();
             conn.commit();
         } finally {
@@ -84,7 +95,7 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testRoundingUpDate() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(dt, 'day'), ROUND(dt, 'hour', 1), ROUND(dt, 'minute', 1), ROUND(dt, 'second', 1), ROUND(dt, 'millisecond', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(dt, 'day'), ROUND(dt, 'hour', 1), ROUND(dt, 'minute', 1), ROUND(dt, 'second', 1), ROUND(dt, 'millisecond', 1) FROM t1");
         assertTrue(rs.next());
         Date expectedDate = DateUtil.parseDate("2012-01-02 00:00:00");
         assertEquals(expectedDate, rs.getDate(1));
@@ -99,14 +110,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testRoundingUpDateInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE ROUND(dt, 'day') = to_date('2012-01-02 00:00:00')");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE ROUND(dt, 'day') = to_date('2012-01-02 00:00:00')");
         assertTrue(rs.next());
     }
     
     @Test
     public void testFloorDate() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(dt, 'day', 1), FLOOR(dt, 'hour', 1), FLOOR(dt, 'minute', 1), FLOOR(dt, 'second', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(dt, 'day', 1), FLOOR(dt, 'hour', 1), FLOOR(dt, 'minute', 1), FLOOR(dt, 'second', 1) FROM t1");
         assertTrue(rs.next());
         Date expectedDate = DateUtil.parseDate("2012-01-01 00:00:00");
         assertEquals(expectedDate, rs.getDate(1));
@@ -121,14 +132,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testFloorDateInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE FLOOR(dt, 'hour') = to_date('2012-01-01 14:00:00')");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE FLOOR(dt, 'hour') = to_date('2012-01-01 14:00:00')");
         assertTrue(rs.next());
     }
     
     @Test
     public void testCeilDate() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(dt, 'day', 1), CEIL(dt, 'hour', 1), CEIL(dt, 'minute', 1), CEIL(dt, 'second', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(dt, 'day', 1), CEIL(dt, 'hour', 1), CEIL(dt, 'minute', 1), CEIL(dt, 'second', 1) FROM t1");
         assertTrue(rs.next());
         //Date upserted is 2012-01-01 14:25:28.660. So we will end up bumping up in every case.
         Date expectedDate = DateUtil.parseDate("2012-01-02 00:00:00");
@@ -144,14 +155,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testCeilDateInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE CEIL(dt, 'second') = to_date('2012-01-01 14:25:29')");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE CEIL(dt, 'second') = to_date('2012-01-01 14:25:29')");
         assertTrue(rs.next());
     }
     
     @Test
     public void testRoundingUpTimestamp() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(ts, 'day'), ROUND(ts, 'hour', 1), ROUND(ts, 'minute', 1), ROUND(ts, 'second', 1), ROUND(ts, 'millisecond', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(ts, 'day'), ROUND(ts, 'hour', 1), ROUND(ts, 'minute', 1), ROUND(ts, 'second', 1), ROUND(ts, 'millisecond', 1) FROM t1");
         assertTrue(rs.next());
         Timestamp expectedTimestamp;
         expectedTimestamp = new Timestamp(DateUtil.parseDate("2012-01-02 00:00:00").getTime());
@@ -172,14 +183,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testRoundingUpTimestampInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE ROUND(ts, 'second') = to_date('2012-01-01 14:25:29')");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE ROUND(ts, 'second') = to_date('2012-01-01 14:25:29')");
         assertTrue(rs.next());
     }
     
     @Test
     public void testFloorTimestamp() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(ts, 'day'), FLOOR(ts, 'hour', 1), FLOOR(ts, 'minute', 1), FLOOR(ts, 'second', 1), FLOOR(ts, 'millisecond', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(ts, 'day'), FLOOR(ts, 'hour', 1), FLOOR(ts, 'minute', 1), FLOOR(ts, 'second', 1), FLOOR(ts, 'millisecond', 1) FROM t1");
         assertTrue(rs.next());
         Timestamp expectedTimestamp;
         expectedTimestamp = new Timestamp(DateUtil.parseDate("2012-01-01 00:00:00").getTime());
@@ -199,14 +210,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testFloorTimestampInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE FLOOR(ts, 'second') = to_date('2012-01-01 14:25:28')");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE FLOOR(ts, 'second') = to_date('2012-01-01 14:25:28')");
         assertTrue(rs.next());
     }
     
     @Test
     public void testCeilTimestamp() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(ts, 'day'), CEIL(ts, 'hour', 1), CEIL(ts, 'minute', 1), CEIL(ts, 'second', 1), CEIL(ts, 'millisecond', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(ts, 'day'), CEIL(ts, 'hour', 1), CEIL(ts, 'minute', 1), CEIL(ts, 'second', 1), CEIL(ts, 'millisecond', 1) FROM t1");
         assertTrue(rs.next());
         Timestamp expectedTimestamp;
         expectedTimestamp = new Timestamp(DateUtil.parseDate("2012-01-02 00:00:00").getTime());
@@ -227,14 +238,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testCeilTimestampInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE CEIL(ts, 'second') = to_date('2012-01-01 14:25:29')");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE CEIL(ts, 'second') = to_date('2012-01-01 14:25:29')");
         assertTrue(rs.next());
     }
     
     @Test
     public void testRoundingUpTime() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(t, 'day', 1), ROUND(t, 'hour', 1), ROUND(t, 'minute', 1), ROUND(t, 'second', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(t, 'day', 1), ROUND(t, 'hour', 1), ROUND(t, 'minute', 1), ROUND(t, 'second', 1) FROM t1");
         assertTrue(rs.next());
         Time expectedTime = new Time(DateUtil.parseDate("2012-01-02 00:00:00").getTime());
         assertEquals(expectedTime, rs.getTime(1));
@@ -249,7 +260,7 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testFloorTime() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(t, 'day', 1), FLOOR(t, 'hour', 1), FLOOR(t, 'minute', 1), FLOOR(t, 'second', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(t, 'day', 1), FLOOR(t, 'hour', 1), FLOOR(t, 'minute', 1), FLOOR(t, 'second', 1) FROM t1");
         assertTrue(rs.next());
         Time expectedTime = new Time(DateUtil.parseDate("2012-01-01 00:00:00").getTime());
         assertEquals(expectedTime, rs.getTime(1));
@@ -264,7 +275,7 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testCeilTime() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(t, 'day', 1), CEIL(t, 'hour', 1), CEIL(t, 'minute', 1), CEIL(t, 'second', 1) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(t, 'day', 1), CEIL(t, 'hour', 1), CEIL(t, 'minute', 1), CEIL(t, 'second', 1) FROM t1");
         assertTrue(rs.next());
         Time expectedTime = new Time(DateUtil.parseDate("2012-01-02 00:00:00").getTime());
         assertEquals(expectedTime, rs.getTime(1));
@@ -279,7 +290,7 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testRoundingUpDecimal() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(dec), ROUND(dec, 1), ROUND(dec, 2), ROUND(dec, 3) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(dec), ROUND(dec, 1), ROUND(dec, 2), ROUND(dec, 3) FROM t1");
         assertTrue(rs.next());
         BigDecimal expectedBd = BigDecimal.valueOf(1);
         assertEquals(expectedBd, rs.getBigDecimal(1));
@@ -294,14 +305,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testRoundingUpDecimalInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE ROUND(dec, 2) = 1.26");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE ROUND(dec, 2) = 1.26");
         assertTrue(rs.next());
     }
     
     @Test
     public void testFloorDecimal() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(dec), FLOOR(dec, 1), FLOOR(dec, 2), FLOOR(dec, 3) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(dec), FLOOR(dec, 1), FLOOR(dec, 2), FLOOR(dec, 3) FROM t1");
         assertTrue(rs.next());
         BigDecimal expectedBd = BigDecimal.valueOf(1);
         assertEquals(expectedBd, rs.getBigDecimal(1));
@@ -316,14 +327,14 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testFloorDecimalInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE FLOOR(dec, 2) = 1.26");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE FLOOR(dec, 2) = 1.26");
         assertTrue(rs.next());
     }
     
     @Test
     public void testCeilDecimal() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(dec), CEIL(dec, 1), CEIL(dec, 2), CEIL(dec, 3) FROM ROUND_DATE_TIME_TS_DECIMAL");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(dec), CEIL(dec, 1), CEIL(dec, 2), CEIL(dec, 3) FROM t1");
         assertTrue(rs.next());
         BigDecimal expectedBd = BigDecimal.valueOf(2);
         assertEquals(expectedBd, rs.getBigDecimal(1));
@@ -338,7 +349,94 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
     @Test
     public void testCeilDecimalInWhere() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());
-        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM ROUND_DATE_TIME_TS_DECIMAL WHERE CEIL(dec, 2) = 1.27");
+        ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE CEIL(dec, 2) = 1.27");
         assertTrue(rs.next());
     }
+    @Test
+	public void testRoundingUpDouble() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(doub), ROUND(doub, 1), ROUND(doub, 2), ROUND(doub, 3) FROM t1");
+		assertTrue(rs.next());
+		assertEquals(0, Doubles.compare(1, rs.getDouble(1)));
+		assertEquals(0, Doubles.compare(1.3, rs.getDouble(2)));
+		assertEquals(0, Doubles.compare(1.26, rs.getDouble(3)));
+		assertEquals(0, Doubles.compare(1.264, rs.getDouble(4)));
+	}
+
+	@Test
+	public void testRoundingUpDoubleInWhere() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE ROUND(dec, 2) = 1.26");
+		assertTrue(rs.next());
+	}
+
+	@Test
+	public void testCeilDouble() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT CEIL(doub), CEIL(doub, 1), CEIL(doub, 2), CEIL(doub, 3) FROM t1");
+		assertTrue(rs.next());
+		assertEquals(0, Doubles.compare(2, rs.getDouble(1)));
+		assertEquals(0, Doubles.compare(1.3, rs.getDouble(2)));
+		assertEquals(0, Doubles.compare(1.27, rs.getDouble(3)));
+		assertEquals(0, Doubles.compare(1.264, rs.getDouble(4)));
+	}
+
+	@Test
+	public void testCeilDoubleInWhere() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE CEIL(doub, 2) = 1.27");
+		assertTrue(rs.next());
+	}
+
+	@Test
+	public void testFloorDouble() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT FLOOR(doub), FLOOR(doub, 1), FLOOR(doub, 2), FLOOR(doub, 3) FROM t1");
+		assertTrue(rs.next());
+		assertEquals(0, Doubles.compare(1, rs.getDouble(1)));
+		assertEquals(0, Doubles.compare(1.2, rs.getDouble(2)));
+		assertEquals(0, Doubles.compare(1.26, rs.getDouble(3)));
+		assertEquals(0, Doubles.compare(1.264, rs.getDouble(4)));
+	}
+
+	@Test
+	public void testFloorDoubleInWhere() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM t1 WHERE FLOOR(doub, 2) = 1.26");
+		assertTrue(rs.next());
+	}
+	
+	@Test
+	public void testRoundFloat() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(fl), ROUND(fl, 1), ROUND(fl, 2), ROUND(fl, 3) FROM t1");
+		assertTrue(rs.next());
+		assertEquals(0, Floats.compare(1, rs.getFloat(1)));
+		assertEquals(0, Floats.compare(1.3f, rs.getFloat(2)));
+		assertEquals(0, Floats.compare(1.26f, rs.getFloat(3)));
+		assertEquals(0, Floats.compare(1.264f, rs.getFloat(4)));
+	}
+	
+	@Test
+	public void testRoundUnsignedFloat() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(unfl), ROUND(unfl, 1), ROUND(unfl, 2), ROUND(unfl, 3) FROM t1");
+		assertTrue(rs.next());
+		assertEquals(0, Floats.compare(1, rs.getFloat(1)));
+		assertEquals(0, Floats.compare(1.3f, rs.getFloat(2)));
+		assertEquals(0, Floats.compare(1.26f, rs.getFloat(3)));
+		assertEquals(0, Floats.compare(1.264f, rs.getFloat(4)));
+	}
+	
+	@Test
+	public void testRoundUnsignedDouble() throws Exception {
+		Connection conn = DriverManager.getConnection(getUrl());
+		ResultSet rs = conn.createStatement().executeQuery("SELECT ROUND(undoub), ROUND(undoub, 1), ROUND(undoub, 2), ROUND(undoub, 3) FROM t1");
+		assertTrue(rs.next());
+		assertEquals(0, Floats.compare(1, rs.getFloat(1)));
+		assertEquals(0, Floats.compare(1.3f, rs.getFloat(2)));
+		assertEquals(0, Floats.compare(1.26f, rs.getFloat(3)));
+		assertEquals(0, Floats.compare(1.264f, rs.getFloat(4)));
+	}	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/10642d84/phoenix-core/src/main/java/org/apache/phoenix/expression/function/RoundDecimalExpression.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/RoundDecimalExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/RoundDecimalExpression.java
index 5e6fc2f..be03682 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/RoundDecimalExpression.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/RoundDecimalExpression.java
@@ -92,7 +92,7 @@ public class RoundDecimalExpression extends ScalarFunction {
     public boolean evaluate(Tuple tuple, ImmutableBytesWritable ptr) {
         Expression childExpr = children.get(0);
         if(childExpr.evaluate(tuple, ptr)) {
-            BigDecimal value = (BigDecimal)PDataType.DECIMAL.toObject(ptr, childExpr.getSortOrder());
+            BigDecimal value = (BigDecimal)PDataType.DECIMAL.toObject(ptr, getDataType(), childExpr.getSortOrder());
             BigDecimal scaledValue = value.setScale(scale, getRoundingMode());
             ptr.set(getDataType().toBytes(scaledValue));
             return true;