somu-imply commented on code in PR #15241:
URL: https://github.com/apache/druid/pull/15241#discussion_r1373642265
##########
sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java:
##########
@@ -1473,13 +1481,78 @@ private WindowOperatorQuery toWindowQuery()
);
}
+ /**
+ * Create an OperatorQuery which runs an order on top of a scan.
+ */
+ @Nullable
+ private WindowOperatorQuery toScanAndSortQuery()
+ {
+ if (sorting == null
+ || sorting.getOrderBys().isEmpty()
+ || sorting.getProjection() != null) {
+ return null;
+ }
+
+ ScanQuery scan = toScanQuery(false);
+ if (scan == null) {
+ return null;
+ }
+
+ // Reject cases which would sort the datasource directly
+ if (dataSource != DruidOuterQueryRel.DUMMY_DATA_SOURCE &&
dataSource.isConcrete()) {
Review Comment:
Maybe use Object.equals here
##########
sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java:
##########
@@ -237,7 +233,12 @@ public List<Program> programs(final PlannerContext
plannerContext)
boolean isDebug = plannerContext.queryContext().isDebug();
return ImmutableList.of(
- Programs.sequence(preProgram,
Programs.ofRules(druidConventionRuleSet(plannerContext))),
+ Programs.sequence(
Review Comment:
This is great to tell us how the plans look before the hep planner starts.
Probably put a comment here saying that these are printed only when the Debug
flag is set and developers should set that and run queries to get more info on
the plans. a
##########
sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java:
##########
@@ -1473,13 +1481,78 @@ private WindowOperatorQuery toWindowQuery()
);
}
+ /**
+ * Create an OperatorQuery which runs an order on top of a scan.
+ */
+ @Nullable
+ private WindowOperatorQuery toScanAndSortQuery()
+ {
+ if (sorting == null
+ || sorting.getOrderBys().isEmpty()
+ || sorting.getProjection() != null) {
+ return null;
+ }
+
+ ScanQuery scan = toScanQuery(false);
+ if (scan == null) {
+ return null;
+ }
+
+ // Reject cases which would sort the datasource directly
Review Comment:
We can be more direct and say that we are currently allowing non-time
ordering only on subqueries.
##########
processing/src/test/java/org/apache/druid/query/operator/NaiveSortOperatorTest.java:
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.operator;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.druid.query.operator.Operator.Signal;
+import org.apache.druid.query.operator.window.RowsAndColumnsHelper;
+import org.apache.druid.query.rowsandcols.MapOfColumnsRowsAndColumns;
+import org.apache.druid.query.rowsandcols.RowsAndColumns;
+import org.apache.druid.query.rowsandcols.column.IntArrayColumn;
+import org.junit.Test;
+
+public class NaiveSortOperatorTest
+{
+ @Test
+ public void testNoInputisHandledCorrectly()
+ {
+ NaiveSortOperator op = new NaiveSortOperator(
+ InlineScanOperator.make(),
+ ImmutableList.of(ColumnWithDirection.ascending("someColumn")));
+
+ new OperatorTestHelper()
+ .withPushFn(() -> (someRac) -> Signal.GO)
+ .runToCompletion(op);
+ }
+
+ @Test
+ public void testSort()
Review Comment:
nit. rename to testSortAscending() and also add a testSortDescending()
##########
processing/src/main/java/org/apache/druid/query/operator/OffsetLimit.java:
##########
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.operator;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Preconditions;
+import org.apache.druid.error.DruidException;
+import java.util.Objects;
+
+public class OffsetLimit
Review Comment:
Also can we call this a OffsetLimitOperator ?
##########
processing/src/main/java/org/apache/druid/query/operator/OffsetLimit.java:
##########
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.operator;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Preconditions;
+import org.apache.druid.error.DruidException;
+import java.util.Objects;
+
+public class OffsetLimit
+{
+ protected final long offset;
+ protected final long limit;
+
+ public static final OffsetLimit NONE = new OffsetLimit(0, -1);
+
+ @JsonCreator
+ public OffsetLimit(
+ @JsonProperty("offset") long offset,
+ @JsonProperty("limit") long limit)
+ {
+ Preconditions.checkArgument(offset >= 0, "offset >= 0");
+ this.offset = offset;
+ this.limit = limit < 0 ? -1 : limit;
+ }
+
+ @JsonProperty("offset")
+ public long getOffset()
+ {
+ return offset;
+ }
+
+ @JsonProperty("limit")
+ public long getLimit()
+ {
+ return limit;
+ }
+
+ public boolean isPresent()
+ {
+ return hasOffset() || hasLimit();
+ }
+
+ public boolean hasOffset()
+ {
+ return offset > 0;
+ }
+
+ public boolean hasLimit()
+ {
+ return limit >= 0;
+ }
+
+ public static OffsetLimit limit(int limit2)
+ {
+ return new OffsetLimit(0, limit2);
+ }
+
+ public long getLimitOrMax()
+ {
+ if (limit < 0) {
+ return Long.MAX_VALUE;
+ } else {
+ return limit;
+ }
+ }
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof OffsetLimit)) {
+ return false;
+ }
+ OffsetLimit that = (OffsetLimit) o;
+ return limit == that.limit && offset == that.offset;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return Objects.hash(limit, offset);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "OffsetLimit{" +
+ "offset=" + offset +
+ ", limit=" + limit +
+ '}';
+ }
+
+ public long getFetchFromIndex(long maxIndex)
Review Comment:
nit. getFromIndex or getPositionFromIndex might be a better name. same for
getFetchToIndex
##########
processing/src/main/java/org/apache/druid/query/operator/OffsetLimit.java:
##########
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.operator;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Preconditions;
+import org.apache.druid.error.DruidException;
+import java.util.Objects;
+
+public class OffsetLimit
Review Comment:
Question: The planner also has an offset limit object which does similar
stuff. Maybe we could move this to an utility? Am not sure though so asked the Q
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
