rohangarg commented on code in PR #12715:
URL: https://github.com/apache/druid/pull/12715#discussion_r911937777
##########
sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java:
##########
@@ -234,7 +242,11 @@ private static Program buildHepProgram(Iterable<? extends
RelOptRule> rules,
return Programs.of(builder.build(), noDag, metadataProvider);
}
- private static List<RelOptRule> druidConventionRuleSet(final PlannerContext
plannerContext)
+ @VisibleForTesting
Review Comment:
Done, as discussed the annotation doesn't add a lot of value without a
static checker which enforces only test usage.
##########
sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidExtensionCalciteRuleManager.java:
##########
@@ -0,0 +1,45 @@
+/*
+ * 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.sql.calcite.rule;
+
+import com.google.inject.Inject;
+
+import java.util.Set;
+
+/**
+ * Manages the custom calcite rules coming from extensions
+ */
+public class DruidExtensionCalciteRuleManager
+{
+ private final Set<DruidExtensionCalciteRuleProvider>
druidExtensionCalciteRuleProviderSet;
+
+ @Inject
+ public DruidExtensionCalciteRuleManager(
+ @ExtensionCalciteRuleProvider Set<DruidExtensionCalciteRuleProvider>
druidExtensionCalciteRuleProviderSet
+ )
+ {
+ this.druidExtensionCalciteRuleProviderSet =
druidExtensionCalciteRuleProviderSet;
+ }
+
+ public Set<DruidExtensionCalciteRuleProvider>
getDruidExtensionCalciteRuleProviderSet()
Review Comment:
Yes, giving the whole set was wrong. have updated method to update the
existing core rules via manager without exposing the extension interface
##########
sql/src/main/java/org/apache/druid/sql/calcite/rule/ExtensionCalciteRuleProvider.java:
##########
@@ -0,0 +1,39 @@
+/*
+ * 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.sql.calcite.rule;
+
+import com.google.inject.BindingAnnotation;
+import org.apache.druid.guice.annotations.UnstableApi;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to use while binding custom calcite rules from extensions to
{@link DruidExtensionCalciteRuleProvider}
+ */
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD,
ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@BindingAnnotation
+@UnstableApi
+public @interface ExtensionCalciteRuleProvider
Review Comment:
Yes, it can be done without Annotation. had done with annotation earlier to
mark uniqueness to the Set. But a conflict seems unlikely, and the annotation
can be done if and when that situation arises.
--
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]
