minor

Author: hkulyc

src/main/clojure/clojask/classes/DataFrame.clj

@@ -72,25 +72,18 @@
             ^DataStat stat
             output-func
             ^Boolean have-col]
-  
+
   GenDFIntf
 
   (checkInputPathClash
     [this path]
-    (defn get-path-str
-      [path]
-      (if (str/starts-with? path "./")
-        (str "file:///" (str/replace-first path "./" ""))
-        (if (str/starts-with? path "/")
-          (str "file:///" (str/replace-first path "/" ""))
-          (str "file:///" path))))
-    (let [path-str (get-path-str path)
-          input-path-str (get-path-str (.getPath this))
-          path-obj (java.nio.file.Paths/get (new java.net.URI path-str))
-          input-path-obj (java.nio.file.Paths/get (new java.net.URI input-path-str))
-          paths-equal (java.nio.file.Paths/.equals path-obj input-path-obj)]
-      (cond paths-equal
-            (throw (OperationException. "Output path should be different from input path of dataframe argument.")))))
+    (try
+      (let [path1 (.getPath this)
+            path1 (.getAbsolutePath (io/file path1))
+            path2 (.getAbsolutePath (io/file path))]
+        (if (= path1 path2)
+              (throw (OperationException. "Output path should be different from input path of dataframe argument."))))
+      (catch Exception e nil)))
 
   (getOutput
     [this]
@@ -99,7 +92,7 @@
   (setOutput
     [this output]
     (reset! output-func output))
-  
+
   (getColNames
     [this]
     (if (and (= 0 (count (.getGroupbyKeys (:row-info this)))) (= 0 (count (.getAggreNewKeys (:row-info this)))))
@@ -109,15 +102,15 @@
         (mapv (fn [i] (get index-key i)) index))
         ;; if aggregate
       (.getAggreColNames this)))
-  
+
   (printCol
     ;; print column names, called by compute, computeAggre and computeGroupByAggre
     [this output-path selected-index out]
     (let [col-set (if (= selected-index [nil]) (.getColNames this) (mapv (vec (.getColNames this)) selected-index))]
       (let [wrtr (if output-path (io/writer output-path) nil)]
         ((or out (.getOutput this)) wrtr [col-set])
         (if output-path (.close wrtr)))))
-  
+
   (preview
     [this sample-size return-size format]
     (cond (not (and (integer? sample-size) (integer? return-size)))

src/main/clojure/clojask/dataframe.clj

@@ -307,7 +307,7 @@
   [this num-worker output-dir & {:keys [exception order output select exclude melt header] :or {exception false order false output nil select nil exclude nil melt vector header nil}}]
   (assert (or (nil? select) (nil? exclude)) "Can only specify either of select or exclude")
   ;; check if output-dir clashes with input file path
-  ;; (.checkInputPathClash this output-dir)
+  (.checkInputPathClash this output-dir)
   ;; initialise file
   (u/init-file output-dir header)
   ;; check which type of dataframe this is

src/main/clojure/clojask/onyx_comps.clj

@@ -404,7 +404,7 @@
       :clojask/join-type join-type
       :lifecycle/calls :clojask.clojask-join/writer-join-calls}]))
 
-(def num-workers (atom 1))
+;; (def num-workers (atom 1))
 
 ;; (defn rem0?
 ;;   [event old-segment new-segment all-new-segment]
@@ -460,7 +460,7 @@
 (defn flow-cond-gen
   "Generate the flow conditions for running Onyx"
   [num-work]
-  (reset! num-workers num-work)
+  ;; (reset! num-workers num-work)
   (def flow-conditions []) ;; initialisation
   (def predicate-funcs [])
   ;; for loop for sample workers
@@ -659,7 +659,7 @@
 
 
 ;; !! debugging
-(defn -main
+(defn- -main
   [& args]
   ;; (catalog-gen 2 10)
   ;; (workflow-gen 2)