You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by ji...@apache.org on 2020/04/10 04:36:30 UTC
[druid] branch 0.18.0 updated: Preserve the null values for numeric
type dimensions post-compaction. (#9622) (#9660)
This is an automated email from the ASF dual-hosted git repository.
jihoonson pushed a commit to branch 0.18.0
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/0.18.0 by this push:
new 0f25367 Preserve the null values for numeric type dimensions post-compaction. (#9622) (#9660)
0f25367 is described below
commit 0f25367b517063879f3659b0bf220c2a29ba1863
Author: Abhishek Radhakrishnan <ab...@gmail.com>
AuthorDate: Thu Apr 9 21:36:17 2020 -0700
Preserve the null values for numeric type dimensions post-compaction. (#9622) (#9660)
* Add selector null check to preserve null values as-is.
* Fix typo.
* add wrapping dimension selector test.
* Address review comments.
* nit: replace exception type.
* uh, float is indeed NOT a special case.
---
.../segment/DoubleWrappingDimensionSelector.java | 4 +-
.../segment/FloatWrappingDimensionSelector.java | 4 +-
.../segment/LongWrappingDimensionSelector.java | 4 +-
.../segment/TestNullableDoubleColumnSelector.java} | 43 ++++----
.../segment/TestNullableFloatColumnSelector.java} | 44 ++++----
.../segment/TestNullableLongColumnSelector.java} | 43 ++++----
.../segment/WrappingDimensionSelectorTest.java | 117 +++++++++++++++++++++
.../segment/loading/LocalDataSegmentPuller.java | 2 +-
8 files changed, 200 insertions(+), 61 deletions(-)
diff --git a/processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java
index 89cc99c..4f1dac0 100644
--- a/processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java
@@ -43,7 +43,9 @@ public class DoubleWrappingDimensionSelector extends BaseSingleValueDimensionSel
@Override
protected String getValue()
{
- if (extractionFn == null) {
+ if (selector.isNull()) {
+ return null;
+ } else if (extractionFn == null) {
return String.valueOf(selector.getDouble());
} else {
return extractionFn.apply(selector.getDouble());
diff --git a/processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java
index 3e39e99..ec5f958 100644
--- a/processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java
@@ -40,7 +40,9 @@ public class FloatWrappingDimensionSelector extends BaseSingleValueDimensionSele
@Override
protected String getValue()
{
- if (extractionFn == null) {
+ if (selector.isNull()) {
+ return null;
+ } else if (extractionFn == null) {
return String.valueOf(selector.getFloat());
} else {
return extractionFn.apply(selector.getFloat());
diff --git a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
index 1388dcf..de25d2e 100644
--- a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
@@ -40,7 +40,9 @@ public class LongWrappingDimensionSelector extends BaseSingleValueDimensionSelec
@Override
protected String getValue()
{
- if (extractionFn == null) {
+ if (selector.isNull()) {
+ return null;
+ } else if (extractionFn == null) {
return String.valueOf(selector.getLong());
} else {
return extractionFn.apply(selector.getLong());
diff --git a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java b/processing/src/test/java/org/apache/druid/segment/TestNullableDoubleColumnSelector.java
similarity index 51%
copy from processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
copy to processing/src/test/java/org/apache/druid/segment/TestNullableDoubleColumnSelector.java
index 1388dcf..609ce1e 100644
--- a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestNullableDoubleColumnSelector.java
@@ -19,38 +19,43 @@
package org.apache.druid.segment;
-import org.apache.druid.query.extraction.ExtractionFn;
-import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.common.config.NullHandling;
-import javax.annotation.Nullable;
-
-public class LongWrappingDimensionSelector extends BaseSingleValueDimensionSelector
+public class TestNullableDoubleColumnSelector extends TestDoubleColumnSelector
{
- private final BaseLongColumnValueSelector selector;
- @Nullable
- private final ExtractionFn extractionFn;
+ private final Double[] doubles;
+
+ static {
+ NullHandling.initializeForTests();
+ }
+
+ private int index = 0;
- public LongWrappingDimensionSelector(BaseLongColumnValueSelector selector, @Nullable ExtractionFn extractionFn)
+ public TestNullableDoubleColumnSelector(Double[] doubles)
{
- this.selector = selector;
- this.extractionFn = extractionFn;
+ this.doubles = doubles;
}
- @Nullable
@Override
- protected String getValue()
+ public double getDouble()
{
- if (extractionFn == null) {
- return String.valueOf(selector.getLong());
+ if (doubles[index] != null) {
+ return doubles[index];
+ } else if (NullHandling.replaceWithDefault()) {
+ return NullHandling.ZERO_DOUBLE;
} else {
- return extractionFn.apply(selector.getLong());
+ throw new IllegalStateException("Should never be invoked when current value is null && SQL-compatible null handling is enabled!");
}
}
@Override
- public void inspectRuntimeShape(RuntimeShapeInspector inspector)
+ public boolean isNull()
+ {
+ return !NullHandling.replaceWithDefault() && doubles[index] == null;
+ }
+
+ public void increment()
{
- inspector.visit("selector", selector);
- inspector.visit("extractionFn", extractionFn);
+ ++index;
}
}
diff --git a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java b/processing/src/test/java/org/apache/druid/segment/TestNullableFloatColumnSelector.java
similarity index 51%
copy from processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
copy to processing/src/test/java/org/apache/druid/segment/TestNullableFloatColumnSelector.java
index 1388dcf..19b4961 100644
--- a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestNullableFloatColumnSelector.java
@@ -19,38 +19,44 @@
package org.apache.druid.segment;
-import org.apache.druid.query.extraction.ExtractionFn;
-import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.common.config.NullHandling;
-import javax.annotation.Nullable;
-
-public class LongWrappingDimensionSelector extends BaseSingleValueDimensionSelector
+public class TestNullableFloatColumnSelector extends TestFloatColumnSelector
{
- private final BaseLongColumnValueSelector selector;
- @Nullable
- private final ExtractionFn extractionFn;
- public LongWrappingDimensionSelector(BaseLongColumnValueSelector selector, @Nullable ExtractionFn extractionFn)
+ private final Float[] floats;
+
+ static {
+ NullHandling.initializeForTests();
+ }
+
+ private int index = 0;
+
+ public TestNullableFloatColumnSelector(Float[] floats)
{
- this.selector = selector;
- this.extractionFn = extractionFn;
+ this.floats = floats;
}
- @Nullable
@Override
- protected String getValue()
+ public float getFloat()
{
- if (extractionFn == null) {
- return String.valueOf(selector.getLong());
+ if (floats[index] != null) {
+ return floats[index];
+ } else if (NullHandling.replaceWithDefault()) {
+ return NullHandling.ZERO_FLOAT;
} else {
- return extractionFn.apply(selector.getLong());
+ throw new IllegalStateException("Should never be invoked when current value is null && SQL-compatible null handling is enabled!");
}
}
@Override
- public void inspectRuntimeShape(RuntimeShapeInspector inspector)
+ public boolean isNull()
+ {
+ return !NullHandling.replaceWithDefault() && floats[index] == null;
+ }
+
+ public void increment()
{
- inspector.visit("selector", selector);
- inspector.visit("extractionFn", extractionFn);
+ ++index;
}
}
diff --git a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java b/processing/src/test/java/org/apache/druid/segment/TestNullableLongColumnSelector.java
similarity index 51%
copy from processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
copy to processing/src/test/java/org/apache/druid/segment/TestNullableLongColumnSelector.java
index 1388dcf..5e27e99 100644
--- a/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestNullableLongColumnSelector.java
@@ -19,38 +19,43 @@
package org.apache.druid.segment;
-import org.apache.druid.query.extraction.ExtractionFn;
-import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.common.config.NullHandling;
-import javax.annotation.Nullable;
-
-public class LongWrappingDimensionSelector extends BaseSingleValueDimensionSelector
+public class TestNullableLongColumnSelector extends TestLongColumnSelector
{
- private final BaseLongColumnValueSelector selector;
- @Nullable
- private final ExtractionFn extractionFn;
+ private final Long[] longs;
+
+ static {
+ NullHandling.initializeForTests();
+ }
+
+ private int index = 0;
- public LongWrappingDimensionSelector(BaseLongColumnValueSelector selector, @Nullable ExtractionFn extractionFn)
+ public TestNullableLongColumnSelector(Long[] longs)
{
- this.selector = selector;
- this.extractionFn = extractionFn;
+ this.longs = longs;
}
- @Nullable
@Override
- protected String getValue()
+ public long getLong()
{
- if (extractionFn == null) {
- return String.valueOf(selector.getLong());
+ if (longs[index] != null) {
+ return longs[index];
+ } else if (NullHandling.replaceWithDefault()) {
+ return NullHandling.ZERO_LONG;
} else {
- return extractionFn.apply(selector.getLong());
+ throw new IllegalStateException("Should never be invoked when current value is null && SQL-compatible null handling is enabled!");
}
}
@Override
- public void inspectRuntimeShape(RuntimeShapeInspector inspector)
+ public boolean isNull()
+ {
+ return !NullHandling.replaceWithDefault() && longs[index] == null;
+ }
+
+ public void increment()
{
- inspector.visit("selector", selector);
- inspector.visit("extractionFn", extractionFn);
+ ++index;
}
}
diff --git a/processing/src/test/java/org/apache/druid/segment/WrappingDimensionSelectorTest.java b/processing/src/test/java/org/apache/druid/segment/WrappingDimensionSelectorTest.java
new file mode 100644
index 0000000..b208b96
--- /dev/null
+++ b/processing/src/test/java/org/apache/druid/segment/WrappingDimensionSelectorTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.
+ */
+
+package org.apache.druid.segment;
+
+import org.apache.druid.common.config.NullHandling;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class WrappingDimensionSelectorTest
+{
+ @Test
+ public void testLongWrappingDimensionSelector()
+ {
+ Long[] vals = new Long[]{24L, null, 50L, 0L, -60L};
+ TestNullableLongColumnSelector lngSelector = new TestNullableLongColumnSelector(vals);
+
+ LongWrappingDimensionSelector lngWrapSelector = new LongWrappingDimensionSelector(lngSelector, null);
+ Assert.assertEquals(24L, lngSelector.getLong());
+ Assert.assertEquals("24", lngWrapSelector.getValue());
+
+ lngSelector.increment();
+ if (NullHandling.sqlCompatible()) {
+ Assert.assertTrue(lngSelector.isNull());
+ } else {
+ Assert.assertEquals(0L, lngSelector.getLong());
+ }
+
+ lngSelector.increment();
+ Assert.assertEquals(50L, lngSelector.getLong());
+ Assert.assertEquals("50", lngWrapSelector.getValue());
+
+ lngSelector.increment();
+ Assert.assertEquals(0L, lngSelector.getLong());
+ Assert.assertEquals("0", lngWrapSelector.getValue());
+
+ lngSelector.increment();
+ Assert.assertEquals(-60L, lngSelector.getLong());
+ Assert.assertEquals("-60", lngWrapSelector.getValue());
+ }
+
+ @Test
+ public void testDoubleWrappingDimensionSelector()
+ {
+ Double[] vals = new Double[]{32.0d, null, 5.0d, 0.0d, -45.0d};
+ TestNullableDoubleColumnSelector dblSelector = new TestNullableDoubleColumnSelector(vals);
+
+ DoubleWrappingDimensionSelector dblWrapSelector = new DoubleWrappingDimensionSelector(dblSelector, null);
+ Assert.assertEquals(32.0d, dblSelector.getDouble(), 0);
+ Assert.assertEquals("32.0", dblWrapSelector.getValue());
+
+ dblSelector.increment();
+ if (NullHandling.sqlCompatible()) {
+ Assert.assertTrue(dblSelector.isNull());
+ } else {
+ Assert.assertEquals(0d, dblSelector.getDouble(), 0);
+ }
+
+ dblSelector.increment();
+ Assert.assertEquals(5.0d, dblSelector.getDouble(), 0);
+ Assert.assertEquals("5.0", dblWrapSelector.getValue());
+
+ dblSelector.increment();
+ Assert.assertEquals(0.0d, dblSelector.getDouble(), 0);
+ Assert.assertEquals("0.0", dblWrapSelector.getValue());
+
+ dblSelector.increment();
+ Assert.assertEquals(-45.0d, dblSelector.getDouble(), 0);
+ Assert.assertEquals("-45.0", dblWrapSelector.getValue());
+ }
+
+ @Test
+ public void testFloatWrappingDimensionSelector()
+ {
+ Float[] vals = new Float[]{32.0f, null, 5.0f, 0.0f, -45.0f};
+ TestNullableFloatColumnSelector flSelector = new TestNullableFloatColumnSelector(vals);
+
+ FloatWrappingDimensionSelector flWrapSelector = new FloatWrappingDimensionSelector(flSelector, null);
+ Assert.assertEquals(32.0f, flSelector.getFloat(), 0);
+ Assert.assertEquals("32.0", flWrapSelector.getValue());
+
+ flSelector.increment();
+ if (NullHandling.sqlCompatible()) {
+ Assert.assertTrue(flSelector.isNull());
+ } else {
+ Assert.assertEquals(0f, flSelector.getFloat(), 0);
+ }
+
+ flSelector.increment();
+ Assert.assertEquals(5.0f, flSelector.getFloat(), 0);
+ Assert.assertEquals("5.0", flWrapSelector.getValue());
+
+ flSelector.increment();
+ Assert.assertEquals(0.0f, flSelector.getFloat(), 0);
+ Assert.assertEquals("0.0", flWrapSelector.getValue());
+
+ flSelector.increment();
+ Assert.assertEquals(-45.0f, flSelector.getFloat(), 0);
+ Assert.assertEquals("-45.0", flWrapSelector.getValue());
+ }
+}
diff --git a/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
index 45121a9..5f63557 100644
--- a/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
+++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
@@ -151,7 +151,7 @@ public class LocalDataSegmentPuller implements URIDataPuller
);
}
log.info(
- "Coppied %d bytes from [%s] to [%s]",
+ "Copied %d bytes from [%s] to [%s]",
result.size(),
sourceFile.getAbsolutePath(),
dir.getAbsolutePath()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org