Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving bitwise_or to use native calcite operator (#16237)

This commit is contained in:
Soumyava 2024-04-04 12:49:29 -07:00 committed by GitHub
parent 972937659d
commit 7759f25095
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/BitwiseSqlAggregator.java
View File

@ -22,14 +22,7 @@ package org.apache.druid.sql.calcite.aggregation.builtin;
import com.google.common.collect.ImmutableSet;
import org.apache.calcite.rel.core.AggregateCall;
import org.apache.calcite.sql.SqlAggFunction;
import org.apache.calcite.sql.SqlFunctionCategory;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.type.InferTypes;
import org.apache.calcite.sql.type.OperandTypes;
import org.apache.calcite.sql.type.ReturnTypes;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.util.Optionality;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.math.expr.ExprMacroTable;
@ -54,8 +47,6 @@ import java.util.stream.Collectors;
public class BitwiseSqlAggregator implements SqlAggregator
{
private static final SqlAggFunction XOR_FUNCTION = new BitwiseXorSqlAggFunction();
public enum Op
{
AND {
@ -88,8 +79,7 @@ public class BitwiseSqlAggregator implements SqlAggregator
@Override
SqlAggFunction getCalciteFunction()
{
// newer versions of calcite have this built-in so someday we can drop this...
return XOR_FUNCTION;
return SqlStdOperatorTable.BIT_XOR;
}
@Override
@ -175,23 +165,4 @@ public class BitwiseSqlAggregator implements SqlAggregator
)
);
}
private static class BitwiseXorSqlAggFunction extends SqlAggFunction
{
BitwiseXorSqlAggFunction()
{
super(
"BIT_XOR",
null,
SqlKind.OTHER_FUNCTION,
ReturnTypes.explicit(SqlTypeName.BIGINT),
InferTypes.ANY_NULLABLE,
OperandTypes.EXACT_NUMERIC,
SqlFunctionCategory.NUMERIC,
false,
false,
Optionality.IGNORED
);
}
}
}

73
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
View File

@ -15550,4 +15550,77 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
ImmutableList.of(NullHandling.sqlCompatible() ? new Object[]{null} : new Object[]{0})
);
}
@Test
public void testBitwiseXor()
{
skipVectorize();
cannotVectorize();
msqIncompatible();
testQuery(
"select count(*) from (\n"
+ " select __time, cityName, bit_xor(cityName) c2\n"
+ " from wikipedia\n"
+ " group by __time, cityName\n"
+ " having bit_xor(cityName) is null\n"
+ ")",
ImmutableList.of(
GroupByQuery.builder()
.setDataSource(
new QueryDataSource(
new GroupByQuery.Builder()
.setDataSource(CalciteTests.WIKIPEDIA)
.setInterval(querySegmentSpec(Filtration.eternity()))
.setGranularity(Granularities.ALL)
.setDimensions(
new DefaultDimensionSpec("__time", "d0", ColumnType.LONG),
new DefaultDimensionSpec("cityName", "d1", ColumnType.STRING)
)
.setLimitSpec(
NoopLimitSpec.instance()
)
.setAggregatorSpecs(aggregators(new FilteredAggregatorFactory(
new ExpressionLambdaAggregatorFactory(
"a0",
ImmutableSet.of("cityName"),
"__acc",
"0",
"0",
NullHandling.sqlCompatible(),
false,
false,
"bitwiseXor(\"__acc\", \"cityName\")",
"bitwiseXor(\"__acc\", \"a0\")",
null,
null,
ExpressionLambdaAggregatorFactory.DEFAULT_MAX_SIZE_BYTES,
TestExprMacroTable.INSTANCE
),
notNull("cityName")
)))
.setHavingSpec(
having(
isNull("a0")
)
)
.setContext(OUTER_LIMIT_CONTEXT)
.build()
)
)
.setInterval(querySegmentSpec(Filtration.eternity()))
.setGranularity(Granularities.ALL)
.setAggregatorSpecs(
aggregators(
new CountAggregatorFactory("_a0")
)
)
.setContext(QUERY_CONTEXT_DEFAULT)
.build()
),
ImmutableList.of(
useDefault ?
new Object[]{0L} : new Object[]{37091L}
)
);
}
}