Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@windtalker
windtalker committed Feb 15, 2022
1 parent 0fe3f67 commit e8592df
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dbms/src/Flash/Coprocessor/DAGExpressionAnalyzerHelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ String DAGExpressionAnalyzerHelper::buildRegexpFunction(
String name = analyzer->getActions(child, actions);
argument_names.push_back(name);
}
std::shared_ptr<TiDB::ITiDBCollator> collator = getCollatorFromExpr(expr);
TiDB::TiDBCollatorPtr collator = getCollatorFromExpr(expr);
if (expr.sig() == tipb::ScalarFuncSig::RegexpReplaceSig || expr.sig() == tipb::ScalarFuncSig::RegexpSig)
{
/// according to https://github.com/pingcap/tidb/blob/v5.0.0/expression/builtin_like.go#L126,
Expand Down
30 changes: 15 additions & 15 deletions dbms/src/Functions/FunctionsStringSearch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ struct PositionImpl
}
};

static String getRE2ModeModifiers(const std::string & match_type, const std::shared_ptr<TiDB::ITiDBCollator> & collator)
static String getRE2ModeModifiers(const std::string & match_type, const TiDB::TiDBCollatorPtr collator)
{
/// for regexp only ci/cs is supported
re2_st::RE2::Options options(re2_st::RE2::CannedOptions::DefaultOptions);
Expand Down Expand Up @@ -963,7 +963,7 @@ struct ReplaceRegexpImpl
const Int64 & pos,
const Int64 & occ,
const std::string & match_type,
std::shared_ptr<TiDB::ITiDBCollator> collator,
TiDB::TiDBCollatorPtr collator,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1012,7 +1012,7 @@ struct ReplaceRegexpImpl
const Int64 & pos,
const Int64 & occ,
const std::string & match_type,
std::shared_ptr<TiDB::ITiDBCollator> collator,
TiDB::TiDBCollatorPtr collator,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1048,7 +1048,7 @@ struct ReplaceRegexpImpl
res_offsets[i] = res_offset;
}
}
static void constant(const String & input, const String & needle, const String & replacement, const Int64 & pos, const Int64 & occ, const String & match_type, std::shared_ptr<TiDB::ITiDBCollator> collator, String & output)
static void constant(const String & input, const String & needle, const String & replacement, const Int64 & pos, const Int64 & occ, const String & match_type, TiDB::TiDBCollatorPtr collator, String & output)
{
ColumnString::Chars_t input_data;
input_data.insert(input_data.end(), input.begin(), input.end());
Expand Down Expand Up @@ -1081,7 +1081,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1169,7 +1169,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1243,7 +1243,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1335,7 +1335,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1410,7 +1410,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1508,7 +1508,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1583,7 +1583,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1685,7 +1685,7 @@ struct ReplaceStringImpl
const Int64 & /* pos */,
const Int64 & /* occ */,
const std::string & /* match_type */,
std::shared_ptr<TiDB::ITiDBCollator> /* collator */,
TiDB::TiDBCollatorPtr /* collator */,
ColumnString::Chars_t & res_data,
ColumnString::Offsets & res_offsets)
{
Expand Down Expand Up @@ -1755,7 +1755,7 @@ struct ReplaceStringImpl
}
}

static void constant(const std::string & data, const std::string & needle, const std::string & replacement, const Int64 & /* pos */, const Int64 & /* occ */, const std::string & /* match_type */, std::shared_ptr<TiDB::ITiDBCollator> /* collator */, std::string & res_data)
static void constant(const std::string & data, const std::string & needle, const std::string & replacement, const Int64 & /* pos */, const Int64 & /* occ */, const std::string & /* match_type */, TiDB::TiDBCollatorPtr /* collator */, std::string & res_data)
{
if (needle.empty())
{
Expand Down Expand Up @@ -1826,7 +1826,7 @@ class FunctionStringReplace : public IFunction
return {1, 2, 3, 4, 5};
}
}
void setCollator(const std::shared_ptr<TiDB::ITiDBCollator> & collator_) override { collator = collator_; }
void setCollator(const TiDB::TiDBCollatorPtr & collator_) override { collator = collator_; }

DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{
Expand Down Expand Up @@ -2042,7 +2042,7 @@ class FunctionStringReplace : public IFunction
throw Exception("Argument at index 2 and 3 for function replace must be constant", ErrorCodes::ILLEGAL_COLUMN);
}
}
std::shared_ptr<TiDB::ITiDBCollator> collator;
TiDB::TiDBCollatorPtr collator;
};

struct NamePosition
Expand Down

0 comments on commit e8592df

Please sign in to comment.