Repository: drill Updated Branches: refs/heads/merge_2015_05_14 [created] 3698377d8
Add convenience drill-* executables for sqlline. Rename drill_dumpcat to dumpcat Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/ae4ced10 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/ae4ced10 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/ae4ced10 Branch: refs/heads/merge_2015_05_14 Commit: ae4ced105c5fcab9d5c0bb0a63062dcdfed62701 Parents: 583ca4a Author: Jacques Nadeau <[email protected]> Authored: Thu May 14 10:13:35 2015 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Thu May 14 10:24:33 2015 -0700 ---------------------------------------------------------------------- distribution/src/assemble/bin.xml | 17 ++++++++++++++++- distribution/src/resources/drill-conf | 22 ++++++++++++++++++++++ distribution/src/resources/drill-embedded | 22 ++++++++++++++++++++++ distribution/src/resources/drill-localhost | 22 ++++++++++++++++++++++ distribution/src/resources/drill_dumpcat | 25 ------------------------- distribution/src/resources/dumpcat | 25 +++++++++++++++++++++++++ 6 files changed, 107 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/ae4ced10/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 0576fd2..684ff19 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -245,6 +245,21 @@ <outputDirectory>bin</outputDirectory> </file> <file> + <source>src/resources/drill-conf</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/drill-embedded</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/drill-localhost</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> <source>src/resources/drill-config.sh</source> <fileMode>0755</fileMode> <outputDirectory>bin</outputDirectory> @@ -264,7 +279,7 @@ <outputDirectory>bin</outputDirectory> </file> <file> - <source>src/resources/drill_dumpcat</source> + <source>src/resources/dumpcat</source> <fileMode>0755</fileMode> <outputDirectory>bin</outputDirectory> </file> http://git-wip-us.apache.org/repos/asf/drill/blob/ae4ced10/distribution/src/resources/drill-conf ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-conf b/distribution/src/resources/drill-conf new file mode 100755 index 0000000..00e0d25 --- /dev/null +++ b/distribution/src/resources/drill-conf @@ -0,0 +1,22 @@ +#!/bin/bash +# +# 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. + +bin=`dirname "${BASH_SOURCE-$0}"` +bin=`cd "$bin">/dev/null; pwd` + +# Start sqlline session using connection settings from configuration file +exec ${bin}/sqlline -u "jdbc:drill:" "$@" http://git-wip-us.apache.org/repos/asf/drill/blob/ae4ced10/distribution/src/resources/drill-embedded ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-embedded b/distribution/src/resources/drill-embedded new file mode 100755 index 0000000..d66ba7b --- /dev/null +++ b/distribution/src/resources/drill-embedded @@ -0,0 +1,22 @@ +#!/bin/bash +# +# 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. + +bin=`dirname "${BASH_SOURCE-$0}"` +bin=`cd "$bin">/dev/null; pwd` + +# Start a sqlline session with an embedded Drillbit +exec ${bin}/sqlline -u "jdbc:drill:zk=local" "$@" http://git-wip-us.apache.org/repos/asf/drill/blob/ae4ced10/distribution/src/resources/drill-localhost ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-localhost b/distribution/src/resources/drill-localhost new file mode 100755 index 0000000..454045c --- /dev/null +++ b/distribution/src/resources/drill-localhost @@ -0,0 +1,22 @@ +#!/bin/bash +# +# 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. + +bin=`dirname "${BASH_SOURCE-$0}"` +bin=`cd "$bin">/dev/null; pwd` + +# Start sqlline session by connection to locally running Drillbit +exec ${bin}/sqlline -u "jdbc:drill:drillbit=localhost" "$@" http://git-wip-us.apache.org/repos/asf/drill/blob/ae4ced10/distribution/src/resources/drill_dumpcat ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill_dumpcat b/distribution/src/resources/drill_dumpcat deleted file mode 100755 index a2ea4d3..0000000 --- a/distribution/src/resources/drill_dumpcat +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# 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. - -bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` - -. "$bin"/drill-config.sh - -DRILL_SHELL_JAVA_OPTS="$DRILL_SHELL_JAVA_OPTS -Dlog.path=$DRILL_LOG_DIR/drill_dumpcat.log" - -exec $JAVA $DRILL_SHELL_JAVA_OPTS $DRILL_JAVA_OPTS -cp $CP org.apache.drill.exec.client.DumpCat $@ http://git-wip-us.apache.org/repos/asf/drill/blob/ae4ced10/distribution/src/resources/dumpcat ---------------------------------------------------------------------- diff --git a/distribution/src/resources/dumpcat b/distribution/src/resources/dumpcat new file mode 100755 index 0000000..a2ea4d3 --- /dev/null +++ b/distribution/src/resources/dumpcat @@ -0,0 +1,25 @@ +#!/bin/bash + +# 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. + +bin=`dirname "${BASH_SOURCE-$0}"` +bin=`cd "$bin">/dev/null; pwd` + +. "$bin"/drill-config.sh + +DRILL_SHELL_JAVA_OPTS="$DRILL_SHELL_JAVA_OPTS -Dlog.path=$DRILL_LOG_DIR/drill_dumpcat.log" + +exec $JAVA $DRILL_SHELL_JAVA_OPTS $DRILL_JAVA_OPTS -cp $CP org.apache.drill.exec.client.DumpCat $@
