fix package location of trove extensions

This commit is contained in:
Shay Banon 2011-12-10 00:12:42 +02:00
parent 2b388cff5a
commit e7eed3c182
34 changed files with 39 additions and 50 deletions

View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.search.type;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;
@ -27,6 +26,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.action.SearchServiceListener;
import org.elasticsearch.search.action.SearchServiceTransportAction;

View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.search.type;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;
@ -27,6 +26,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.action.SearchServiceListener;
import org.elasticsearch.search.action.SearchServiceTransportAction;

View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.search.type;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;
@ -29,6 +28,7 @@ import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.action.SearchServiceListener;
import org.elasticsearch.search.action.SearchServiceTransportAction;

View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.search.type;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.action.support.BaseAction;
@ -33,6 +32,7 @@ import org.elasticsearch.cluster.routing.ShardIterator;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.search.SearchPhaseResult;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.action.SearchServiceListener;

View File

@ -19,12 +19,12 @@
package org.elasticsearch.common;
import gnu.trove.ExtTDoubleObjectHashMap;
import gnu.trove.ExtTHashMap;
import gnu.trove.ExtTLongObjectHashMap;
import gnu.trove.map.hash.*;
import jsr166y.LinkedTransferQueue;
import org.elasticsearch.common.compress.lzf.BufferRecycler;
import org.elasticsearch.common.trove.ExtTDoubleObjectHashMap;
import org.elasticsearch.common.trove.ExtTHashMap;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import java.lang.ref.SoftReference;
import java.util.Arrays;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package gnu.trove;
package org.elasticsearch.common.trove;
import gnu.trove.map.TDoubleObjectMap;
import gnu.trove.map.hash.TDoubleObjectHashMap;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package gnu.trove;
package org.elasticsearch.common.trove;
import gnu.trove.map.hash.THashMap;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package gnu.trove;
package org.elasticsearch.common.trove;
import gnu.trove.list.array.TIntArrayList;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package gnu.trove;
package org.elasticsearch.common.trove;
import gnu.trove.map.TLongObjectMap;
import gnu.trove.map.hash.TLongObjectHashMap;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package gnu.trove;
package org.elasticsearch.common.trove;
import gnu.trove.map.hash.TObjectIntHashMap;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package gnu.trove;
package org.elasticsearch.common.trove;
import gnu.trove.strategy.HashingStrategy;

View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.cache.id.simple;
import gnu.trove.ExtTObjectIntHasMap;
import gnu.trove.impl.Constants;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@ -31,6 +30,7 @@ import org.elasticsearch.common.BytesWrap;
import org.elasticsearch.common.collect.MapBuilder;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTObjectIntHasMap;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.index.AbstractIndexComponent;
import org.elasticsearch.index.Index;

View File

@ -19,8 +19,8 @@
package org.elasticsearch.index.cache.id.simple;
import gnu.trove.ExtTObjectIntHasMap;
import org.elasticsearch.common.BytesWrap;
import org.elasticsearch.common.trove.ExtTObjectIntHasMap;
import org.elasticsearch.index.cache.id.IdReaderTypeCache;
/**

View File

@ -23,7 +23,6 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Ordering;
import gnu.trove.ExtTIntArrayList;
import gnu.trove.impl.Constants;
import gnu.trove.map.hash.TObjectIntHashMap;
import org.apache.lucene.index.Term;
@ -33,6 +32,7 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.dfs.AggregatedDfs;
import org.elasticsearch.search.dfs.DfsSearchResult;

View File

@ -19,7 +19,6 @@
package org.elasticsearch.search.dfs;
import gnu.trove.ExtTObjectIntHasMap;
import gnu.trove.impl.Constants;
import gnu.trove.iterator.TObjectIntIterator;
import gnu.trove.map.hash.TObjectIntHashMap;
@ -27,6 +26,7 @@ import org.apache.lucene.index.Term;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.trove.ExtTObjectIntHasMap;
import java.io.IOException;

View File

@ -19,10 +19,10 @@
package org.elasticsearch.search.facet.datehistogram;
import gnu.trove.ExtTLongObjectHashMap;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facet.Facet;
@ -152,7 +152,7 @@ public class InternalFullDateHistogramFacet extends InternalDateHistogramFacet {
private ComparatorType comparatorType;
ExtTLongObjectHashMap<InternalFullDateHistogramFacet.FullEntry> tEntries;
ExtTLongObjectHashMap<FullEntry> tEntries;
boolean cachedEntries;
Collection<FullEntry> entries;

View File

@ -19,9 +19,9 @@
package org.elasticsearch.search.facet.datehistogram;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;
@ -38,8 +38,6 @@ import java.io.IOException;
/**
* A histogram facet collector that uses different fields for the key and the value.
*
*
*/
public class ValueDateHistogramFacetCollector extends AbstractFacetCollector {

View File

@ -19,10 +19,10 @@
package org.elasticsearch.search.facet.datehistogram;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.longs.LongFieldData;
@ -41,8 +41,6 @@ import java.util.Map;
/**
* A histogram facet collector that uses the same field as the key as well as the
* value.
*
*
*/
public class ValueScriptDateHistogramFacetCollector extends AbstractFacetCollector {

View File

@ -19,9 +19,9 @@
package org.elasticsearch.search.facet.histogram.unbounded;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;
@ -38,8 +38,6 @@ import java.io.IOException;
/**
* A histogram facet collector that uses the same field as the key as well as the
* value.
*
*
*/
public class FullHistogramFacetCollector extends AbstractFacetCollector {

View File

@ -19,10 +19,10 @@
package org.elasticsearch.search.facet.histogram.unbounded;
import gnu.trove.ExtTLongObjectHashMap;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facet.Facet;
@ -151,7 +151,7 @@ public class InternalFullHistogramFacet extends InternalHistogramFacet {
private ComparatorType comparatorType;
ExtTLongObjectHashMap<InternalFullHistogramFacet.FullEntry> tEntries;
ExtTLongObjectHashMap<FullEntry> tEntries;
boolean cachedEntries;
Collection<FullEntry> entries;

View File

@ -19,10 +19,10 @@
package org.elasticsearch.search.facet.histogram.unbounded;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.script.SearchScript;
import org.elasticsearch.search.facet.AbstractFacetCollector;
import org.elasticsearch.search.facet.Facet;

View File

@ -19,9 +19,9 @@
package org.elasticsearch.search.facet.histogram.unbounded;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;
@ -36,8 +36,6 @@ import java.io.IOException;
/**
* A histogram facet collector that uses different fields for the key and the value.
*
*
*/
public class ValueHistogramFacetCollector extends AbstractFacetCollector {

View File

@ -19,10 +19,10 @@
package org.elasticsearch.search.facet.histogram.unbounded;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;
@ -41,8 +41,6 @@ import java.util.Map;
/**
* A histogram facet collector that uses the same field as the key as well as the
* value.
*
*
*/
public class ValueScriptHistogramFacetCollector extends AbstractFacetCollector {

View File

@ -20,10 +20,10 @@
package org.elasticsearch.search.facet.termsstats.doubles;
import com.google.common.collect.ImmutableList;
import gnu.trove.ExtTDoubleObjectHashMap;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.trove.ExtTDoubleObjectHashMap;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facet.Facet;
@ -252,7 +252,6 @@ public class InternalTermsStatsDoubleFacet extends InternalTermsStatsFacet {
}
int missing = 0;
ExtTDoubleObjectHashMap<DoubleEntry> map = CacheRecycler.popDoubleObjectMap();
map.clear();
for (Facet facet : facets) {
InternalTermsStatsDoubleFacet tsFacet = (InternalTermsStatsDoubleFacet) facet;
missing += tsFacet.missing;

View File

@ -21,11 +21,11 @@ package org.elasticsearch.search.facet.termsstats.doubles;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import gnu.trove.ExtTDoubleObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTDoubleObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;

View File

@ -20,10 +20,10 @@
package org.elasticsearch.search.facet.termsstats.longs;
import com.google.common.collect.ImmutableList;
import gnu.trove.ExtTLongObjectHashMap;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facet.Facet;
@ -67,6 +67,7 @@ public class InternalTermsStatsLongFacet extends InternalTermsStatsFacet {
public LongEntry(long term, long count, long totalCount, double total, double min, double max) {
this.term = term;
this.count = count;
this.totalCount = totalCount;
this.total = total;
this.min = min;
this.max = max;
@ -251,7 +252,6 @@ public class InternalTermsStatsLongFacet extends InternalTermsStatsFacet {
}
int missing = 0;
ExtTLongObjectHashMap<LongEntry> map = CacheRecycler.popLongObjectMap();
map.clear();
for (Facet facet : facets) {
InternalTermsStatsLongFacet tsFacet = (InternalTermsStatsLongFacet) facet;
missing += tsFacet.missing;

View File

@ -21,11 +21,11 @@ package org.elasticsearch.search.facet.termsstats.longs;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import gnu.trove.ExtTLongObjectHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;

View File

@ -20,10 +20,10 @@
package org.elasticsearch.search.facet.termsstats.strings;
import com.google.common.collect.ImmutableList;
import gnu.trove.ExtTHashMap;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.trove.ExtTHashMap;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facet.Facet;

View File

@ -21,11 +21,11 @@ package org.elasticsearch.search.facet.termsstats.strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import gnu.trove.ExtTHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.CacheRecycler;
import org.elasticsearch.common.trove.ExtTHashMap;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldData;
import org.elasticsearch.index.field.data.FieldDataType;

View File

@ -19,10 +19,10 @@
package org.elasticsearch.search.fetch;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import java.io.IOException;

View File

@ -19,7 +19,6 @@
package org.elasticsearch.benchmark.trove;
import gnu.trove.StringIdentityHashingStrategy;
import gnu.trove.map.custom_hash.TObjectIntCustomHashMap;
import gnu.trove.map.hash.THashMap;
import gnu.trove.map.hash.TIntIntHashMap;
@ -29,6 +28,7 @@ import gnu.trove.strategy.IdentityHashingStrategy;
import jsr166y.ThreadLocalRandom;
import org.elasticsearch.common.RandomStringGenerator;
import org.elasticsearch.common.StopWatch;
import org.elasticsearch.common.trove.StringIdentityHashingStrategy;
import org.elasticsearch.common.unit.SizeValue;
import java.util.HashMap;

View File

@ -21,9 +21,9 @@ package org.elasticsearch.test.integration.search.embedded;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.node.internal.InternalNode;
import org.elasticsearch.search.*;

View File

@ -21,13 +21,13 @@ package org.elasticsearch.test.integration.search.embedded;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.routing.ShardIterator;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.node.internal.InternalNode;
import org.elasticsearch.search.*;

View File

@ -20,7 +20,6 @@
package org.elasticsearch.test.integration.search.embedded;
import com.google.common.collect.ImmutableMap;
import gnu.trove.ExtTIntArrayList;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
@ -34,6 +33,7 @@ import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.trove.ExtTIntArrayList;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.node.internal.InternalNode;
import org.elasticsearch.node.settings.NodeSettingsService;