insertFrom

src/Columns/ColumnAggregateFunction.cpp

@@ -466,7 +466,11 @@ void ColumnAggregateFunction::insertFromWithOwnership(const IColumn & from, size
     insertMergeFrom(from, n);
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnAggregateFunction::insertFrom(const IColumn & from, size_t n)
+#else
 void ColumnAggregateFunction::doInsertFrom(const IColumn & from, size_t n)
+#endif
 {
     insertRangeFrom(from, n, 1);
 }

src/Columns/ColumnAggregateFunction.h

@@ -145,7 +145,11 @@ public:
 
     void insertData(const char * pos, size_t length) override;
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & from, size_t n) override;
+#else
     void doInsertFrom(const IColumn & from, size_t n) override;
+#endif
 
     using IColumn::insertFrom;
 

src/Columns/ColumnArray.cpp

@@ -337,7 +337,11 @@ bool ColumnArray::tryInsert(const Field & x)
     return true;
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnArray::insertFrom(const IColumn & src_, size_t n)
+#else
 void ColumnArray::doInsertFrom(const IColumn & src_, size_t n)
+#endif
 {
     const ColumnArray & src = assert_cast<const ColumnArray &>(src_);
     size_t size = src.sizeAt(n);

src/Columns/ColumnArray.h

@@ -91,7 +91,11 @@ public:
 #endif
     void insert(const Field & x) override;
     bool tryInsert(const Field & x) override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src_, size_t n) override;
+#endif
     void insertDefault() override;
     void popBack(size_t n) override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;

src/Columns/ColumnConst.h

@@ -151,7 +151,11 @@ public:
         ++s;
     }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn &, size_t) override
+#else
     void doInsertFrom(const IColumn &, size_t) override
+#endif
     {
         ++s;
     }

src/Columns/ColumnDecimal.h

@@ -55,7 +55,11 @@ public:
     void reserve(size_t n) override { data.reserve_exact(n); }
     void shrinkToFit() override { data.shrink_to_fit(); }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override { data.push_back(static_cast<const Self &>(src).getData()[n]); }
+#else
     void doInsertFrom(const IColumn & src, size_t n) override { data.push_back(static_cast<const Self &>(src).getData()[n]); }
+#endif
 
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertManyFrom(const IColumn & src, size_t position, size_t length) override

src/Columns/ColumnDynamic.cpp

@@ -213,7 +213,11 @@ bool ColumnDynamic::tryInsert(const DB::Field & x)
 }
 
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnDynamic::insertFrom(const DB::IColumn & src_, size_t n)
+#else
 void ColumnDynamic::doInsertFrom(const DB::IColumn & src_, size_t n)
+#endif
 {
     const auto & dynamic_src = assert_cast<const ColumnDynamic &>(src_);
 

src/Columns/ColumnDynamic.h

@@ -142,7 +142,11 @@ public:
 
     void insert(const Field & x) override;
     bool tryInsert(const Field & x) override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src_, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 #else

src/Columns/ColumnFixedString.cpp

@@ -74,7 +74,11 @@ bool ColumnFixedString::tryInsert(const Field & x)
     return true;
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnFixedString::insertFrom(const IColumn & src_, size_t index)
+#else
 void ColumnFixedString::doInsertFrom(const IColumn & src_, size_t index)
+#endif
 {
     const ColumnFixedString & src = assert_cast<const ColumnFixedString &>(src_);
 

src/Columns/ColumnFixedString.h

@@ -98,7 +98,11 @@ public:
 
     bool tryInsert(const Field & x) override;
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t index) override;
+#else
     void doInsertFrom(const IColumn & src_, size_t index) override;
+#endif
 
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertManyFrom(const IColumn & src, size_t position, size_t length) override;

src/Columns/ColumnFunction.cpp

@@ -72,7 +72,11 @@ ColumnPtr ColumnFunction::cut(size_t start, size_t length) const
     return ColumnFunction::create(length, function, capture, is_short_circuit_argument, is_function_compiled);
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnFunction::insertFrom(const IColumn & src, size_t n)
+#else
 void ColumnFunction::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     const ColumnFunction & src_func = assert_cast<const ColumnFunction &>(src);
 

src/Columns/ColumnFunction.h

@@ -94,7 +94,11 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot insert into {}", getName());
     }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertRangeFrom(const IColumn &, size_t start, size_t length) override;
 #else

src/Columns/ColumnLowCardinality.cpp

@@ -159,7 +159,11 @@ void ColumnLowCardinality::insertDefault()
     idx.insertPosition(getDictionary().getDefaultValueIndex());
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnLowCardinality::insertFrom(const IColumn & src, size_t n)
+#else
 void ColumnLowCardinality::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     const auto * low_cardinality_src = typeid_cast<const ColumnLowCardinality *>(&src);
 

src/Columns/ColumnLowCardinality.h

@@ -78,7 +78,11 @@ public:
     bool tryInsert(const Field & x) override;
     void insertDefault() override;
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src, size_t n) override;
+#endif
     void insertFromFullColumn(const IColumn & src, size_t n);
 
 #if !defined(ABORT_ON_LOGICAL_ERROR)

src/Columns/ColumnMap.cpp

@@ -153,7 +153,11 @@ void ColumnMap::updateHashFast(SipHash & hash) const
     nested->updateHashFast(hash);
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnMap::insertFrom(const IColumn & src, size_t n)
+#else
 void ColumnMap::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     nested->insertFrom(assert_cast<const ColumnMap &>(src).getNestedColumn(), n);
 }

src/Columns/ColumnMap.h

@@ -66,7 +66,11 @@ public:
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src_, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
 #else

src/Columns/ColumnNullable.cpp

@@ -262,7 +262,11 @@ bool ColumnNullable::tryInsert(const Field & x)
     return true;
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnNullable::insertFrom(const IColumn & src, size_t n)
+#else
 void ColumnNullable::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     const ColumnNullable & src_concrete = assert_cast<const ColumnNullable &>(src);
     getNestedColumn().insertFrom(src_concrete.getNestedColumn(), n);

src/Columns/ColumnNullable.h

@@ -76,7 +76,11 @@ public:
 #endif
     void insert(const Field & x) override;
     bool tryInsert(const Field & x) override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
 #else

src/Columns/ColumnObject.cpp

@@ -763,7 +763,11 @@ void ColumnObject::get(size_t n, Field & res) const
     }
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnObject::insertFrom(const IColumn & src, size_t n)
+#else
 void ColumnObject::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     insert(src[n]);
 }

src/Columns/ColumnObject.h

@@ -209,7 +209,11 @@ public:
     void insert(const Field & field) override;
     bool tryInsert(const Field & field) override;
     void insertDefault() override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 #else

src/Columns/ColumnSparse.cpp

@@ -252,7 +252,11 @@ bool ColumnSparse::tryInsert(const Field & x)
     return true;
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnSparse::insertFrom(const IColumn & src, size_t n)
+#else
 void ColumnSparse::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     if (const auto * src_sparse = typeid_cast<const ColumnSparse *>(&src))
     {

src/Columns/ColumnSparse.h

@@ -88,7 +88,11 @@ public:
 #endif
     void insert(const Field & x) override;
     bool tryInsert(const Field & x) override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src, size_t n) override;
+#endif
     void insertDefault() override;
     void insertManyDefaults(size_t length) override;
 

src/Columns/ColumnString.h

@@ -142,7 +142,11 @@ public:
         return true;
     }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t n) override
+#else
     void doInsertFrom(const IColumn & src_, size_t n) override
+#endif
     {
         const ColumnString & src = assert_cast<const ColumnString &>(src_);
         const size_t size_to_append = src.offsets[n] - src.offsets[n - 1];  /// -1th index is Ok, see PaddedPODArray.

src/Columns/ColumnTuple.cpp

@@ -205,7 +205,11 @@ bool ColumnTuple::tryInsert(const Field & x)
     return true;
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnTuple::insertFrom(const IColumn & src_, size_t n)
+#else
 void ColumnTuple::doInsertFrom(const IColumn & src_, size_t n)
+#endif
 {
     const ColumnTuple & src = assert_cast<const ColumnTuple &>(src_);
 

src/Columns/ColumnTuple.h

@@ -65,7 +65,11 @@ public:
     void insertData(const char * pos, size_t length) override;
     void insert(const Field & x) override;
     bool tryInsert(const Field & x) override;
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src_, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
 #else

src/Columns/ColumnVariant.cpp

@@ -595,7 +595,11 @@ void ColumnVariant::insertManyFromImpl(const DB::IColumn & src_, size_t position
     }
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void ColumnVariant::insertFrom(const IColumn & src_, size_t n)
+#else
 void ColumnVariant::doInsertFrom(const IColumn & src_, size_t n)
+#endif
 {
     insertFromImpl(src_, n, nullptr);
 }

src/Columns/ColumnVariant.h

@@ -180,7 +180,11 @@ public:
     void insert(const Field & x) override;
     bool tryInsert(const Field & x) override;
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src_, size_t n) override;
+#else
     void doInsertFrom(const IColumn & src_, size_t n) override;
+#endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
     void insertRangeFrom(const IColumn & src_, size_t start, size_t length) override;
 #else

src/Columns/ColumnVector.h

@@ -64,7 +64,11 @@ public:
         return data.size();
     }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn & src, size_t n) override
+#else
     void doInsertFrom(const IColumn & src, size_t n) override
+#endif
     {
         data.push_back(assert_cast<const Self &>(src).getData()[n]);
     }

src/Columns/IColumn.cpp

@@ -46,7 +46,11 @@ String IColumn::dumpStructure() const
     return res.str();
 }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+void IColumn::insertFrom(const IColumn & src, size_t n)
+#else
 void IColumn::doInsertFrom(const IColumn & src, size_t n)
+#endif
 {
     insert(src[n]);
 }

src/Columns/IColumn.h

@@ -179,11 +179,15 @@ public:
 
     /// Appends n-th element from other column with the same type.
     /// Is used in merge-sort and merges. It could be implemented in inherited classes more optimally than default implementation.
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    virtual void insertFrom(const IColumn & src, size_t n);
+#else
     void insertFrom(const IColumn & src, size_t n)
     {
         assertTypeEquality(src);
         doInsertFrom(src, n);
     }
+#endif
 
     /// Appends range of elements from other column with the same type.
     /// Could be used to concatenate columns.
@@ -659,13 +663,11 @@ protected:
         Sort full_sort,
         PartialSort partial_sort) const;
 
+#if defined(ABORT_ON_LOGICAL_ERROR)
     virtual void doInsertFrom(const IColumn & src, size_t n);
 
-#if defined(ABORT_ON_LOGICAL_ERROR)
     virtual void doInsertRangeFrom(const IColumn & src, size_t start, size_t length) = 0;
-#endif
 
-#if defined(ABORT_ON_LOGICAL_ERROR)
     virtual void doInsertManyFrom(const IColumn & src, size_t position, size_t length)
     {
         for (size_t i = 0; i < length; ++i)

src/Columns/IColumnDummy.h

@@ -67,7 +67,11 @@ public:
     {
     }
 
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    void insertFrom(const IColumn &, size_t) override
+#else
     void doInsertFrom(const IColumn &, size_t) override
+#endif
     {
         ++s;
     }