You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "amaliujia (via GitHub)" <gi...@apache.org> on 2024/01/05 03:11:16 UTC
[PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
amaliujia opened a new pull request, #44602:
URL: https://github.com/apache/spark/pull/44602
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This code proposes to introduce a new object named `SqlApiConfHelper` to contain shared code between `SqlApiConf` and `SqlConf`.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
As of now, SqlConf will access some of the variables of SqlApiConf while SqlApiConf also try to initialize SqlConf upon initialization. This PR is to avoid potential circular dependency between SqlConf and SqlApiConf. The shared variables or access to the shared variables are moved to the new `SqlApiConfHelper`. So either SqlApiConf and SqlConf wants to initialize the other side, they will only initialize the same third object.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
NO
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Existing UT
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
NO
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "zsxwing (via GitHub)" <gi...@apache.org>.
zsxwing commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443262720
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
If this line (or `SqlApiConf.get`) is called in a JVM before any code touches `object SQLConf`, are we going to return `DefaultSqlApiConf` which is wrong?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1444166378
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
@zsxwing good point! How about this: We make `SqlApiConf` the only place to deal with the active conf problem. It should use reflection to get the active `SQLConf` and set it as the getter. `SQLConf` should only access this new `SqlApiConfHelper` for config names.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell commented on PR #44602:
URL: https://github.com/apache/spark/pull/44602#issuecomment-1882204497
Merging to master/3.5
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "zsxwing (via GitHub)" <gi...@apache.org>.
zsxwing commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1445374830
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
Review Comment:
+1 to document the rules to use `SqlApiConfHelper`.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1445364006
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
@zsxwing I don't think it is an issue. An end user should never touch this object unless they know what they are doing. That is a limitation of this approach, we should document this, and we can add a liniting rule if we must.
Just to make sure that we are on the same page. In a normal situation, the initialisation is as follows:
- User touches the `SQLConf` object. This loads and initialises the `SQLConf` object. The loading of the `SQLConf` object triggers the initialisation of the `SqlApiConfHelper` because it needs to set the setter, and it needs to load the shared keys.
- User touces the `SqlApiConf` object. This tries to load the `SQLConf` object as part of its initialisation (see previous bullet), if it is on the classpath the getter will be updated to return the `SQLConf`.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "zsxwing (via GitHub)" <gi...@apache.org>.
zsxwing commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443262720
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
If this line is called in a JVM before any code touching `object SQLConf`, are we going to return `DefaultSqlApiConf` which is wrong?
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
If this line is called in a JVM before any code touches `object SQLConf`, are we going to return `DefaultSqlApiConf` which is wrong?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443129337
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConf.scala:
##########
@@ -48,23 +47,16 @@ private[sql] trait SqlApiConf {
private[sql] object SqlApiConf {
// Shared keys.
- val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
- val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
- val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
- val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
- val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
-
+ val ANSI_ENABLED_KEY: String = SqlApiConfHelper.ANSI_ENABLED_KEY
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = SqlApiConfHelper.LEGACY_TIME_PARSER_POLICY_KEY
+ val CASE_SENSITIVE_KEY: String = SqlApiConfHelper.CASE_SENSITIVE_KEY
+ val SESSION_LOCAL_TIMEZONE_KEY: String = SqlApiConfHelper.SESSION_LOCAL_TIMEZONE_KEY
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String =
+ SqlApiConfHelper.LOCAL_RELATION_CACHE_THRESHOLD_KEY
/**
* Defines a getter that returns the [[SqlApiConf]] within scope.
*/
- private val confGetter = new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
-
- /**
- * Sets the active config getter.
- */
- private[sql] def setConfGetter(getter: () => SqlApiConf): Unit = {
- confGetter.set(getter)
- }
+ private val confGetter = SqlApiConfHelper.getConfGetter
Review Comment:
do we need this val? `def get: SqlApiConf = SqlApiConfHelper.getConfGetter.get()()`
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell closed pull request #44602: [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper
URL: https://github.com/apache/spark/pull/44602
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443128307
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
+
+ /**
+ * Sets the active config getter.
+ */
+ private[sql] def setConfGetter(getter: () => SqlApiConf): Unit = {
Review Comment:
```suggestion
def setConfGetter(getter: () => SqlApiConf): Unit = {
```
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
+
+ /**
+ * Sets the active config getter.
+ */
+ private[sql] def setConfGetter(getter: () => SqlApiConf): Unit = {
Review Comment:
the entire object is private[sql]
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "zsxwing (via GitHub)" <gi...@apache.org>.
zsxwing commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443262720
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
If this line is called in a JVM before any code touches `object SQLConf`, are we going to return `DefaultSqlApiConf` which is wrong?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "amaliujia (via GitHub)" <gi...@apache.org>.
amaliujia commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1445424676
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
Review Comment:
done
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "amaliujia (via GitHub)" <gi...@apache.org>.
amaliujia commented on PR #44602:
URL: https://github.com/apache/spark/pull/44602#issuecomment-1878964421
@cloud-fan @hvanhovell
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "amaliujia (via GitHub)" <gi...@apache.org>.
amaliujia commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443309073
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
+ // Shared keys.
+ val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
+ val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
+ val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
+
+ val confGetter: AtomicReference[() => SqlApiConf] = {
+ new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
+ }
+
+ def getConfGetter: AtomicReference[() => SqlApiConf] = confGetter
Review Comment:
@hvanhovell Do you know if the scenario mentioned here could happen?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "amaliujia (via GitHub)" <gi...@apache.org>.
amaliujia commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1443224726
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConf.scala:
##########
@@ -48,23 +47,16 @@ private[sql] trait SqlApiConf {
private[sql] object SqlApiConf {
// Shared keys.
- val ANSI_ENABLED_KEY: String = "spark.sql.ansi.enabled"
- val LEGACY_TIME_PARSER_POLICY_KEY: String = "spark.sql.legacy.timeParserPolicy"
- val CASE_SENSITIVE_KEY: String = "spark.sql.caseSensitive"
- val SESSION_LOCAL_TIMEZONE_KEY: String = "spark.sql.session.timeZone"
- val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String = "spark.sql.session.localRelationCacheThreshold"
-
+ val ANSI_ENABLED_KEY: String = SqlApiConfHelper.ANSI_ENABLED_KEY
+ val LEGACY_TIME_PARSER_POLICY_KEY: String = SqlApiConfHelper.LEGACY_TIME_PARSER_POLICY_KEY
+ val CASE_SENSITIVE_KEY: String = SqlApiConfHelper.CASE_SENSITIVE_KEY
+ val SESSION_LOCAL_TIMEZONE_KEY: String = SqlApiConfHelper.SESSION_LOCAL_TIMEZONE_KEY
+ val LOCAL_RELATION_CACHE_THRESHOLD_KEY: String =
+ SqlApiConfHelper.LOCAL_RELATION_CACHE_THRESHOLD_KEY
/**
* Defines a getter that returns the [[SqlApiConf]] within scope.
*/
- private val confGetter = new AtomicReference[() => SqlApiConf](() => DefaultSqlApiConf)
-
- /**
- * Sets the active config getter.
- */
- private[sql] def setConfGetter(getter: () => SqlApiConf): Unit = {
- confGetter.set(getter)
- }
+ private val confGetter = SqlApiConfHelper.getConfGetter
Review Comment:
Right. Consolidated.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46600][SQL] Move shared code between SqlConf and SqlApiConf to SqlApiConfHelper [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell commented on code in PR #44602:
URL: https://github.com/apache/spark/pull/44602#discussion_r1445365850
##########
sql/api/src/main/scala/org/apache/spark/sql/internal/SqlApiConfHelper.scala:
##########
@@ -0,0 +1,41 @@
+/*
+ * 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.spark.sql.internal
+
+import java.util.concurrent.atomic.AtomicReference
+
+private[sql] object SqlApiConfHelper {
Review Comment:
Can you add some documentation explaining why this is needed? And how this code should never be used by an end-user.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org