Permalink
Browse files

Fixed regression in ThunderGate improvement modification (#215).

  • Loading branch information...
1 parent 6225326 commit 6dcafa9d00c4742b9263fe82cf135a417a7b5943 @akirakw akirakw committed Aug 27, 2012
@@ -626,7 +626,7 @@ public static String getRemoteScriptPath(String relativePath) {
if (remoteHome.endsWith("/") == false) {
remoteHome = remoteHome + "/";
}
- return remoteHome + relativePath;
+ return remoteHome + Constants.PATH_REMOTE_ROOT + relativePath;
}
/**
@@ -351,34 +351,40 @@
*/
/**
+ * Root path of ThunderGate install directory.
+ * @since 0.4.0
+ */
+ public static final String PATH_REMOTE_ROOT = "bulkloader/";
+
+ /**
* Relative path to the remote extractor script (from framework installation home).
* @since 0.4.0
*/
- public static final String PATH_REMOTE_EXTRACTOR = "bulkloader/libexec/extractor.sh";
+ public static final String PATH_REMOTE_EXTRACTOR = "libexec/extractor.sh";
/**
* Relative path to the remote collector script (from framework installation home).
* @since 0.4.0
*/
- public static final String PATH_REMOTE_COLLECTOR = "bulkloader/libexec/collector.sh";
+ public static final String PATH_REMOTE_COLLECTOR = "libexec/collector.sh";
/**
* Relative path to the fetching remote cache info script (from framework installation home).
* @since 0.4.0
*/
- public static final String PATH_REMOTE_CACHE_INFO = "bulkloader/libexec/get-cache-info.sh";
+ public static final String PATH_REMOTE_CACHE_INFO = "libexec/get-cache-info.sh";
/**
* Relative path to the deleting remote cache contents script (from framework installation home).
* @since 0.4.0
*/
- public static final String PATH_REMOTE_CACHE_DELETE = "bulkloader/libexec/delete-cache-storage.sh";
+ public static final String PATH_REMOTE_CACHE_DELETE = "libexec/delete-cache-storage.sh";
/**
* Relative path to the building cache contents script (from framework installation home).
* @since 0.4.0
*/
- public static final String PATH_LOCAL_CACHE_BUILD = "bulkloader/libexec/hadoop-build-cache.sh";
+ public static final String PATH_LOCAL_CACHE_BUILD = "libexec/hadoop-build-cache.sh";
/**
* DBMSの接続情報を記述したプロパティファイルの接尾辞。
@@ -307,7 +307,7 @@ public void update_delete() throws Exception {
private void execute(String subcommand) throws IOException, InterruptedException {
FileListProvider provider = execute(
- Constants.PATH_LOCAL_CACHE_BUILD,
+ Constants.PATH_REMOTE_ROOT + Constants.PATH_LOCAL_CACHE_BUILD,
subcommand,
"tbatch",
"tflow",

0 comments on commit 6dcafa9

Please sign in to comment.