flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpe...@apache.org
Subject flume git commit: Fix various typos
Date Fri, 29 Jul 2016 05:07:57 GMT
Repository: flume
Updated Branches:
  refs/heads/trunk 988ede948 -> dff1505c1


Fix various typos

This closes #49

(Fonso Li via Mike Percy)


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

Branch: refs/heads/trunk
Commit: dff1505c1ed76358d3f6e84df95118e1d92ece8d
Parents: 988ede9
Author: lfzCarlosC <lfz.carlos@gmail.com>
Authored: Thu Jul 28 22:04:19 2016 -0700
Committer: Mike Percy <mpercy@apache.org>
Committed: Thu Jul 28 22:06:50 2016 -0700

----------------------------------------------------------------------
 CHANGELOG                                                        | 2 +-
 .../main/java/org/apache/flume/channel/file/FlumeEventQueue.java | 2 +-
 .../src/main/java/org/apache/flume/channel/file/Log.java         | 2 +-
 .../org/apache/flume/clients/log4jappender/Log4jAppender.java    | 2 +-
 .../org/apache/flume/conf/sink/SinkProcessorConfiguration.java   | 2 +-
 .../java/org/apache/flume/conf/source/SourceConfiguration.java   | 2 +-
 .../src/main/java/org/apache/flume/conf/Configurable.java        | 2 +-
 .../main/java/org/apache/flume/formatter/output/BucketPath.java  | 4 ++--
 .../apache/flume/serialization/ResettableFileInputStream.java    | 2 +-
 .../main/java/org/apache/flume/sink/FailoverSinkProcessor.java   | 2 +-
 .../src/test/java/org/apache/flume/source/TestExecSource.java    | 2 +-
 .../src/test/java/org/apache/flume/source/TestStressSource.java  | 2 +-
 flume-ng-doc/sphinx/FlumeUserGuide.rst                           | 4 ++--
 .../apache/flume/node/PropertiesFileConfigurationProvider.java   | 2 +-
 .../java/org/apache/flume/api/TestLoadBalancingRpcClient.java    | 2 +-
 .../src/main/java/org/apache/flume/sink/kite/DatasetSink.java    | 2 +-
 .../sink/elasticsearch/client/ElasticSearchClientFactory.java    | 2 +-
 .../main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java    | 4 ++--
 .../main/java/org/apache/flume/source/twitter/TwitterSource.java | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 53ea45c..6e6a668 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -720,7 +720,7 @@ Release Notes - Flume - Version v1.2.0
     * [FLUME-1017] - syslog classes missing
     * [FLUME-1026] - Document Thread Safety Guarantees
     * [FLUME-1027] - Missing log4j library in Flume distribution
-    * [FLUME-1031] - Depricate code generated by Thrift and Avro OG sources that is under
com.cloudera package
+    * [FLUME-1031] - Deprecate code generated by Thrift and Avro OG sources that is under
com.cloudera package
     * [FLUME-1035] - slf4j error in flume sdk unit tests
     * [FLUME-1036] - Reconfiguration of AVRO or NETCAT source causes port bind exception
     * [FLUME-1037] - NETCAT handler theads terminate under stress test

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java
index 4311c7f..4bb4f72 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java
@@ -514,7 +514,7 @@ final class FlumeEventQueue {
             + values.size()) * 8) //Event pointers
             + 16; //Checksum
         //There is no real need of filling the channel with 0s, since we
-        //will write the exact nummber of bytes as expected file size.
+        //will write the exact number of bytes as expected file size.
         file.setLength(expectedFileSize);
         Preconditions.checkState(file.length() == expectedFileSize,
             "Expected File size of inflight events file does not match the "

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java
index 02d8e7f..5f59d97 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java
@@ -1141,7 +1141,7 @@ public class Log {
    * <p> Locking is not supported by all file systems.
    * E.g., NFS does not consistently support exclusive locks.
    * <p>
-   * <p> If locking is supported we guarantee exculsive access to the
+   * <p> If locking is supported we guarantee exclusive access to the
    * storage directory. Otherwise, no guarantee is given.
    *
    * @throws IOException if locking fails

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
----------------------------------------------------------------------
diff --git a/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
b/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
index f9803e4..117542d 100644
--- a/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
+++ b/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
@@ -47,7 +47,7 @@ import org.apache.log4j.spi.LoggingEvent;
 
 /**
  *
- * Appends Log4j Events to an external Flume client which is decribed by
+ * Appends Log4j Events to an external Flume client which is described by
  * the Log4j configuration file. The appender takes two required parameters:
  *<p>
  *<strong>Hostname</strong> : This is the hostname of the first hop

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-configuration/src/main/java/org/apache/flume/conf/sink/SinkProcessorConfiguration.java
----------------------------------------------------------------------
diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/sink/SinkProcessorConfiguration.java
b/flume-ng-configuration/src/main/java/org/apache/flume/conf/sink/SinkProcessorConfiguration.java
index 9ce0058..d0c9802 100644
--- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/sink/SinkProcessorConfiguration.java
+++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/sink/SinkProcessorConfiguration.java
@@ -46,7 +46,7 @@ public class SinkProcessorConfiguration extends ComponentConfiguration {
 
   public enum SinkProcessorConfigurationType {
     /**
-     * Load balacing channel selector
+     * Load balancing channel selector
      */
     LOAD_BALANCE("org.apache.flume.conf.sink.LoadBalancingSinkProcessorConfiguration"),
     /**

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java
----------------------------------------------------------------------
diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java
b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java
index 8d7318e..6bd1489 100644
--- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java
+++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java
@@ -153,7 +153,7 @@ public class SourceConfiguration extends ComponentConfiguration {
     EXEC("org.apache.flume.conf.source.ExecSourceConfiguration"),
 
     /**
-     * Avro soruce.
+     * Avro source.
      *
      * @see AvroSource
      */

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-core/src/main/java/org/apache/flume/conf/Configurable.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/main/java/org/apache/flume/conf/Configurable.java b/flume-ng-core/src/main/java/org/apache/flume/conf/Configurable.java
index 5b78626..f5f9285 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/conf/Configurable.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/conf/Configurable.java
@@ -41,7 +41,7 @@ public interface Configurable {
    * reflected by the component asap.
    * </p>
    * <p>
-   * There are no thread safety guarrantees on when configure might be called.
+   * There are no thread safety guarantees on when configure might be called.
    * </p>
    * @param context
    */

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
b/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
index 167b542..f640ec9 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
@@ -433,10 +433,10 @@ public class BucketPath {
       // The replacement string must have '$' and '\' chars escaped. This
       // replacement string is pretty arcane.
       //
-      // replacee : '$' -> for java '\$' -> for regex "\\$"
+      // replace : '$' -> for java '\$' -> for regex "\\$"
       // replacement: '\$' -> for regex '\\\$' -> for java "\\\\\\$"
       //
-      // replacee : '\' -> for java "\\" -> for regex "\\\\"
+      // replace : '\' -> for java "\\" -> for regex "\\\\"
       // replacement: '\\' -> for regex "\\\\" -> for java "\\\\\\\\"
 
       // note: order matters

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
b/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
index 7d6d95c..b263f98 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
@@ -119,7 +119,7 @@ public class ResettableFileInputStream extends ResettableInputStream
   private boolean hasLowSurrogate = false;
 
   /**
-   * A low surrrgate character read from a surrogate pair.
+   * A low surrogate character read from a surrogate pair.
    * When a surrogate pair is found, the high (first) surrogate pair
    * is returned upon a call to {@link #read()},
    * while the low (second) surrogate remains stored in memory,

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
b/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
index 69541e6..fd6dc2f 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/FailoverSinkProcessor.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
  *
  * The failover mechanism works by relegating failed sinks to a pool
  * where they are assigned a cooldown period, increasing with sequential
- * failures before they are retried. Once a sink succesfully sends an
+ * failures before they are retried. Once a sink successfully sends an
  * event it is restored to the live pool.
  *
  * FailoverSinkProcessor is in no way thread safe and expects to be run via

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java
index 6204d13..36a2921 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java
@@ -415,7 +415,7 @@ public class TestExecSource {
     }
 
     // yes in the mean time someone could use our sleep time
-    // but this should be a fairly rare scenerio
+    // but this should be a fairly rare scenario
 
     String command = "sleep " + seconds;
     Pattern pattern = Pattern.compile("\b" + command + "\b");

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-core/src/test/java/org/apache/flume/source/TestStressSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestStressSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestStressSource.java
index 06e663c..5bf3805 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/TestStressSource.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestStressSource.java
@@ -164,7 +164,7 @@ public class TestStressSource {
       source.process();
     }
 
-    // 1 failed call, 50 succesful
+    // 1 failed call, 50 successful
     doThrow(new ChannelException("stub")).when(
         mockProcessor).processEvent(getEvent(source));
     source.process();

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index b390e71..3f08d8b 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -900,7 +900,7 @@ Property Name               Default      Description
 **channels**                --
 **type**                    --           The component type name, needs to be ``jms``
 **initialContextFactory**   --           Inital Context Factory, e.g: org.apache.activemq.jndi.ActiveMQInitialContextFactory
-**connectionFactory**       --           The JNDI name the connection factory shoulld appear
as
+**connectionFactory**       --           The JNDI name the connection factory should appear
as
 **providerURL**             --           The JMS provider URL
 **destinationName**         --           Destination name
 **destinationType**         --           Destination type (queue or topic)
@@ -1176,7 +1176,7 @@ Property Name          Default      Description
 **consumerKey**        --           OAuth consumer key
 **consumerSecret**     --           OAuth consumer secret
 **accessToken**        --           OAuth access token
-**accessTokenSecret**  --           OAuth toekn secret
+**accessTokenSecret**  --           OAuth token secret
 maxBatchSize           1000         Maximum number of twitter messages to put in a single
batch
 maxBatchDurationMillis 1000         Maximum number of milliseconds to wait before closing
a batch
 ====================== ===========  ===================================================

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-node/src/main/java/org/apache/flume/node/PropertiesFileConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/PropertiesFileConfigurationProvider.java
b/flume-ng-node/src/main/java/org/apache/flume/node/PropertiesFileConfigurationProvider.java
index bc5438a..b428c9e 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/PropertiesFileConfigurationProvider.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/PropertiesFileConfigurationProvider.java
@@ -96,7 +96,7 @@ import org.slf4j.LoggerFactory;
  * belonging to it. These cannot be shared by multiple groups.
  * Further, one can set a processor and behavioral parameters to determine
  * how sink selection is made via <tt>&lt;agent name&gt;.sinkgroups.&lt;
- * group name&lt.processor</tt>. For further detail refer to inividual processor
+ * group name&lt.processor</tt>. For further detail refer to individual processor
  * documentation</li>
  * <li>Sinks not assigned to a group will be assigned to default single sink
  * groups.</li>

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-sdk/src/test/java/org/apache/flume/api/TestLoadBalancingRpcClient.java
----------------------------------------------------------------------
diff --git a/flume-ng-sdk/src/test/java/org/apache/flume/api/TestLoadBalancingRpcClient.java
b/flume-ng-sdk/src/test/java/org/apache/flume/api/TestLoadBalancingRpcClient.java
index dc53d3f..ba7a735 100644
--- a/flume-ng-sdk/src/test/java/org/apache/flume/api/TestLoadBalancingRpcClient.java
+++ b/flume-ng-sdk/src/test/java/org/apache/flume/api/TestLoadBalancingRpcClient.java
@@ -617,7 +617,7 @@ public class TestLoadBalancingRpcClient {
 
     }
     Assert.assertEquals(0, hosts.get(1).getAppendCount());
-    // after this s2 should be receiving events agains
+    // after this s2 should be receiving events again
     Thread.sleep(2500);
     int numEvents = 60;
     for (int i = 0; i < numEvents; i++) {

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/DatasetSink.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/DatasetSink.java
b/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/DatasetSink.java
index e3b57c3..fa31262 100644
--- a/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/DatasetSink.java
+++ b/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/DatasetSink.java
@@ -391,7 +391,7 @@ public class DatasetSink extends AbstractSink implements Configurable
{
    */
   @VisibleForTesting
   void createWriter() throws EventDeliveryException {
-    // reset the commited flag whenver a new writer is created
+    // reset the commited flag whenever a new writer is created
     committedBatch = false;
     try {
       View<GenericRecord> view;

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/client/ElasticSearchClientFactory.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/client/ElasticSearchClientFactory.java
b/flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/client/ElasticSearchClientFactory.java
index cb34394..986fb2b 100644
--- a/flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/client/ElasticSearchClientFactory.java
+++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/client/ElasticSearchClientFactory.java
@@ -34,7 +34,7 @@ public class ElasticSearchClientFactory {
    * @param clientType
    *    String representation of client type
    * @param hostNames
-   *    Array of strings that represents hosntames with ports (hostname:port)
+   *    Array of strings that represents hostnames with ports (hostname:port)
    * @param clusterName
    *    Elasticsearch cluster name used only by Transport Client
    * @param serializer

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
b/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
index 280d0b0..f120f59 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
+++ b/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
@@ -64,9 +64,9 @@ import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * A simple sink which reads events from a channel and writes them to HBase.
- * This Sink uses an aysnchronous API internally and is likely to
+ * This Sink uses an asynchronous API internally and is likely to
  * perform better.
- * The Hbase configution is picked up from the first <tt>hbase-site.xml</tt>
+ * The Hbase configuration is picked up from the first <tt>hbase-site.xml</tt>
  * encountered in the classpath. This sink supports batch reading of
  * events from the channel, and writing them to Hbase, to minimize the number
  * of flushes on the hbase tables. To use this sink, it has to be configured

http://git-wip-us.apache.org/repos/asf/flume/blob/dff1505c/flume-ng-sources/flume-twitter-source/src/main/java/org/apache/flume/source/twitter/TwitterSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-twitter-source/src/main/java/org/apache/flume/source/twitter/TwitterSource.java
b/flume-ng-sources/flume-twitter-source/src/main/java/org/apache/flume/source/twitter/TwitterSource.java
index 27b2c3f..f5c8328 100644
--- a/flume-ng-sources/flume-twitter-source/src/main/java/org/apache/flume/source/twitter/TwitterSource.java
+++ b/flume-ng-sources/flume-twitter-source/src/main/java/org/apache/flume/source/twitter/TwitterSource.java
@@ -57,7 +57,7 @@ import twitter4j.auth.AccessToken;
 
 /**
  * Demo Flume source that connects via Streaming API to the 1% sample twitter
- * firehose, continously downloads tweets, converts them to Avro format and
+ * firehose, continuously downloads tweets, converts them to Avro format and
  * sends Avro events to a downstream Flume sink.
  *
  * Requires the consumer and access tokens and secrets of a Twitter developer


Mime
View raw message