Github user ijokarumawak commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2199#discussion_r145696081
--- Diff:
nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
---
@@ -170,159 +210,213 @@ protected void init(final
ProcessorInitializationContext context) {
return this.descriptors;
}
+ final static Set<String> propertyNamesForActivatingClearState = new
HashSet<String>();
+ static {
+ propertyNamesForActivatingClearState.add(SOLR_TYPE.getName());
+ propertyNamesForActivatingClearState.add(SOLR_LOCATION.getName());
+ propertyNamesForActivatingClearState.add(COLLECTION.getName());
+ propertyNamesForActivatingClearState.add(SOLR_QUERY.getName());
+ propertyNamesForActivatingClearState.add(DATE_FIELD.getName());
+ propertyNamesForActivatingClearState.add(RETURN_FIELDS.getName());
+ }
+
@Override
public void onPropertyModified(PropertyDescriptor descriptor, String
oldValue, String newValue) {
- lastEndDatedRef.set(UNINITIALIZED_LAST_END_DATE_VALUE);
+ if
(propertyNamesForActivatingClearState.contains(descriptor.getName()))
+ clearState.set(true);
}
- @OnStopped
- public void onStopped() {
- writeLastEndDate();
- }
+ @OnScheduled
+ public void clearState(final ProcessContext context) throws
IOException {
+ if (clearState.getAndSet(false)) {
+ context.getStateManager().clear(Scope.CLUSTER);
+ final Map<String,String> newStateMap = new
HashMap<String,String>();
- @OnRemoved
- public void onRemoved() {
- final File lastEndDateCache = new File(FILE_PREFIX +
getIdentifier());
- if (lastEndDateCache.exists()) {
- lastEndDateCache.delete();
- }
- }
+ newStateMap.put(STATE_MANAGER_CURSOR_MARK, "*");
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- final ComponentLog logger = getLogger();
- readLastEndDate();
-
- final SimpleDateFormat sdf = new
SimpleDateFormat(LAST_END_DATE_PATTERN, Locale.US);
- sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
- final String currDate = sdf.format(new Date());
-
- final boolean initialized =
!UNINITIALIZED_LAST_END_DATE_VALUE.equals(lastEndDatedRef.get());
-
- final String query = context.getProperty(SOLR_QUERY).getValue();
- final SolrQuery solrQuery = new SolrQuery(query);
- solrQuery.setRows(context.getProperty(BATCH_SIZE).asInteger());
-
- // if initialized then apply a filter to restrict results from the
last end time til now
- if (initialized) {
- StringBuilder filterQuery = new StringBuilder();
- filterQuery.append(context.getProperty(DATE_FIELD).getValue())
- .append(":{").append(lastEndDatedRef.get()).append("
TO ")
- .append(currDate).append("]");
- solrQuery.addFilterQuery(filterQuery.toString());
- logger.info("Applying filter query {}", new
Object[]{filterQuery.toString()});
- }
+ final String initialDate =
context.getProperty(DATE_FILTER).getValue();
+ if (StringUtils.isBlank(initialDate))
+ newStateMap.put(STATE_MANAGER_FILTER, "*");
+ else
+ newStateMap.put(STATE_MANAGER_FILTER, initialDate);
- final String returnFields =
context.getProperty(RETURN_FIELDS).getValue();
- if (returnFields != null && !returnFields.trim().isEmpty()) {
- for (String returnField : returnFields.trim().split("[,]")) {
- solrQuery.addField(returnField.trim());
- }
+ context.getStateManager().setState(newStateMap, Scope.CLUSTER);
+
+ id_field = null;
}
+ }
- final String fullSortClause =
context.getProperty(SORT_CLAUSE).getValue();
- if (fullSortClause != null && !fullSortClause.trim().isEmpty()) {
- for (String sortClause : fullSortClause.split("[,]")) {
- String[] sortParts = sortClause.trim().split("[ ]");
- solrQuery.addSort(sortParts[0],
SolrQuery.ORDER.valueOf(sortParts[1]));
- }
+ @Override
+ protected final Collection<ValidationResult>
additionalCustomValidation(ValidationContext context) {
+ final Collection<ValidationResult> problems = new ArrayList<>();
+
+ if
(context.getProperty(RETURN_TYPE).evaluateAttributeExpressions().getValue().equals(MODE_REC.getValue())
+ && !context.getProperty(RECORD_WRITER).isSet()) {
+ problems.add(new ValidationResult.Builder()
+ .explanation("for parsing records a record writer has
to be configured")
+ .valid(false)
+ .subject("Record writer check")
+ .build());
}
+ return problems;
+ }
+ private String getFieldNameOfUniqueKey() {
+ final SolrQuery solrQuery = new SolrQuery();
try {
+ solrQuery.setRequestHandler("/schema/uniquekey");
final QueryRequest req = new QueryRequest(solrQuery);
if (isBasicAuthEnabled()) {
req.setBasicAuthCredentials(getUsername(), getPassword());
}
- // run the initial query and send out the first page of results
- final StopWatch stopWatch = new StopWatch(true);
- QueryResponse response = req.process(getSolrClient());
- stopWatch.stop();
-
- long duration = stopWatch.getDuration(TimeUnit.MILLISECONDS);
+
return(req.process(getSolrClient()).getResponse().get("uniqueKey").toString());
+ } catch (SolrServerException | IOException e) {
+ getLogger().error("Solr query to retrieve uniqueKey-field
failed due to {}", new Object[]{solrQuery.toString(), e}, e);
+ throw new ProcessException(e);
+ }
+ }
- final SolrDocumentList documentList = response.getResults();
- logger.info("Retrieved {} results from Solr for {} in {} ms",
- new Object[] {documentList.getNumFound(), query,
duration});
+ @Override
+ public void onTrigger(final ProcessContext context, final
ProcessSession session) throws ProcessException {
- if (documentList != null && documentList.getNumFound() > 0) {
- FlowFile flowFile = session.create();
- flowFile = session.write(flowFile, new
QueryResponseOutputStreamCallback(response));
- flowFile = session.putAttribute(flowFile,
CoreAttributes.MIME_TYPE.key(), "application/xml");
- session.transfer(flowFile, REL_SUCCESS);
+ final ComponentLog logger = getLogger();
+ final AtomicBoolean continuePaging = new AtomicBoolean(true);
+ final SolrQuery solrQuery = new SolrQuery();
- StringBuilder transitUri = new StringBuilder("solr://");
- transitUri.append(getSolrLocation());
- if
(SOLR_TYPE_CLOUD.equals(context.getProperty(SOLR_TYPE).getValue())) {
-
transitUri.append("/").append(context.getProperty(COLLECTION).getValue());
- }
+ try {
+ if (id_field == null) {
+ id_field = getFieldNameOfUniqueKey();
+ }
- session.getProvenanceReporter().receive(flowFile,
transitUri.toString(), duration);
+ final String dateField =
context.getProperty(DATE_FIELD).getValue();
- // if initialized then page through the results and send
out each page
- if (initialized) {
- int endRow = response.getResults().size();
- long totalResults =
response.getResults().getNumFound();
+ solrQuery.setQuery("*:*");
+ final String query =
context.getProperty(SOLR_QUERY).getValue();
+ if (!StringUtils.isBlank(query) && !query.equals("*:*")) {
+ solrQuery.addFilterQuery(query);
+ }
+ final StringBuilder automatedFilterQuery = (new
StringBuilder())
+ .append(dateField)
+ .append(":[")
+
.append(context.getStateManager().getState(Scope.CLUSTER).get(STATE_MANAGER_FILTER))
+ .append(" TO *]");
+ solrQuery.addFilterQuery(automatedFilterQuery.toString());
+
+ final List<String> fieldList = new ArrayList<String>();
+ final String returnFields =
context.getProperty(RETURN_FIELDS).getValue();
+ if (!StringUtils.isBlank(returnFields)) {
+
fieldList.addAll(Arrays.asList(returnFields.trim().split("[,]")));
+ if (!fieldList.contains(dateField)) {
+ fieldList.add(dateField);
+ dateFieldNotInSpecifiedFieldsList.set(true);
+ }
+ for (String returnField : fieldList) {
+ solrQuery.addField(returnField.trim());
+ }
+ }
- while (endRow < totalResults) {
- solrQuery.setStart(endRow);
+ solrQuery.setParam(CursorMarkParams.CURSOR_MARK_PARAM,
context.getStateManager().getState(Scope.CLUSTER).get(STATE_MANAGER_CURSOR_MARK));
+ solrQuery.setRows(context.getProperty(BATCH_SIZE).asInteger());
- stopWatch.start();
- response = getSolrClient().query(solrQuery);
- stopWatch.stop();
+ final StringBuilder sortClause = (new StringBuilder())
+ .append(dateField)
+ .append(" asc,")
+ .append(id_field)
+ .append(" asc");
+ solrQuery.setParam("sort", sortClause.toString());
- duration =
stopWatch.getDuration(TimeUnit.MILLISECONDS);
- logger.info("Retrieved results for {} in {} ms",
new Object[]{query, duration});
+ while (continuePaging.get()) {
+ final QueryRequest req = new QueryRequest(solrQuery);
+ if (isBasicAuthEnabled()) {
+ req.setBasicAuthCredentials(getUsername(),
getPassword());
+ }
- flowFile = session.create();
+ logger.debug(solrQuery.toQueryString());
+ final QueryResponse response =
req.process(getSolrClient());
+ final SolrDocumentList documentList =
response.getResults();
+
+ if (response.getResults().size() > 0) {
+ final SolrDocument lastSolrDocument =
documentList.get(response.getResults().size()-1);
+ final String latestDateValue =
df.format(lastSolrDocument.get(dateField));
+
+ solrQuery.setParam(CursorMarkParams.CURSOR_MARK_PARAM,
response.getNextCursorMark());
+ final Map<String,String> updateStateManager = new
HashMap<String,String>();
+
updateStateManager.putAll(context.getStateManager().getState(Scope.CLUSTER).toMap());
+ updateStateManager.put(STATE_MANAGER_CURSOR_MARK,
response.getNextCursorMark());
+ updateStateManager.put(STATE_MANAGER_FILTER,
latestDateValue);
+ context.getStateManager().setState(updateStateManager,
Scope.CLUSTER);
+
+ FlowFile flowFile = session.create();
+ flowFile = session.putAttribute(flowFile, "solrQuery",
solrQuery.toString());
+
+ if
(context.getProperty(RETURN_TYPE).getValue().equals(MODE_XML.getValue())){
+ if (dateFieldNotInSpecifiedFieldsList.get()) {
+ for (SolrDocument doc : response.getResults())
{
+ doc.removeFields(dateField);
+ }
+ }
flowFile = session.write(flowFile, new
QueryResponseOutputStreamCallback(response));
--- End diff --
Surprisingly, this processor has not been able to output a proper XML if
multiple documents are fetched at a single onTrigger method. The resulted
FlowFile contains following text data, but it's not a well formatted XML and
can't be parsed at downstream correctly. We should wrap `doc` elements by
something like `docs` to make it parsable..
```
<doc boost="1.0">
<field name="id">F8V7067-APL-KIT</field>
<field name="price_c____l_ns">1995</field>
</doc>
<doc boost="1.0">
<field name="id">MA147LL/A</field>
</doc>
```
Would you be able to fix this method, too?
https://github.com/apache/nifi/blob/master/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java#L339
---
