SQOOP-2296: Merge statement incorrectly includes table hints
(Keegan Witt via Jarek Jarcec Cecho)
diff --git a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java
index 0cb2c78..5abb5ea 100644
--- a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java
+++ b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java
@@ -149,12 +149,6 @@
}
sb.append(" )");
- String tableHints = getConf().get(org.apache.sqoop.manager.SQLServerManager.TABLE_HINTS_PROP);
- if (tableHints != null) {
- LOG.info("Using table hints for query hints: " + tableHints);
- sb.append(" OPTION (").append(tableHints).append(")");
- }
-
sb.append(";");
return sb.toString();
diff --git a/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java b/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java
index a144e30..a89e800 100644
--- a/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java
+++ b/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java
@@ -52,7 +52,6 @@
StringUtils.join(columnNames, ','));
conf.set(ExportJobBase.SQOOP_EXPORT_UPDATE_COL_KEY,
StringUtils.join(updateKeyColumns, ','));
- conf.set(SQLServerManager.TABLE_HINTS_PROP, "NOLOCK");
conf.set(SQLServerManager.IDENTITY_INSERT_PROP, "true");
TaskAttemptContext context = null;
Class cls = null;
@@ -90,7 +89,7 @@
+ "_source.SecondColumn, _target.ThirdColumn = _source.ThirdColumn"
+ " WHEN NOT MATCHED THEN INSERT ( FirstColumn, SecondColumn,"
+ " ThirdColumn ) VALUES "
- + "( _source.FirstColumn, _source.SecondColumn, _source.ThirdColumn ) "
- + "OPTION (NOLOCK);", recordWriter.getUpdateStatement());
+ + "( _source.FirstColumn, _source.SecondColumn, _source.ThirdColumn );",
+ recordWriter.getUpdateStatement());
}
}
