Github user felixcheung commented on a diff in the pull request:

    https://github.com/apache/spark/pull/13584#discussion_r77272532
  
    --- Diff: mllib/src/main/scala/org/apache/spark/ml/r/RWrapperUtils.scala ---
    @@ -0,0 +1,71 @@
    +/*
    + * 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.ml.r
    +
    +import org.apache.spark.internal.Logging
    +import org.apache.spark.ml.feature.RFormula
    +import org.apache.spark.sql.Dataset
    +
    +object RWrapperUtils extends Logging {
    +
    +  /**
    +   * DataFrame column check.
    +   * When loading data, default columns "features" and "label" will be 
added. And these two names
    +   * would conflict with RFormula default feature and label column names.
    +   * Here is to change the column name to avoid "column already exists" 
error.
    +   *
    +   * @param rFormula RFormula instance
    +   * @param data Input dataset
    +   * @return Unit
    +   */
    +  def checkDataColumns(rFormula: RFormula, data: Dataset[_]): Unit = {
    +    if (data.schema.fieldNames.contains(rFormula.getLabelCol)) {
    +      val newLabelName = convertToUniqueName(rFormula.getLabelCol, 
data.schema.fieldNames)
    +      logWarning(
    +        s"data containing ${rFormula.getLabelCol} column, using new name 
$newLabelName instead")
    +      rFormula.setLabelCol(newLabelName)
    +    }
    +
    +    if (data.schema.fieldNames.contains(rFormula.getFeaturesCol)) {
    +      val newFeaturesName = convertToUniqueName(rFormula.getFeaturesCol, 
data.schema.fieldNames)
    +      logWarning(
    +        s"data containing ${rFormula.getFeaturesCol} column, using new 
name $newFeaturesName")
    --- End diff --
    
    let's make this consistent with the message above in L40?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org

Reply via email to