[fix][core] Support operations on tables without primary keys

Author: guojn1

core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java

@@ -88,7 +88,6 @@
 import org.apache.calcite.sql.TableCharacteristic;
 import org.apache.calcite.sql.fun.SqlCase;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
-import org.apache.calcite.sql.fun.SqlSumAggFunction;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.type.*;
 import org.apache.calcite.sql.util.IdPair;
@@ -167,6 +166,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
    * Alias prefix generated for source columns when rewriting UPDATE to MERGE.
    */
   public static final String UPDATE_ANON_PREFIX = "SYS$ANON";
+  public static final String IMPLICIT_COL_NAME = "_ROWID";
 
   //~ Instance fields --------------------------------------------------------
 
@@ -4895,7 +4895,7 @@ protected RelDataType createTargetRowType(
         ? logicalTargetRowType
         : realTargetRowType;
 
-    checkFieldCount(insert.getTargetTable(), table, strategies,
+    checkFieldCount(insert.getTargetColumnList(), insert.getTargetTable(), table, strategies,
         targetRowTypeToValidate, realTargetRowType,
         source, logicalSourceRowType, logicalTargetRowType);
 
@@ -5027,21 +5027,23 @@ private void checkConstraint(
    *                                make a subset of fields(start from the left first field) whose
    *                                length is equals with the source row type fields number
    */
-  private void checkFieldCount(SqlNode node, SqlValidatorTable table,
+  private void checkFieldCount(SqlNodeList targetColumnList, SqlNode node, SqlValidatorTable table,
       List<ColumnStrategy> strategies, RelDataType targetRowTypeToValidate,
       RelDataType realTargetRowType, SqlNode source,
       RelDataType logicalSourceRowType, RelDataType logicalTargetRowType) {
-    final int sourceFieldCount = logicalSourceRowType.getFieldCount();
-    final int targetFieldCount = logicalTargetRowType.getFieldCount();
-    final int targetRealFieldCount = realTargetRowType.getFieldCount();
-    if (sourceFieldCount != targetFieldCount
-        && sourceFieldCount != targetRealFieldCount) {
+    //final int sourceFieldCount = logicalSourceRowType.getFieldCount();
+    //final int targetFieldCount = logicalTargetRowType.getFieldCount();
+    //final int targetRealFieldCount = realTargetRowType.getFieldCount();
+    //if (sourceFieldCount != targetFieldCount
+    //    && sourceFieldCount != targetRealFieldCount) {
       // Allows the source row fields count to be equal with either
       // the logical or the real(excludes columns that can not insert into)
       // target row fields count.
-      throw newValidationError(node,
-          RESOURCE.unmatchInsertColumn(targetFieldCount, sourceFieldCount));
-    }
+      //throw newValidationError(node,
+      //    RESOURCE.unmatchInsertColumn(targetFieldCount, sourceFieldCount));
+    //  return;
+    //}
+    checkFieldCount(targetColumnList, node, logicalSourceRowType, logicalTargetRowType);
     // Ensure that non-nullable fields are targeted.
     for (final RelDataTypeField field : table.getRowType().getFieldList()) {
       final RelDataTypeField targetField =
@@ -5071,6 +5073,41 @@ private void checkFieldCount(SqlNode node, SqlValidatorTable table,
     }
   }
 
+  protected void checkFieldCount(SqlNodeList targetColumnList, SqlNode node, RelDataType logicalSourceRowType,
+                                 RelDataType logicalTargetRowType) {
+    final int sourceFieldCount = logicalSourceRowType.getFieldCount();
+    final int targetFieldCount = logicalTargetRowType.getFieldCount();
+    int implicitNum = 0;
+    int sourceImplicitNum = 0;
+
+    if (targetColumnList != null) {
+      for (SqlNode identifier : targetColumnList.getList()) {
+        if (identifier instanceof SqlIdentifier && isImplicitKey(((SqlIdentifier) identifier).getLastName())) {
+          sourceImplicitNum++;
+        }
+      }
+    } else {
+      // if there is no target column in insert sql,then use default row type
+      for (String fieldName : logicalSourceRowType.getFieldNames()) {
+        if (isImplicitKey(fieldName)) {
+          sourceImplicitNum++;
+        }
+      }
+    }
+    for (String fieldName : logicalTargetRowType.getFieldNames()) {
+      if (isImplicitKey(fieldName)) {
+        implicitNum++;
+      }
+    }
+    if ((sourceFieldCount - sourceImplicitNum) != (targetFieldCount - implicitNum)) {
+      throw newValidationError(node, RESOURCE.unmatchInsertColumn(targetFieldCount, sourceFieldCount));
+    }
+  }
+
+  public static boolean isImplicitKey(String fieldName) {
+    return IMPLICIT_COL_NAME.equals(fieldName);
+  }
+
   /** Returns whether a query uses {@code DEFAULT} to populate a given
    *  column. */
   private static boolean isValuesWithDefault(SqlNode source, int column) {

core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java

@@ -114,6 +114,7 @@
 import static org.apache.calcite.sql.SqlUtil.stripAs;
 
 import static java.util.Objects.requireNonNull;
+import static org.apache.calcite.sql.validate.SqlValidatorImpl.isImplicitKey;
 
 /**
  * Converts a SQL parse tree (consisting of
@@ -4075,6 +4076,9 @@ private Blackboard createInsertBlackboard(RelOptTable targetTable,
     final List<ColumnStrategy> strategies = targetTable.getColumnStrategies();
     final List<String> targetFields = targetTable.getRowType().getFieldNames();
     for (String targetColumnName : targetColumnNames) {
+      if (isImplicitKey(targetColumnName)) {
+        continue;
+      }
       final int i = targetFields.indexOf(targetColumnName);
       switch (strategies.get(i)) {
       case STORED: