You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/03 11:08:18 UTC
[22/26] incubator-kylin git commit: revert joda dependency,
and revise hbasestreaminginput
revert joda dependency, and revise hbasestreaminginput
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1d6505b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1d6505b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1d6505b3
Branch: refs/heads/streaming
Commit: 1d6505b3489dfdf8bd925dcf3ecfde9d8db286f6
Parents: f980b9f
Author: honma <ho...@ebay.com>
Authored: Mon Mar 2 13:34:42 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Mar 3 15:39:44 2015 +0800
----------------------------------------------------------------------
common/pom.xml | 11 ++----
.../org/apache/kylin/common/util/BasicTest.java | 35 --------------------
job/pom.xml | 5 ---
.../kylin/job/tools/HbaseStreamingInput.java | 6 +++-
pom.xml | 6 ----
5 files changed, 8 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d6505b3/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 41d2291..97fb50a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-common</artifactId>
@@ -64,10 +63,6 @@
<artifactId>compress-lzf</artifactId>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
<!-- Env & Test -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -132,11 +127,11 @@
<artifactId>commons-compress</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId>
<version>${hive-hcatalog.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d6505b3/common/src/test/java/org/apache/kylin/common/util/BasicTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/kylin/common/util/BasicTest.java b/common/src/test/java/org/apache/kylin/common/util/BasicTest.java
index 6358177..4a6edc8 100644
--- a/common/src/test/java/org/apache/kylin/common/util/BasicTest.java
+++ b/common/src/test/java/org/apache/kylin/common/util/BasicTest.java
@@ -26,10 +26,8 @@ import java.util.Calendar;
import java.util.concurrent.Semaphore;
import org.apache.commons.configuration.ConfigurationException;
-import org.joda.time.DateTime;
import org.junit.Ignore;
import org.junit.Test;
-import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
import org.slf4j.LoggerFactory;
/**
@@ -72,39 +70,6 @@ public class BasicTest {
@Ignore("fix it later")
public void test2() throws IOException, ConfigurationException {
- new Thread(new Runnable() {
- @Override
- public void run() {
-
- semaphore.release();
- semaphore.release();
- semaphore.release();
- try {
- System.out.println("sleeping");
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- semaphore.release();
- }
- }).start();
-
- try {
- try {
- System.out.println("sleeping");
- Thread.sleep(5000);
- int x = semaphore.drainPermits();
- System.out.println("drained " +x);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- semaphore.acquire();
- System.out.println("left " + semaphore.availablePermits());
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
}
private static String time(long t) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d6505b3/job/pom.xml
----------------------------------------------------------------------
diff --git a/job/pom.xml b/job/pom.xml
index 128e03c..c8fbc73 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -136,11 +136,6 @@
hbase utils like Bytes, ImmutableBytesWritable etc. -->
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
<!-- Env & Test -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d6505b3/job/src/main/java/org/apache/kylin/job/tools/HbaseStreamingInput.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/tools/HbaseStreamingInput.java b/job/src/main/java/org/apache/kylin/job/tools/HbaseStreamingInput.java
index b1c7e30..ff313b4 100644
--- a/job/src/main/java/org/apache/kylin/job/tools/HbaseStreamingInput.java
+++ b/job/src/main/java/org/apache/kylin/job/tools/HbaseStreamingInput.java
@@ -65,6 +65,9 @@ public class HbaseStreamingInput {
}
public static void addData(String tableName) throws IOException {
+
+ createTable(tableName);
+
final Semaphore semaphore = new Semaphore(0);
new Thread(new Runnable() {
@Override
@@ -156,8 +159,9 @@ public class HbaseStreamingInput {
for (Result result : scanner) {
Cell cell = result.getColumnLatestCell(CF, QN);
byte[] value = cell.getValueArray();
- if (cell.getValueLength() != CELL_SIZE)
+ if (cell.getValueLength() != CELL_SIZE) {
logger.error("value size invalid!!!!!");
+ }
hash += Arrays.hashCode(Arrays.copyOfRange(value, cell.getValueOffset(), cell.getValueLength() + cell.getValueOffset()));
rowCount++;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d6505b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d86bcb2..74743db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@
<compress-lzf.version>1.0.3</compress-lzf.version>
<extendedset.version>1.3.4</extendedset.version>
<jetty.version>9.2.7.v20150116</jetty.version>
- <joda.version>2.7</joda.version>
<!-- REST Service -->
<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
@@ -400,11 +399,6 @@
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>