From cf1ea92dd8abd1f47ebb9105d3ea4e9fab0db79f Mon Sep 17 00:00:00 2001 From: alperez Date: Fri, 6 Apr 2012 16:36:42 -0700 Subject: [PATCH 1/8] Downgrading hadoop. --- sensei-core/pom.xml | 12 ++++++++++-- sensei-hadoop-indexing/pom.xml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sensei-core/pom.xml b/sensei-core/pom.xml index c7cc98ebb..9b1f9f4f8 100644 --- a/sensei-core/pom.xml +++ b/sensei-core/pom.xml @@ -156,12 +156,20 @@ protobuf-java 2.4.0a - + + commons-codec + commons-codec + 1.4 + org.apache.hadoop hadoop-core - 0.20.204.0 + 0.20.2 + + commons-codec + commons-codec + tomcat jasper-runtime diff --git a/sensei-hadoop-indexing/pom.xml b/sensei-hadoop-indexing/pom.xml index f8e7710c2..777cbac34 100644 --- a/sensei-hadoop-indexing/pom.xml +++ b/sensei-hadoop-indexing/pom.xml @@ -58,7 +58,7 @@ org.apache.hadoop hadoop-core - 0.20.204.0 + 0.20.2 From 06fdc58212ef566659251ff61f9e974b597b6704 Mon Sep 17 00:00:00 2001 From: alperez Date: Mon, 9 Apr 2012 15:25:47 -0700 Subject: [PATCH 2/8] Upgrading the fastutil version. --- sensei-core/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sensei-core/pom.xml b/sensei-core/pom.xml index 9b1f9f4f8..8bbca122f 100644 --- a/sensei-core/pom.xml +++ b/sensei-core/pom.xml @@ -196,10 +196,9 @@ - fastutil + it.unimi.dsi fastutil - 5.0.5 - jar + 6.4.3 From cd1c4a7d4bd7c59680e7e22947ce7efc8fefc5de Mon Sep 17 00:00:00 2001 From: alperez Date: Thu, 26 Apr 2012 15:03:12 -0700 Subject: [PATCH 3/8] Changed zoie package references. --- docs/src/docbkx/chap-administration.xml | 4 ++-- docs/src/docbkx/chap-configuration.xml | 8 +++---- .../tweets/gateway/TwitterSampleGateway.java | 2 +- .../tweets/gateway/TwitterSampleStreamer.java | 4 ++-- .../perf/indexing/PerfStreamDataProvider.java | 4 ++-- .../PerfStreamDataProviderBuilder.java | 2 +- resources/log4j.properties | 2 +- .../senseidb/conf/SenseiServerBuilder.java | 16 +++++++------- .../com/senseidb/conf/ZoieFactoryFactory.java | 4 ++-- .../http/HttpDataProviderAdminMBean.java | 2 +- .../http/HttpStreamDataProvider.java | 4 ++-- .../examples/SchemaIndexingExample.java | 4 ++-- .../com/senseidb/gateway/SenseiGateway.java | 4 ++-- .../gateway/file/LinedFileDataProvider.java | 4 ++-- .../file/LinedFileDataProviderBuilder.java | 4 ++-- .../DefaultJsonSchemaInterpreter.java | 6 ++--- .../indexing/DefaultSenseiInterpreter.java | 4 ++-- .../indexing/DefaultSenseiZoieIndexable.java | 4 ++-- .../DefaultStreamingIndexingManager.java | 22 +++++++++---------- .../indexing/JSONDataInterpreter.java | 6 ++--- .../indexing/JSONValueInterpreter.java | 4 ++-- .../search/facet/UIDFacetHandler.java | 6 ++--- .../search/node/NoOpIndexableInterpreter.java | 4 ++-- .../senseidb/search/node/ResultMerger.java | 2 +- .../senseidb/search/node/SenseiBroker.java | 2 +- .../com/senseidb/search/node/SenseiCore.java | 10 ++++----- .../search/node/SenseiHourglassFactory.java | 14 ++++++------ .../node/SenseiIndexReaderDecorator.java | 4 ++-- .../search/node/SenseiIndexingManager.java | 6 ++--- .../search/node/SenseiPairFactory.java | 12 +++++----- .../senseidb/search/node/SenseiServer.java | 2 +- .../search/node/SenseiZoieFactory.java | 8 +++---- .../search/node/SenseiZoieSystemFactory.java | 16 +++++++------- .../node/impl/CompositeDataConsumer.java | 4 ++-- .../node/impl/DemoZoieSystemFactory.java | 8 +++---- .../search/node/impl/JSONDataSerializer.java | 2 +- .../search/node/impl/NoopIndexingManager.java | 6 ++--- .../search/query/TimeRetentionFilter.java | 2 +- .../search/req/mapred/FieldAccessor.java | 2 +- .../search/req/mapred/SenseiMapReduce.java | 2 +- .../mapred/impl/SenseiMapFunctionWrapper.java | 4 ++-- .../req/mapred/obsolete/MapReduceJob.java | 2 +- .../obsolete/MapReduceSenseiService.java | 4 ++-- .../svc/impl/AbstractSenseiCoreService.java | 4 ++-- .../svc/impl/CoreSenseiServiceImpl.java | 6 ++--- .../impl/LocalQueryOnlySenseiServiceImpl.java | 8 +++---- .../com/senseidb/util/HDFSIndexCopier.java | 2 +- .../req/mapred/CountGroupByMapReduce.java | 2 +- .../search/req/mapred/MaxTestMapReduce.java | 2 +- .../com/senseidb/test/TestIndexingAPI.java | 4 ++-- .../com/senseidb/test/ZoieTestFactory.java | 8 +++---- .../test/plugin/VirtualGroupIdFactory.java | 2 +- .../src/test/resources/test-conf/zoie.spring | 2 +- .../gateway/jdbc/JdbcDataProviderBuilder.java | 12 +++++----- .../gateway/jms/JmsDataProviderBuilder.java | 12 +++++----- .../kafka/KafkaDataProviderBuilder.java | 4 ++-- .../kafka/KafkaStreamDataProvider.java | 4 ++-- .../gateway/kafka/SimpleKafkaGateway.java | 2 +- .../kafka/SimpleKafkaStreamDataProvider.java | 4 ++-- .../com/senseidb/gateway/perf/PerfDriver.java | 8 +++---- .../gateway/test/BaseGatewayTestUtil.java | 10 ++++----- .../gateway/test/TestJDBCGateway.java | 2 +- .../gateway/test/TestKafkaGateway.java | 2 +- .../indexing/hadoop/map/SenseiMapper.java | 8 +++---- 64 files changed, 172 insertions(+), 172 deletions(-) diff --git a/docs/src/docbkx/chap-administration.xml b/docs/src/docbkx/chap-administration.xml index f9ca4ec63..299ae238e 100644 --- a/docs/src/docbkx/chap-administration.xml +++ b/docs/src/docbkx/chap-administration.xml @@ -226,7 +226,7 @@ DiskFreeSpaceBytes, DiskIndexSizeBytes, LastOptimizationTime, LastDiskIndexModifiedTime, IndexDir, DiskIndexSegmentCount @@ -234,7 +234,7 @@ LastIndexingBatchSize, LastIndexingBatchDuration, LastIndexingEndTime diff --git a/docs/src/docbkx/chap-configuration.xml b/docs/src/docbkx/chap-configuration.xml index 3c7967b6f..c8cd11456 100644 --- a/docs/src/docbkx/chap-configuration.xml +++ b/docs/src/docbkx/chap-configuration.xml @@ -742,7 +742,7 @@ sensei.indexer.type=zoie # sensei # version comparator, default: ZoieConfig.DefaultVersionComparator -# sensei.version.comparator.class = proj.zoie.impl.indexing.ZoieConfig$DefaultVersionComparator +# sensei.version.comparator.class = com.linkedin.zoie.impl.indexing.ZoieConfig$DefaultVersionComparator # extra services sensei.plugin.services.list = @@ -2479,7 +2479,7 @@ sensei.custom.facets.list= virtual_groupids, my.custom_facets.tags, groupid

This is the bean ID of the - proj.zoie.dataprovider.jms.TopicFactory + com.linkedin.zoie.dataprovider.jms.TopicFactory object. This object is used to generate a topic object based on the given topic name. @@ -2547,9 +2547,9 @@ sensei.custom.facets.list= virtual_groupids, my.custom_facets.tags, groupid

This is the bean ID of the com.sensei.indexing.api.jdbc.SenseiJDBCAdaptor object. This object is used to build a - proj.zoie.dataprovider.jdbc.PreparedStatementBuilder + com.linkedin.zoie.dataprovider.jdbc.PreparedStatementBuilder object, which is required by - proj.zoie.dataprovider.jdbc.JDBCStreamDataProvider. + com.linkedin.zoie.dataprovider.jdbc.JDBCStreamDataProvider. diff --git a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java index ea290a41a..1ef48d631 100644 --- a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java +++ b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java @@ -5,7 +5,7 @@ import org.json.JSONObject; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.senseidb.gateway.SenseiGateway; import com.senseidb.indexing.DataSourceFilter; diff --git a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java index 6a4a72171..c75868b4b 100644 --- a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java +++ b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java @@ -16,8 +16,8 @@ import org.apache.log4j.Logger; import org.json.JSONObject; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; public class TwitterSampleStreamer extends StreamDataProvider { diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java index aa3710a64..0ddc1415a 100644 --- a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java +++ b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java @@ -7,8 +7,8 @@ import org.apache.log4j.Logger; import org.json.JSONObject; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.sensei.indexing.api.DataSourceFilter; import com.sensei.indexing.api.DataSourceFilterable; diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java index 2f70cf71d..512a86c18 100644 --- a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java +++ b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import org.springframework.context.ApplicationContext; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.sensei.indexing.api.DataSourceFilter; import com.sensei.indexing.api.gateway.SenseiGateway; diff --git a/resources/log4j.properties b/resources/log4j.properties index 40524d688..1908c8b3e 100644 --- a/resources/log4j.properties +++ b/resources/log4j.properties @@ -65,6 +65,6 @@ log4j.appender.sensei-norbert.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SS log4j.logger.com.sensei=INFO,sensei log4j.logger.com.linkedin.norbert=INFO,sensei-norbert -log4j.logger.proj.zoie=INFO,sensei-zoie +log4j.logger.com.linkedin.zoie=INFO,sensei-zoie log4j.logger.com.browseengine.bobo=INFO,sensei-bobo log4j.logger.com.sensei.querylog=INFO,sensei-query diff --git a/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java b/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java index 95277784d..d48fb3b5e 100644 --- a/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java +++ b/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java @@ -47,14 +47,14 @@ import org.springframework.core.io.Resource; import org.w3c.dom.Document; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.IndexCopier; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY; -import proj.zoie.impl.indexing.DefaultReaderCache; -import proj.zoie.impl.indexing.ReaderCacheFactory; -import proj.zoie.impl.indexing.SimpleReaderCache; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.IndexCopier; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY; +import com.linkedin.zoie.impl.indexing.DefaultReaderCache; +import com.linkedin.zoie.impl.indexing.ReaderCacheFactory; +import com.linkedin.zoie.impl.indexing.SimpleReaderCache; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.browseengine.bobo.facets.FacetHandler; import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory; diff --git a/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java b/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java index 00783188b..c2b65adc1 100644 --- a/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java +++ b/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java @@ -2,8 +2,8 @@ import java.io.File; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.search.node.SenseiIndexReaderDecorator; import com.senseidb.search.node.SenseiZoieFactory; diff --git a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java index 4b35e07f6..d55a615bf 100644 --- a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java +++ b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java @@ -1,6 +1,6 @@ package com.senseidb.dataprovider.http; -import proj.zoie.mbean.DataProviderAdminMBean; +import com.linkedin.zoie.mbean.DataProviderAdminMBean; public interface HttpDataProviderAdminMBean extends DataProviderAdminMBean { diff --git a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java index 6790445cb..8ecf1139a 100644 --- a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java +++ b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java @@ -32,8 +32,8 @@ import org.apache.http.protocol.HttpContext; import org.apache.log4j.Logger; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; public abstract class HttpStreamDataProvider extends StreamDataProvider implements HttpDataProviderAdminMBean{ diff --git a/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java b/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java index 012227a06..f89cba269 100644 --- a/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java +++ b/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java @@ -12,8 +12,8 @@ import org.apache.lucene.util.Version; import org.json.JSONObject; -import proj.zoie.api.indexing.ZoieIndexable; -import proj.zoie.api.indexing.ZoieIndexable.IndexingReq; +import com.linkedin.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq; import com.senseidb.conf.SenseiSchema; import com.senseidb.conf.SenseiServerBuilder; diff --git a/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java b/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java index 90aecf1f1..2cd350e6f 100644 --- a/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java +++ b/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java @@ -5,8 +5,8 @@ import org.json.JSONObject; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.conf.SenseiSchema; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java index 02a872bff..1f221d344 100644 --- a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java +++ b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java @@ -10,8 +10,8 @@ import org.apache.log4j.Logger; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; public abstract class LinedFileDataProvider extends StreamDataProvider { diff --git a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java index 77d572831..1ceaf2f6d 100644 --- a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java +++ b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java @@ -6,8 +6,8 @@ import org.json.JSONObject; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.gateway.SenseiGateway; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java index 19b9e9879..4f2930e57 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java @@ -24,9 +24,9 @@ import org.json.JSONException; import org.json.JSONObject; -import proj.zoie.api.indexing.AbstractZoieIndexable; -import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter; -import proj.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; +import com.linkedin.zoie.api.indexing.ZoieIndexable; import com.senseidb.conf.SenseiSchema; import com.senseidb.conf.SenseiSchema.FieldDefinition; diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java index f4eef8116..31d3483d8 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java @@ -18,8 +18,8 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.Field.TermVector; -import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter; -import proj.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; +import com.linkedin.zoie.api.indexing.ZoieIndexable; import com.browseengine.bobo.facets.data.PredefinedTermListFactory; import com.browseengine.bobo.facets.data.TermListFactory; diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java index 50503366c..b9f7026b3 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java @@ -13,8 +13,8 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.Field.TermVector; -import proj.zoie.api.indexing.AbstractZoieIndexable; -import proj.zoie.api.indexing.ZoieIndexable.IndexingReq; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexable; +import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq; import com.senseidb.indexing.DefaultSenseiInterpreter.IndexSpec; import com.senseidb.indexing.DefaultSenseiInterpreter.MetaFormatSpec; diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java index e8eb6e884..511a3b966 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java @@ -16,16 +16,16 @@ import org.apache.log4j.Logger; import org.json.JSONObject; -import proj.zoie.api.DataConsumer; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.api.DataProvider; -import proj.zoie.api.Zoie; -import proj.zoie.api.ZoieException; -import proj.zoie.api.ZoieIndexReader; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; -import proj.zoie.mbean.DataProviderAdmin; -import proj.zoie.mbean.DataProviderAdminMBean; +import com.linkedin.zoie.api.DataConsumer; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.api.DataProvider; +import com.linkedin.zoie.api.Zoie; +import com.linkedin.zoie.api.ZoieException; +import com.linkedin.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.mbean.DataProviderAdmin; +import com.linkedin.zoie.mbean.DataProviderAdminMBean; import com.browseengine.bobo.api.BoboIndexReader; import com.senseidb.conf.SenseiSchema; @@ -300,7 +300,7 @@ else if (type != null) } @Override - public void consume(Collection> data) throws ZoieException + public void consume(Collection> data) throws ZoieException { UpdateBatchSizeMeter.mark(data.size()); ProviderBatchSizeMeter.mark(_dataProvider.getBatchSize()); diff --git a/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java index b4a84e8d3..9087b34a0 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java @@ -4,9 +4,9 @@ import org.json.JSONException; import org.json.JSONObject; -import proj.zoie.api.indexing.AbstractZoieIndexable; -import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter; -import proj.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; +import com.linkedin.zoie.api.indexing.ZoieIndexable; public abstract class JSONDataInterpreter extends AbstractZoieIndexableInterpreter { diff --git a/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java index 3a5b4bdf3..2f13acd0d 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java @@ -2,8 +2,8 @@ import org.json.JSONObject; -import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter; -import proj.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; +import com.linkedin.zoie.api.indexing.ZoieIndexable; public abstract class JSONValueInterpreter extends AbstractZoieIndexableInterpreter { diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java b/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java index 1b683f777..e870a42e2 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java @@ -14,9 +14,9 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.ScoreDoc; -import proj.zoie.api.DocIDMapper; -import proj.zoie.api.ZoieIndexReader; -import proj.zoie.api.ZoieSegmentReader; +import com.linkedin.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.ZoieSegmentReader; import scala.actors.threadpool.Arrays; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java b/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java index 9832b5659..7f27192f3 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java @@ -1,7 +1,7 @@ package com.senseidb.search.node; -import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter; -import proj.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; +import com.linkedin.zoie.api.indexing.ZoieIndexable; public class NoOpIndexableInterpreter extends diff --git a/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java b/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java index 923e25d5f..507edb5cf 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.util.PriorityQueue; -import proj.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.ZoieIndexReader; import com.browseengine.bobo.api.BoboIndexReader; import com.browseengine.bobo.api.BrowseFacet; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java index 15736e95a..6af35a93e 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java @@ -10,7 +10,7 @@ import org.apache.log4j.Logger; import org.apache.lucene.document.Document; -import proj.zoie.api.indexing.AbstractZoieIndexable; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexable; import com.browseengine.bobo.api.FacetSpec; import com.linkedin.norbert.NorbertException; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java index 4ee1c9bd4..17ae664b2 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java @@ -8,11 +8,11 @@ import org.apache.log4j.Logger; -import proj.zoie.api.DataProvider; -import proj.zoie.api.IndexReaderFactory; -import proj.zoie.api.Zoie; -import proj.zoie.api.ZoieException; -import proj.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.DataProvider; +import com.linkedin.zoie.api.IndexReaderFactory; +import com.linkedin.zoie.api.Zoie; +import com.linkedin.zoie.api.ZoieException; +import com.linkedin.zoie.api.ZoieIndexReader; import com.browseengine.bobo.api.BoboIndexReader; import com.browseengine.bobo.facets.FacetHandler; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java index 7ff81830a..f0a40e545 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java @@ -4,13 +4,13 @@ import org.apache.log4j.Logger; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.hourglass.impl.HourGlassScheduler; -import proj.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY; -import proj.zoie.hourglass.impl.Hourglass; -import proj.zoie.hourglass.impl.HourglassDirectoryManagerFactory; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.hourglass.impl.HourGlassScheduler; +import com.linkedin.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY; +import com.linkedin.zoie.hourglass.impl.Hourglass; +import com.linkedin.zoie.hourglass.impl.HourglassDirectoryManagerFactory; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java index 2020a1ed9..aacfda2a7 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java @@ -5,8 +5,8 @@ import org.apache.log4j.Logger; -import proj.zoie.api.ZoieIndexReader; -import proj.zoie.impl.indexing.AbstractIndexReaderDecorator; +import com.linkedin.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.impl.indexing.AbstractIndexReaderDecorator; import com.browseengine.bobo.api.BoboIndexReader; import com.browseengine.bobo.facets.FacetHandler; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java index 8bb5496bd..b0fc98b0b 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java @@ -2,9 +2,9 @@ import java.util.Map; -import proj.zoie.api.DataProvider; -import proj.zoie.api.Zoie; -import proj.zoie.api.ZoieException; +import com.linkedin.zoie.api.DataProvider; +import com.linkedin.zoie.api.Zoie; +import com.linkedin.zoie.api.ZoieException; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java index 082d65fdb..8ef4af18f 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java @@ -4,12 +4,12 @@ import org.apache.log4j.Logger; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.IndexCopier; -import proj.zoie.api.Zoie; -import proj.zoie.impl.indexing.ZoieConfig; -import proj.zoie.pair.impl.Pair; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.IndexCopier; +import com.linkedin.zoie.api.Zoie; +import com.linkedin.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.pair.impl.Pair; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java index a46abb061..f4dca5ba5 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java @@ -12,7 +12,7 @@ import org.apache.log4j.Logger; import org.mortbay.jetty.Server; -import proj.zoie.api.DataProvider; +import com.linkedin.zoie.api.DataProvider; import scala.actors.threadpool.Arrays; import com.linkedin.norbert.javacompat.cluster.ClusterClient; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java index cc56ea339..70c3f10f0 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java @@ -3,10 +3,10 @@ import java.io.File; import java.util.Comparator; -import proj.zoie.api.Zoie; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.Zoie; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java index 2ca2b82d9..26d9f0a6c 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java @@ -8,14 +8,14 @@ import org.apache.log4j.Logger; import org.apache.lucene.search.Filter; -import proj.zoie.api.DefaultDirectoryManager; -import proj.zoie.api.DirectoryManager; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.indexing.IndexingEventListener; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.impl.indexing.IndexUpdatedEvent; -import proj.zoie.impl.indexing.ZoieConfig; -import proj.zoie.impl.indexing.ZoieSystem; +import com.linkedin.zoie.api.DefaultDirectoryManager; +import com.linkedin.zoie.api.DirectoryManager; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.indexing.IndexingEventListener; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.impl.indexing.IndexUpdatedEvent; +import com.linkedin.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.impl.indexing.ZoieSystem; import com.browseengine.bobo.api.BoboIndexReader; import com.senseidb.metrics.MetricsConstants; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java index 22b46f965..7e0e995f5 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java @@ -5,8 +5,8 @@ import java.util.LinkedList; import java.util.List; -import proj.zoie.api.DataConsumer; -import proj.zoie.api.ZoieException; +import com.linkedin.zoie.api.DataConsumer; +import com.linkedin.zoie.api.ZoieException; public class CompositeDataConsumer implements DataConsumer { diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java index 9fc1e9c2f..103511be6 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java @@ -2,10 +2,10 @@ import java.io.File; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.impl.indexing.ZoieConfig; -import proj.zoie.impl.indexing.ZoieSystem; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.impl.indexing.ZoieSystem; import com.browseengine.bobo.api.BoboIndexReader; import com.senseidb.conf.ZoieFactoryFactory; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java index 9f535a46d..c3cc27873 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java @@ -7,7 +7,7 @@ import com.senseidb.conf.SenseiSchema; -import proj.zoie.store.ZoieStoreSerializer; +import com.linkedin.zoie.store.ZoieStoreSerializer; public class JSONDataSerializer implements ZoieStoreSerializer{ diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java index a6e915981..d93080053 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java @@ -2,9 +2,9 @@ import java.util.Map; -import proj.zoie.api.DataProvider; -import proj.zoie.api.Zoie; -import proj.zoie.api.ZoieException; +import com.linkedin.zoie.api.DataProvider; +import com.linkedin.zoie.api.Zoie; +import com.linkedin.zoie.api.ZoieException; import com.browseengine.bobo.api.BoboIndexReader; import com.senseidb.search.node.SenseiIndexingManager; diff --git a/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java b/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java index 047c716f5..359d47ab3 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java @@ -10,7 +10,7 @@ import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.Filter; -import proj.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.ZoieIndexReader; import com.browseengine.bobo.api.BoboIndexReader; import com.browseengine.bobo.api.BrowseSelection; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java index 8abb60092..a29aa2da5 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import proj.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.DocIDMapper; import com.browseengine.bobo.api.BoboIndexReader; import com.browseengine.bobo.facets.FacetHandler; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java index c115f09f8..2bac27115 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java @@ -6,7 +6,7 @@ import org.json.JSONObject; -import proj.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.DocIDMapper; public interface SenseiMapReduce extends Serializable { public void init(JSONObject params); diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java index 0d24c13b7..93262eb43 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java @@ -2,8 +2,8 @@ import java.util.Set; -import proj.zoie.api.ZoieSegmentReader; -import proj.zoie.api.impl.DocIDMapperImpl; +import com.linkedin.zoie.api.ZoieSegmentReader; +import com.linkedin.zoie.api.impl.DocIDMapperImpl; import com.browseengine.bobo.api.BoboIndexReader; import com.browseengine.bobo.mapred.BoboMapFunctionWrapper; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java index 3780aa886..444faa3c9 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java @@ -7,7 +7,7 @@ import com.senseidb.search.req.mapred.FieldAccessor; -import proj.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.DocIDMapper; public interface MapReduceJob extends Serializable{ public MapResult map(long[] uids, DocIDMapper docIDMapper, FieldAccessor fieldAccessor); diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java index 4965d413e..284956867 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java @@ -5,8 +5,8 @@ import org.apache.log4j.Logger; -import proj.zoie.api.DocIDMapper; -import proj.zoie.api.ZoieSegmentReader; +import com.linkedin.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.ZoieSegmentReader; import com.browseengine.bobo.api.BoboBrowser; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java b/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java index 6c19484ea..d48d0af75 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java @@ -16,8 +16,8 @@ import org.apache.log4j.Logger; import org.apache.lucene.util.NamedThreadFactory; -import proj.zoie.api.IndexReaderFactory; -import proj.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.IndexReaderFactory; +import com.linkedin.zoie.api.ZoieIndexReader; import com.browseengine.bobo.api.BoboIndexReader; import com.linkedin.norbert.network.Serializer; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java index 54868dcbb..13a4caaf7 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java @@ -11,9 +11,9 @@ import org.apache.log4j.Logger; import org.apache.lucene.search.Query; -import proj.zoie.api.ZoieIndexReader; -import proj.zoie.api.ZoieIndexReader.SubReaderAccessor; -import proj.zoie.api.ZoieIndexReader.SubReaderInfo; +import com.linkedin.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.ZoieIndexReader.SubReaderAccessor; +import com.linkedin.zoie.api.ZoieIndexReader.SubReaderInfo; import com.browseengine.bobo.api.BoboBrowser; import com.browseengine.bobo.api.BoboIndexReader; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java index 276d4c65c..29f2cbeb0 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java @@ -7,10 +7,10 @@ import org.apache.lucene.util.Version; import org.json.JSONObject; -import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter; -import proj.zoie.api.indexing.ZoieIndexable; -import proj.zoie.impl.indexing.SimpleReaderCache; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; +import com.linkedin.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.impl.indexing.SimpleReaderCache; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.search.node.SenseiCore; import com.senseidb.search.node.impl.DefaultJsonQueryBuilderFactory; diff --git a/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java b/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java index 59652dd01..caa21441d 100644 --- a/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java +++ b/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java @@ -24,7 +24,7 @@ import org.apache.hadoop.fs.Path; import org.apache.log4j.Logger; -import proj.zoie.api.IndexCopier; +import com.linkedin.zoie.api.IndexCopier; public class HDFSIndexCopier implements IndexCopier { diff --git a/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java b/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java index 1e0796bdb..22188a607 100644 --- a/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java +++ b/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java @@ -10,7 +10,7 @@ import org.json.JSONObject; -import proj.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.DocIDMapper; import com.senseidb.search.req.mapred.CountGroupByMapReduce.GroupedValue; import com.senseidb.search.req.mapred.CountGroupByMapReduce.IntContainer; diff --git a/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java b/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java index a2cdfd42d..a296cc5af 100644 --- a/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java +++ b/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java @@ -7,7 +7,7 @@ import com.senseidb.search.req.mapred.obsolete.MapReduceJob; -import proj.zoie.api.DocIDMapper; +import com.linkedin.zoie.api.DocIDMapper; public class MaxTestMapReduce implements MapReduceJob { private static final long serialVersionUID = 1L; diff --git a/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java b/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java index 55ed294b1..970c5563a 100644 --- a/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java +++ b/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java @@ -19,8 +19,8 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.Field.TermVector; -import proj.zoie.api.indexing.ZoieIndexable; -import proj.zoie.api.indexing.ZoieIndexable.IndexingReq; +import com.linkedin.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq; import com.senseidb.indexing.DefaultSenseiInterpreter; import com.senseidb.indexing.DeleteChecker; diff --git a/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java b/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java index 509b07759..49cdd2983 100644 --- a/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java +++ b/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java @@ -2,10 +2,10 @@ import java.io.File; -import proj.zoie.api.DirectoryManager.DIRECTORY_MODE; -import proj.zoie.api.indexing.ZoieIndexableInterpreter; -import proj.zoie.impl.indexing.ZoieConfig; -import proj.zoie.impl.indexing.ZoieSystem; +import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE; +import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; +import com.linkedin.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.impl.indexing.ZoieSystem; import com.browseengine.bobo.api.BoboIndexReader; import com.senseidb.search.node.SenseiIndexReaderDecorator; diff --git a/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java b/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java index 511611d91..7471c157f 100644 --- a/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java +++ b/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java @@ -12,7 +12,7 @@ import com.senseidb.plugin.SenseiPluginFactory; import com.senseidb.plugin.SenseiPluginRegistry; -import proj.zoie.api.ZoieIndexReader; +import com.linkedin.zoie.api.ZoieIndexReader; public class VirtualGroupIdFactory implements SenseiPluginFactory { @Override diff --git a/sensei-core/src/test/resources/test-conf/zoie.spring b/sensei-core/src/test/resources/test-conf/zoie.spring index b86a092a9..a2f843cff 100644 --- a/sensei-core/src/test/resources/test-conf/zoie.spring +++ b/sensei-core/src/test/resources/test-conf/zoie.spring @@ -28,7 +28,7 @@ - + diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java b/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java index c55b3dcae..13cfad309 100644 --- a/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java +++ b/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java @@ -12,12 +12,12 @@ import org.json.JSONObject; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.dataprovider.jdbc.JDBCConnectionFactory; -import proj.zoie.dataprovider.jdbc.JDBCStreamDataProvider; -import proj.zoie.dataprovider.jdbc.PreparedStatementBuilder; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.dataprovider.jdbc.JDBCConnectionFactory; +import com.linkedin.zoie.dataprovider.jdbc.JDBCStreamDataProvider; +import com.linkedin.zoie.dataprovider.jdbc.PreparedStatementBuilder; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.gateway.SenseiGateway; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java b/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java index 5fb44be8c..2a12553d4 100644 --- a/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java +++ b/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java @@ -10,12 +10,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.json.JSONObject; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.dataprovider.jms.DataEventBuilder; -import proj.zoie.dataprovider.jms.JMSStreamDataProvider; -import proj.zoie.dataprovider.jms.TopicFactory; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.dataprovider.jms.DataEventBuilder; +import com.linkedin.zoie.dataprovider.jms.JMSStreamDataProvider; +import com.linkedin.zoie.dataprovider.jms.TopicFactory; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.gateway.SenseiGateway; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java index 49aaa5d4d..43bad7d89 100644 --- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java +++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java @@ -5,8 +5,8 @@ import org.json.JSONObject; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.gateway.SenseiGateway; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java index 933d2a43d..98cd94846 100644 --- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java +++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java @@ -17,8 +17,8 @@ import org.apache.log4j.Logger; import org.json.JSONObject; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java index e78730021..3ac03b05d 100644 --- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java +++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java @@ -5,7 +5,7 @@ import org.json.JSONObject; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.senseidb.gateway.SenseiGateway; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java index 23be8b1a5..c456f9dd5 100644 --- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java +++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java @@ -12,8 +12,8 @@ import org.apache.log4j.Logger; import org.json.JSONObject; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import scala.collection.Iterator; import com.senseidb.indexing.DataSourceFilter; diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java b/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java index 6ae9158bd..9ed19a3f3 100644 --- a/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java +++ b/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java @@ -6,10 +6,10 @@ import java.util.Iterator; import java.util.Map; -import proj.zoie.api.DataConsumer; -import proj.zoie.api.ZoieException; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.DataConsumer; +import com.linkedin.zoie.api.ZoieException; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.gateway.SenseiGateway; import com.senseidb.gateway.file.LinedFileDataProviderBuilder; diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java b/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java index 5482f89b6..49b2a28d3 100644 --- a/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java +++ b/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java @@ -15,11 +15,11 @@ import org.json.JSONObject; import org.junit.BeforeClass; -import proj.zoie.api.DataConsumer; -import proj.zoie.api.ZoieException; -import proj.zoie.api.DataConsumer.DataEvent; -import proj.zoie.impl.indexing.StreamDataProvider; -import proj.zoie.impl.indexing.ZoieConfig; +import com.linkedin.zoie.api.DataConsumer; +import com.linkedin.zoie.api.ZoieException; +import com.linkedin.zoie.api.DataConsumer.DataEvent; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.senseidb.gateway.SenseiGateway; import com.senseidb.plugin.SenseiPluginRegistry; diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java index 839d497ac..62a34ac87 100644 --- a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java +++ b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java @@ -12,7 +12,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.senseidb.gateway.SenseiGateway; import com.senseidb.gateway.test.jdbc.ResultSetJsonFilter; diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java index dd45694f8..a535f47a3 100644 --- a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java +++ b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java @@ -22,7 +22,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import proj.zoie.impl.indexing.StreamDataProvider; +import com.linkedin.zoie.impl.indexing.StreamDataProvider; import com.senseidb.gateway.SenseiGateway; import com.senseidb.gateway.kafka.DefaultJsonDataSourceFilter; diff --git a/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java b/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java index 7f40f7d4c..56ec00a47 100644 --- a/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java +++ b/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java @@ -29,10 +29,10 @@ import org.json.JSONException; import org.json.JSONObject; -import proj.zoie.api.ZoieSegmentReader; -import proj.zoie.api.indexing.AbstractZoieIndexable; -import proj.zoie.api.indexing.ZoieIndexable; -import proj.zoie.api.indexing.ZoieIndexable.IndexingReq; +import com.linkedin.zoie.api.ZoieSegmentReader; +import com.linkedin.zoie.api.indexing.AbstractZoieIndexable; +import com.linkedin.zoie.api.indexing.ZoieIndexable; +import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq; import com.senseidb.conf.SchemaConverter; import com.senseidb.conf.SenseiSchema; From bb0f12068b7e385d68b71b568e48213a5ffe54ef Mon Sep 17 00:00:00 2001 From: alperez Date: Thu, 26 Apr 2012 15:46:07 -0700 Subject: [PATCH 4/8] Bumping the used zoie version. --- sensei-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensei-core/pom.xml b/sensei-core/pom.xml index 8bbca122f..28f9acae3 100644 --- a/sensei-core/pom.xml +++ b/sensei-core/pom.xml @@ -192,7 +192,7 @@ com.linkedin.zoie zoie-jms - 3.1.2-SNAPSHOT + 3.2.0-SNAPSHOT From 6e6ee58fdf382cf36e707fb1dcbe59212434718c Mon Sep 17 00:00:00 2001 From: alperez Date: Thu, 26 Apr 2012 16:28:31 -0700 Subject: [PATCH 5/8] Changing import for bobo. --- example/cars/conf/schema.xml | 10 +++--- example/cars/conf/sensei.properties | 2 +- perf/perf-sensei-conf/schema.xml | 10 +++--- resources/log4j.properties | 2 +- sensei-core/pom.xml | 4 +-- .../cluster/client/BrowseRequestBuilder.java | 6 ++-- .../cluster/client/BrowseResultFormatter.java | 8 ++--- .../conf/SenseiFacetHandlerBuilder.java | 36 +++++++++---------- .../senseidb/conf/SenseiServerBuilder.java | 4 +-- .../indexing/DefaultSenseiInterpreter.java | 4 +-- .../DefaultStreamingIndexingManager.java | 2 +- .../senseidb/indexing/SenseiIndexPruner.java | 10 +++--- ...stractFacetHandlerSenseiPluginFactory.java | 4 +-- .../senseidb/plugin/SenseiPluginRegistry.java | 4 +-- .../TermListFactorySenseiPluginFactory.java | 4 +-- ...SimpleFacetHandlerSenseiPluginFactory.java | 8 ++--- .../search/facet/UIDFacetHandler.java | 24 ++++++------- .../facet/attribute/FacetPredicate.java | 2 +- .../attribute/PredicateDocIdIterator.java | 2 +- .../facet/attribute/PredicateFacetFilter.java | 12 +++---- .../search/facet/attribute/Range.java | 2 +- .../facet/attribute/RangePredicate.java | 4 +-- .../senseidb/search/node/ResultMerger.java | 32 ++++++++--------- .../senseidb/search/node/SenseiBroker.java | 2 +- .../com/senseidb/search/node/SenseiCore.java | 6 ++-- .../search/node/SenseiHourglassFactory.java | 2 +- .../node/SenseiIndexReaderDecorator.java | 6 ++-- .../search/node/SenseiIndexingManager.java | 2 +- .../search/node/SenseiPairFactory.java | 2 +- .../node/SenseiScatterGatherHandler.java | 2 +- .../search/node/SenseiZoieFactory.java | 2 +- .../search/node/SenseiZoieSystemFactory.java | 2 +- .../node/impl/DemoZoieSystemFactory.java | 2 +- .../search/node/impl/NoopIndexingManager.java | 2 +- .../search/query/ScoreAugmentQuery.java | 2 +- .../search/query/TimeRetentionFilter.java | 6 ++-- .../query/filters/AndFilterConstructor.java | 2 +- .../filters/BooleanFilterConstructor.java | 6 ++-- .../FacetSelectionFilterConstructor.java | 8 ++--- .../query/filters/NullFilterConstructor.java | 12 +++---- .../query/filters/OrFilterConstructor.java | 2 +- .../query/filters/PathFilterConstructor.java | 10 +++--- .../query/filters/RangeFilterConstructor.java | 8 ++--- .../query/filters/SenseiTermFilter.java | 14 ++++---- .../query/filters/UIDFilterConstructor.java | 6 ++-- .../com/senseidb/search/relevance/MFacet.java | 6 ++-- .../search/relevance/MFacetDouble.java | 4 +-- .../search/relevance/MFacetFloat.java | 4 +-- .../senseidb/search/relevance/MFacetInt.java | 4 +-- .../senseidb/search/relevance/MFacetLong.java | 4 +-- .../search/relevance/MFacetShort.java | 4 +-- .../search/relevance/MFacetString.java | 4 +-- .../search/relevance/RelevanceQuery.java | 22 ++++++------ .../relevance/WeightedMFacetDouble.java | 6 ++-- .../search/relevance/WeightedMFacetFloat.java | 6 ++-- .../search/relevance/WeightedMFacetInt.java | 6 ++-- .../search/relevance/WeightedMFacetLong.java | 6 ++-- .../search/relevance/WeightedMFacetShort.java | 6 ++-- .../relevance/WeightedMFacetString.java | 6 ++-- .../com/senseidb/search/req/SenseiHit.java | 2 +- .../senseidb/search/req/SenseiRequest.java | 6 ++-- .../com/senseidb/search/req/SenseiResult.java | 8 ++--- .../search/req/mapred/FieldAccessor.java | 20 +++++------ .../mapred/impl/SenseiMapFunctionWrapper.java | 8 ++--- .../impl/SenseiReduceFunctionWrapper.java | 2 +- .../obsolete/MapReduceSenseiService.java | 4 +-- .../obsolete/SenseiMapReduceResult.java | 2 +- .../servlet/AbstractSenseiClientServlet.java | 2 +- .../servlet/DefaultSenseiJSONServlet.java | 16 ++++----- .../svc/impl/AbstractSenseiCoreService.java | 2 +- .../svc/impl/CoreSenseiServiceImpl.java | 14 ++++---- .../svc/impl/HttpRestSenseiServiceImpl.java | 12 +++---- .../svc/impl/SysSenseiCoreServiceImpl.java | 6 ++-- .../com/senseidb/util/RequestConverter.java | 4 +-- .../com/senseidb/util/RequestConverter2.java | 10 +++--- .../test/TestHttpRestSenseiServiceImpl.java | 14 ++++---- .../senseidb/test/TestNegativeNumbers.java | 10 +++--- .../senseidb/test/TestRequestConverter2.java | 4 +-- .../java/com/senseidb/test/TestSensei.java | 12 +++---- .../test/TestSenseiAttributesHandler.java | 8 ++--- .../com/senseidb/test/ZoieTestFactory.java | 2 +- .../MockRuntimeFacetHandlerFactory.java | 6 ++-- .../test/plugin/OtherCustomFacetsFactory.java | 6 ++-- .../test/plugin/SenseiConfigurationTest.java | 6 ++-- .../test/plugin/VirtualGroupIdFactory.java | 12 +++---- .../sensei.properties | 2 +- .../src/test/resources/test-conf/bobo.spring | 22 ++++++------ .../test/resources/test-conf/node1/schema.xml | 10 +++--- .../test-conf/node1/sensei.properties | 2 +- .../test/resources/test-conf/node2/schema.xml | 10 +++--- .../test-conf/node2/sensei.properties | 2 +- sensei-parent/pom.xml | 4 +-- 92 files changed, 320 insertions(+), 320 deletions(-) diff --git a/example/cars/conf/schema.xml b/example/cars/conf/schema.xml index 9af42dba3..edeb5a2fd 100644 --- a/example/cars/conf/schema.xml +++ b/example/cars/conf/schema.xml @@ -35,11 +35,11 @@ diff --git a/example/cars/conf/sensei.properties b/example/cars/conf/sensei.properties index 042988f97..d927f5181 100644 --- a/example/cars/conf/sensei.properties +++ b/example/cars/conf/sensei.properties @@ -68,7 +68,7 @@ sensei.plugin.services.list=custom.plugins.spring # the list of beans might be referenced both by simple name and the full prefix #Sensei plugin factory returns the list of custom facets custom.facets.spring.class=com.senseidb.conf.SpringSenseiPluginFactory -custom.facets.spring.returnedClass=com.browseengine.bobo.facets.FacetHandler, com.browseengine.bobo.facets.RuntimeFacetHandlerFactory +custom.facets.spring.returnedClass=com.linkedin.bobo.facets.FacetHandler, com.linkedin.bobo.facets.RuntimeFacetHandlerFactory custom.facets.spring.springFile=custom-facets.xml # the list of beans might be referenced both by simple name and the full prefix sensei.custom.facets.list= custom.facets.spring diff --git a/perf/perf-sensei-conf/schema.xml b/perf/perf-sensei-conf/schema.xml index b9cb7bd68..3916f1917 100644 --- a/perf/perf-sensei-conf/schema.xml +++ b/perf/perf-sensei-conf/schema.xml @@ -34,11 +34,11 @@ diff --git a/resources/log4j.properties b/resources/log4j.properties index 1908c8b3e..e8b4c0b34 100644 --- a/resources/log4j.properties +++ b/resources/log4j.properties @@ -66,5 +66,5 @@ log4j.appender.sensei-norbert.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SS log4j.logger.com.sensei=INFO,sensei log4j.logger.com.linkedin.norbert=INFO,sensei-norbert log4j.logger.com.linkedin.zoie=INFO,sensei-zoie -log4j.logger.com.browseengine.bobo=INFO,sensei-bobo +log4j.logger.com.linkedin.bobo=INFO,sensei-bobo log4j.logger.com.sensei.querylog=INFO,sensei-query diff --git a/sensei-core/pom.xml b/sensei-core/pom.xml index 28f9acae3..96700e072 100644 --- a/sensei-core/pom.xml +++ b/sensei-core/pom.xml @@ -240,9 +240,9 @@ - com.browseengine.bobo + com.linkedin.bobo bobo-browse - 3.0.6-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseRequestBuilder.java b/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseRequestBuilder.java index a1ef4a4be..88c7bb2e1 100644 --- a/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseRequestBuilder.java +++ b/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseRequestBuilder.java @@ -5,9 +5,9 @@ import org.apache.lucene.search.SortField; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; import com.senseidb.search.req.SenseiJSONQuery; import com.senseidb.search.req.SenseiQuery; import com.senseidb.search.req.SenseiRequest; diff --git a/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseResultFormatter.java b/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseResultFormatter.java index 4fe3ccf70..cd2f1b64d 100644 --- a/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseResultFormatter.java +++ b/sensei-core/src/main/java/com/senseidb/cluster/client/BrowseResultFormatter.java @@ -6,10 +6,10 @@ import java.util.Map.Entry; import java.util.Set; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseHit; -import com.browseengine.bobo.api.BrowseResult; -import com.browseengine.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseHit; +import com.linkedin.bobo.api.BrowseResult; +import com.linkedin.bobo.api.FacetAccessible; public class BrowseResultFormatter{ diff --git a/sensei-core/src/main/java/com/senseidb/conf/SenseiFacetHandlerBuilder.java b/sensei-core/src/main/java/com/senseidb/conf/SenseiFacetHandlerBuilder.java index ef728c537..edf9a1630 100644 --- a/sensei-core/src/main/java/com/senseidb/conf/SenseiFacetHandlerBuilder.java +++ b/sensei-core/src/main/java/com/senseidb/conf/SenseiFacetHandlerBuilder.java @@ -17,24 +17,24 @@ import org.json.JSONObject; import org.springframework.util.Assert; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.FacetHandler.FacetDataNone; -import com.browseengine.bobo.facets.FacetHandlerInitializerParam; -import com.browseengine.bobo.facets.RuntimeFacetHandler; -import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory; -import com.browseengine.bobo.facets.AbstractRuntimeFacetHandlerFactory; -import com.browseengine.bobo.facets.attribute.AttributesFacetHandler; -import com.browseengine.bobo.facets.data.PredefinedTermListFactory; -import com.browseengine.bobo.facets.data.TermListFactory; -import com.browseengine.bobo.facets.impl.CompactMultiValueFacetHandler; -import com.browseengine.bobo.facets.impl.DynamicTimeRangeFacetHandler; -import com.browseengine.bobo.facets.impl.HistogramFacetHandler; -import com.browseengine.bobo.facets.impl.MultiValueFacetHandler; -import com.browseengine.bobo.facets.impl.MultiValueWithWeightFacetHandler; -import com.browseengine.bobo.facets.impl.PathFacetHandler; -import com.browseengine.bobo.facets.impl.RangeFacetHandler; -import com.browseengine.bobo.facets.impl.SimpleFacetHandler; -import com.browseengine.bobo.facets.range.MultiRangeFacetHandler; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.FacetHandler.FacetDataNone; +import com.linkedin.bobo.facets.FacetHandlerInitializerParam; +import com.linkedin.bobo.facets.RuntimeFacetHandler; +import com.linkedin.bobo.facets.RuntimeFacetHandlerFactory; +import com.linkedin.bobo.facets.AbstractRuntimeFacetHandlerFactory; +import com.linkedin.bobo.facets.attribute.AttributesFacetHandler; +import com.linkedin.bobo.facets.data.PredefinedTermListFactory; +import com.linkedin.bobo.facets.data.TermListFactory; +import com.linkedin.bobo.facets.impl.CompactMultiValueFacetHandler; +import com.linkedin.bobo.facets.impl.DynamicTimeRangeFacetHandler; +import com.linkedin.bobo.facets.impl.HistogramFacetHandler; +import com.linkedin.bobo.facets.impl.MultiValueFacetHandler; +import com.linkedin.bobo.facets.impl.MultiValueWithWeightFacetHandler; +import com.linkedin.bobo.facets.impl.PathFacetHandler; +import com.linkedin.bobo.facets.impl.RangeFacetHandler; +import com.linkedin.bobo.facets.impl.SimpleFacetHandler; +import com.linkedin.bobo.facets.range.MultiRangeFacetHandler; import com.senseidb.indexing.DefaultSenseiInterpreter; import com.senseidb.plugin.SenseiPluginRegistry; import com.senseidb.search.facet.UIDFacetHandler; diff --git a/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java b/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java index d48fb3b5e..0cbc3fa63 100644 --- a/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java +++ b/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java @@ -56,8 +56,8 @@ import com.linkedin.zoie.impl.indexing.SimpleReaderCache; import com.linkedin.zoie.impl.indexing.ZoieConfig; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.RuntimeFacetHandlerFactory; import com.linkedin.norbert.javacompat.cluster.ClusterClient; import com.linkedin.norbert.javacompat.cluster.ZooKeeperClusterClient; import com.linkedin.norbert.javacompat.network.NettyNetworkServer; diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java index 31d3483d8..6562f960e 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java @@ -21,8 +21,8 @@ import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter; import com.linkedin.zoie.api.indexing.ZoieIndexable; -import com.browseengine.bobo.facets.data.PredefinedTermListFactory; -import com.browseengine.bobo.facets.data.TermListFactory; +import com.linkedin.bobo.facets.data.PredefinedTermListFactory; +import com.linkedin.bobo.facets.data.TermListFactory; public class DefaultSenseiInterpreter extends AbstractZoieIndexableInterpreter { diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java index 511a3b966..2e9f6e294 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java @@ -27,7 +27,7 @@ import com.linkedin.zoie.mbean.DataProviderAdmin; import com.linkedin.zoie.mbean.DataProviderAdminMBean; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; import com.senseidb.conf.SenseiSchema; import com.senseidb.gateway.SenseiGateway; import com.senseidb.jmx.JmxUtil; diff --git a/sensei-core/src/main/java/com/senseidb/indexing/SenseiIndexPruner.java b/sensei-core/src/main/java/com/senseidb/indexing/SenseiIndexPruner.java index 1be14cfbb..984e63f68 100644 --- a/sensei-core/src/main/java/com/senseidb/indexing/SenseiIndexPruner.java +++ b/sensei-core/src/main/java/com/senseidb/indexing/SenseiIndexPruner.java @@ -2,11 +2,11 @@ import java.io.IOException; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.filter.EmptyFilter; -import com.browseengine.bobo.facets.filter.RandomAccessFilter; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.filter.EmptyFilter; +import com.linkedin.bobo.facets.filter.RandomAccessFilter; import com.senseidb.search.req.SenseiRequest; public interface SenseiIndexPruner { diff --git a/sensei-core/src/main/java/com/senseidb/plugin/AbstractFacetHandlerSenseiPluginFactory.java b/sensei-core/src/main/java/com/senseidb/plugin/AbstractFacetHandlerSenseiPluginFactory.java index 0a0689735..4243c057b 100644 --- a/sensei-core/src/main/java/com/senseidb/plugin/AbstractFacetHandlerSenseiPluginFactory.java +++ b/sensei-core/src/main/java/com/senseidb/plugin/AbstractFacetHandlerSenseiPluginFactory.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.Set; -import com.browseengine.bobo.facets.data.TermListFactory; -import com.browseengine.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.data.TermListFactory; +import com.linkedin.bobo.facets.FacetHandler; public abstract class AbstractFacetHandlerSenseiPluginFactory implements SenseiPluginFactory { diff --git a/sensei-core/src/main/java/com/senseidb/plugin/SenseiPluginRegistry.java b/sensei-core/src/main/java/com/senseidb/plugin/SenseiPluginRegistry.java index 9047322db..36f284d57 100644 --- a/sensei-core/src/main/java/com/senseidb/plugin/SenseiPluginRegistry.java +++ b/sensei-core/src/main/java/com/senseidb/plugin/SenseiPluginRegistry.java @@ -10,8 +10,8 @@ import org.apache.commons.configuration.Configuration; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.RuntimeFacetHandlerFactory; public class SenseiPluginRegistry { public static final String FACET_CONF_PREFIX = "sensei.custom.facets"; diff --git a/sensei-core/src/main/java/com/senseidb/plugin/TermListFactorySenseiPluginFactory.java b/sensei-core/src/main/java/com/senseidb/plugin/TermListFactorySenseiPluginFactory.java index e4d32b038..af65c2f7a 100644 --- a/sensei-core/src/main/java/com/senseidb/plugin/TermListFactorySenseiPluginFactory.java +++ b/sensei-core/src/main/java/com/senseidb/plugin/TermListFactorySenseiPluginFactory.java @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; -import com.browseengine.bobo.facets.data.TermFixedLengthLongArrayListFactory; -import com.browseengine.bobo.facets.data.TermListFactory; +import com.linkedin.bobo.facets.data.TermFixedLengthLongArrayListFactory; +import com.linkedin.bobo.facets.data.TermListFactory; import com.senseidb.indexing.DefaultSenseiInterpreter; diff --git a/sensei-core/src/main/java/com/senseidb/plugin/VirtualSimpleFacetHandlerSenseiPluginFactory.java b/sensei-core/src/main/java/com/senseidb/plugin/VirtualSimpleFacetHandlerSenseiPluginFactory.java index ed2b66513..76bca015d 100644 --- a/sensei-core/src/main/java/com/senseidb/plugin/VirtualSimpleFacetHandlerSenseiPluginFactory.java +++ b/sensei-core/src/main/java/com/senseidb/plugin/VirtualSimpleFacetHandlerSenseiPluginFactory.java @@ -2,10 +2,10 @@ import java.util.Map; -import com.browseengine.bobo.facets.data.FacetDataFetcher; -import com.browseengine.bobo.facets.data.TermListFactory; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.impl.VirtualSimpleFacetHandler; +import com.linkedin.bobo.facets.data.FacetDataFetcher; +import com.linkedin.bobo.facets.data.TermListFactory; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.impl.VirtualSimpleFacetHandler; public class VirtualSimpleFacetHandlerSenseiPluginFactory extends AbstractFacetHandlerSenseiPluginFactory { diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java b/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java index e870a42e2..4369af52d 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java @@ -19,18 +19,18 @@ import com.linkedin.zoie.api.ZoieSegmentReader; import scala.actors.threadpool.Arrays; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.docidset.EmptyDocIdSet; -import com.browseengine.bobo.docidset.RandomAccessDocIdSet; -import com.browseengine.bobo.facets.FacetCountCollectorSource; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.filter.EmptyFilter; -import com.browseengine.bobo.facets.filter.RandomAccessFilter; -import com.browseengine.bobo.facets.filter.RandomAccessNotFilter; -import com.browseengine.bobo.sort.DocComparator; -import com.browseengine.bobo.sort.DocComparatorSource; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.docidset.EmptyDocIdSet; +import com.linkedin.bobo.docidset.RandomAccessDocIdSet; +import com.linkedin.bobo.facets.FacetCountCollectorSource; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.filter.EmptyFilter; +import com.linkedin.bobo.facets.filter.RandomAccessFilter; +import com.linkedin.bobo.facets.filter.RandomAccessNotFilter; +import com.linkedin.bobo.sort.DocComparator; +import com.linkedin.bobo.sort.DocComparatorSource; import com.kamikaze.docidset.impl.IntArrayDocIdSet; public class UIDFacetHandler extends FacetHandler { diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/FacetPredicate.java b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/FacetPredicate.java index cec5a567b..c6e127cac 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/FacetPredicate.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/FacetPredicate.java @@ -1,6 +1,6 @@ package com.senseidb.search.facet.attribute; -import com.browseengine.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.FacetDataCache; public interface FacetPredicate { public boolean evaluate(FacetDataCache cache, int docId); diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateDocIdIterator.java b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateDocIdIterator.java index b36ca739d..b313d12d2 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateDocIdIterator.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateDocIdIterator.java @@ -4,7 +4,7 @@ import org.apache.lucene.search.DocIdSetIterator; -import com.browseengine.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.FacetDataCache; @SuppressWarnings("rawtypes") public class PredicateDocIdIterator extends DocIdSetIterator { private final int startDocId; diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateFacetFilter.java b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateFacetFilter.java index 46d054030..9d976c005 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateFacetFilter.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/PredicateFacetFilter.java @@ -4,12 +4,12 @@ import org.apache.lucene.search.DocIdSetIterator; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.docidset.EmptyDocIdSet; -import com.browseengine.bobo.docidset.RandomAccessDocIdSet; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.filter.AdaptiveFacetFilter.FacetDataCacheBuilder; -import com.browseengine.bobo.facets.filter.RandomAccessFilter; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.docidset.EmptyDocIdSet; +import com.linkedin.bobo.docidset.RandomAccessDocIdSet; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.filter.AdaptiveFacetFilter.FacetDataCacheBuilder; +import com.linkedin.bobo.facets.filter.RandomAccessFilter; public class PredicateFacetFilter extends RandomAccessFilter { private final FacetDataCacheBuilder dataCacheBuilder; diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/Range.java b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/Range.java index 1c7b955aa..ff4983fdd 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/Range.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/Range.java @@ -1,6 +1,6 @@ package com.senseidb.search.facet.attribute; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; public class Range { int start; diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/RangePredicate.java b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/RangePredicate.java index f3a844b06..0bfc7dea1 100644 --- a/sensei-core/src/main/java/com/senseidb/search/facet/attribute/RangePredicate.java +++ b/sensei-core/src/main/java/com/senseidb/search/facet/attribute/RangePredicate.java @@ -1,7 +1,7 @@ package com.senseidb.search.facet.attribute; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; public class RangePredicate implements FacetPredicate { diff --git a/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java b/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java index 507edb5cf..477664d3a 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java @@ -23,22 +23,22 @@ import com.linkedin.zoie.api.ZoieIndexReader; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetAccessible; -import com.browseengine.bobo.api.FacetIterator; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; -import com.browseengine.bobo.facets.CombinedFacetAccessible; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.PrimitiveLongArrayWrapper; -import com.browseengine.bobo.sort.DocComparator; -import com.browseengine.bobo.sort.DocIDPriorityQueue; -import com.browseengine.bobo.sort.SortCollector; -import com.browseengine.bobo.sort.SortCollector.CollectorContext; -import com.browseengine.bobo.util.ListMerger; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.FacetIterator; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.facets.CombinedFacetAccessible; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.PrimitiveLongArrayWrapper; +import com.linkedin.bobo.sort.DocComparator; +import com.linkedin.bobo.sort.DocIDPriorityQueue; +import com.linkedin.bobo.sort.SortCollector; +import com.linkedin.bobo.sort.SortCollector.CollectorContext; +import com.linkedin.bobo.util.ListMerger; import com.senseidb.search.req.SenseiHit; import com.senseidb.search.req.SenseiRequest; import com.senseidb.search.req.SenseiResult; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java index 6af35a93e..bcdf1fdfd 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java @@ -12,7 +12,7 @@ import com.linkedin.zoie.api.indexing.AbstractZoieIndexable; -import com.browseengine.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec; import com.linkedin.norbert.NorbertException; import com.linkedin.norbert.javacompat.cluster.ClusterClient; import com.linkedin.norbert.javacompat.cluster.Node; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java index 17ae664b2..ec87b3262 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java @@ -14,9 +14,9 @@ import com.linkedin.zoie.api.ZoieException; import com.linkedin.zoie.api.ZoieIndexReader; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.RuntimeFacetHandlerFactory; import com.senseidb.indexing.SenseiIndexPruner; import com.senseidb.indexing.SenseiIndexPruner.DefaultSenseiIndexPruner; import com.senseidb.jmx.JmxUtil; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java index f0a40e545..3b0c0ae65 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java @@ -12,7 +12,7 @@ import com.linkedin.zoie.hourglass.impl.HourglassDirectoryManagerFactory; import com.linkedin.zoie.impl.indexing.ZoieConfig; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; public class SenseiHourglassFactory extends SenseiZoieFactory { diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java index aacfda2a7..9584e6281 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java @@ -8,9 +8,9 @@ import com.linkedin.zoie.api.ZoieIndexReader; import com.linkedin.zoie.impl.indexing.AbstractIndexReaderDecorator; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.RuntimeFacetHandlerFactory; public class SenseiIndexReaderDecorator extends AbstractIndexReaderDecorator { private final List> _facetHandlers; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java index b0fc98b0b..30a34af2e 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java @@ -6,7 +6,7 @@ import com.linkedin.zoie.api.Zoie; import com.linkedin.zoie.api.ZoieException; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; public interface SenseiIndexingManager { void initialize(Map> zoieSystemMap) throws Exception; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java index 8ef4af18f..ba1781ca6 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java @@ -11,7 +11,7 @@ import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.linkedin.zoie.pair.impl.Pair; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; public class SenseiPairFactory extends SenseiZoieFactory { diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiScatterGatherHandler.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiScatterGatherHandler.java index a90bd9ec4..3d87b1720 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiScatterGatherHandler.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiScatterGatherHandler.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.zip.GZIPInputStream; -import com.browseengine.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec; import com.linkedin.norbert.javacompat.cluster.Node; import org.apache.log4j.Logger; import org.apache.lucene.document.Document; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java index 70c3f10f0..9cc19f695 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java @@ -8,7 +8,7 @@ import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter; import com.linkedin.zoie.impl.indexing.ZoieConfig; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; public abstract class SenseiZoieFactory { diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java index 26d9f0a6c..47604bb2c 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java @@ -17,7 +17,7 @@ import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.linkedin.zoie.impl.indexing.ZoieSystem; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; import com.senseidb.metrics.MetricsConstants; import com.yammer.metrics.Metrics; import com.yammer.metrics.core.Histogram; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java index 103511be6..0285c5d1f 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java @@ -7,7 +7,7 @@ import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.linkedin.zoie.impl.indexing.ZoieSystem; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; import com.senseidb.conf.ZoieFactoryFactory; import com.senseidb.search.node.SenseiIndexReaderDecorator; import com.senseidb.search.node.SenseiZoieFactory; diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java index d93080053..9b99dbd82 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java @@ -6,7 +6,7 @@ import com.linkedin.zoie.api.Zoie; import com.linkedin.zoie.api.ZoieException; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; import com.senseidb.search.node.SenseiIndexingManager; public class NoopIndexingManager implements SenseiIndexingManager { diff --git a/sensei-core/src/main/java/com/senseidb/search/query/ScoreAugmentQuery.java b/sensei-core/src/main/java/com/senseidb/search/query/ScoreAugmentQuery.java index a6347315d..4986d0074 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/ScoreAugmentQuery.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/ScoreAugmentQuery.java @@ -7,7 +7,7 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Similarity; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; public class ScoreAugmentQuery extends AbstractScoreAdjuster { diff --git a/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java b/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java index 359d47ab3..477fba9bb 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java @@ -12,9 +12,9 @@ import com.linkedin.zoie.api.ZoieIndexReader; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.facets.FacetHandler; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.facets.FacetHandler; import com.kamikaze.docidset.impl.OrDocIdSet; import com.senseidb.indexing.DefaultSenseiInterpreter; import com.senseidb.indexing.MetaType; diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/AndFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/AndFilterConstructor.java index c8d3389b9..5c846bea2 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/AndFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/AndFilterConstructor.java @@ -7,7 +7,7 @@ import org.apache.lucene.search.Filter; import org.json.JSONArray; -import com.browseengine.bobo.facets.filter.AndFilter; +import com.linkedin.bobo.facets.filter.AndFilter; public class AndFilterConstructor extends FilterConstructor { diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/BooleanFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/BooleanFilterConstructor.java index 0167cb7b8..74398cbea 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/BooleanFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/BooleanFilterConstructor.java @@ -8,9 +8,9 @@ import org.json.JSONArray; import org.json.JSONObject; -import com.browseengine.bobo.facets.filter.AndFilter; -import com.browseengine.bobo.facets.filter.NotFilter; -import com.browseengine.bobo.facets.filter.OrFilter; +import com.linkedin.bobo.facets.filter.AndFilter; +import com.linkedin.bobo.facets.filter.NotFilter; +import com.linkedin.bobo.facets.filter.OrFilter; public class BooleanFilterConstructor extends FilterConstructor diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/FacetSelectionFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/FacetSelectionFilterConstructor.java index cf61a37cd..583357d46 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/FacetSelectionFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/FacetSelectionFilterConstructor.java @@ -10,10 +10,10 @@ import org.apache.lucene.search.Filter; import org.json.JSONObject; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.BrowseSelection.ValueOperation; -import com.browseengine.bobo.facets.FacetHandler; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseSelection.ValueOperation; +import com.linkedin.bobo.facets.FacetHandler; import com.kamikaze.docidset.impl.AndDocIdSet; import com.senseidb.util.RequestConverter2; diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/NullFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/NullFilterConstructor.java index 52c71d3ba..527141465 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/NullFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/NullFilterConstructor.java @@ -8,12 +8,12 @@ import org.apache.lucene.search.Filter; import org.json.JSONObject; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.filter.FacetFilter; -import com.browseengine.bobo.facets.filter.FacetFilter.FacetDocIdSetIterator; -import com.browseengine.bobo.util.BigNestedIntArray; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.filter.FacetFilter; +import com.linkedin.bobo.facets.filter.FacetFilter.FacetDocIdSetIterator; +import com.linkedin.bobo.util.BigNestedIntArray; public class NullFilterConstructor extends FilterConstructor { public static final String FILTER_TYPE = "isNull"; diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/OrFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/OrFilterConstructor.java index f583f6bff..330e8b31d 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/OrFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/OrFilterConstructor.java @@ -8,7 +8,7 @@ import org.json.JSONArray; import org.json.JSONObject; -import com.browseengine.bobo.facets.filter.OrFilter; +import com.linkedin.bobo.facets.filter.OrFilter; public class OrFilterConstructor extends FilterConstructor { diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/PathFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/PathFilterConstructor.java index 2c327d8f3..7d80f5fd9 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/PathFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/PathFilterConstructor.java @@ -9,12 +9,12 @@ import org.apache.lucene.search.Filter; import org.json.JSONObject; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.facets.impl.PathFacetHandler; -import com.browseengine.bobo.facets.FacetHandler; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.facets.impl.PathFacetHandler; +import com.linkedin.bobo.facets.FacetHandler; -import com.browseengine.bobo.query.MatchAllDocIdSetIterator; +import com.linkedin.bobo.query.MatchAllDocIdSetIterator; public class PathFilterConstructor extends FilterConstructor { diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/RangeFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/RangeFilterConstructor.java index 9d7a0f842..e3c6708e4 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/RangeFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/RangeFilterConstructor.java @@ -15,10 +15,10 @@ import org.apache.lucene.search.TermRangeFilter; import org.json.JSONObject; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.filter.FacetRangeFilter; -import com.browseengine.bobo.query.MatchAllDocIdSetIterator; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.filter.FacetRangeFilter; +import com.linkedin.bobo.query.MatchAllDocIdSetIterator; import com.senseidb.indexing.DefaultSenseiInterpreter; import com.senseidb.indexing.MetaType; diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/SenseiTermFilter.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/SenseiTermFilter.java index e6a44c02a..8edbfb77e 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/SenseiTermFilter.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/SenseiTermFilter.java @@ -12,13 +12,13 @@ import scala.actors.threadpool.Arrays; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.BrowseSelection.ValueOperation; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.TermValueList; -import com.browseengine.bobo.facets.filter.EmptyFilter; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseSelection.ValueOperation; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.TermValueList; +import com.linkedin.bobo.facets.filter.EmptyFilter; import com.kamikaze.docidset.impl.AndDocIdSet; import com.kamikaze.docidset.impl.NotDocIdSet; import com.kamikaze.docidset.impl.OrDocIdSet; diff --git a/sensei-core/src/main/java/com/senseidb/search/query/filters/UIDFilterConstructor.java b/sensei-core/src/main/java/com/senseidb/search/query/filters/UIDFilterConstructor.java index c94b8c083..8064d88ab 100644 --- a/sensei-core/src/main/java/com/senseidb/search/query/filters/UIDFilterConstructor.java +++ b/sensei-core/src/main/java/com/senseidb/search/query/filters/UIDFilterConstructor.java @@ -7,9 +7,9 @@ import org.apache.lucene.search.Filter; import org.json.JSONObject; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.facets.FacetHandler; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.facets.FacetHandler; import com.senseidb.conf.SenseiFacetHandlerBuilder; import com.senseidb.search.facet.UIDFacetHandler; import com.senseidb.util.RequestConverter2; diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacet.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacet.java index 456f61bed..7ffa44bb5 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacet.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacet.java @@ -2,9 +2,9 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermValueList; -import com.browseengine.bobo.util.BigNestedIntArray; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermValueList; +import com.linkedin.bobo.util.BigNestedIntArray; public abstract class MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetDouble.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetDouble.java index ea09557b8..214aec11c 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetDouble.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetDouble.java @@ -2,8 +2,8 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermDoubleList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermDoubleList; public class MFacetDouble extends MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetFloat.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetFloat.java index 090601c3b..96d99913a 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetFloat.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetFloat.java @@ -2,8 +2,8 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermFloatList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermFloatList; public class MFacetFloat extends MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetInt.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetInt.java index 6dc18e9e7..2545b25ff 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetInt.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetInt.java @@ -2,8 +2,8 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermIntList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermIntList; public class MFacetInt extends MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetLong.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetLong.java index fbb552e1b..d5512c22a 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetLong.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetLong.java @@ -2,8 +2,8 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermLongList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermLongList; public class MFacetLong extends MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetShort.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetShort.java index 7f8cc7ea7..760f46694 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetShort.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetShort.java @@ -2,8 +2,8 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermShortList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermShortList; public class MFacetShort extends MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetString.java b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetString.java index d9024be7f..ab86f698a 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetString.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/MFacetString.java @@ -2,8 +2,8 @@ import java.util.Set; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermStringList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermStringList; public class MFacetString extends MFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/RelevanceQuery.java b/sensei-core/src/main/java/com/senseidb/search/relevance/RelevanceQuery.java index c65436e6d..16c2dbaa3 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/RelevanceQuery.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/RelevanceQuery.java @@ -45,17 +45,17 @@ import org.json.JSONException; import org.json.JSONObject; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermDoubleList; -import com.browseengine.bobo.facets.data.TermFloatList; -import com.browseengine.bobo.facets.data.TermIntList; -import com.browseengine.bobo.facets.data.TermLongList; -import com.browseengine.bobo.facets.data.TermShortList; -import com.browseengine.bobo.facets.data.TermStringList; -import com.browseengine.bobo.facets.data.TermValueList; -import com.browseengine.bobo.util.BigSegmentedArray; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermDoubleList; +import com.linkedin.bobo.facets.data.TermFloatList; +import com.linkedin.bobo.facets.data.TermIntList; +import com.linkedin.bobo.facets.data.TermLongList; +import com.linkedin.bobo.facets.data.TermShortList; +import com.linkedin.bobo.facets.data.TermStringList; +import com.linkedin.bobo.facets.data.TermValueList; +import com.linkedin.bobo.util.BigSegmentedArray; import com.senseidb.search.query.AbstractScoreAdjuster; public class RelevanceQuery extends AbstractScoreAdjuster diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetDouble.java b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetDouble.java index dfab46d0e..8840df9f4 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetDouble.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetDouble.java @@ -1,8 +1,8 @@ package com.senseidb.search.relevance; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueWithWeightFacetDataCache; -import com.browseengine.bobo.facets.data.TermDoubleList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueWithWeightFacetDataCache; +import com.linkedin.bobo.facets.data.TermDoubleList; public class WeightedMFacetDouble extends MFacetDouble implements WeightedMFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetFloat.java b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetFloat.java index 09bdde417..38bc353dd 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetFloat.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetFloat.java @@ -1,8 +1,8 @@ package com.senseidb.search.relevance; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueWithWeightFacetDataCache; -import com.browseengine.bobo.facets.data.TermFloatList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueWithWeightFacetDataCache; +import com.linkedin.bobo.facets.data.TermFloatList; public class WeightedMFacetFloat extends MFacetFloat implements WeightedMFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetInt.java b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetInt.java index ee5bd36de..9297a27a1 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetInt.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetInt.java @@ -1,8 +1,8 @@ package com.senseidb.search.relevance; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueWithWeightFacetDataCache; -import com.browseengine.bobo.facets.data.TermIntList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueWithWeightFacetDataCache; +import com.linkedin.bobo.facets.data.TermIntList; public class WeightedMFacetInt extends MFacetInt implements WeightedMFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetLong.java b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetLong.java index 8b99aac83..985fd7947 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetLong.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetLong.java @@ -1,8 +1,8 @@ package com.senseidb.search.relevance; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueWithWeightFacetDataCache; -import com.browseengine.bobo.facets.data.TermLongList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueWithWeightFacetDataCache; +import com.linkedin.bobo.facets.data.TermLongList; public class WeightedMFacetLong extends MFacetLong implements WeightedMFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetShort.java b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetShort.java index 55ae8b157..24d0a533c 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetShort.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetShort.java @@ -1,8 +1,8 @@ package com.senseidb.search.relevance; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueWithWeightFacetDataCache; -import com.browseengine.bobo.facets.data.TermShortList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueWithWeightFacetDataCache; +import com.linkedin.bobo.facets.data.TermShortList; public class WeightedMFacetShort extends MFacetShort implements WeightedMFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetString.java b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetString.java index fa6bf1e39..7658c6a9f 100644 --- a/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetString.java +++ b/sensei-core/src/main/java/com/senseidb/search/relevance/WeightedMFacetString.java @@ -1,8 +1,8 @@ package com.senseidb.search.relevance; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueWithWeightFacetDataCache; -import com.browseengine.bobo.facets.data.TermStringList; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueWithWeightFacetDataCache; +import com.linkedin.bobo.facets.data.TermStringList; public class WeightedMFacetString extends MFacetString implements WeightedMFacet { diff --git a/sensei-core/src/main/java/com/senseidb/search/req/SenseiHit.java b/sensei-core/src/main/java/com/senseidb/search/req/SenseiHit.java index 088949ee6..1cd7e8191 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/SenseiHit.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/SenseiHit.java @@ -1,6 +1,6 @@ package com.senseidb.search.req; -import com.browseengine.bobo.api.BrowseHit; +import com.linkedin.bobo.api.BrowseHit; public class SenseiHit extends BrowseHit { diff --git a/sensei-core/src/main/java/com/senseidb/search/req/SenseiRequest.java b/sensei-core/src/main/java/com/senseidb/search/req/SenseiRequest.java index 8f86cac4a..29400a7b6 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/SenseiRequest.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/SenseiRequest.java @@ -13,9 +13,9 @@ import org.apache.lucene.search.SortField; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.facets.FacetHandlerInitializerParam; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.facets.FacetHandlerInitializerParam; import com.senseidb.search.req.mapred.SenseiMapReduce; import com.senseidb.util.RequestConverter2; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/SenseiResult.java b/sensei-core/src/main/java/com/senseidb/search/req/SenseiResult.java index 9e384fd9f..881b4cd7d 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/SenseiResult.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/SenseiResult.java @@ -9,10 +9,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.search.Explanation; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseHit; -import com.browseengine.bobo.api.BrowseResult; -import com.browseengine.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseHit; +import com.linkedin.bobo.api.BrowseResult; +import com.linkedin.bobo.api.FacetAccessible; import com.senseidb.search.req.mapred.obsolete.SenseiMapReduceResult; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java index a29aa2da5..933a09541 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java @@ -7,16 +7,16 @@ import com.linkedin.zoie.api.DocIDMapper; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.MultiValueFacetDataCache; -import com.browseengine.bobo.facets.data.TermFloatList; -import com.browseengine.bobo.facets.data.TermIntList; -import com.browseengine.bobo.facets.data.TermLongList; -import com.browseengine.bobo.facets.data.TermNumberList; -import com.browseengine.bobo.facets.data.TermShortList; -import com.browseengine.bobo.facets.data.TermValueList; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.MultiValueFacetDataCache; +import com.linkedin.bobo.facets.data.TermFloatList; +import com.linkedin.bobo.facets.data.TermIntList; +import com.linkedin.bobo.facets.data.TermLongList; +import com.linkedin.bobo.facets.data.TermNumberList; +import com.linkedin.bobo.facets.data.TermShortList; +import com.linkedin.bobo.facets.data.TermValueList; import com.senseidb.search.req.SenseiSystemInfo.SenseiFacetInfo; /** diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java index 93262eb43..4ab2f3f65 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java @@ -5,10 +5,10 @@ import com.linkedin.zoie.api.ZoieSegmentReader; import com.linkedin.zoie.api.impl.DocIDMapperImpl; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.mapred.BoboMapFunctionWrapper; -import com.browseengine.bobo.mapred.MapReduceResult; -import com.browseengine.bobo.util.MemoryManager; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.mapred.BoboMapFunctionWrapper; +import com.linkedin.bobo.mapred.MapReduceResult; +import com.linkedin.bobo.util.MemoryManager; import com.senseidb.search.req.SenseiSystemInfo.SenseiFacetInfo; import com.senseidb.search.req.mapred.FieldAccessor; import com.senseidb.search.req.mapred.SenseiMapReduce; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiReduceFunctionWrapper.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiReduceFunctionWrapper.java index e04a215b5..c59d8937a 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiReduceFunctionWrapper.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiReduceFunctionWrapper.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; -import com.browseengine.bobo.mapred.MapReduceResult; +import com.linkedin.bobo.mapred.MapReduceResult; import com.senseidb.search.req.SenseiResult; import com.senseidb.search.req.mapred.SenseiMapReduce; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java index 284956867..fd9aac8f8 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java @@ -8,8 +8,8 @@ import com.linkedin.zoie.api.DocIDMapper; import com.linkedin.zoie.api.ZoieSegmentReader; -import com.browseengine.bobo.api.BoboBrowser; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboBrowser; +import com.linkedin.bobo.api.BoboIndexReader; import com.linkedin.norbert.network.JavaSerializer; import com.linkedin.norbert.network.Serializer; import com.senseidb.search.node.SenseiCore; diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/SenseiMapReduceResult.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/SenseiMapReduceResult.java index 163bc8a13..e65c3ad8f 100644 --- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/SenseiMapReduceResult.java +++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/SenseiMapReduceResult.java @@ -2,7 +2,7 @@ import java.util.List; -import com.browseengine.bobo.mapred.MapReduceResult; +import com.linkedin.bobo.mapred.MapReduceResult; import com.senseidb.search.req.AbstractSenseiResult; public class SenseiMapReduceResult extends MapReduceResult implements AbstractSenseiResult { diff --git a/sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java b/sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java index 0fb6fe7d0..c8c14aada 100644 --- a/sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java +++ b/sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java @@ -25,7 +25,7 @@ import org.json.JSONException; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseSelection; import com.linkedin.norbert.javacompat.cluster.ClusterClient; import com.linkedin.norbert.javacompat.cluster.ZooKeeperClusterClient; import com.linkedin.norbert.javacompat.network.NetworkClientConfig; diff --git a/sensei-core/src/main/java/com/senseidb/servlet/DefaultSenseiJSONServlet.java b/sensei-core/src/main/java/com/senseidb/servlet/DefaultSenseiJSONServlet.java index c72ea8d2d..94afed6f2 100644 --- a/sensei-core/src/main/java/com/senseidb/servlet/DefaultSenseiJSONServlet.java +++ b/sensei-core/src/main/java/com/senseidb/servlet/DefaultSenseiJSONServlet.java @@ -108,14 +108,14 @@ import org.json.JSONException; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseHit; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.BrowseSelection.ValueOperation; -import com.browseengine.bobo.api.FacetAccessible; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; -import com.browseengine.bobo.facets.DefaultFacetHandlerInitializerParam; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseHit; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseSelection.ValueOperation; +import com.linkedin.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.facets.DefaultFacetHandlerInitializerParam; import com.senseidb.search.req.SenseiHit; import com.senseidb.search.req.SenseiJSONQuery; import com.senseidb.search.req.SenseiQuery; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java b/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java index d48d0af75..a8fc24a63 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java @@ -19,7 +19,7 @@ import com.linkedin.zoie.api.IndexReaderFactory; import com.linkedin.zoie.api.ZoieIndexReader; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; import com.linkedin.norbert.network.Serializer; import com.senseidb.metrics.MetricsConstants; import com.senseidb.search.node.SenseiCore; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java index 13a4caaf7..6e5bd51c4 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java @@ -15,13 +15,13 @@ import com.linkedin.zoie.api.ZoieIndexReader.SubReaderAccessor; import com.linkedin.zoie.api.ZoieIndexReader.SubReaderInfo; -import com.browseengine.bobo.api.BoboBrowser; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.BrowseException; -import com.browseengine.bobo.api.BrowseHit; -import com.browseengine.bobo.api.BrowseRequest; -import com.browseengine.bobo.api.BrowseResult; -import com.browseengine.bobo.api.MultiBoboBrowser; +import com.linkedin.bobo.api.BoboBrowser; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BrowseException; +import com.linkedin.bobo.api.BrowseHit; +import com.linkedin.bobo.api.BrowseRequest; +import com.linkedin.bobo.api.BrowseResult; +import com.linkedin.bobo.api.MultiBoboBrowser; import com.linkedin.norbert.network.JavaSerializer; import com.linkedin.norbert.network.Serializer; import com.senseidb.indexing.SenseiIndexPruner; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/HttpRestSenseiServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/HttpRestSenseiServiceImpl.java index 1873618bb..950b68c51 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/HttpRestSenseiServiceImpl.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/HttpRestSenseiServiceImpl.java @@ -69,12 +69,12 @@ import org.json.JSONException; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetAccessible; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.MappedFacetAccessible; -import com.browseengine.bobo.facets.FacetHandlerInitializerParam; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.MappedFacetAccessible; +import com.linkedin.bobo.facets.FacetHandlerInitializerParam; import com.senseidb.search.req.SenseiHit; import com.senseidb.search.req.SenseiQuery; import com.senseidb.search.req.SenseiRequest; diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/SysSenseiCoreServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/SysSenseiCoreServiceImpl.java index d102ade67..43d18ea52 100644 --- a/sensei-core/src/main/java/com/senseidb/svc/impl/SysSenseiCoreServiceImpl.java +++ b/sensei-core/src/main/java/com/senseidb/svc/impl/SysSenseiCoreServiceImpl.java @@ -6,9 +6,9 @@ import com.sensei.search.req.protobuf.SenseiSysReqProtoSerializer; import org.apache.log4j.Logger; -import com.browseengine.bobo.api.BoboBrowser; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.api.MultiBoboBrowser; +import com.linkedin.bobo.api.BoboBrowser; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.MultiBoboBrowser; import com.linkedin.norbert.network.JavaSerializer; import com.linkedin.norbert.network.Serializer; import com.senseidb.search.node.SenseiCore; diff --git a/sensei-core/src/main/java/com/senseidb/util/RequestConverter.java b/sensei-core/src/main/java/com/senseidb/util/RequestConverter.java index 127b3b242..115c240f3 100644 --- a/sensei-core/src/main/java/com/senseidb/util/RequestConverter.java +++ b/sensei-core/src/main/java/com/senseidb/util/RequestConverter.java @@ -1,8 +1,8 @@ package com.senseidb.util; -import com.browseengine.bobo.api.BrowseRequest; -import com.browseengine.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseRequest; +import com.linkedin.bobo.api.BrowseSelection; import com.senseidb.search.node.SenseiQueryBuilder; import com.senseidb.search.node.SenseiQueryBuilderFactory; import com.senseidb.search.req.SenseiRequest; diff --git a/sensei-core/src/main/java/com/senseidb/util/RequestConverter2.java b/sensei-core/src/main/java/com/senseidb/util/RequestConverter2.java index f1fcb056a..e22bc119f 100644 --- a/sensei-core/src/main/java/com/senseidb/util/RequestConverter2.java +++ b/sensei-core/src/main/java/com/senseidb/util/RequestConverter2.java @@ -15,11 +15,11 @@ import org.json.JSONException; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.BrowseSelection.ValueOperation; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.facets.DefaultFacetHandlerInitializerParam; -import com.browseengine.bobo.facets.impl.PathFacetHandler; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseSelection.ValueOperation; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.facets.DefaultFacetHandlerInitializerParam; +import com.linkedin.bobo.facets.impl.PathFacetHandler; import com.senseidb.search.req.SenseiJSONQuery; import com.senseidb.search.req.SenseiRequest; import com.senseidb.search.req.mapred.SenseiMapReduce; diff --git a/sensei-core/src/test/java/com/senseidb/test/TestHttpRestSenseiServiceImpl.java b/sensei-core/src/test/java/com/senseidb/test/TestHttpRestSenseiServiceImpl.java index cb76380b9..6760e67a1 100644 --- a/sensei-core/src/test/java/com/senseidb/test/TestHttpRestSenseiServiceImpl.java +++ b/sensei-core/src/test/java/com/senseidb/test/TestHttpRestSenseiServiceImpl.java @@ -25,13 +25,13 @@ import org.json.JSONException; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetAccessible; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.MappedFacetAccessible; -import com.browseengine.bobo.facets.DefaultFacetHandlerInitializerParam; -import com.browseengine.bobo.facets.FacetHandlerInitializerParam; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.MappedFacetAccessible; +import com.linkedin.bobo.facets.DefaultFacetHandlerInitializerParam; +import com.linkedin.bobo.facets.FacetHandlerInitializerParam; import com.senseidb.search.req.SenseiHit; import com.senseidb.search.req.SenseiJSONQuery; import com.senseidb.search.req.SenseiQuery; diff --git a/sensei-core/src/test/java/com/senseidb/test/TestNegativeNumbers.java b/sensei-core/src/test/java/com/senseidb/test/TestNegativeNumbers.java index 9ab18d42a..9bd0749fd 100644 --- a/sensei-core/src/test/java/com/senseidb/test/TestNegativeNumbers.java +++ b/sensei-core/src/test/java/com/senseidb/test/TestNegativeNumbers.java @@ -9,11 +9,11 @@ import scala.actors.threadpool.Arrays; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.BrowseSelection.ValueOperation; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.BrowseSelection.ValueOperation; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; import com.senseidb.search.node.SenseiBroker; import com.senseidb.search.req.SenseiRequest; import com.senseidb.search.req.SenseiResult; diff --git a/sensei-core/src/test/java/com/senseidb/test/TestRequestConverter2.java b/sensei-core/src/test/java/com/senseidb/test/TestRequestConverter2.java index 90d71e1d4..c75dcff30 100644 --- a/sensei-core/src/test/java/com/senseidb/test/TestRequestConverter2.java +++ b/sensei-core/src/test/java/com/senseidb/test/TestRequestConverter2.java @@ -16,8 +16,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; -import com.browseengine.bobo.facets.FacetHandlerInitializerParam; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.facets.FacetHandlerInitializerParam; import com.senseidb.search.req.SenseiRequest; import com.senseidb.util.RequestConverter2; diff --git a/sensei-core/src/test/java/com/senseidb/test/TestSensei.java b/sensei-core/src/test/java/com/senseidb/test/TestSensei.java index 2db5beb51..52aa39361 100644 --- a/sensei-core/src/test/java/com/senseidb/test/TestSensei.java +++ b/sensei-core/src/test/java/com/senseidb/test/TestSensei.java @@ -18,12 +18,12 @@ import org.json.JSONArray; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.BrowseSelection; -import com.browseengine.bobo.api.FacetAccessible; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; -import com.browseengine.bobo.facets.DefaultFacetHandlerInitializerParam; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.BrowseSelection; +import com.linkedin.bobo.api.FacetAccessible; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.facets.DefaultFacetHandlerInitializerParam; import com.senseidb.search.node.SenseiBroker; import com.senseidb.search.req.SenseiHit; import com.senseidb.search.req.SenseiRequest; diff --git a/sensei-core/src/test/java/com/senseidb/test/TestSenseiAttributesHandler.java b/sensei-core/src/test/java/com/senseidb/test/TestSenseiAttributesHandler.java index 34a0fd570..1ec6582e7 100644 --- a/sensei-core/src/test/java/com/senseidb/test/TestSenseiAttributesHandler.java +++ b/sensei-core/src/test/java/com/senseidb/test/TestSenseiAttributesHandler.java @@ -14,10 +14,10 @@ import org.apache.log4j.Logger; import org.json.JSONObject; -import com.browseengine.bobo.api.BrowseFacet; -import com.browseengine.bobo.api.FacetSpec; -import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; -import com.browseengine.bobo.facets.attribute.AttributesFacetHandler; +import com.linkedin.bobo.api.BrowseFacet; +import com.linkedin.bobo.api.FacetSpec; +import com.linkedin.bobo.api.FacetSpec.FacetSortSpec; +import com.linkedin.bobo.facets.attribute.AttributesFacetHandler; import com.senseidb.search.node.SenseiBroker; import com.senseidb.search.req.SenseiRequest; import com.senseidb.search.req.SenseiResult; diff --git a/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java b/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java index 49cdd2983..fa3fffc1e 100644 --- a/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java +++ b/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java @@ -7,7 +7,7 @@ import com.linkedin.zoie.impl.indexing.ZoieConfig; import com.linkedin.zoie.impl.indexing.ZoieSystem; -import com.browseengine.bobo.api.BoboIndexReader; +import com.linkedin.bobo.api.BoboIndexReader; import com.senseidb.search.node.SenseiIndexReaderDecorator; import com.senseidb.search.node.SenseiZoieSystemFactory; diff --git a/sensei-core/src/test/java/com/senseidb/test/plugin/MockRuntimeFacetHandlerFactory.java b/sensei-core/src/test/java/com/senseidb/test/plugin/MockRuntimeFacetHandlerFactory.java index d9e367f03..362224f1f 100644 --- a/sensei-core/src/test/java/com/senseidb/test/plugin/MockRuntimeFacetHandlerFactory.java +++ b/sensei-core/src/test/java/com/senseidb/test/plugin/MockRuntimeFacetHandlerFactory.java @@ -1,8 +1,8 @@ package com.senseidb.test.plugin; -import com.browseengine.bobo.facets.FacetHandlerInitializerParam; -import com.browseengine.bobo.facets.RuntimeFacetHandler; -import com.browseengine.bobo.facets.AbstractRuntimeFacetHandlerFactory; +import com.linkedin.bobo.facets.FacetHandlerInitializerParam; +import com.linkedin.bobo.facets.RuntimeFacetHandler; +import com.linkedin.bobo.facets.AbstractRuntimeFacetHandlerFactory; public class MockRuntimeFacetHandlerFactory extends AbstractRuntimeFacetHandlerFactory> { diff --git a/sensei-core/src/test/java/com/senseidb/test/plugin/OtherCustomFacetsFactory.java b/sensei-core/src/test/java/com/senseidb/test/plugin/OtherCustomFacetsFactory.java index 41643d97f..e82e57312 100644 --- a/sensei-core/src/test/java/com/senseidb/test/plugin/OtherCustomFacetsFactory.java +++ b/sensei-core/src/test/java/com/senseidb/test/plugin/OtherCustomFacetsFactory.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.data.PredefinedTermListFactory; -import com.browseengine.bobo.facets.impl.SimpleFacetHandler; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.data.PredefinedTermListFactory; +import com.linkedin.bobo.facets.impl.SimpleFacetHandler; import com.senseidb.plugin.SenseiPluginFactory; import com.senseidb.plugin.SenseiPluginRegistry; diff --git a/sensei-core/src/test/java/com/senseidb/test/plugin/SenseiConfigurationTest.java b/sensei-core/src/test/java/com/senseidb/test/plugin/SenseiConfigurationTest.java index 0bb5dd972..c1b1c7d22 100644 --- a/sensei-core/src/test/java/com/senseidb/test/plugin/SenseiConfigurationTest.java +++ b/sensei-core/src/test/java/com/senseidb/test/plugin/SenseiConfigurationTest.java @@ -10,9 +10,9 @@ import org.junit.Before; import org.junit.Test; -import com.browseengine.bobo.facets.FacetHandler; -import com.browseengine.bobo.facets.impl.SimpleFacetHandler; -import com.browseengine.bobo.facets.impl.VirtualSimpleFacetHandler; +import com.linkedin.bobo.facets.FacetHandler; +import com.linkedin.bobo.facets.impl.SimpleFacetHandler; +import com.linkedin.bobo.facets.impl.VirtualSimpleFacetHandler; import com.senseidb.plugin.SenseiPluginRegistry; public class SenseiConfigurationTest extends Assert { diff --git a/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java b/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java index 7471c157f..20dffc489 100644 --- a/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java +++ b/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java @@ -3,12 +3,12 @@ import java.util.HashSet; import java.util.Map; -import com.browseengine.bobo.api.BoboIndexReader; -import com.browseengine.bobo.facets.data.FacetDataCache; -import com.browseengine.bobo.facets.data.FacetDataFetcher; -import com.browseengine.bobo.facets.data.PredefinedTermListFactory; -import com.browseengine.bobo.facets.data.TermFixedLengthLongArrayListFactory; -import com.browseengine.bobo.facets.impl.VirtualSimpleFacetHandler; +import com.linkedin.bobo.api.BoboIndexReader; +import com.linkedin.bobo.facets.data.FacetDataCache; +import com.linkedin.bobo.facets.data.FacetDataFetcher; +import com.linkedin.bobo.facets.data.PredefinedTermListFactory; +import com.linkedin.bobo.facets.data.TermFixedLengthLongArrayListFactory; +import com.linkedin.bobo.facets.impl.VirtualSimpleFacetHandler; import com.senseidb.plugin.SenseiPluginFactory; import com.senseidb.plugin.SenseiPluginRegistry; diff --git a/sensei-core/src/test/resources/refactored-configuration/sensei.properties b/sensei-core/src/test/resources/refactored-configuration/sensei.properties index e24250720..df507f5b8 100644 --- a/sensei-core/src/test/resources/refactored-configuration/sensei.properties +++ b/sensei-core/src/test/resources/refactored-configuration/sensei.properties @@ -17,7 +17,7 @@ my.custom.facets.virtual_groupid_fixedlengthlongarray.typeProp=fixedlengthlongar my.custom.facets.other_custom_facets.class=com.senseidb.test.plugin.OtherCustomFacetsFactory # the list of beans might be referenced both by simple name and the full prefix custom.facets.spring.class=com.senseidb.conf.SpringSenseiPluginFactory -custom.facets.spring.returnedClass=com.browseengine.bobo.facets.FacetHandler, com.browseengine.bobo.facets.RuntimeFacetHandlerFactory +custom.facets.spring.returnedClass=com.linkedin.bobo.facets.FacetHandler, com.linkedin.bobo.facets.RuntimeFacetHandlerFactory custom.facets.spring.springFile=custom-facets.xml sensei.custom.facets.list= virtual_groupid, virtual_groupid_fixedlengthlongarray, my.custom.facets.other_custom_facets, custom.facets.spring diff --git a/sensei-core/src/test/resources/test-conf/bobo.spring b/sensei-core/src/test/resources/test-conf/bobo.spring index 87dd5c5a5..76f52785f 100644 --- a/sensei-core/src/test/resources/test-conf/bobo.spring +++ b/sensei-core/src/test/resources/test-conf/bobo.spring @@ -3,28 +3,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + - + - + - + - + @@ -40,10 +40,10 @@ - + - + @@ -58,10 +58,10 @@ - + - + @@ -76,7 +76,7 @@ - + diff --git a/sensei-core/src/test/resources/test-conf/node1/schema.xml b/sensei-core/src/test/resources/test-conf/node1/schema.xml index fc0a3253b..a7fa1a388 100644 --- a/sensei-core/src/test/resources/test-conf/node1/schema.xml +++ b/sensei-core/src/test/resources/test-conf/node1/schema.xml @@ -37,11 +37,11 @@ diff --git a/sensei-core/src/test/resources/test-conf/node1/sensei.properties b/sensei-core/src/test/resources/test-conf/node1/sensei.properties index 4201f5aee..92ddd86b7 100644 --- a/sensei-core/src/test/resources/test-conf/node1/sensei.properties +++ b/sensei-core/src/test/resources/test-conf/node1/sensei.properties @@ -76,7 +76,7 @@ my.custom.facets.other_custom_facets.class=com.senseidb.test.plugin.OtherCustomF # the list of beans might be referenced both by simple name and the full prefix #Sensei plugin factory returns the list of custom facets custom.facets.spring.class=com.senseidb.conf.SpringSenseiPluginFactory -custom.facets.spring.returnedClass=com.browseengine.bobo.facets.FacetHandler, com.browseengine.bobo.facets.RuntimeFacetHandlerFactory +custom.facets.spring.returnedClass=com.linkedin.bobo.facets.FacetHandler, com.linkedin.bobo.facets.RuntimeFacetHandlerFactory custom.facets.spring.springFile=custom-facets.xml # the list of beans might be referenced both by simple name and the full prefix sensei.custom.facets.list= custom.facets.spring, my.custom.facets.other_custom_facets, my.custom.facets.virtual_groupid, my.custom.facets.virtual_groupid_fixedlengthlongarray diff --git a/sensei-core/src/test/resources/test-conf/node2/schema.xml b/sensei-core/src/test/resources/test-conf/node2/schema.xml index ac260827b..d8a720e25 100644 --- a/sensei-core/src/test/resources/test-conf/node2/schema.xml +++ b/sensei-core/src/test/resources/test-conf/node2/schema.xml @@ -37,11 +37,11 @@ diff --git a/sensei-core/src/test/resources/test-conf/node2/sensei.properties b/sensei-core/src/test/resources/test-conf/node2/sensei.properties index 9ea6c37b8..967cb6026 100644 --- a/sensei-core/src/test/resources/test-conf/node2/sensei.properties +++ b/sensei-core/src/test/resources/test-conf/node2/sensei.properties @@ -72,7 +72,7 @@ my.custom.facets.other_custom_facets.class=com.senseidb.test.plugin.OtherCustomF # the list of beans might be referenced both by simple name and the full prefix #Sensei plugin factory returns the list of custom facets custom.facets.spring.class=com.senseidb.conf.SpringSenseiPluginFactory -custom.facets.spring.returnedClass=com.browseengine.bobo.facets.FacetHandler, com.browseengine.bobo.facets.RuntimeFacetHandlerFactory +custom.facets.spring.returnedClass=com.linkedin.bobo.facets.FacetHandler, com.linkedin.bobo.facets.RuntimeFacetHandlerFactory custom.facets.spring.springFile=custom-facets.xml # the list of beans might be referenced both by simple name and the full prefix sensei.custom.facets.list= custom.facets.spring, my.custom.facets.other_custom_facets, my.custom.facets.virtual_groupid_fixedlengthlongarray, my.custom.facets.virtual_groupid diff --git a/sensei-parent/pom.xml b/sensei-parent/pom.xml index 3e1748bb9..cf09c4a71 100644 --- a/sensei-parent/pom.xml +++ b/sensei-parent/pom.xml @@ -130,10 +130,10 @@ false - + labs-consol-release ConSol* Labs Repository (Releases) From 932ae09a074b23bfbcaba0d3cf77f3861e02bd04 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 1 May 2012 13:04:44 +0300 Subject: [PATCH 6/8] Fix to make 'perf' subproject compatible with 1.1.3 API --- perf/perf-sensei-conf/plugins.xml | 8 - perf/perf-sensei-conf/sensei.properties | 9 +- .../sensei/perf/indexing/PerfJsonFilter.java | 34 +- .../perf/indexing/PerfStreamDataProvider.java | 200 +++--- .../PerfStreamDataProviderBuilder.java | 61 +- .../indexing/client/SenseiPerfClient.java | 651 +++++++++--------- 6 files changed, 477 insertions(+), 486 deletions(-) diff --git a/perf/perf-sensei-conf/plugins.xml b/perf/perf-sensei-conf/plugins.xml index 43aac55f7..532429141 100644 --- a/perf/perf-sensei-conf/plugins.xml +++ b/perf/perf-sensei-conf/plugins.xml @@ -4,12 +4,4 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - - - - diff --git a/perf/perf-sensei-conf/sensei.properties b/perf/perf-sensei-conf/sensei.properties index 492e046ce..744ade685 100644 --- a/perf/perf-sensei-conf/sensei.properties +++ b/perf/perf-sensei-conf/sensei.properties @@ -25,9 +25,12 @@ sensei.index.freshness = 10000 # index manager parameters sensei.index.manager.default.maxpartition.id = 1 -sensei.index.manager.default.type = perf -sensei.index.manager.default.perf.file = data/cars.json -sensei.index.manager.default.perf.maxIter = 1000 + +sensei.gateway.class=com.sematext.sensei.perf.indexing.PerfStreamDataProviderBuilder +sensei.gateway.file = example/cars_perf/data/cars.json +sensei.gateway.maxIter = 1000 +sensei.gateway.sleepMills = 100 + # plugins: from plugins.xml diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfJsonFilter.java b/perf/src/main/java/com/sensei/perf/indexing/PerfJsonFilter.java index 87faf38da..8c88e7e3d 100644 --- a/perf/src/main/java/com/sensei/perf/indexing/PerfJsonFilter.java +++ b/perf/src/main/java/com/sensei/perf/indexing/PerfJsonFilter.java @@ -2,24 +2,24 @@ import org.json.JSONObject; -import com.sensei.indexing.api.DataSourceFilter; +import com.senseidb.indexing.DataSourceFilter; public class PerfJsonFilter extends DataSourceFilter { - private final int _maxCount; - private int _count; - - public PerfJsonFilter(int maxCount){ - _maxCount = maxCount; - _count = 0; - } - - @Override - protected JSONObject doFilter(String data) throws Exception { - JSONObject obj = new JSONObject(data); - long uid = _count % _maxCount; - obj.put("uid",uid); - _count++; - return obj; - } + private final int _maxCount; + private int _count; + + public PerfJsonFilter(int maxCount){ + _maxCount = maxCount; + _count = 0; + } + + @Override + protected JSONObject doFilter(String data) throws Exception { + JSONObject obj = new JSONObject(data); + long uid = _count % _maxCount; + obj.put("uid",uid); + _count++; + return obj; + } } diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java index 0ddc1415a..76cf15832 100644 --- a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java +++ b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java @@ -10,117 +10,117 @@ import com.linkedin.zoie.api.DataConsumer.DataEvent; import com.linkedin.zoie.impl.indexing.StreamDataProvider; -import com.sensei.indexing.api.DataSourceFilter; -import com.sensei.indexing.api.DataSourceFilterable; +import com.senseidb.indexing.DataSourceFilter; +import com.senseidb.indexing.DataSourceFilterable; import com.sensei.perf.indexing.PerfVersion.PerfVersionComparator; public class PerfStreamDataProvider extends StreamDataProvider implements DataSourceFilterable { - private static Logger logger = Logger.getLogger(PerfStreamDataProvider.class); - - private DataSourceFilter _dataFilter; - private final File _file; - private RandomAccessFile _rad; - private PerfVersion _offset; - private PerfVersion _startingOffset; - private final int _maxIter; - - - public PerfStreamDataProvider(File file,PerfVersion startingOffset,int maxIter) { - super(new PerfVersionComparator()); - _file = file; - _startingOffset = startingOffset; - _maxIter = maxIter; - } + private static Logger logger = Logger.getLogger(PerfStreamDataProvider.class); + + private DataSourceFilter _dataFilter; + private final File _file; + private RandomAccessFile _rad; + private PerfVersion _offset; + private PerfVersion _startingOffset; + private final int _maxIter; + + + public PerfStreamDataProvider(File file,PerfVersion startingOffset,int maxIter) { + super(new PerfVersionComparator()); + _file = file; + _startingOffset = startingOffset; + _maxIter = maxIter; + } - @Override - public DataEvent next() { - DataEvent event = null; - if (_rad!=null){ - try{ - String line = _rad.readLine(); - if (line == null){ - if (_offset.iter >= _maxIter){ - return null; - } - else{ - _offset.iter++; - _offset.version = 0L; - _rad.seek(0L); - line = _rad.readLine(); - if (line ==null) return null; - } - } - JSONObject dataObj = _dataFilter.filter(line); - String version = String.valueOf(_offset); - long fp = _rad.getFilePointer(); - _offset.version = fp; - event = new DataEvent(dataObj,version); - } - catch(Exception ioe){ - logger.error(ioe.getMessage(),ioe); - } - } - return event; - } + @Override + public DataEvent next() { + DataEvent event = null; + if (_rad!=null){ + try{ + String line = _rad.readLine(); + if (line == null){ + if (_offset.iter >= _maxIter){ + return null; + } + else{ + _offset.iter++; + _offset.version = 0L; + _rad.seek(0L); + line = _rad.readLine(); + if (line ==null) return null; + } + } + JSONObject dataObj = _dataFilter.filter(line); + String version = String.valueOf(_offset); + long fp = _rad.getFilePointer(); + _offset.version = fp; + event = new DataEvent(dataObj,version); + } + catch(Exception ioe){ + logger.error(ioe.getMessage(),ioe); + } + } + return event; + } - @Override - public void setStartingOffset(String version) { - _startingOffset = PerfVersion.parse(version); - } + @Override + public void setStartingOffset(String version) { + _startingOffset = PerfVersion.parse(version); + } - @Override - public void reset() { - if (_rad!=null){ - try { - _offset = _startingOffset; - _rad.seek(_offset.version); - } catch (IOException e) { - logger.error(e.getMessage(),e); - } - } - } + @Override + public void reset() { + if (_rad!=null){ + try { + _offset = _startingOffset; + _rad.seek(_offset.version); + } catch (IOException e) { + logger.error(e.getMessage(),e); + } + } + } - @Override - public void setFilter(DataSourceFilter filter) { - _dataFilter = filter; - } + @Override + public void setFilter(DataSourceFilter filter) { + _dataFilter = filter; + } - @Override - public void start() { - super.start(); - - try{ - _offset = _startingOffset; + @Override + public void start() { + super.start(); + + try{ + _offset = _startingOffset; - logger.info("data file: "+_file.getAbsolutePath()+", offset: "+_offset); - _rad = new RandomAccessFile(_file,"r"); - _rad.seek(_offset.version); - } - catch(IOException ioe){ - logger.error(ioe.getMessage(),ioe); - } - } + logger.info("data file: "+_file.getAbsolutePath()+", offset: "+_offset); + _rad = new RandomAccessFile(_file,"r"); + _rad.seek(_offset.version); + } + catch(IOException ioe){ + logger.error(ioe.getMessage(),ioe); + } + } - @Override - public void stop() { - try{ - try{ - if (_rad!=null){ - _rad.close(); - } - } - catch(IOException ioe){ - logger.error(ioe.getMessage(),ioe); - } - finally{ - _rad = null; - } - } - finally{ - super.stop(); - } - } + @Override + public void stop() { + try{ + try{ + if (_rad!=null){ + _rad.close(); + } + } + catch(IOException ioe){ + logger.error(ioe.getMessage(),ioe); + } + finally{ + _rad = null; + } + } + finally{ + super.stop(); + } + } } diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java index 512a86c18..82e201296 100644 --- a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java +++ b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java @@ -2,45 +2,40 @@ import java.io.File; import java.util.Comparator; +import java.util.Set; -import org.apache.commons.configuration.Configuration; import org.json.JSONObject; -import org.springframework.context.ApplicationContext; import com.linkedin.zoie.impl.indexing.StreamDataProvider; -import com.sensei.indexing.api.DataSourceFilter; -import com.sensei.indexing.api.gateway.SenseiGateway; +import com.senseidb.gateway.SenseiGateway; +import com.senseidb.indexing.DataSourceFilter; +import com.senseidb.indexing.ShardingStrategy; +import com.linkedin.zoie.impl.indexing.ZoieConfig; public class PerfStreamDataProviderBuilder extends SenseiGateway { - private final PerfJsonFilter _perfFilter; - private final Comparator _versionComparator; - - public PerfStreamDataProviderBuilder(PerfJsonFilter perfFilter){ - _perfFilter = perfFilter; - } - @Override - public String getName() { - return "perf"; - } - - @Override - public StreamDataProvider buildDataProvider(Configuration conf, - DataSourceFilter dataFilter, - Comparator versionComparator, String oldSinceKey, - ApplicationContext plugin) throws Exception { - String file = conf.getString("file"); - int maxIter = conf.getInt("maxIter"); - - PerfVersion version = PerfVersion.parse(oldSinceKey); - PerfStreamDataProvider provider = new PerfStreamDataProvider(new File(file), version, maxIter); - provider.setFilter(_perfFilter); - return provider; - } - - @Override - public Comparator getVersionComparator() { - return _versionComparator; - } + private final Comparator _versionComparator = ZoieConfig.DEFAULT_VERSION_COMPARATOR; + + public PerfStreamDataProviderBuilder(){ + } + + @Override + public StreamDataProvider buildDataProvider(DataSourceFilter dataFilter, String oldSinceKey, + ShardingStrategy shardingStrategy, Set partitions) throws Exception { + String file = config.get("file"); + int maxIter = Integer.parseInt(config.get("maxIter")); + + PerfVersion version = PerfVersion.parse(oldSinceKey); + PerfStreamDataProvider provider = new PerfStreamDataProvider(new File(file), version, maxIter); + + PerfJsonFilter perfFilter = new PerfJsonFilter(maxIter); + provider.setFilter(perfFilter); + return provider; + } + + @Override + public Comparator getVersionComparator() { + return _versionComparator; + } } diff --git a/perf/src/main/java/com/sensei/perf/indexing/client/SenseiPerfClient.java b/perf/src/main/java/com/sensei/perf/indexing/client/SenseiPerfClient.java index d938bba27..b25dfe125 100644 --- a/perf/src/main/java/com/sensei/perf/indexing/client/SenseiPerfClient.java +++ b/perf/src/main/java/com/sensei/perf/indexing/client/SenseiPerfClient.java @@ -22,347 +22,348 @@ import org.apache.commons.configuration.PropertiesConfiguration; import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean; -import com.sensei.search.client.servlet.DefaultSenseiJSONServlet; -import com.sensei.search.req.SenseiRequest; -import com.sensei.search.req.SenseiResult; -import com.sensei.search.svc.api.SenseiService; -import com.sensei.search.svc.impl.HttpRestSenseiServiceImpl; -import com.sensei.search.util.HttpUtil; +import com.senseidb.servlet.DefaultSenseiJSONServlet; +import com.senseidb.search.req.SenseiRequest; +import com.senseidb.search.req.SenseiResult; +import com.senseidb.svc.api.SenseiService; +import com.senseidb.svc.impl.HttpRestSenseiServiceImpl; +import com.senseidb.util.HttpUtil; import com.yammer.metrics.Metrics; -import com.yammer.metrics.core.GaugeMetric; -import com.yammer.metrics.core.TimerMetric; +import com.yammer.metrics.core.Timer; +import com.yammer.metrics.core.Gauge; +import com.yammer.metrics.stats.Snapshot; public class SenseiPerfClient { - public static final String URL = "sensei.client.url"; - public static final String TYPE = "sensei.client.type"; - public static final String JMX_URL = "sensei.jmx.url"; - public static final String TIME_TO_RUN = "sensei.perf.timeToRunMin"; - public static final String NUM_THREADS = "sensei.perf.numThreads"; - public static final String WAIT_INTERVAL = "sensei.perf.waitIntervalMs"; - public static final String REQ_FILE = "sensei.perf.request.file"; - - public static final String SEARCH_REPORT_FILE = "search-report.txt"; - public static final String INDEXING_REPORT_FILE = "indexing-report.txt"; - public static final String SYSTEM_REPORT_FILE = "system-report.txt"; - - static TimerMetric searchTimer = Metrics.newTimer(SenseiPerfClient.class, "perf-timer", TimeUnit.MILLISECONDS, TimeUnit.MILLISECONDS); + public static final String URL = "sensei.client.url"; + public static final String TYPE = "sensei.client.type"; + public static final String JMX_URL = "sensei.jmx.url"; + public static final String TIME_TO_RUN = "sensei.perf.timeToRunMin"; + public static final String NUM_THREADS = "sensei.perf.numThreads"; + public static final String WAIT_INTERVAL = "sensei.perf.waitIntervalMs"; + public static final String REQ_FILE = "sensei.perf.request.file"; + + public static final String SEARCH_REPORT_FILE = "search-report.txt"; + public static final String INDEXING_REPORT_FILE = "indexing-report.txt"; + public static final String SYSTEM_REPORT_FILE = "system-report.txt"; + + static final Timer searchTimer = Metrics.newTimer(SenseiPerfClient.class, "perf-timer", TimeUnit.MILLISECONDS, TimeUnit.MILLISECONDS); - - private static PrintStream searchReport; - private static PrintStream indexingReport; - private static PrintStream systemReport; - - private static ExecutorService _threadPool; - - private static final AtomicInteger _numDocs = new AtomicInteger(0); - + + private static PrintStream searchReport; + private static PrintStream indexingReport; + private static PrintStream systemReport; + + private static ExecutorService _threadPool; + + private static final AtomicInteger _numDocs = new AtomicInteger(0); + - static GaugeMetric indexSizeGauge = Metrics.newGauge(SenseiPerfClient.class, "index-stats", new GaugeMetric(){ + static final Gauge indexSizeGauge = Metrics.newGauge(SenseiPerfClient.class, "index-stats", new Gauge(){ - @Override - public Integer value() { - return _numDocs.get(); - } - - }); - - public static SenseiService buildSvc(String url,String type) throws Exception{ - if ("rest".equals(type)){ - HttpRestSenseiServiceImpl restSvc = new HttpRestSenseiServiceImpl(url); - return restSvc; - } - else if ("sprintrpc".equals(type)){ - HttpInvokerProxyFactoryBean springInvokerBean = new HttpInvokerProxyFactoryBean(); - springInvokerBean.setServiceUrl(url); - springInvokerBean.setServiceInterface(SenseiService.class); - springInvokerBean.afterPropertiesSet(); - return (SenseiService)(springInvokerBean.getObject()); - } - else{ - throw new IllegalArgumentException("type not supported: "+type); - } - } - - static String[] loadRequestFile(File reqFile) throws Exception{ - FileReader freader = null; - try{ - freader = new FileReader(reqFile); - BufferedReader reader = new BufferedReader(freader); - LinkedList list = new LinkedList(); - while(true){ - String line = reader.readLine(); - if (line == null) break; - - int index = line.indexOf("q="); - if (index >= 0){ - line = line.substring(index); - } - list.add(line); - } - - return list.toArray(new String[0]); - } - finally{ - if (freader!=null){ - freader.close(); - } - } - } - /** - * @param args - */ - public static void main(String[] args) throws Exception{ - File confDir; - if (args.length<1){ - confDir = new File("perf-client-conf"); - } - else{ - confDir = new File(args[0]); - } - - System.out.println("Using conf dir: "+confDir.getAbsolutePath()); - org.apache.log4j.PropertyConfigurator.configure("log4j.properties"); - - File confFile = new File(confDir,"perf-test.properties"); + @Override + public Integer value() { + return _numDocs.get(); + } + + }); + + public static SenseiService buildSvc(String url,String type) throws Exception{ + if ("rest".equals(type)){ + HttpRestSenseiServiceImpl restSvc = new HttpRestSenseiServiceImpl(url); + return restSvc; + } + else if ("sprintrpc".equals(type)){ + HttpInvokerProxyFactoryBean springInvokerBean = new HttpInvokerProxyFactoryBean(); + springInvokerBean.setServiceUrl(url); + springInvokerBean.setServiceInterface(SenseiService.class); + springInvokerBean.afterPropertiesSet(); + return (SenseiService)(springInvokerBean.getObject()); + } + else{ + throw new IllegalArgumentException("type not supported: "+type); + } + } + + static String[] loadRequestFile(File reqFile) throws Exception{ + FileReader freader = null; + try{ + freader = new FileReader(reqFile); + BufferedReader reader = new BufferedReader(freader); + LinkedList list = new LinkedList(); + while(true){ + String line = reader.readLine(); + if (line == null) break; + + int index = line.indexOf("q="); + if (index >= 0){ + line = line.substring(index); + } + list.add(line); + } + + return list.toArray(new String[0]); + } + finally{ + if (freader!=null){ + freader.close(); + } + } + } + /** + * @param args + */ + public static void main(String[] args) throws Exception{ + File confDir; + if (args.length<1){ + confDir = new File("perf-client-conf"); + } + else{ + confDir = new File(args[0]); + } + + System.out.println("Using conf dir: "+confDir.getAbsolutePath()); + org.apache.log4j.PropertyConfigurator.configure("log4j.properties"); + + File confFile = new File(confDir,"perf-test.properties"); - System.out.println("Using conf file: "+confFile.getAbsolutePath()); - - Configuration conf = new PropertiesConfiguration(confFile); - - String outDirString = conf.getString("output.dir",null); - File outDir = outDirString == null ? confFile.getParentFile() : new File(outDirString); - outDir.mkdirs(); - - File searchFile = new File(outDir,SEARCH_REPORT_FILE); - FileOutputStream searchFileOut = new FileOutputStream(searchFile); - searchReport = new PrintStream(searchFileOut); - - - File indexingFile = new File(outDir,INDEXING_REPORT_FILE); - FileOutputStream indexingFileOut = new FileOutputStream(indexingFile); - indexingReport = new PrintStream(indexingFileOut); - - - File systemFile = new File(outDir,SYSTEM_REPORT_FILE); - FileOutputStream systemFileOut = new FileOutputStream(systemFile); - systemReport = new PrintStream(systemFileOut); - - String url = conf.getString(URL); - String type = conf.getString(TYPE); - - SenseiService svc = buildSvc(url, type); - - int nThreads = conf.getInt(NUM_THREADS); - - _threadPool= Executors.newFixedThreadPool(nThreads+2); - - String reqFile = conf.getString(REQ_FILE); - - long waitInterval = conf.getLong(WAIT_INTERVAL,500); - int timeToRun = conf.getInt(TIME_TO_RUN); - - String[] queries = loadRequestFile(new File(reqFile)); - - - SearchThread[] searchThreads = new SearchThread[nThreads]; - for (int i=0;i> futureList = new ArrayList>(nThreads); - for (SearchThread searchThread :searchThreads){ - //_threadPool..execute(searchThread); - Future future = _threadPool.submit(searchThread); - futureList.add(future); - } - - SearchReporter searchReportThread = new SearchReporter(1000); - IndexReporter indexReportThread = new IndexReporter(1000); - - searchReportThread.start(); - indexReportThread.start(); - - for(Future future : futureList){ - future.get(); - } - - - _threadPool.shutdown(); - - _threadPool.awaitTermination(10,TimeUnit.SECONDS); - - System.out.println("test completed, cleaning up..."); - + System.out.println("Using conf file: "+confFile.getAbsolutePath()); + + Configuration conf = new PropertiesConfiguration(confFile); + + String outDirString = conf.getString("output.dir",null); + File outDir = outDirString == null ? confFile.getParentFile() : new File(outDirString); + outDir.mkdirs(); + + File searchFile = new File(outDir,SEARCH_REPORT_FILE); + FileOutputStream searchFileOut = new FileOutputStream(searchFile); + searchReport = new PrintStream(searchFileOut); + + + File indexingFile = new File(outDir,INDEXING_REPORT_FILE); + FileOutputStream indexingFileOut = new FileOutputStream(indexingFile); + indexingReport = new PrintStream(indexingFileOut); + + + File systemFile = new File(outDir,SYSTEM_REPORT_FILE); + FileOutputStream systemFileOut = new FileOutputStream(systemFile); + systemReport = new PrintStream(systemFileOut); + + String url = conf.getString(URL); + String type = conf.getString(TYPE); + + SenseiService svc = buildSvc(url, type); + + int nThreads = conf.getInt(NUM_THREADS); + + _threadPool= Executors.newFixedThreadPool(nThreads+2); + + String reqFile = conf.getString(REQ_FILE); + + long waitInterval = conf.getLong(WAIT_INTERVAL,500); + int timeToRun = conf.getInt(TIME_TO_RUN); + + String[] queries = loadRequestFile(new File(reqFile)); + + + SearchThread[] searchThreads = new SearchThread[nThreads]; + for (int i=0;i> futureList = new ArrayList>(nThreads); + for (SearchThread searchThread :searchThreads){ + //_threadPool..execute(searchThread); + Future future = _threadPool.submit(searchThread); + futureList.add(future); + } + + SearchReporter searchReportThread = new SearchReporter(1000); + IndexReporter indexReportThread = new IndexReporter(1000); + + searchReportThread.start(); + indexReportThread.start(); + + for(Future future : futureList){ + future.get(); + } + + + _threadPool.shutdown(); + + _threadPool.awaitTermination(10,TimeUnit.SECONDS); + + System.out.println("test completed, cleaning up..."); + - searchReportThread.terminate(); - indexReportThread.terminate(); - - searchReportThread.join(); - indexReportThread.join(); - - svc.shutdown(); - - searchReport.close(); - indexingReport.close(); - systemReport.close(); - } - - static class SearchReporter extends Thread{ - - private volatile boolean stop; - private final long _tickInterval; - public SearchReporter(long tickInterval){ - super("search-reporter"); - super.setDaemon(true); - stop = false; - _tickInterval = tickInterval; - } - - public void terminate(){ - stop = true; - Thread.currentThread().interrupt(); - } - - public void run(){ - while(!stop){ - StringBuilder builder = new StringBuilder(); - builder.append(System.currentTimeMillis()).append(","); - builder.append(searchTimer.count()).append(","); - builder.append(searchTimer.min()).append(","); - builder.append(searchTimer.max()).append(","); - builder.append(searchTimer.mean()).append(","); - Double[] percents = searchTimer.percentiles(0.90,0.95,0.99); - builder.append(percents[0]).append(","); - builder.append(percents[1]).append(","); - builder.append(percents[2]); - searchReport.println(builder.toString()); - searchReport.flush(); - try { - Thread.sleep(_tickInterval); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - } - + searchReportThread.terminate(); + indexReportThread.terminate(); + + searchReportThread.join(); + indexReportThread.join(); + + svc.shutdown(); + + searchReport.close(); + indexingReport.close(); + systemReport.close(); + } + + static class SearchReporter extends Thread{ + + private volatile boolean stop; + private final long _tickInterval; + public SearchReporter(long tickInterval){ + super("search-reporter"); + super.setDaemon(true); + stop = false; + _tickInterval = tickInterval; + } + + public void terminate(){ + stop = true; + Thread.currentThread().interrupt(); + } + + public void run(){ + while(!stop){ + StringBuilder builder = new StringBuilder(); + builder.append(System.currentTimeMillis()).append(","); + builder.append(searchTimer.count()).append(","); + builder.append(searchTimer.min()).append(","); + builder.append(searchTimer.max()).append(","); + builder.append(searchTimer.mean()).append(","); + Snapshot searchTimerSnapshot = searchTimer.getSnapshot(); + builder.append(searchTimerSnapshot.get75thPercentile()).append(","); + builder.append(searchTimerSnapshot.get95thPercentile()).append(","); + builder.append(searchTimerSnapshot.get99thPercentile()); + searchReport.println(builder.toString()); + searchReport.flush(); + try { + Thread.sleep(_tickInterval); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + } + private static class IndexReporter extends Thread{ - - private volatile boolean stop; - private final long _tickInterval; - public IndexReporter(long tickInterval){ - super("indexing-reporter"); - super.setDaemon(true); - stop = false; - _tickInterval = tickInterval; - } - - public void terminate(){ - stop = true; - Thread.currentThread().interrupt(); - } - - public void run(){ - while(!stop){ - StringBuilder builder = new StringBuilder(); - builder.append(System.currentTimeMillis()).append(","); - builder.append(_numDocs); - - indexingReport.println(builder.toString()); - indexingReport.flush(); - try { - Thread.sleep(_tickInterval); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - } - - private static class SearchThread extends PollingDataCollector{ + + private volatile boolean stop; + private final long _tickInterval; + public IndexReporter(long tickInterval){ + super("indexing-reporter"); + super.setDaemon(true); + stop = false; + _tickInterval = tickInterval; + } + + public void terminate(){ + stop = true; + Thread.currentThread().interrupt(); + } + + public void run(){ + while(!stop){ + StringBuilder builder = new StringBuilder(); + builder.append(System.currentTimeMillis()).append(","); + builder.append(_numDocs); + + indexingReport.println(builder.toString()); + indexingReport.flush(); + try { + Thread.sleep(_tickInterval); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + } + + private static class SearchThread extends PollingDataCollector{ - private SenseiService _svc; - private final String[] _queries; - private final Random rand; - - public SearchThread(String url,String type,String[] queries,long waitInterval,int timeToRun){ - super(waitInterval,timeToRun); - try{ - _svc = SenseiPerfClient.buildSvc(url, type); - - // do a search - SenseiResult res = _svc.doQuery(new SenseiRequest()); - } - catch(Exception e){ - _svc = null; - e.printStackTrace(); - } - _queries = queries; - rand = new Random(System.nanoTime()); - } - - @Override - public void shutDown() { - _svc.shutdown(); - } + private SenseiService _svc; + private final String[] _queries; + private final Random rand; + + public SearchThread(String url,String type,String[] queries,long waitInterval,int timeToRun){ + super(waitInterval,timeToRun); + try{ + _svc = SenseiPerfClient.buildSvc(url, type); + + // do a search + SenseiResult res = _svc.doQuery(new SenseiRequest()); + } + catch(Exception e){ + _svc = null; + e.printStackTrace(); + } + _queries = queries; + rand = new Random(System.nanoTime()); + } + + @Override + public void shutDown() { + _svc.shutdown(); + } - public void doWork() throws Exception{ - if (_svc==null){ - throw new Exception("null sensei service..."); - } - int qid = rand.nextInt(_queries.length); - String q = _queries[qid]; - Map reqMap = HttpUtil.buildRequestMap(q); - MapConfiguration mapConf = new MapConfiguration(reqMap); - DataConfiguration params = new DataConfiguration(mapConf); - final SenseiRequest req = DefaultSenseiJSONServlet.convertSenseiRequest(params); - try{ - SenseiResult res = searchTimer.time(new Callable(){ + public void doWork() throws Exception{ + if (_svc==null){ + throw new Exception("null sensei service..."); + } + int qid = rand.nextInt(_queries.length); + String q = _queries[qid]; + Map reqMap = HttpUtil.buildRequestMap(q); + MapConfiguration mapConf = new MapConfiguration(reqMap); + DataConfiguration params = new DataConfiguration(mapConf); + final SenseiRequest req = DefaultSenseiJSONServlet.convertSenseiRequest(params); + try{ + SenseiResult res = searchTimer.time(new Callable(){ - @Override - public SenseiResult call() throws Exception { - return _svc.doQuery(req); - } - }); - - - int numDocs = res.getTotalDocs(); - synchronized(_numDocs){ - int val = _numDocs.get(); - if (numDocs>val){ - _numDocs.set(numDocs); - } - } - } - catch(Exception e){ - e.printStackTrace(); - } - } - } - - public static class SystemStatsCollector extends PollingDataCollector{ - private JMXMonitor _jmxMonitor; - - public SystemStatsCollector(String jmxUrl,long waitInterval,int timeToRun){ - super(waitInterval,timeToRun); - _jmxMonitor = new JMXMonitor(jmxUrl); - } - - - - @Override - public void doWork() throws Exception { - - } + @Override + public SenseiResult call() throws Exception { + return _svc.doQuery(req); + } + }); + + + int numDocs = res.getTotalDocs(); + synchronized(_numDocs){ + int val = _numDocs.get(); + if (numDocs>val){ + _numDocs.set(numDocs); + } + } + } + catch(Exception e){ + e.printStackTrace(); + } + } + } + + public static class SystemStatsCollector extends PollingDataCollector{ + private JMXMonitor _jmxMonitor; + + public SystemStatsCollector(String jmxUrl,long waitInterval,int timeToRun){ + super(waitInterval,timeToRun); + _jmxMonitor = new JMXMonitor(jmxUrl); + } + + + + @Override + public void doWork() throws Exception { + + } - @Override - public void shutDown() { - _jmxMonitor.shutdown(); - } - } + @Override + public void shutDown() { + _jmxMonitor.shutdown(); + } + } } From 3214a6cd10d361cd7a0c66094b1c9a6ff480a2c0 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 1 May 2012 13:36:17 +0300 Subject: [PATCH 7/8] Fix for indexer stats. Before it, the stats only for one shard was available, because all have been mapped to the single JMX bean. --- .../com/senseidb/search/node/SenseiZoieSystemFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java index 47604bb2c..a01819920 100644 --- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java +++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java @@ -97,13 +97,13 @@ private static class IndexingMetrics{ final Histogram flushTimeHistogram; IndexingMetrics(int partition){ - MetricName docsIndexedName = new MetricName(MetricsConstants.Domain,"meter","docs-indexed","indexer"); + MetricName docsIndexedName = new MetricName(MetricsConstants.Domain,"meter","docs-indexed-" + partition,"indexer"); docsIndexedMetric = Metrics.newMeter(docsIndexedName, "indexing", TimeUnit.SECONDS); - MetricName docsLeftoverName = new MetricName(MetricsConstants.Domain,"meter","docs-leftover","indexer"); + MetricName docsLeftoverName = new MetricName(MetricsConstants.Domain,"meter","docs-leftover-" + partition,"indexer"); docsLeftoverMetric = Metrics.newMeter(docsLeftoverName, "indexing", TimeUnit.SECONDS); - MetricName flushTimeName = new MetricName(MetricsConstants.Domain,"histogram","flush-time","indexer"); + MetricName flushTimeName = new MetricName(MetricsConstants.Domain,"histogram","flush-time-" + partition,"indexer"); flushTimeHistogram = Metrics.newHistogram(flushTimeName, false); } } From 3b0c15f8f81963d9514da2abd170b76ab5f2b875 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 21 May 2012 09:23:21 +0300 Subject: [PATCH 8/8] Config fix. Package name of PerfStreamDataProviderBuilder changed to the correct --- perf/perf-sensei-conf/sensei.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perf/perf-sensei-conf/sensei.properties b/perf/perf-sensei-conf/sensei.properties index 744ade685..1a0585e85 100644 --- a/perf/perf-sensei-conf/sensei.properties +++ b/perf/perf-sensei-conf/sensei.properties @@ -26,7 +26,7 @@ sensei.index.freshness = 10000 sensei.index.manager.default.maxpartition.id = 1 -sensei.gateway.class=com.sematext.sensei.perf.indexing.PerfStreamDataProviderBuilder +sensei.gateway.class=com.sensei.perf.indexing.PerfStreamDataProviderBuilder sensei.gateway.file = example/cars_perf/data/cars.json sensei.gateway.maxIter = 1000 sensei.gateway.sleepMills = 100