Master dl korean

.travis.yml

@@ -29,4 +29,4 @@ deploy:
     on:
       repo: brightics/studio
       branche: master
-      tags: true
+      tags: true

README.md

@@ -1,64 +1,3 @@
-If you have downloaded Brightics Studio windows version v1.1 2020.07,
-please use the following steps to handle infected files of Brightics Studio.
-
-Brightics Studio 사용자께 안내 말씀드립니다.
-BrighticsStudio-v1.1-2020.07-windows.exe에 악성코드 감염이 발견되어 조치 방법을 안내해 드립니다.
-
-### [For V3 Antivirus program user] <br>
-### [V3 백신 프로그램 사용자]
-1. Update the antivirus program. <br>
-   백신 업데이트 <br>
-2. Run Detailed Scan. <br>
-   정밀검사 수행
-
-### [How to remove if not using V3 Antivirus program]
-### [V3 백신을 사용하지 않을시 삭제방법]
-
-
-1. Remove brightics-studio folder. (Default installation path is `C:\brightics-studio`) <br>
-   설치한 `brightics-studio` 폴더 전체를 삭제해주세요. (기본 설치 경로는 `C:\brightics-studio` 입니다.)
-![1](img/1_e.png)
-
-2. Open File Explorer and type `%userprofile%` in the address bar. <br>
-   파일 탐색기를 열고 주소 표시창에 `%userprofile%` 을 입력해주세요.
-![2](img/2_e.png)
-
-3. If you find `Brightics Studio Updater.exe` file, delete this file. <br>
-   If you don't, go to step 4. <br>
-   `Brightics Studio Updater.exe` 파일이 존재하면 삭제해주시고 없다면 다음 단계로 넘어가 주세요.
-
-4. If you find `msvcp140_3.dll` file, delete this file. <br>
-   If you don't, go to step 5. <br>
-   `msvcp140_3.dll` 파일이 존재하면 삭제해주시고 없다면 다음 단계로 넘어가 주세요.
-![4](img/4_e.png)
-
-5. Open File Explorer and type `%temp%` in the address bar. <br>
-   파일 탐색기를 열고 주소 표시창에 `%temp%` 를 입력해주세요.
-![5](img/5_e.png)
-
-6. If you find `STL.vbs` file, delete this file. <br>
-   `STL.vbs` 파일이 존재하면 삭제해주시고 없다면 다음 단계로 넘어가 주세요. <br>
-   If you don't, go to step 7 
-![6](img/6_e.png)
-
-7. Open Window Run window. (Press `Window Key + R`)  <br>
-   Then type `cmd`   <br>
-   윈도키 + R 단축키를 이용하거나 윈도 실행창에서 `cmd` 를 입력해주세요.  <br>
-![7](img/7_e.png)
-
-8. When Command Prompt is open, type `SchTasks /DELETE /TN BrighticsStudioUpdater`   <br>
-   윈도우 명령어 창이 열리면 `SchTasks /DELETE /TN BrighticsStudioUpdater` 를 입력해주세요.
-![8](img/8_e.png)
-
-### [How to reinstall Brightics Studio]
-Please, download and reinstall Brightics Studio using the download link beflow.  <br>
-아래 링크를 다운로드하여 재설치하시기 바랍니다. <br>
-[BrighticsStudio-v1.1-2020.06-windows.exe](https://github.com/brightics/studio/releases/download/v1.1-2020.06/BrighticsStudio-v1.1-2020.06-windows.exe)
-
-If you have any inconvenience or further questions, please contact us  [email protected] . <br>
-사용에 불편을 끼쳐 죄송합니다. 궁금한점이 있으면 [email protected] 로 연락주세요.
-
-
 # Brightics Studio v1.1
 [![Version](https://img.shields.io/github/v/release/brightics/studio)](https://github.com/brightics/studio/releases)
 [![Release Date](https://img.shields.io/github/release-date/brightics/studio)](https://github.com/brightics/studio/releases)
@@ -197,8 +136,6 @@ We are working hard to solve these issues and soon it will be public.
 This project exists thanks to all the people who contribute.
 <a href="../../graphs/contributors"><img src="https://opencollective.com/brightics-studio/contributors.svg?width=890&button=false" /></a>
 
-
 ## Contact us
 If you like to use Brightics Studio, please let us know your usage and feedback.<br>
 Or you have questions while using Brightics Studio, don't hesitate and feel free to contact [email protected]
-

agent/brightics-agent/pom.xml

@@ -5,7 +5,7 @@
         <groupId>com.samsung.sds.brightics</groupId>
         <artifactId>agent-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.5.0</version>
+        <version>1.0.0</version>
     </parent>
     <artifactId>brightics-agent</artifactId>
     <build>
@@ -75,6 +75,44 @@
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
             <version>1.2.0-incubating</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>jackson-annotations</artifactId>
+					<groupId>com.fasterxml.jackson.core</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jackson-core</artifactId>
+					<groupId>com.fasterxml.jackson.core</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jackson-databind</artifactId>
+					<groupId>com.fasterxml.jackson.core</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jsr305</artifactId>
+					<groupId>com.google.code.findbugs</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>janino</artifactId>
+					<groupId>org.codehaus.janino</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-compiler</artifactId>
+					<groupId>org.codehaus.janino</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hsqldb</artifactId>
+					<groupId>org.hsqldb</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>pentaho-aggdesigner-algorithm</artifactId>
+					<groupId>org.pentaho</groupId>
+				</exclusion>
+			</exclusions>            
         </dependency>
     </dependencies>
 </project>

agent/brightics-agent/src/main/java/com/samsung/sds/brightics/agent/context/AbstractContext.java

@@ -1,19 +1,19 @@
-/*
-    Copyright 2019 Samsung SDS
-
-    Licensed 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.
-*/
-
+/*
+    Copyright 2019 Samsung SDS
+    
+    Licensed 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.
+*/
+
 package com.samsung.sds.brightics.agent.context;
 
 import org.slf4j.Logger;
@@ -38,7 +38,7 @@ public AbstractContext(String id) {
     }
 
     // init contextRunner
-    abstract public void init();
+    abstract public void init(String contextType);
 
     // function task run.
     abstract public String runFunction(TaskMessageWrapper message) throws Exception;
@@ -58,7 +58,7 @@ public AbstractContext(String id) {
     // init data container
     abstract public void initDataMap();
 
-    abstract public String viewData(String key, long min, long max) throws Exception;
+    abstract public String viewData(String key, long min, long max, int[] columnIndex) throws Exception;
 
     abstract public String viewSchema(String key) throws Exception;
 

agent/brightics-agent/src/main/java/com/samsung/sds/brightics/agent/context/ContextManager.java

@@ -1,19 +1,19 @@
-/*
-    Copyright 2019 Samsung SDS
-
-    Licensed 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.
-*/
-
+/*
+    Copyright 2019 Samsung SDS
+    
+    Licensed 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.
+*/
+
 package com.samsung.sds.brightics.agent.context;
 
 import java.util.Map;
@@ -62,16 +62,17 @@ private static class Lock {}
     private static final Lock lock = new Lock();
 
     static {
-
         Set<Class<?>> classes;
         try {
             Reflections reflections = new Reflections(defaultRunnerPackage);
             classes = reflections.getTypesAnnotatedWith(ScriptContext.class);
             for (Class<?> clazz : classes) {
                 ScriptContext annotation = clazz.getAnnotation(ScriptContext.class);
                 if (annotation != null) {
-                    contextClassByType.put(annotation.contextType(), (Class<? extends AbstractContext>) clazz);
-                    logger.info("Success to regist '{}'.", clazz.getName());
+                    for (ContextType contextType : annotation.contextType()) {
+                        contextClassByType.put(contextType, (Class<? extends AbstractContext>) clazz);
+                        logger.info("Success to regist type '{}', name '{}'.", contextType.name(), clazz.getName());
+                    }
                 }
             }
             logger.info("Finish to initialize script context classes.");
@@ -97,7 +98,7 @@ public static AbstractContext getRunnerAsContext(ContextType contextType, String
                 logger.info("Create new {} context.", contextType);
                 AbstractContext someContext = contextClassByType.get(contextType).getConstructor(String.class)
                         .newInstance(user);
-                someContext.init();
+                someContext.init(contextType.name());
                 someContext.initDataMap();
                 userContextSession.putContext(contextType, someContext);
             }

agent/brightics-agent/src/main/java/com/samsung/sds/brightics/agent/context/ScriptContext.java

@@ -14,14 +14,14 @@
     limitations under the License.
 */
 
-package com.samsung.sds.brightics.agent.context;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import com.samsung.sds.brightics.common.network.proto.ContextType;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ScriptContext {
-    ContextType contextType();
-}
+package com.samsung.sds.brightics.agent.context;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import com.samsung.sds.brightics.common.network.proto.ContextType;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ScriptContext {
+    ContextType[] contextType();
+}