Skip to content

Commit d3c1be0

Browse files
committed
Changes for Laura's review
1 parent c3b4fd5 commit d3c1be0

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

warehouse/query-core/src/main/java/datawave/query/iterator/QueryOptions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,6 +2463,7 @@ public static void addOption(IteratorSetting setting, String option, Object valu
24632463
*/
24642464
public static <T> void addOption(IteratorSetting setting, String option, T value, Function<T,String> valueTransformer, boolean allowBlankValues) {
24652465
// If we have a default options implementation for the specified iterator setting's class, fetch it.
2466+
System.out.println("Hey" + setting.getIteratorClass());
24662467
DefaultOptions defaultOptions = getDefaultOptions(setting.getIteratorClass());
24672468
// If the value matches the default value, do not add it to the setting.
24682469
if (defaultOptions.hasDefaultValue(option) && defaultOptions.equalsDefaultValue(option, value)) {

warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,17 +2408,17 @@ public static <T> void addOption(IteratorSetting cfg, String option, T value, bo
24082408
QueryOptions.addOption(cfg, option, value, allowBlankValues);
24092409
}
24102410

2411-
// public static void addOption(IteratorSetting cfg, String option, String value, boolean allowBlankValue) {
2412-
// if (StringUtils.isNotBlank(option) && (allowBlankValue || StringUtils.isNotBlank(value))) {
2413-
// // If blank value, then we need to change it to something else or it
2414-
// // will fail in InputFormatBase when run
2415-
// // through the MapReduce api.
2416-
// if (StringUtils.isBlank(value) && allowBlankValue) {
2417-
// value = " ";
2418-
// }
2419-
// cfg.addOption(option, value);
2420-
// }
2421-
// }
2411+
// public static void addOption(IteratorSetting cfg, String option, String value, boolean allowBlankValue) {
2412+
// if (StringUtils.isNotBlank(option) && (allowBlankValue || StringUtils.isNotBlank(value))) {
2413+
// // If blank value, then we need to change it to something else or it
2414+
// // will fail in InputFormatBase when run
2415+
// // through the MapReduce api.
2416+
// if (StringUtils.isBlank(value) && allowBlankValue) {
2417+
// value = " ";
2418+
// }
2419+
// cfg.addOption(option, value);
2420+
// }
2421+
// }
24222422

24232423
/**
24242424
* Load the common iterator options for both the optimized and non-optimized query paths. Said options include: enrichers, filters (post-processing and

warehouse/query-core/src/test/java/datawave/query/iterator/QueryOptionsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,4 +288,4 @@ public void testDefaultOptions() {
288288
assertEquals(0, iteratorSetting.getOptions().size());
289289

290290
}
291-
}
291+
}

0 commit comments

Comments
 (0)