kasakrisz commented on a change in pull request #3121:
URL: https://github.com/apache/hive/pull/3121#discussion_r832123342
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
##########
@@ -3119,65 +3123,24 @@ private RelNode genTableLogicalPlan(String tableAlias,
QB qb) throws SemanticExc
return tableRel;
}
- private RelDataType inferNotNullableColumns(Table tabMetaData, RelDataType
rowType)
- throws HiveException {
- final NotNullConstraint nnc = tabMetaData.getNotNullConstraint();
- final PrimaryKeyInfo pkc = tabMetaData.getPrimaryKeyInfo();
- if ((nnc == null || nnc.getNotNullConstraints().isEmpty()) &&
- (pkc == null || pkc.getColNames().isEmpty())) {
- return rowType;
+ private boolean isNullable(String colName, NotNullConstraint
notNullConstraints, PrimaryKeyInfo primaryKeyInfo) {
+ if (notNullConstraints == null && primaryKeyInfo == null) {
+ return true;
}
- // Build the bitset with not null columns
- ImmutableBitSet.Builder builder = ImmutableBitSet.builder();
- if (nnc != null) {
- for (String nnCol : nnc.getNotNullConstraints().values()) {
- int nnPos = -1;
- for (int i = 0; i < rowType.getFieldNames().size(); i++) {
- if (rowType.getFieldNames().get(i).equals(nnCol)) {
- nnPos = i;
- break;
- }
- }
- if (nnPos == -1) {
- LOG.error("Column for not null constraint definition " + nnCol + "
not found");
- return rowType;
- }
- builder.set(nnPos);
- }
- }
- if (pkc != null) {
- for (String pkCol : pkc.getColNames().values()) {
- int pkPos = -1;
- for (int i = 0; i < rowType.getFieldNames().size(); i++) {
- if (rowType.getFieldNames().get(i).equals(pkCol)) {
- pkPos = i;
- break;
- }
- }
- if (pkPos == -1) {
- LOG.error("Column for not null constraint definition " + pkCol + "
not found");
- return rowType;
- }
- builder.set(pkPos);
- }
+ if (notNullConstraints != null &&
+ !notNullConstraints.getNotNullConstraints().isEmpty() &&
Review comment:
Removed
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
##########
@@ -3119,65 +3123,24 @@ private RelNode genTableLogicalPlan(String tableAlias,
QB qb) throws SemanticExc
return tableRel;
}
- private RelDataType inferNotNullableColumns(Table tabMetaData, RelDataType
rowType)
- throws HiveException {
- final NotNullConstraint nnc = tabMetaData.getNotNullConstraint();
- final PrimaryKeyInfo pkc = tabMetaData.getPrimaryKeyInfo();
- if ((nnc == null || nnc.getNotNullConstraints().isEmpty()) &&
- (pkc == null || pkc.getColNames().isEmpty())) {
- return rowType;
+ private boolean isNullable(String colName, NotNullConstraint
notNullConstraints, PrimaryKeyInfo primaryKeyInfo) {
+ if (notNullConstraints == null && primaryKeyInfo == null) {
+ return true;
}
- // Build the bitset with not null columns
- ImmutableBitSet.Builder builder = ImmutableBitSet.builder();
- if (nnc != null) {
- for (String nnCol : nnc.getNotNullConstraints().values()) {
- int nnPos = -1;
- for (int i = 0; i < rowType.getFieldNames().size(); i++) {
- if (rowType.getFieldNames().get(i).equals(nnCol)) {
- nnPos = i;
- break;
- }
- }
- if (nnPos == -1) {
- LOG.error("Column for not null constraint definition " + nnCol + "
not found");
- return rowType;
- }
- builder.set(nnPos);
- }
- }
- if (pkc != null) {
- for (String pkCol : pkc.getColNames().values()) {
- int pkPos = -1;
- for (int i = 0; i < rowType.getFieldNames().size(); i++) {
- if (rowType.getFieldNames().get(i).equals(pkCol)) {
- pkPos = i;
- break;
- }
- }
- if (pkPos == -1) {
- LOG.error("Column for not null constraint definition " + pkCol + "
not found");
- return rowType;
- }
- builder.set(pkPos);
- }
+ if (notNullConstraints != null &&
+ !notNullConstraints.getNotNullConstraints().isEmpty() &&
+
notNullConstraints.getNotNullConstraints().containsValue(colName)) {
+ return false;
}
- ImmutableBitSet bitSet = builder.build();
-
- RexBuilder rexBuilder = cluster.getRexBuilder();
- RelDataTypeFactory dtFactory = rexBuilder.getTypeFactory();
- List<RelDataType> fieldTypes = new LinkedList<RelDataType>();
- List<String> fieldNames = new LinkedList<String>();
- for (RelDataTypeField rdtf : rowType.getFieldList()) {
- if (bitSet.indexOf(rdtf.getIndex()) != -1) {
- fieldTypes.add(dtFactory.createTypeWithNullability(rdtf.getType(),
false));
- } else {
- fieldTypes.add(rdtf.getType());
- }
- fieldNames.add(rdtf.getName());
+ if (primaryKeyInfo != null &&
+ !primaryKeyInfo.getColNames().isEmpty() &&
Review comment:
Removed
--
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]
