incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Small shell fixes and logger problem.
Date Mon, 14 Jan 2013 02:22:56 GMT
Updated Branches:
  refs/heads/0.2-dev 2ef1c1ce5 -> 4a8c3779f


Small shell fixes and logger problem.


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

Branch: refs/heads/0.2-dev
Commit: 4a8c3779f8a0297daa242e8a2a81ae70908686e7
Parents: 2ef1c1c
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Jan 13 21:21:02 2013 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Jan 13 21:21:02 2013 -0500

----------------------------------------------------------------------
 .../java/org/apache/blur/thrift/TableContext.java  |    7 +++++--
 .../src/main/java/org/apache/blur/shell/Main.java  |    6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4a8c3779/src/blur-core/src/main/java/org/apache/blur/thrift/TableContext.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/TableContext.java b/src/blur-core/src/main/java/org/apache/blur/thrift/TableContext.java
index 5918bfc..0e6b41a 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/TableContext.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/TableContext.java
@@ -10,6 +10,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.blur.analysis.BlurAnalyzer;
+import org.apache.blur.log.Log;
+import org.apache.blur.log.LogFactory;
 import org.apache.blur.lucene.search.QueryConverter;
 import org.apache.blur.lucene.search.QueryConverterImpl;
 import org.apache.blur.thrift.generated.TableDescriptor;
@@ -20,9 +22,10 @@ import org.apache.lucene.index.IndexDeletionPolicy;
 import org.apache.lucene.index.KeepOnlyLastCommitDeletionPolicy;
 import org.apache.lucene.search.similarities.DefaultSimilarity;
 import org.apache.lucene.search.similarities.Similarity;
-import org.mortbay.log.Log;
 
 public class TableContext {
+  
+  private static final Log LOG = LogFactory.getLog(TableContext.class);
 
   private static final String LOGS = "logs";
 
@@ -44,7 +47,7 @@ public class TableContext {
   }
 
   public static TableContext create(TableDescriptor tableDescriptor) {
-    Log.info("Creating table context for table [{0}]", tableDescriptor.getName());
+    LOG.info("Creating table context for table [{0}]", tableDescriptor.getName());
     Configuration configuration = new Configuration();
     Map<String, String> properties = tableDescriptor.getProperties();
     if (properties != null) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4a8c3779/src/blur-shell/src/main/java/org/apache/blur/shell/Main.java
----------------------------------------------------------------------
diff --git a/src/blur-shell/src/main/java/org/apache/blur/shell/Main.java b/src/blur-shell/src/main/java/org/apache/blur/shell/Main.java
index d250d2f..9f3addf 100644
--- a/src/blur-shell/src/main/java/org/apache/blur/shell/Main.java
+++ b/src/blur-shell/src/main/java/org/apache/blur/shell/Main.java
@@ -45,7 +45,7 @@ public class Main {
   private static Map<String, Command> commands;
 
   public static void usage() {
-    System.out.println("Usage: java " + Main.class.getName() + " controller:port");
+    System.out.println("Usage: java " + Main.class.getName() + " host:port");
   }
 
   private static class DebugCommand extends Command {
@@ -178,7 +178,7 @@ public class Main {
       reader.setCompletionHandler(new ShowDiffsOnlyCompletionHandler());
 
       for (Completer c : commands.values()) {
-        System.out.println("adding " + c + " " + reader.addCompleter(c));
+        reader.addCompleter(c);
       }
 
       String line;
@@ -245,7 +245,7 @@ public class Main {
     // builder.put("schema", new SchemaTableCommand());
     add(builder, new SearchCommand(client));
     add(builder, new AddCommand(client));
-    add(builder, new UpdateCommand(client));
+    //    add(builder, new UpdateCommand(client));
     // builder.put("indexaccesslog", new IndexAccessLogCommand());
     // builder.put("shardlayout", new ShardServerLayoutCommand());
     commands = builder.build();


Mime
View raw message