Merge pull request yahoojapan#111 from koijima/bugfix_null_filter

Bug fix on NULL filter.
HelenParr · Jun 23, 2020 · abfa0ad · abfa0ad
2 parents 2811dfd + 68a8ac6
commit abfa0ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>jp.co.yahoo.yosegi</groupId>
   <artifactId>yosegi</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>jar</packaging>
   <name>Yosegi</name>
   <description>Yosegi package.</description>

diff --git a/src/main/java/jp/co/yahoo/yosegi/binary/maker/BufferDirectDictionaryLinkCellManager.java b/src/main/java/jp/co/yahoo/yosegi/binary/maker/BufferDirectDictionaryLinkCellManager.java
@@ -101,33 +101,8 @@ public boolean[] filter(
       final boolean[] filterArray ) throws IOException {
     switch ( filter.getFilterType() ) {
       case NOT_NULL:
-        if ( columnType != ( (INullFilter)filter ).getTargetColumnType() ) {
-          return null;
-        }
-        for ( int i = 0 ; i < filterArray.length ; i++ ) {
-          if ( i < size() ) {
-            if ( dicIndexIntBuffer.get(i) != 0 ) {
-              filterArray[i] = true;
-            }
-          } else {
-            filterArray[i] = false;
-          }
-        }
-        return filterArray;
       case NULL:
-        if ( columnType != ( (INullFilter)filter ).getTargetColumnType() ) {
-          return null;
-        }
-        for ( int i = 0 ; i < filterArray.length ; i++ ) {
-          if ( i < size() ) {
-            if ( dicIndexIntBuffer.get(i) == 0 ) {
-              filterArray[i] = true;
-            }
-          } else {
-            filterArray[i] = true;
-          }
-        }
-        return filterArray;
+        return null;
       default:
         return index.filter( filter , filterArray );
     }

diff --git a/src/main/java/jp/co/yahoo/yosegi/binary/maker/ConstantColumnBinaryMaker.java b/src/main/java/jp/co/yahoo/yosegi/binary/maker/ConstantColumnBinaryMaker.java
@@ -342,12 +342,8 @@ public boolean[] filter(
         final IFilter filter , final boolean[] filterArray ) throws IOException {
       switch ( filter.getFilterType() ) {
         case NOT_NULL:
-          return null;
         case NULL:
-          if ( columnType != ( (INullFilter)filter ).getTargetColumnType() ) {
-            return null;
-          }
-          return new boolean[filterArray.length];
+          return null;
         default:
           return index.filter( filter , filterArray );
       }