This is an automated email from the ASF dual-hosted git repository. timothyfarkas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 2a8d5bb546a629aab60b95edd496ecedd81fd23f Author: Arina Ielchiieva <[email protected]> AuthorDate: Fri Sep 21 15:44:14 2018 +0300 DRILL-6752: Surround Drill quotes with double quotes 1. Surround Drill quotes with double quotes. 2. Remove drill-sqlline-test.conf, use drill-sqlline.conf for tests instead. closes #1475 --- .../resources/drill-sqlline-override-example.conf | 2 +- .../src/main/resources/drill-sqlline.conf | 58 +++++++++++----------- .../exec/client/DrillSqlLineApplicationTest.java | 8 +-- .../resources/drill-sqlline-test-override.conf | 5 +- .../src/test/resources/drill-sqlline-test.conf | 40 --------------- 5 files changed, 38 insertions(+), 75 deletions(-) diff --git a/distribution/src/resources/drill-sqlline-override-example.conf b/distribution/src/resources/drill-sqlline-override-example.conf index 34decdc..6507079 100644 --- a/distribution/src/resources/drill-sqlline-override-example.conf +++ b/distribution/src/resources/drill-sqlline-override-example.conf @@ -20,7 +20,7 @@ drill.sqlline { # ${?drill.sqlline.quotes} is used to append new quotes to the existing ones # remove it if you want to override existing quotes completely quotes: ${?drill.sqlline.quotes} [ - "east or west, drill is the best" + "East or West, Drill is the best." ], # overrides default SqlLine properties # for the full list of properties use !set command in SqlLine diff --git a/exec/java-exec/src/main/resources/drill-sqlline.conf b/exec/java-exec/src/main/resources/drill-sqlline.conf index b977d9f..e081794 100644 --- a/exec/java-exec/src/main/resources/drill-sqlline.conf +++ b/exec/java-exec/src/main/resources/drill-sqlline.conf @@ -17,36 +17,36 @@ # This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information. drill.sqlline { - info_message_template: "apache drill %s\n%s", + info_message_template: "Apache Drill %s%n\"%s\"", quotes: [ - "start your sql engine", - "this isn't your grandfather's sql", - "a little sql for your nosql", - "json ain't no thang", - "drill baby drill", - "just drill it", - "say hello to my little drill", - "what ever the mind of man can conceive and believe, drill can query", - "the only truly happy people are children, the creative minority and drill users", - "a drill is a terrible thing to waste", - "got drill?", - "a drill in the hand is better than two in the bush", - "drill never goes out of style", - "everything is easier with drill", - "you told me to drill, sergeant", - "you're gonna need a bigger drill", - "keep your data close, but your drillbits closer", - "let's drill something more solid than concrete", - "drill must go on", - "in drill we trust", - "two things are infinite: the universe and drill; and i'm not sure about the universe", - "a query result is never late, nor is it early, it arrives precisely when it means to", - "think different, think drill", - "there are two types of analysts in the world: those who use drill and those who don't", - "good friends, good books and drill cluster: this is the ideal life", - "data is the new oil: ready to drill some?", - "you won't meet santa, but drill supports clauses", - "your drill is the drill that will pierce the heavens" + "Start your SQL engine.", + "This isn't your grandfather's SQL.", + "A little SQL for your NoSQL.", + "JSON ain't no thang.", + "Drill, baby, Drill.", + "Just Drill It.", + "Say hello to my little Drill.", + "What ever the mind of man can conceive and believe, Drill can query.", + "The only truly happy people are children, the creative minority and Drill users.", + "A Drill is a terrible thing to waste.", + "Got Drill?", + "A Drill in the hand is better than two in the bush.", + "Drill never goes out of style.", + "Everything is easier with Drill.", + "You told me to, Drill Sergeant!", + "You're gonna need a bigger Drill.", + "Keep your data close, but your Drillbits closer.", + "Let's Drill something more solid than concrete.", + "Drill must go on.", + "In Drill We Trust.", + "Two things are infinite: the universe and Drill; and I'm not sure about the universe.", + "A query result is never late, nor is it early, it arrives precisely when it means to.", + "Think different, think Drill.", + "There are two types of analysts in the world: those who use Drill and those who don't.", + "Good friends, good books and Drill cluster: this is the ideal life.", + "Data is the new oil. Ready to Drill some?", + "You won't meet Santa, but Drill supports Clauses.", + "Your Drill is the Drill that will pierce the heavens." ], drivers: [ org.apache.drill.jdbc.Driver diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java index 4996ce2..8d3c290 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java @@ -43,14 +43,14 @@ public class DrillSqlLineApplicationTest { @BeforeClass public static void init() { application = new DrillSqlLineApplication( - "drill-sqlline-test.conf", + "drill-sqlline.conf", "drill-sqlline-test-override.conf"); } @Test public void testInfoMessage() throws Exception { String infoMessage = application.getInfoMessage(); - assertThat(infoMessage, containsString("all code is guilty until proven innocent")); + assertThat(infoMessage, containsString("\"All code is guilty until proven innocent.\"")); } @Test @@ -99,14 +99,14 @@ public class DrillSqlLineApplicationTest { @Test public void testEmptyConfig() { DrillSqlLineApplication application = new DrillSqlLineApplication( - "missing.conf", "missing_example.conf"); + "missing.conf", "missing_override.conf"); assertTrue(application.getConfig().isEmpty()); } @Test public void testConfigWithoutOverride() { DrillSqlLineApplication application = new DrillSqlLineApplication( - "drill-sqlline-test.conf", "missing_example.conf"); + "drill-sqlline.conf", "missing_override.conf"); assertFalse(application.getConfig().isEmpty()); } diff --git a/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf b/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf index 380785c..b7d949e 100644 --- a/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf +++ b/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf @@ -17,12 +17,15 @@ # This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information. drill.sqlline { + # override all quotes for the test quotes: [ - "all code is guilty until proven innocent" + "All code is guilty until proven innocent." ], + # override all url examples for the test connection_url_examples: [ "jdbc:drill:zk=local" ], + # override maxWidth and add timeout for the test opts: { maxWidth: 20000, timeout: 200 diff --git a/exec/java-exec/src/test/resources/drill-sqlline-test.conf b/exec/java-exec/src/test/resources/drill-sqlline-test.conf deleted file mode 100644 index d0d9a89..0000000 --- a/exec/java-exec/src/test/resources/drill-sqlline-test.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file customizes SqlLine application. -# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information. - -drill.sqlline { - info_message_template: "apache drill %s\n%s", - quotes: [ - "start your sql engine" - ], - drivers: [ - org.apache.drill.jdbc.Driver - ], - connection_url_examples: [ - "jdbc:drill:drillbit=localhost", - "jdbc:drill:zk=local" - ], - commands.exclude: [ - describe, - indexes - ], - opts: { - incremental: false, - isolation: TRANSACTION_NONE, - maxWidth: 10000 - } -}
