Author: jbellis
Date: Tue Sep 6 22:20:10 2011
New Revision: 1165906
URL: http://svn.apache.org/viewvc?rev=1165906&view=rev
Log:
add DecimalType
patch by Rick Shaw; reviewed by jbellis for CASSANDRA-2883
Added:
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DecimalType.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g
cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g?rev=1165906&r1=1165905&r2=1165906&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g Tue Sep 6 22:20:10
2011
@@ -436,7 +436,7 @@ dropColumnFamilyStatement returns [Strin
;
comparatorType
- : 'bytea' | 'ascii' | 'text' | 'varchar' | 'int' | 'varint' | 'bigint' |
'uuid' | 'counter' | 'boolean' | 'date' | 'float' | 'double'
+ : 'bytea' | 'ascii' | 'text' | 'varchar' | 'int' | 'varint' | 'bigint' |
'uuid' | 'counter' | 'boolean' | 'date' | 'float' | 'double' | 'decimal'
;
term returns [Term item]
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java?rev=1165906&r1=1165905&r2=1165906&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
Tue Sep 6 22:20:10 2011
@@ -76,6 +76,7 @@ public class CreateColumnFamilyStatement
comparators.put("date", "DateType");
comparators.put("float", "FloatType");
comparators.put("double", "DoubleType");
+ comparators.put("decimal", "DecimalType");
keywords.add(KW_COMPARATOR);
keywords.add(KW_COMMENT);
Added: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java?rev=1165906&view=auto
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
(added)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java Tue
Sep 6 22:20:10 2011
@@ -0,0 +1,97 @@
+package org.apache.cassandra.cql.jdbc;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.sql.Types;
+
+public class JdbcDecimal extends AbstractJdbcType<BigDecimal>
+{
+ public static final JdbcDecimal instance = new JdbcDecimal();
+
+ JdbcDecimal() {}
+
+ public boolean isCaseSensitive()
+ {
+ return false;
+ }
+
+ public int getScale(BigDecimal obj)
+ {
+ return obj.scale();
+ }
+
+ public int getPrecision(BigDecimal obj)
+ {
+ return obj.precision();
+ }
+
+ public boolean isCurrency()
+ {
+ return false;
+ }
+
+ public boolean isSigned()
+ {
+ return true;
+ }
+
+ public String toString(BigDecimal obj)
+ {
+ return obj.toPlainString();
+ }
+
+ public boolean needsQuotes()
+ {
+ return false;
+ }
+
+ public String getString(ByteBuffer bytes)
+ {
+ if (bytes == null) return "null";
+ if (bytes.remaining() == 0) return "empty";
+ return compose(bytes).toPlainString();
+ }
+
+ public Class<BigDecimal> getType()
+ {
+ return BigDecimal.class;
+ }
+
+ public int getJdbcType()
+ {
+ return Types.DECIMAL;
+ }
+
+ public BigDecimal compose(ByteBuffer bytes)
+ {
+ if (bytes == null) return null;
+
+ int scale = bytes.getInt();
+ byte[] bibytes = new byte[bytes.remaining()];
+ bytes.get(bibytes, 0, bytes.remaining());
+ BigInteger bi = new BigInteger(bibytes);
+
+ return new BigDecimal(bi,scale);
+ }
+}
Added: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DecimalType.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DecimalType.java?rev=1165906&view=auto
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DecimalType.java
(added)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DecimalType.java
Tue Sep 6 22:20:10 2011
@@ -0,0 +1,94 @@
+package org.apache.cassandra.db.marshal;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+
+import org.apache.cassandra.cql.jdbc.JdbcDecimal;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+public class DecimalType extends AbstractType<BigDecimal>
+{
+ public static final DecimalType instance = new DecimalType();
+
+ DecimalType() {} // singleton
+
+ public int compare(ByteBuffer bb0, ByteBuffer bb1)
+ {
+ return compose(bb0).compareTo(compose(bb1));
+ }
+
+ public BigDecimal compose(ByteBuffer bytes)
+ {
+ return JdbcDecimal.instance.compose(bytes);
+ }
+
+ /**
+ * The bytes of the ByteBuffer are made up of 4 bytes of int containing
the scale
+ * followed by the n bytes it takes to store a BigInteger.
+ */
+ public ByteBuffer decompose(BigDecimal value)
+ {
+ if (value == null) return ByteBufferUtil.EMPTY_BYTE_BUFFER;
+
+ BigInteger bi = value.unscaledValue();
+ Integer scale = value.scale();
+ byte[] bibytes = bi.toByteArray();
+ byte[] sbytes = ByteBufferUtil.bytes(scale).array();
+ byte[] bytes = new byte[bi.toByteArray().length+4];
+
+ for (int i = 0 ; i < 4 ; i++) bytes[i] = sbytes[i];
+ for (int i = 4 ; i < bibytes.length+4 ; i++) bytes[i] = bibytes[i-4];
+
+ return ByteBuffer.wrap(bytes);
+ }
+
+ public String getString(ByteBuffer bytes)
+ {
+ return JdbcDecimal.instance.getString(bytes);
+ }
+
+ public ByteBuffer fromString(String source) throws MarshalException
+ {
+ // Return an empty ByteBuffer for an empty string.
+ if (source.isEmpty()) return ByteBufferUtil.EMPTY_BYTE_BUFFER;
+
+ BigDecimal decimal;
+
+ try
+ {
+ decimal = new BigDecimal(source);
+ }
+ catch (Exception e)
+ {
+ throw new MarshalException(String.format("unable to make
BigDecimal from '%s'", source), e);
+ }
+
+ return decompose(decimal);
+ }
+
+ public void validate(ByteBuffer bytes) throws MarshalException
+ {
+ // no useful check for invalid decimals.
+ }
+}
