From 929e6be8e9bc113fb4364a72c9ebee76efbb15a7 Mon Sep 17 00:00:00 2001 From: GuiSim Date: Mon, 27 Jan 2014 17:28:59 -0500 Subject: [PATCH 1/5] text cleanup --- docs/content/Coordinator.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/Coordinator.md b/docs/content/Coordinator.md index da6559b6cbc..bee85e14fd1 100644 --- a/docs/content/Coordinator.md +++ b/docs/content/Coordinator.md @@ -102,7 +102,7 @@ io.druid.cli.Main server coordinator Rules ----- -Segments are loaded and dropped from the cluster based on a set of rules. Rules indicate how segments should be assigned to different historical node tiers and how many replicants of a segment should exist in each tier. Rules may also indicate when segments should be dropped entirely from the cluster. The coordinator loads a set of rules from the database. Rules may be specific to a certain datasource and/or a default set of rules can be configured. Rules are read in order and hence the ordering of rules is important. The coordinator will cycle through all available segments and match each segment with the first rule that applies. Each segment may only match a single rule +Segments are loaded and dropped from the cluster based on a set of rules. Rules indicate how segments should be assigned to different historical node tiers and how many replicants of a segment should exist in each tier. Rules may also indicate when segments should be dropped entirely from the cluster. The coordinator loads a set of rules from the database. Rules may be specific to a certain datasource and/or a default set of rules can be configured. Rules are read in order and hence the ordering of rules is important. The coordinator will cycle through all available segments and match each segment with the first rule that applies. Each segment may only match a single rule. For more information on rules, see [Rule Configuration](Rule-Configuration.html). @@ -218,4 +218,4 @@ FAQ No. If the Druid coordinator is not started up, no new segments will be loaded in the cluster and outdated segments will not be dropped. However, the coordinator node can be started up at any time, and after a configurable delay, will start running coordinator tasks. - This also means that if you have a working cluster and all of your coordinators die, the cluster will continue to function, it just won’t experience any changes to its data topology. \ No newline at end of file + This also means that if you have a working cluster and all of your coordinators die, the cluster will continue to function, it just won’t experience any changes to its data topology. From 8d024a5e9aecd45967040fa5e396e549c0150e90 Mon Sep 17 00:00:00 2001 From: GuiSim Date: Tue, 28 Jan 2014 09:56:38 -0500 Subject: [PATCH 2/5] typo fix --- docs/content/GroupByQuery.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/GroupByQuery.md b/docs/content/GroupByQuery.md index dd7f49f7179..0443b525844 100644 --- a/docs/content/GroupByQuery.md +++ b/docs/content/GroupByQuery.md @@ -1,7 +1,7 @@ --- layout: doc_page --- -These types of queries take a groupBy query object and return an array of JSON objects where each object represents a grouping asked for by the query. Note: If you only want to do straight aggreagates for some time range, we highly recommend using [TimeseriesQueries](TimeseriesQuery.html) instead. The performance will be substantially better. +These types of queries take a groupBy query object and return an array of JSON objects where each object represents a grouping asked for by the query. Note: If you only want to do straight aggregates for some time range, we highly recommend using [TimeseriesQueries](TimeseriesQuery.html) instead. The performance will be substantially better. An example groupBy query object is shown below: ``` json @@ -86,4 +86,4 @@ To pull it all together, the above query would return *n\*m* data points, up to }, ... ] -``` \ No newline at end of file +``` From 9831401c7da8d56cf0bd07deeb2f309e13bf18ab Mon Sep 17 00:00:00 2001 From: GuiSim Date: Tue, 28 Jan 2014 10:17:49 -0500 Subject: [PATCH 3/5] missing word --- docs/content/SearchQuery.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/SearchQuery.md b/docs/content/SearchQuery.md index 2cfc726d60b..52a271e44db 100644 --- a/docs/content/SearchQuery.md +++ b/docs/content/SearchQuery.md @@ -36,7 +36,7 @@ There are several main parts to a search query: |intervals|A JSON Object representing ISO-8601 Intervals. This defines the time ranges to run the query over.|yes| |searchDimensions|The dimensions to run the search over. Excluding this means the search is run over all dimensions.|no| |query|See [SearchQuerySpec](SearchQuerySpec.html).|yes| -|sort|How the results of the search should sorted. Two possible types here are "lexicographic" and "strlen".|yes| +|sort|How the results of the search should be sorted. Two possible types here are "lexicographic" and "strlen".|yes| |context|An additional JSON Object which can be used to specify certain flags.|no| The format of the result is: From 374904ce202950de3d9549ac6ee6cbede7ce01e0 Mon Sep 17 00:00:00 2001 From: GuiSim Date: Tue, 28 Jan 2014 10:34:13 -0500 Subject: [PATCH 4/5] Removed trailing comma --- docs/content/SegmentMetadataQuery.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/SegmentMetadataQuery.md b/docs/content/SegmentMetadataQuery.md index c65e6957d43..26a3b08a6f5 100644 --- a/docs/content/SegmentMetadataQuery.md +++ b/docs/content/SegmentMetadataQuery.md @@ -14,7 +14,7 @@ Segment metadata queries return per segment information about: { "queryType":"segmentMetadata", "dataSource":"sample_datasource", - "intervals":["2013-01-01/2014-01-01"], + "intervals":["2013-01-01/2014-01-01"] } ``` From 624b13e8f546dbbbf91d7939607e3f23c0cc3c25 Mon Sep 17 00:00:00 2001 From: Guillaume Simard Date: Tue, 28 Jan 2014 11:04:19 -0500 Subject: [PATCH 5/5] Fixed JSON --- docs/content/TopNQuery.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/content/TopNQuery.md b/docs/content/TopNQuery.md index d418799d29c..cfb603705f7 100644 --- a/docs/content/TopNQuery.md +++ b/docs/content/TopNQuery.md @@ -9,6 +9,7 @@ TopN queries return a sorted set of results for the values in a given dimension A topN query object looks like: ```json +{ "queryType": "topN", "dataSource": "sample_data", "dimension": "sample_dim",