incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [21/27] git commit: Merge branch 'master' into 0.2.0-newtypesystem
Date Fri, 09 Aug 2013 17:24:26 GMT
Merge branch 'master' into 0.2.0-newtypesystem

Conflicts:
	blur-core/src/main/java/org/apache/blur/manager/IndexManager.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/b7084641
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/b7084641
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/b7084641

Branch: refs/heads/0.2.0-newtypesystem
Commit: b70846411e2b9ac9799d71f471b6a926fb6e5196
Parents: 5f77a2b 775bb21
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Aug 9 09:02:12 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Aug 9 09:02:12 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/manager/IndexManager.java   |  55 +++++---
 .../blur/manager/status/MergerQueryStatus.java  |   8 ++
 .../blur/manager/status/QueryStatusManager.java |   1 +
 .../blur/manager/writer/IndexImporter.java      |   8 +-
 .../org/apache/blur/thrift/BlurShardServer.java |   6 +-
 .../org/apache/blur/thrift/ThriftServer.java    |  45 ++++++-
 .../blur/mapreduce/lib/BlurOutputFormat.java    |  27 ++--
 .../blur/mapreduce/lib/CsvBlurDriver.java       |  73 ++++++++---
 .../mapreduce/lib/BlurOutputFormatTest.java     |  16 ++-
 .../blur/mapreduce/lib/CsvBlurDriverTest.java   |  30 ++++-
 .../org/apache/blur/shell/GetRowCommand.java    |  26 +++-
 .../apache/blur/shell/LoadTestDataCommand.java  |  60 +++++++++
 .../main/java/org/apache/blur/shell/Main.java   |  47 ++++---
 .../apache/blur/shell/PagingPrintWriter.java    | 117 +++++++++++++++++
 .../org/apache/blur/shell/QueryCommand.java     |  28 +++-
 .../org/apache/blur/shell/SelectorCommand.java  | 100 +++++++++++++++
 .../java/org/apache/blur/shell/TopCommand.java  |  24 +++-
 .../org/apache/blur/shell/top.properties        |  13 +-
 .../java/org/apache/blur/thrift/Connection.java |   1 +
 .../blur/thrift/generated/BlurQueryStatus.java  | 128 ++++++++++++++++++-
 .../apache/blur/thrift/generated/Status.java    |  68 ++++++++++
 .../org/apache/blur/thrift/util/LoadData.java   |  73 ++++++++---
 .../apache/blur/metrics/MetricsConstants.java   |   1 +
 distribution/src/assemble/bin.xml               |  49 ++++++-
 .../src/main/scripts/bin/blur-config.sh         |  12 ++
 .../src/main/scripts/interface/Blur.thrift      |  13 ++
 .../main/scripts/interface/gen-html/Blur.html   |  10 ++
 .../main/scripts/interface/gen-html/index.html  |   1 +
 .../blur/thrift/generated/BlurQueryStatus.java  | 128 ++++++++++++++++++-
 .../apache/blur/thrift/generated/Status.java    |  68 ++++++++++
 .../main/scripts/interface/gen-js/Blur_types.js |  20 +++
 .../scripts/interface/gen-perl/Blur/Types.pm    |  20 ++-
 .../main/scripts/interface/gen-rb/blur_types.rb |  15 ++-
 33 files changed, 1166 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
----------------------------------------------------------------------
diff --cc blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
index b56d2bb,4d04459..5aabb58
--- a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
@@@ -227,20 -235,19 +235,21 @@@ public class IndexManager 
          searcher = index.getIndexReader();
          usedCache = false;
        }
 -      BlurAnalyzer analyzer = _indexServer.getAnalyzer(table);
 +      
 +      TableContext tableContext = getTableContext(table);
 +      FieldManager fieldManager = tableContext.getFieldManager();
 +      
 +      Query highlightQuery = getHighlightQuery(selector, table, fieldManager);
  
 -      Query highlightQuery = getHighlightQuery(selector, table, analyzer);
 +      fetchRow(searcher.getIndexReader(), table, shard, selector, fetchResult, highlightQuery,
fieldManager, _maxHeapPerRowFetch);
+ 
 -      fetchRow(searcher.getIndexReader(), table, shard, selector, fetchResult, highlightQuery,
analyzer,
 -          _maxHeapPerRowFetch);
        if (fetchResult.rowResult != null) {
          if (fetchResult.rowResult.row != null && fetchResult.rowResult.row.records
!= null) {
-           _recordsMeter.mark(fetchResult.rowResult.row.records.size());
+           _readRecordsMeter.mark(fetchResult.rowResult.row.records.size());
          }
-         _rowMeter.mark();
+         _readRowMeter.mark();
        } else if (fetchResult.recordResult != null) {
-         _recordsMeter.mark();
+         _readRecordsMeter.mark();
        }
      } catch (Exception e) {
        LOG.error("Unknown error while trying to fetch row.", e);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java
----------------------------------------------------------------------
diff --cc blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java
index f6269e4,981fbc9..ef38f48
--- a/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java
+++ b/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java
@@@ -367,9 -372,8 +371,8 @@@ public class BlurOutputFormat extends O
      private File _localTmpPath;
      private ProgressableDirectory _localTmpDir;
      private String _deletedRowId;
-     
  
 -    public BlurRecordWriter(Configuration configuration, BlurAnalyzer blurAnalyzer, int
attemptId, String tmpDirName)
 +    public BlurRecordWriter(Configuration configuration, int attemptId, String tmpDirName)
          throws IOException {
  
        _indexLocally = BlurOutputFormat.isIndexLocally(configuration);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/distribution/src/main/scripts/interface/gen-js/Blur_types.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b7084641/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------


Mime
View raw message