Updated Branches: refs/heads/master 5ea9c30e2 -> 04d127eea
Got the agent compiling, one test is still failing Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/445997a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/445997a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/445997a6 Branch: refs/heads/master Commit: 445997a6cfc92e14dfed4ac7e704f937c8a2a5a3 Parents: ffa1d72 Author: Chris Rohr <[email protected]> Authored: Thu Aug 29 17:44:39 2013 -0400 Committer: Chris Rohr <[email protected]> Committed: Thu Aug 29 17:44:39 2013 -0400 ---------------------------------------------------------------------- contrib/blur-console/blur-admin/Rakefile | 2 +- ...031155_change_blur_queries_uuid_to_string.rb | 9 +++ contrib/blur-console/blur-admin/db/schema.rb | 19 +---- contrib/blur-console/blur-agent/pom.xml | 12 ++-- .../collectors/blur/query/QueryCollector.java | 8 +-- .../collectors/blur/table/SchemaCollector.java | 76 +++----------------- .../collectors/blur/table/StatsCollector.java | 5 +- .../collectors/blur/table/TableCollector.java | 2 +- .../blur/BlurDatabaseConnection.java | 20 +++--- .../blur/interfaces/QueryDatabaseInterface.java | 6 +- .../blur/interfaces/TableDatabaseInterface.java | 3 +- .../blur/query/QueryCollectorTest.java | 35 +++++++-- 12 files changed, 78 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-admin/Rakefile ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/Rakefile b/contrib/blur-console/blur-admin/Rakefile index 143b4ca..a6c5582 100644 --- a/contrib/blur-console/blur-admin/Rakefile +++ b/contrib/blur-console/blur-admin/Rakefile @@ -34,7 +34,7 @@ module ::RakeFileUtils end if Rails.env == 'development' or Rails.env == 'test' - require 'ci/reporter/rake/rspec' + #require 'ci/reporter/rake/rspec' end BlurAdmin::Application.load_tasks http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb b/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb new file mode 100644 index 0000000..ed3577f --- /dev/null +++ b/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb @@ -0,0 +1,9 @@ +class ChangeBlurQueriesUuidToString < ActiveRecord::Migration + def up + change_column :blur_queries, :uuid, :string + end + + def down + change_column :blur_queries, :uuid, :limit => 8 + end +end http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-admin/db/schema.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/schema.rb b/contrib/blur-console/blur-admin/db/schema.rb index 4fc52b7..1f965ff 100644 --- a/contrib/blur-console/blur-admin/db/schema.rb +++ b/contrib/blur-console/blur-admin/db/schema.rb @@ -1,18 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with this -# work for additional information regarding copyright ownership. The ASF -# licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - # encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to @@ -26,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130505151503) do +ActiveRecord::Schema.define(:version => 20130829031155) do create_table "admin_settings", :force => true do |t| t.string "setting", :null => false @@ -59,7 +44,7 @@ ActiveRecord::Schema.define(:version => 20130505151503) do create_table "blur_queries", :force => true do |t| t.text "query_string", :limit => 16777215 t.integer "complete_shards" - t.integer "uuid", :limit => 8 + t.string "uuid" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.boolean "super_query_on" http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/pom.xml b/contrib/blur-console/blur-agent/pom.xml index 5dac677..806139a 100644 --- a/contrib/blur-console/blur-agent/pom.xml +++ b/contrib/blur-console/blur-agent/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.2.0-incubating</version> + <version>0.2.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> @@ -77,12 +77,12 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> - <version>0.2.0-incubating</version> + <version>0.2.0-incubating-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>0.2.0-incubating</version> + <version>0.2.0-incubating-SNAPSHOT</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -128,13 +128,13 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> - <version>0.2.0-incubating</version> + <version>0.2.0-incubating-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> - <version>0.2.0-incubating</version> + <version>0.2.0-incubating-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -147,7 +147,7 @@ under the License. <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-store</artifactId> - <version>0.2.0-incubating</version> + <version>0.2.0-incubating-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java index 79c60c0..1b62127 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java @@ -25,7 +25,7 @@ import org.apache.blur.agent.connections.blur.interfaces.QueryDatabaseInterface; import org.apache.blur.agent.types.TimeHelper; import org.apache.blur.thrift.generated.Blur.Iface; import org.apache.blur.thrift.generated.BlurQueryStatus; -import org.apache.blur.thrift.generated.SimpleQuery; +import org.apache.blur.thrift.generated.Query; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,7 +50,7 @@ public class QueryCollector implements Runnable { @SuppressWarnings("unchecked") @Override public void run() { - Set<Long> currentQueries = new HashSet<Long>(); + Set<String> currentQueries = new HashSet<String>(); try { currentQueries.addAll(blurConnection.queryStatusIdList(tableName)); //currentQueries.addAll(this.database.getRunningQueries()); @@ -63,7 +63,7 @@ public class QueryCollector implements Runnable { this.database.markOrphanedRunningQueriesComplete(CollectionUtils.subtract(this.database.getRunningQueries((long)tableId), currentQueries)); - for (Long queryUUID : currentQueries) { + for (String queryUUID : currentQueries) { BlurQueryStatus status; try { status = blurConnection.queryStatusById(tableName, queryUUID); @@ -83,7 +83,7 @@ public class QueryCollector implements Runnable { } if (oldQuery == null) { - SimpleQuery query = status.getQuery().getSimpleQuery(); + Query query = status.getQuery().getQuery(); long startTimeLong = status.getQuery().getStartTime(); // Set the query creation time to now or given start time http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/SchemaCollector.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/SchemaCollector.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/SchemaCollector.java index 98920ff..84654be 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/SchemaCollector.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/SchemaCollector.java @@ -19,17 +19,14 @@ package org.apache.blur.agent.collectors.blur.table; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Set; import org.apache.blur.agent.connections.blur.interfaces.TableDatabaseInterface; import org.apache.blur.agent.exceptions.NullReturnedException; import org.apache.blur.agent.types.Column; import org.apache.blur.agent.types.Family; -import org.apache.blur.thrift.generated.AnalyzerDefinition; import org.apache.blur.thrift.generated.Blur.Iface; import org.apache.blur.thrift.generated.BlurException; import org.apache.blur.thrift.generated.ColumnDefinition; -import org.apache.blur.thrift.generated.ColumnFamilyDefinition; import org.apache.blur.thrift.generated.Schema; import org.apache.blur.thrift.generated.TableDescriptor; import org.apache.commons.logging.Log; @@ -67,66 +64,7 @@ public class SchemaCollector implements Runnable { List<Family> columnDefs = getColumnDefinitions(schema); - AnalyzerDefinition analyzerDefinition = descriptor.getAnalyzerDefinition(); - if (analyzerDefinition != null) { - Map<String, ColumnFamilyDefinition> columnFamilyDefinitions = analyzerDefinition.getColumnFamilyDefinitions(); - ColumnDefinition analyzerDefaultDefinition = analyzerDefinition.getDefaultDefinition(); - if (columnFamilyDefinitions == null) { - for (Family family : columnDefs) { - for (Column column : family.getColumns()) { - if (analyzerDefaultDefinition == null) { - column.setAnalyzer("UNKNOWN"); - } else { - column.setAnalyzer(analyzerDefaultDefinition.getAnalyzerClassName()); - column.setFullText(analyzerDefaultDefinition.isFullTextIndex()); - } - } - } - } else { - for (Map.Entry<String, ColumnFamilyDefinition> describeEntry : columnFamilyDefinitions.entrySet()) { - Family family = new Family(describeEntry.getKey()); - int familyIndex = columnDefs.indexOf(family); - - if (familyIndex == -1) { - columnDefs.add(family); - } else { - family = columnDefs.get(familyIndex); - } - - Map<String, ColumnDefinition> columnDefinitions = describeEntry.getValue().getColumnDefinitions(); - ColumnDefinition columnDefaultDefinition = describeEntry.getValue().getDefaultDefinition(); - if (columnDefinitions == null) { - for (Column column : family.getColumns()) { - if (columnDefaultDefinition == null && analyzerDefaultDefinition == null) { - column.setAnalyzer("UNKNOWN"); - } else if (columnDefaultDefinition == null) { - column.setAnalyzer(analyzerDefaultDefinition.getAnalyzerClassName()); - column.setFullText(analyzerDefaultDefinition.isFullTextIndex()); - } else { - column.setAnalyzer(columnDefaultDefinition.getAnalyzerClassName()); - column.setFullText(columnDefaultDefinition.isFullTextIndex()); - } - } - } else { - for (Map.Entry<String, ColumnDefinition> columnDescription : columnDefinitions.entrySet()) { - Column column = new Column(columnDescription.getKey()); - int columnIndex = family.getColumns().indexOf(column); - - if (columnIndex == -1) { - family.getColumns().add(column); - } else { - column = family.getColumns().get(columnIndex); - } - - column.setAnalyzer(columnDescription.getValue().getAnalyzerClassName()); - column.setFullText(columnDescription.getValue().isFullTextIndex()); - } - } - } - } - } - this.database.updateTableSchema(this.tableId, new ObjectMapper().writeValueAsString(columnDefs), this.descriptor - .getAnalyzerDefinition().getFullTextAnalyzerClassName()); + this.database.updateTableSchema(this.tableId, new ObjectMapper().writeValueAsString(columnDefs), "UNKNOWN"); } catch (BlurException e) { log.error("Unable to get the shard schema for table [" + tableName + "].", e); } catch (JsonProcessingException e) { @@ -142,12 +80,16 @@ public class SchemaCollector implements Runnable { private List<Family> getColumnDefinitions(final Schema schema) { List<Family> columnDefs = new ArrayList<Family>(); - Map<String, Set<String>> columnFamilies = schema.getColumnFamilies(); + Map<String, Map<String, ColumnDefinition>> columnFamilies = schema.getFamilies(); if (columnFamilies != null) { - for (Map.Entry<String, Set<String>> schemaEntry : columnFamilies.entrySet()) { + for (Map.Entry<String, Map<String, ColumnDefinition>> schemaEntry : columnFamilies.entrySet()) { Family family = new Family(schemaEntry.getKey()); - for (String columnName : schemaEntry.getValue()) { - Column column = new Column(columnName); + for (ColumnDefinition def : schemaEntry.getValue().values()) { + Column column = new Column(def.getColumnName()); + column.setFullText(def.isFieldLessIndexed()); + //TODO: Is the analyzer available anymore? + //TODO: Add field type + //TODO: Do anything with subcolumns? column.setLive(true); family.getColumns().add(column); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/StatsCollector.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/StatsCollector.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/StatsCollector.java index ef89ba1..8701960 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/StatsCollector.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/StatsCollector.java @@ -44,14 +44,13 @@ public class StatsCollector implements Runnable { @Override public void run() { try { - TableStats tableStats = blurConnection.getTableStats(this.tableName); + TableStats tableStats = blurConnection.tableStats(this.tableName); if (tableStats == null) { throw new NullReturnedException("No table statistics were returned!"); } - this.database.updateTableStats(tableId, tableStats.getBytes(), tableStats.getQueries(), tableStats.getRecordCount(), - tableStats.getRowCount()); + this.database.updateTableStats(tableId, tableStats.getBytes(), tableStats.getRecordCount(), tableStats.getRowCount()); } catch (BlurException e) { log.error("Unable to get table stats for table [" + tableId + "].", e); } catch (DataAccessException e) { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/TableCollector.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/TableCollector.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/TableCollector.java index 36f0524..d0b8e99 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/TableCollector.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/table/TableCollector.java @@ -50,7 +50,7 @@ public class TableCollector implements Runnable { } /* spawn the different table info collectors */ - if (descriptor.isEnabled) { + if (descriptor.enabled) { new Thread(new SchemaCollector(this.blurConnection, this.tableName, this.tableId, descriptor, this.database), "Table Schema Collector - " + this.tableName).start(); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java index 2b66019..73082d4 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java @@ -28,7 +28,7 @@ import org.apache.blur.agent.exceptions.ZookeeperNameCollisionException; import org.apache.blur.agent.exceptions.ZookeeperNameMissingException; import org.apache.blur.agent.types.TimeHelper; import org.apache.blur.thrift.generated.BlurQueryStatus; -import org.apache.blur.thrift.generated.SimpleQuery; +import org.apache.blur.thrift.generated.Query; import org.apache.commons.lang.StringUtils; import org.json.simple.JSONValue; import org.springframework.dao.IncorrectResultSizeDataAccessException; @@ -105,12 +105,12 @@ public class BlurDatabaseConnection implements BlurDatabaseInterface { } @Override - public void updateTableStats(final int tableId, Long tableBytes, Long tableQueries, Long tableRecordCount, Long tableRowCount) { - jdbc.update("update blur_tables set current_size=?, query_usage=?, record_count=?, row_count=? where id=?", new Object[] { tableBytes, - tableQueries, tableRecordCount, tableRowCount, tableId }); + public void updateTableStats(final int tableId, Long tableBytes, Long tableRecordCount, Long tableRowCount) { + jdbc.update("update blur_tables set current_size=?, record_count=?, row_count=? where id=?", new Object[] { tableBytes, + tableRecordCount, tableRowCount, tableId }); } - public Map<String, Object> getQuery(int tableId, long UUID) { + public Map<String, Object> getQuery(int tableId, String UUID) { try { return this.jdbc.queryForMap("select id, complete_shards, times, state from blur_queries where blur_table_id=? and uuid=?", tableId, UUID); @@ -119,11 +119,11 @@ public class BlurDatabaseConnection implements BlurDatabaseInterface { } } - public void createQuery(BlurQueryStatus status, SimpleQuery query, String times, Date startTime, int tableId) { + public void createQuery(BlurQueryStatus status, Query query, String times, Date startTime, int tableId) { this.jdbc .update( "insert into blur_queries (query_string, times, complete_shards, total_shards, state, uuid, created_at, updated_at, blur_table_id, super_query_on, facets, start, fetch_num, pre_filters, post_filters, selector_column_families, selector_columns, userid, record_only) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", - query.getQueryStr(), + query.getQuery(), times, status.getCompleteShards(), status.getTotalShards(), @@ -132,12 +132,12 @@ public class BlurDatabaseConnection implements BlurDatabaseInterface { startTime, TimeHelper.now().getTime(), tableId, - query.isSuperQueryOn(), + query.isRowQuery(), StringUtils.join(status.getQuery().getFacets(), ", "), status.getQuery().getStart(), status.getQuery().getFetch(), - query.getPreSuperFilter(), - query.getPostSuperFilter(), + query.getRecordFilter(), + query.getRowFilter(), status.getQuery().getSelector() == null ? null : JSONValue.toJSONString(status.getQuery().getSelector() .getColumnFamiliesToFetch()), status.getQuery().getSelector() == null ? null : JSONValue.toJSONString(status.getQuery().getSelector().getColumnsToFetch()), http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java index 8dd3147..b60dd19 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java @@ -22,14 +22,14 @@ import java.util.List; import java.util.Map; import org.apache.blur.thrift.generated.BlurQueryStatus; -import org.apache.blur.thrift.generated.SimpleQuery; +import org.apache.blur.thrift.generated.Query; public interface QueryDatabaseInterface { - Map<String, Object> getQuery(int tableId, long UUID); + Map<String, Object> getQuery(int tableId, String UUID); List<Long> getRunningQueries(Long tableId); - void createQuery(BlurQueryStatus status, SimpleQuery query, String times, Date startTime, int tableId); + void createQuery(BlurQueryStatus status, Query query, String times, Date startTime, int tableId); void updateQuery(BlurQueryStatus status, String times, int queryId); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/TableDatabaseInterface.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/TableDatabaseInterface.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/TableDatabaseInterface.java index 1b01927..96ae435 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/TableDatabaseInterface.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/TableDatabaseInterface.java @@ -23,6 +23,5 @@ public interface TableDatabaseInterface { void updateTableServer(final int tableId, final String server); - void updateTableStats(final int tableId, final Long tableBytes, final Long tableQueries, final Long tableRecordCount, - final Long tableRowCount); + void updateTableStats(final int tableId, final Long tableBytes, final Long tableRecordCount, final Long tableRowCount); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/445997a6/contrib/blur-console/blur-agent/src/test/java/org/apache/blur/agent/collectors/blur/query/QueryCollectorTest.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/test/java/org/apache/blur/agent/collectors/blur/query/QueryCollectorTest.java b/contrib/blur-console/blur-agent/src/test/java/org/apache/blur/agent/collectors/blur/query/QueryCollectorTest.java index 30e1ad8..ca2a0c3 100644 --- a/contrib/blur-console/blur-agent/src/test/java/org/apache/blur/agent/collectors/blur/query/QueryCollectorTest.java +++ b/contrib/blur-console/blur-agent/src/test/java/org/apache/blur/agent/collectors/blur/query/QueryCollectorTest.java @@ -20,18 +20,24 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.io.IOException; +import java.util.Arrays; import org.apache.blur.MiniCluster; import org.apache.blur.agent.connections.blur.BlurDatabaseConnection; import org.apache.blur.agent.test.BlurAgentBaseTestClass; import org.apache.blur.thirdparty.thrift_0_9_0.TException; import org.apache.blur.thrift.BlurClient; -import org.apache.blur.thrift.generated.AnalyzerDefinition; import org.apache.blur.thrift.generated.Blur.Iface; import org.apache.blur.thrift.generated.BlurException; import org.apache.blur.thrift.generated.BlurQuery; +import org.apache.blur.thrift.generated.Column; +import org.apache.blur.thrift.generated.Query; +import org.apache.blur.thrift.generated.Record; +import org.apache.blur.thrift.generated.RecordMutation; +import org.apache.blur.thrift.generated.RecordMutationType; +import org.apache.blur.thrift.generated.RowMutation; +import org.apache.blur.thrift.generated.RowMutationType; import org.apache.blur.thrift.generated.ScoreType; -import org.apache.blur.thrift.generated.SimpleQuery; import org.apache.blur.thrift.generated.TableDescriptor; import org.junit.Test; @@ -45,16 +51,35 @@ public class QueryCollectorTest extends BlurAgentBaseTestClass { TableDescriptor td = new TableDescriptor(); - td.setTableUri(MiniCluster.getFileSystemUri() + "/blur-tables/test-table"); - td.setAnalyzerDefinition(new AnalyzerDefinition()); + td.setTableUri(MiniCluster.getFileSystemUri() + "/blur-tables/test"); td.setName("test"); + td.setShardCount(1); blurConnection.createTable(td); +// Record record = new Record(); +// record.setRecordId("abc"); +// record.setFamily("test"); +// record.setColumns(Arrays.asList(new Column[]{new Column("col", "blah")})); +// +// RecordMutation recordMutation = new RecordMutation(); +// recordMutation.setRecordMutationType(RecordMutationType.REPLACE_ENTIRE_RECORD); +// recordMutation.setRecord(record); +// +// RowMutation row = new RowMutation(); +// row.setRowId("12345"); +// row.setTable("test"); +// row.setRowMutationType(RowMutationType.REPLACE_ROW); +// row.setRecordMutations(Arrays.asList(new RecordMutation[]{recordMutation})); +// +// blurConnection.mutate(row); + BlurQuery query = new BlurQuery(); - query.setSimpleQuery(new SimpleQuery("test.col:*", true, ScoreType.SUPER, null, null)); + query.setQuery(new Query("test.col:*", true, ScoreType.SUPER, null, null)); blurConnection.query("test", query); + System.out.println(jdbc.queryForList("select * from blur_queries")); + Thread testQueryCollector = new Thread(new QueryCollector(BlurClient.getClient(MiniCluster.getControllerConnectionStr()), "test", 1, database), "Query Test Thread"); testQueryCollector.start();
