You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2014/04/30 03:24:09 UTC
git commit: TAJO-617: Rename BIN/tajo_dump BIN/tajo-dump. (jinho)
Repository: tajo
Updated Branches:
refs/heads/master 064f18c2d -> 2295cdea1
TAJO-617: Rename BIN/tajo_dump BIN/tajo-dump. (jinho)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/2295cdea
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/2295cdea
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/2295cdea
Branch: refs/heads/master
Commit: 2295cdea1bceeb79b6566ed8804086a812d39157
Parents: 064f18c
Author: jinossy <ji...@gmail.com>
Authored: Wed Apr 30 10:23:37 2014 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Wed Apr 30 10:23:37 2014 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
.../java/org/apache/tajo/client/TajoDump.java | 2 +-
tajo-dist/src/main/bin/tajo-dump | 22 ++++++++++++++++++++
tajo-dist/src/main/bin/tajo_dump | 22 --------------------
.../main/sphinx/backup_and_restore/catalog.rst | 10 ++++-----
5 files changed, 30 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/2295cdea/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 689d93d..4e043c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Release 0.9.0 - unreleased
IMPROVEMENT
+ TAJO-617: Rename BIN/tajo_dump BIN/tajo-dump. (jinho)
+
TAJO-789: Improve shuffle URI. (jinho)
TAJO-769: A minor improvements for HCatalogStore (Fengdong Yu via hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/2295cdea/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java b/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java
index 60b1a7e..d1d93b2 100644
--- a/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java
@@ -50,7 +50,7 @@ public class TajoDump {
private static void printUsage() {
HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp( "tajo_dump [options] [database name]", options);
+ formatter.printHelp( "tajo-dump [options] [database name]", options);
}
private static Pair<String, Integer> getConnectionAddr(TajoConf conf, CommandLine cmd) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/2295cdea/tajo-dist/src/main/bin/tajo-dump
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo-dump b/tajo-dist/src/main/bin/tajo-dump
new file mode 100644
index 0000000..fe0f50f
--- /dev/null
+++ b/tajo-dist/src/main/bin/tajo-dump
@@ -0,0 +1,22 @@
+#!/usr/bin/env 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 "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/tajo dump "$@"
http://git-wip-us.apache.org/repos/asf/tajo/blob/2295cdea/tajo-dist/src/main/bin/tajo_dump
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo_dump b/tajo-dist/src/main/bin/tajo_dump
deleted file mode 100755
index fe0f50f..0000000
--- a/tajo-dist/src/main/bin/tajo_dump
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env 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 "$0"`
-bin=`cd "$bin"; pwd`
-
-. "$bin"/tajo dump "$@"
http://git-wip-us.apache.org/repos/asf/tajo/blob/2295cdea/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst b/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
index b922c62..1b1bf15 100644
--- a/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
+++ b/tajo-docs/src/main/sphinx/backup_and_restore/catalog.rst
@@ -11,13 +11,13 @@ Now, Tajo supports a two backup methods for
SQL dump
==========
-SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo_dump command. The basic usage of this command is: ::
+SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is: ::
- $ tajo_dump table_name > outfile
+ $ tajo-dump table_name > outfile
For example, if you want to backup a table customer, you should type a command as follows: ::
- $ bin/tajo_dump customer > table_backup.sql
+ $ bin/tajo-dump customer > table_backup.sql
$
$ cat table_backup.sql
-- Tajo database dump
@@ -36,9 +36,9 @@ If you want to restore the catalog from the SQL dump file, please type the below
$ bin/tsql -f table_backup.sql
-If you use an option '-a', tajo_dump will dump all table DDLs. ::
+If you use an option '-a', tajo-dump will dump all table DDLs. ::
- $ bin/tajo_dump -a > all_backup.sql
+ $ bin/tajo-dump -a > all_backup.sql
=======================
Database-level backup