Skip to content

Commit

Permalink
HSEARCH-1509 Extract field state collection
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelbernard authored and Sanne committed Mar 4, 2014
1 parent 3806a30 commit 542ce9d
Show file tree
Hide file tree
Showing 3 changed files with 122 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,31 @@ public class ConnectedMultiFieldsTermQueryBuilder implements TermTermination {
private final Object value;
private final QueryCustomizer queryCustomizer;
private final TermQueryContext termContext;
private final List<FieldContext> fieldContexts;
private final FieldsContext fieldsContext;
private final QueryBuildingContext queryContext;

public ConnectedMultiFieldsTermQueryBuilder(TermQueryContext termContext,
Object value,
List<FieldContext> fieldContexts,
FieldsContext fieldsContext,
QueryCustomizer queryCustomizer,
QueryBuildingContext queryContext) {
this.termContext = termContext;
this.value = value;
this.queryContext = queryContext;
this.queryCustomizer = queryCustomizer;
this.fieldContexts = fieldContexts;
this.fieldsContext = fieldsContext;
}

@Override
public Query createQuery() {
final int size = fieldContexts.size();
final int size = fieldsContext.size();
final ConversionContext conversionContext = new ContextualExceptionBridgeHelper();
if ( size == 1 ) {
return queryCustomizer.setWrappedQuery( createQuery( fieldContexts.get( 0 ), conversionContext ) ).createQuery();
return queryCustomizer.setWrappedQuery( createQuery( fieldsContext.getFirst(), conversionContext ) ).createQuery();
}
else {
BooleanQuery aggregatedFieldsQuery = new BooleanQuery();
for ( FieldContext fieldContext : fieldContexts ) {
for ( FieldContext fieldContext : fieldsContext ) {
aggregatedFieldsQuery.add( createQuery( fieldContext, conversionContext ), BooleanClause.Occur.SHOULD );
}
return queryCustomizer.setWrappedQuery( aggregatedFieldsQuery ).createQuery();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@

package org.hibernate.search.query.dsl.impl;

import java.util.ArrayList;
import java.util.List;

import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.query.dsl.TermMatchingContext;
import org.hibernate.search.query.dsl.TermTermination;
Expand All @@ -38,76 +35,56 @@ public class ConnectedTermMatchingContext implements TermMatchingContext, FieldB
private final QueryBuildingContext queryContext;
private final QueryCustomizer queryCustomizer;
private final TermQueryContext termContext;
private final List<FieldContext> fieldContexts;
//when a varargs of fields are passed, apply the same customization for all.
//keep the index of the first context in this queue
private int firstOfContext = 0;
private final FieldsContext fieldsContext;

public ConnectedTermMatchingContext(TermQueryContext termContext,
String field, QueryCustomizer queryCustomizer, QueryBuildingContext queryContext) {
this.queryContext = queryContext;
this.queryCustomizer = queryCustomizer;
this.termContext = termContext;
this.fieldContexts = new ArrayList<FieldContext>(4);
this.fieldContexts.add( new FieldContext( field ) );
this.fieldsContext = new FieldsContext( new String[] { field } );
}

public ConnectedTermMatchingContext(TermQueryContext termContext,
String[] fields, QueryCustomizer queryCustomizer, QueryBuildingContext queryContext) {
this.queryContext = queryContext;
this.queryCustomizer = queryCustomizer;
this.termContext = termContext;
this.fieldContexts = new ArrayList<FieldContext>(fields.length);
for ( String field : fields ) {
this.fieldContexts.add( new FieldContext( field ) );
}
this.fieldsContext = new FieldsContext( fields );
}

@Override
public TermTermination matching(Object value) {
return new ConnectedMultiFieldsTermQueryBuilder( termContext, value, fieldContexts, queryCustomizer, queryContext);
return new ConnectedMultiFieldsTermQueryBuilder( termContext, value, fieldsContext, queryCustomizer, queryContext);
}

@Override
public TermMatchingContext andField(String field) {
this.fieldContexts.add( new FieldContext( field ) );
this.firstOfContext = fieldContexts.size() - 1;
fieldsContext.add( field );
return this;
}

@Override
public TermMatchingContext boostedTo(float boost) {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.getFieldCustomizer().boostedTo( boost );
}
fieldsContext.boostedTo( boost );
return this;
}

private List<FieldContext> getCurrentFieldContexts() {
return fieldContexts.subList( firstOfContext, fieldContexts.size() );
}

@Override
public TermMatchingContext ignoreAnalyzer() {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.setIgnoreAnalyzer( true );
}
fieldsContext.ignoreAnalyzer();
return this;
}

@Override
public TermMatchingContext ignoreFieldBridge() {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.setIgnoreFieldBridge( true );
}
fieldsContext.ignoreFieldBridge();
return this;
}

@Override
public TermMatchingContext withFieldBridge(FieldBridge fieldBridge) {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.setFieldBridge( fieldBridge );
}
fieldsContext.withFieldBridge( fieldBridge );
return this;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010-2014, Red Hat, Inc. and/or its affiliates or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat, Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/

package org.hibernate.search.query.dsl.impl;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.hibernate.search.bridge.FieldBridge;

/**
* Encapsulate the common field context state capture.
*
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
public class FieldsContext implements Iterable<FieldContext> {

public static final String[] NO_FIELD = new String[0];

private final List<FieldContext> fieldContexts;
//when a varargs of fields are passed, apply the same customization for all.
//keep the index of the first context in this queue
private int firstOfContext;

public FieldsContext(String[] fieldNames) {
firstOfContext = 0;
if ( fieldNames == null ) {
fieldNames = NO_FIELD;
}
fieldContexts = new ArrayList<FieldContext>( fieldNames.length < 4 ? 4 : fieldNames.length );
for ( String fieldName : fieldNames ) {
doAdd( fieldName );
}
}

public void add(String fieldName) {
doAdd( fieldName );
firstOfContext = fieldContexts.size() - 1;
}

private void doAdd(String fieldName) {
fieldContexts.add( new FieldContext( fieldName ) );
}

public void boostedTo(float boost) {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.getFieldCustomizer().boostedTo( boost );
}
}

public void ignoreAnalyzer() {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.setIgnoreAnalyzer( true );
}
}

public void ignoreFieldBridge() {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.setIgnoreFieldBridge( true );
}
}

public void withFieldBridge(FieldBridge fieldBridge) {
for ( FieldContext fieldContext : getCurrentFieldContexts() ) {
fieldContext.setFieldBridge( fieldBridge );
}
}

private List<FieldContext> getCurrentFieldContexts() {
return fieldContexts.subList( firstOfContext, fieldContexts.size() );
}

public FieldContext getFirst() {
return fieldContexts.get( 0 );
}

public int size() {
return fieldContexts.size();
}

@Override
public Iterator<FieldContext> iterator() {
return fieldContexts.iterator();
}
}

0 comments on commit 542ce9d

Please sign in to comment.