Removed obsolete code #2226

dbms/src/DataStreams/FilterBlockInputStream.cpp

@@ -17,12 +17,6 @@ namespace ErrorCodes
 }
 
 
-FilterBlockInputStream::FilterBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_, ssize_t filter_column_)
-    : expression(expression_), filter_column(filter_column_)
-{
-    children.push_back(input);
-}
-
 FilterBlockInputStream::FilterBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_, const String & filter_column_name)
     : expression(expression_)
 {

dbms/src/DataStreams/FilterBlockInputStream.h

@@ -20,8 +20,6 @@ private:
     using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
 public:
-    /// filter_column_ - the number of the column with filter conditions.
-    FilterBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_, ssize_t filter_column_);
     FilterBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_, const String & filter_column_name_);
 
     String getName() const override;

dbms/src/DataStreams/tests/filter_stream.cpp

@@ -55,7 +55,7 @@ try
     QueryProcessingStage::Enum stage;
 
     BlockInputStreamPtr in = table->read(column_names, {}, context, stage, 8192, 1)[0];
-    in = std::make_shared<FilterBlockInputStream>(in, expression, 1);
+    in = std::make_shared<FilterBlockInputStream>(in, expression, "equals(modulo(number, 3), 1)");
     in = std::make_shared<LimitBlockInputStream>(in, 10, std::max(static_cast<Int64>(0), static_cast<Int64>(n) - 10));
 
     WriteBufferFromOStream ob(std::cout);

dbms/src/DataStreams/tests/filter_stream_hitlog.cpp

@@ -128,7 +128,7 @@ int main(int, char **)
         QueryProcessingStage::Enum stage;
 
         BlockInputStreamPtr in = table->read(column_names, {}, context, stage, 8192, 1)[0];
-        in = std::make_shared<FilterBlockInputStream>(in, expression, 4);
+        in = std::make_shared<FilterBlockInputStream>(in, expression, "equals(URL, 'http://mail.yandex.ru/neo2/#inbox')");
         //in = std::make_shared<LimitBlockInputStream>(in, 10, 0);
 
         WriteBufferFromOStream ob(std::cout);