tagging release 3.263

Author: dxcity

ReleaseNotes.txt

@@ -1,3 +1,8 @@
+QDS 3.263:
+
+* [QD-976] Introduce WideDecimal format
+  - Run JVM with "-Ddxscheme.price=wide -Ddxscheme.size=wide" to make all price, size and volume fields WideDecimal
+
 QDS 3.262:
 
 * [QD-1081] Agent can loss data after resubscription

auth/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.262</version>
+        <version>3.263</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dxfeed-api/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.262</version>
+		<version>3.263</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

dxfeed-bin/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.262</version>
+		<version>3.263</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

dxfeed-codegen-verify/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.262</version>
+		<version>3.263</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

dxfeed-codegen/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.262</version>
+		<version>3.263</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

dxfeed-codegen/src/main/java/com/dxfeed/api/codegen/FactoryImplGen.java

@@ -136,9 +136,13 @@ private void generateFieldCode(ClassGen cg, Map<String, RecordField> fields, Str
 			}
 			cg.addImport(new ClassName(SerialFieldType.class));
 			for (FieldType.Field field : f.fieldType.fields) {
-				String typeExpr = field.typeSelector != null ?
-					"SystemProperties.getProperty(\"" + field.typeSelector + "\", \"\").equalsIgnoreCase(\"decimal\") ? SerialFieldType.DECIMAL : SerialFieldType.COMPACT_INT"
-					: "SerialFieldType." + field.serialType;
+				String typeExpr = "SerialFieldType." + field.serialType;
+				if (field.typeSelectors.length != 0) {
+					typeExpr = "select(" + typeExpr;
+					for (String typeSelector : field.typeSelectors)
+						typeExpr = typeExpr + ", \"" + typeSelector + "\"";
+					typeExpr = typeExpr + ")";
+				}
 				if (f.voidSuffixes != null)
 					typeExpr = "suffix.matches(\"" + f.voidSuffixes + "\") ? SerialFieldType.VOID : " + typeExpr;
 				if (f.required) {

dxfeed-codegen/src/main/java/com/dxfeed/api/codegen/FieldType.java

@@ -16,7 +16,6 @@
 import com.devexperts.io.Marshalled;
 import com.devexperts.qd.SerialFieldType;
 import com.devexperts.qd.util.*;
-import com.devexperts.util.SystemProperties;
 import com.devexperts.util.TimeUtil;
 
 enum FieldType {
@@ -50,13 +49,36 @@ enum FieldType {
 		.addAccess(Access.createWithAccessPattern("", "int", "0", "getInt(cursor, %s)", "setInt(cursor, %s, %s)"))
 		.setMapper(new DecimalMapper(int.class))
 	),
-	INT_AS_DOUBLE(new Builder() // TODO this field type is more appropriate to name SIZE as it is tied to size type configuration
-		.addField(new Field(false, "dxscheme.size"))
+	SIZE(new Builder()
+		.addField(new Field(false, SerialFieldType.COMPACT_INT, "dxscheme.size"))
 		.addAccess(Access.createWithAccessPattern("", "int", "0", "getAsInt(cursor, %s)", "setAsInt(cursor, %s, %s)"))
 		.addAccess(Access.createWithAccessPattern("Double", "double", "Double.NaN", "getAsDouble(cursor, %s)", "setAsDouble(cursor, %s, %s)"))
-		.addAccess(Access.createWithAccessPattern("Decimal", "int", "0", "getAsDecimal(cursor, %s)", "setAsDecimal(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("Decimal", "int", "0", "getAsTinyDecimal(cursor, %s)", "setAsTinyDecimal(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("WideDecimal", "long", "0", "getAsWideDecimal(cursor, %s)", "setAsWideDecimal(cursor, %s, %s)"))
 		.setMapper(new DefaultMapper("Double", double.class))
 	),
+	VOLUME(new Builder()
+		.addField(new Field(false, SerialFieldType.DECIMAL, "dxscheme.volume", "dxscheme.size"))
+		.addAccess(Access.createWithAccessPattern("", "long", "0", "getAsLong(cursor, %s)", "setAsLong(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("Double", "double", "Double.NaN", "getAsDouble(cursor, %s)", "setAsDouble(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("Decimal", "int", "0", "getAsTinyDecimal(cursor, %s)", "setAsTinyDecimal(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("WideDecimal", "long", "0", "getAsWideDecimal(cursor, %s)", "setAsWideDecimal(cursor, %s, %s)"))
+		.setMapper(new DefaultMapper("Double", double.class))
+	),
+	PRICE(new Builder()
+		.addField(new Field(false, SerialFieldType.DECIMAL, "dxscheme.price"))
+		.addAccess(Access.createWithAccessPattern("", "double", "Double.NaN", "getAsDouble(cursor, %s)", "setAsDouble(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("Decimal", "int", "0", "getAsTinyDecimal(cursor, %s)", "setAsTinyDecimal(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("WideDecimal", "long", "0", "getAsWideDecimal(cursor, %s)", "setAsWideDecimal(cursor, %s, %s)"))
+		.setMapper(new DefaultMapper(double.class))
+	),
+	TURNOVER(new Builder()
+		.addField(new Field(false, SerialFieldType.DECIMAL, "dxscheme.turnover", "dxscheme.price"))
+		.addAccess(Access.createWithAccessPattern("", "double", "Double.NaN", "getAsDouble(cursor, %s)", "setAsDouble(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("Decimal", "int", "0", "getAsTinyDecimal(cursor, %s)", "setAsTinyDecimal(cursor, %s, %s)"))
+		.addAccess(Access.createWithAccessPattern("WideDecimal", "long", "0", "getAsWideDecimal(cursor, %s)", "setAsWideDecimal(cursor, %s, %s)"))
+		.setMapper(new DefaultMapper(double.class))
+	),
 	DECIMAL_AS_DOUBLE(new Builder()
 		.addField(new Field(false, SerialFieldType.DECIMAL))
 		.addAccess(Access.createWithAccessPattern("", "double", "Double.NaN", "Decimal.toDouble(getInt(cursor, %s))", "setInt(cursor, %s, Decimal.compose(%s))"))
@@ -72,14 +94,6 @@ enum FieldType {
 		.addImport(new ClassName(Decimal.class))
 		.setMapper(new DecimalMapper(long.class))
 	),
-	DECIMAL_AS_LONG_AS_DOUBLE(new Builder()
-		.addField(new Field(false, SerialFieldType.DECIMAL))
-		.addAccess(Access.createWithAccessPattern("", "long", "0", "(long)Decimal.toDouble(getInt(cursor, %s))", "setInt(cursor, %s, Decimal.composeDecimal(%s, 0))"))
-		.addAccess(Access.createWithAccessPattern("Double", "double", "Double.NaN", "Decimal.toDouble(getInt(cursor, %s))", "setInt(cursor, %s, Decimal.compose(%s))"))
-		.addAccess(Access.createWithAccessPattern("Decimal", "int", "0", "getInt(cursor, %s)", "setInt(cursor, %s, %s)"))
-		.addImport(new ClassName(Decimal.class))
-		.setMapper(new DefaultMapper("Double", double.class))
-	),
 	DECIMAL_OR_INT_AS_LONG(new Builder()
 		.addField(new Field(false, SerialFieldType.DECIMAL))
 		.addVariable(new Variable(true, "boolean", "IsDecimal") {
@@ -271,22 +285,22 @@ static final class Field {
 		final boolean required;
 		final boolean isObject;
 		final SerialFieldType serialType;
-		final String typeSelector;
+		final String[] typeSelectors;
 		final String suffix;
 
 		Field(boolean isObject, SerialFieldType serialType) {
-			this(true, isObject, serialType, null, "");
+			this(true, isObject, "", serialType);
 		}
 
-		Field(boolean isObject, String typeSelector) {
-			this(true, isObject, null, typeSelector, "");
+		Field(boolean isObject, SerialFieldType serialType, String... typeSelectors) {
+			this(true, isObject, "", serialType, typeSelectors);
 		}
 
-		Field(boolean required, boolean isObject, SerialFieldType serialType, String typeSelector, String suffix) {
+		Field(boolean required, boolean isObject, String suffix, SerialFieldType serialType, String... typeSelectors) {
 			this.required = required;
 			this.isObject = isObject;
 			this.serialType = serialType;
-			this.typeSelector = typeSelector;
+			this.typeSelectors = typeSelectors;
 			this.suffix = suffix;
 		}