Merge branch '5.4.x'

confluentinc · Jan 23, 2020 · 63ec5c7 · 63ec5c7
2 parents 38d7228 + 1ed4c79
commit 63ec5c7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/core/src/main/java/io/confluent/connect/storage/StorageSinkConnectorConfig.java b/core/src/main/java/io/confluent/connect/storage/StorageSinkConnectorConfig.java
@@ -35,7 +35,7 @@ public class StorageSinkConnectorConfig extends AbstractConfig implements Compos
   // Connector group
   public static final String FORMAT_CLASS_CONFIG = "format.class";
   public static final String FORMAT_CLASS_DOC =
-      "The format class to use when writing data to the store. ";
+      "The format class to use when writing data to the store.";
   public static final String FORMAT_CLASS_DISPLAY = "Format class";
 
   public static final String FLUSH_SIZE_CONFIG = "flush.size";
@@ -46,21 +46,25 @@ public class StorageSinkConnectorConfig extends AbstractConfig implements Compos
   public static final String ROTATE_INTERVAL_MS_CONFIG = "rotate.interval.ms";
   public static final String
       ROTATE_INTERVAL_MS_DOC =
-      "The time interval in milliseconds to invoke file commits. This configuration ensures that "
-      + "file commits are invoked every configured interval. This configuration is useful when "
-      + "data ingestion rate is low and the connector didn't write enough messages to commit "
-      + "files. The default value -1 means that this feature is disabled.";
+      "The time interval in milliseconds to invoke file commits. You can configure this parameter"
+      + " so that the time interval is determined by using a timestamp extractor (for "
+      + "example, Kafka Record Time, Record Field, or Wall Clock extractor). When the first "
+      + "record is processed, a timestamp is set as the base time. This is useful if you "
+      + "require exactly-once-semantics. This configuration ensures that file commits are "
+      + "invoked at every configured interval. The default value ``-1`` indicates that this "
+      + "feature is disabled.";
   public static final long ROTATE_INTERVAL_MS_DEFAULT = -1L;
   public static final String ROTATE_INTERVAL_MS_DISPLAY = "Rotate Interval (ms)";
 
   public static final String ROTATE_SCHEDULE_INTERVAL_MS_CONFIG = "rotate.schedule.interval.ms";
   public static final String ROTATE_SCHEDULE_INTERVAL_MS_DOC =
       "The time interval in milliseconds to periodically invoke file commits. This configuration "
-      + "ensures that file commits are invoked every configured interval. Time of commit will be "
-      + "adjusted to 00:00 of selected timezone. Commit will be performed at scheduled time "
-      + "regardless previous commit time or number of messages. This configuration is useful when"
-      + " you have to commit your data based on current server time, like at the beginning of "
-      + "every hour. The default value -1 means that this feature is disabled.";
+      + "ensures that file commits are invoked at every configured interval. Time of commit "
+      + "will be adjusted to 00:00 of selected timezone. The commit will be performed at the "
+      + "scheduled time, regardless of the previous commit time or number of messages. This "
+      + "configuration is useful when you have to commit your data based on current server "
+      + "time, for example at the beginning of every hour. The default value ``-1`` means "
+      + "that this feature is disabled.";
   public static final long ROTATE_SCHEDULE_INTERVAL_MS_DEFAULT = -1L;
   public static final String ROTATE_SCHEDULE_INTERVAL_MS_DISPLAY = "Rotate Schedule Interval (ms)";
 
@@ -84,8 +88,8 @@ public class StorageSinkConnectorConfig extends AbstractConfig implements Compos
       "filename.offset.zero.pad.width";
   public static final String
       FILENAME_OFFSET_ZERO_PAD_WIDTH_DOC =
-      "Width to zero-pad offsets in store's filenames if offsets are too short in order to "
-      + "provide fixed-width filenames that can be ordered by simple lexicographic sorting.";
+      "Width to zero pad offsets in store's filenames if offsets are too short in order to "
+      + "provide fixed width filenames that can be ordered by simple lexicographic sorting.";
   public static final int FILENAME_OFFSET_ZERO_PAD_WIDTH_DEFAULT = 10;
   public static final String FILENAME_OFFSET_ZERO_PAD_WIDTH_DISPLAY =
       "Filename Offset Zero Pad Width";
@@ -106,7 +110,7 @@ public class StorageSinkConnectorConfig extends AbstractConfig implements Compos
   public static final String CONNECT_META_DATA_CONFIG = "connect.meta.data";
   public static final boolean CONNECT_META_DATA_DEFAULT = true;
   public static final String CONNECT_META_DATA_DOC =
-      "Allow connect converter to add its meta data to the output schema";
+      "Allow connect converter to add its metadata to the output schema";
   public static final String CONNECT_META_DATA_DISPLAY = "Connect Metadata";
 
   public static final String AVRO_CODEC_CONFIG = "avro.codec";

diff --git a/partitioner/src/main/java/io/confluent/connect/storage/partitioner/PartitionerConfig.java b/partitioner/src/main/java/io/confluent/connect/storage/partitioner/PartitionerConfig.java
@@ -67,21 +67,20 @@ public class PartitionerConfig extends AbstractConfig implements ComposableConfi
 
   public static final String LOCALE_CONFIG = "locale";
   public static final String LOCALE_DOC =
-      "The locale to use when partitioning with ``TimeBasedPartitioner``. Used to format "
-      + "dates and times. For example, use ``en-US`` for US English, ``en-GB`` for UK English, "
-      + "or ``fr-FR`` for French (in France). These may vary by Java version. See the "
-      + "`available locales <http://www.localeplanet.com/java/>`__.";
+      "The locale to use when partitioning with ``TimeBasedPartitioner``. Used to format dates "
+      + "and times. For example, use ``en-US`` for US English, ``en-GB`` for UK English, or "
+      + "``fr-FR`` for French (in France). These may vary by Java version. See the `available"
+      + " locales <http://www.localeplanet.com/java/>`__.";
   public static final String LOCALE_DEFAULT = "";
   public static final String LOCALE_DISPLAY = "Locale";
 
   public static final String TIMEZONE_CONFIG = "timezone";
   public static final String TIMEZONE_DOC =
-      "The timezone to use when partitioning with ``TimeBasedPartitioner``. Used to format "
-      + "and compute dates and times. "
-      + "Use standard short names for timezones such as ``UTC`` or (without daylight savings)"
-      + " ``PST``, ``EST``, and ``ECT``, or longer standard names such as ``America/Los_Angeles``,"
-      + " ``America/New_York``, and ``Europe/Paris``. "
-      + "These may vary by Java version. See the `available timezones within each locale "
+      "The timezone to use when partitioning with ``TimeBasedPartitioner``. Used to format and "
+      + "compute dates and times. Use standard short names for timezones such as ``UTC`` or "
+      + "(without daylight savings) ``PST``, ``EST``, and ``ECT``, or longer standard names "
+      + "such as ``America/Los_Angeles``, ``America/New_York``, and ``Europe/Paris``. These "
+      + "may vary by Java version. See the `available timezones within each locale "
       + "<http://www.localeplanet.com/java>`__, such as `those within the US English locale "
       + "<http://www.localeplanet.com/java/en-US/index.html>`__.";
   public static final String TIMEZONE_DEFAULT = "";