leventov commented on a change in pull request #5958: Part 2 of changes for SQL 
Compatible Null Handling
URL: https://github.com/apache/incubator-druid/pull/5958#discussion_r202522705
 
 

 ##########
 File path: 
processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java
 ##########
 @@ -248,23 +248,32 @@ public void inspectRuntimeShape(RuntimeShapeInspector 
inspector)
   {
     final Map<String, Supplier<Object>> suppliers = Maps.newHashMap();
     for (String columnName : Parser.findRequiredBindings(expression)) {
-      final ColumnCapabilities columnCapabilities = 
columnSelectorFactory.getColumnCapabilities(columnName);
+      final ColumnCapabilities columnCapabilities = columnSelectorFactory
+              .getColumnCapabilities(columnName);
       final ValueType nativeType = columnCapabilities != null ? 
columnCapabilities.getType() : null;
       final Supplier<Object> supplier;
 
       if (nativeType == ValueType.FLOAT) {
-        supplier = 
columnSelectorFactory.makeColumnValueSelector(columnName)::getFloat;
+        ColumnValueSelector selector = columnSelectorFactory
+                .makeColumnValueSelector(columnName);
+        supplier = makeNullableSupplier(selector, selector::getFloat);
       } else if (nativeType == ValueType.LONG) {
-        supplier = 
columnSelectorFactory.makeColumnValueSelector(columnName)::getLong;
+        ColumnValueSelector selector = columnSelectorFactory
+                .makeColumnValueSelector(columnName);
+        supplier = makeNullableSupplier(selector, selector::getLong);
       } else if (nativeType == ValueType.DOUBLE) {
-        supplier = 
columnSelectorFactory.makeColumnValueSelector(columnName)::getDouble;
+        ColumnValueSelector selector = columnSelectorFactory
+                .makeColumnValueSelector(columnName);
+        supplier = makeNullableSupplier(selector, selector::getDouble);
       } else if (nativeType == ValueType.STRING) {
         supplier = supplierFromDimensionSelector(
-            columnSelectorFactory.makeDimensionSelector(new 
DefaultDimensionSpec(columnName, columnName))
+                columnSelectorFactory
+                        .makeDimensionSelector(new 
DefaultDimensionSpec(columnName, columnName))
         );
       } else if (nativeType == null) {
         // Unknown ValueType. Try making an Object selector and see if that 
gives us anything useful.
-        supplier = 
supplierFromObjectSelector(columnSelectorFactory.makeColumnValueSelector(columnName));
+        supplier = supplierFromObjectSelector(columnSelectorFactory
+                .makeColumnValueSelector(columnName));
 
 Review comment:
   Not formatted properly

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to