From 68a8ac6b4be39908e4f77145250e24c6223a82f1 Mon Sep 17 00:00:00 2001
From: kijima <kijima@yahoo-corp.jp>
Date: Tue, 23 Jun 2020 15:00:45 +0900
Subject: [PATCH] Bug fix on NULL filter.

---
 pom.xml                                       |  2 +-
 ...BufferDirectDictionaryLinkCellManager.java | 27 +------------------
 .../maker/ConstantColumnBinaryMaker.java      |  6 +----
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81704262..cf0b1176 100644
--- 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
index 010ee1bf..b8f72432 100644
--- 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
index 3e337a72..931890e8 100644
--- 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 );
       }