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 2016/09/24 02:46:26 UTC
[1/4] kylin git commit: KYLIN-2047 Remove ineffective null check in
MetadataManager
Repository: kylin
Updated Branches:
refs/heads/master 5aeedd5c7 -> afa350f00
KYLIN-2047 Remove ineffective null check in MetadataManager
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/afa350f0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/afa350f0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/afa350f0
Branch: refs/heads/master
Commit: afa350f0018fce4d34692fb0a1616829e11977ae
Parents: a346db5
Author: lidongsjtu <li...@apache.org>
Authored: Sat Sep 24 10:32:47 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Sep 24 10:42:46 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/MetadataManager.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/afa350f0/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index 9be3faf..8d77131 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -263,7 +263,7 @@ public class MetadataManager {
reloadAllSourceTableExd();
reloadAllDataModel();
reloadAllExternalFilter();
-
+
// touch lower level metadata before registering my listener
Broadcaster.getInstance(config).registerListener(new SrcTableSyncListener(), "table");
Broadcaster.getInstance(config).registerListener(new SrcTableExtSyncListener(), "table_ext");
@@ -283,7 +283,7 @@ public class MetadataManager {
srcTableMap.removeLocal(cacheKey);
else
reloadSourceTable(cacheKey);
-
+
for (ProjectInstance prj : ProjectManager.getInstance(config).findProjectsByTable(cacheKey)) {
broadcaster.notifyProjectSchemaUpdate(prj.getName());
}
@@ -302,7 +302,7 @@ public class MetadataManager {
srcTableExdMap.removeLocal(cacheKey);
else
reloadSourceTableExt(cacheKey);
-
+
for (ProjectInstance prj : ProjectManager.getInstance(config).findProjectsByTable(cacheKey)) {
broadcaster.notifyProjectSchemaUpdate(prj.getName());
}
@@ -328,7 +328,7 @@ public class MetadataManager {
dataModelDescMap.removeLocal(cacheKey);
else
reloadDataModelDesc(cacheKey);
-
+
for (ProjectInstance prj : ProjectManager.getInstance(config).findProjectsByModel(cacheKey)) {
broadcaster.notifyProjectSchemaUpdate(prj.getName());
}
@@ -549,8 +549,7 @@ public class MetadataManager {
public DataModelDesc dropModel(DataModelDesc desc) throws IOException {
logger.info("Dropping model '" + desc.getName() + "'");
ResourceStore store = getStore();
- if (desc != null)
- store.deleteResource(desc.getResourcePath());
+ store.deleteResource(desc.getResourcePath());
// delete model from project
ProjectManager.getInstance(config).removeModelFromProjects(desc.getName());
// clean model cache
[3/4] kylin git commit: KYLIN-2044 Fix unclosed DataInputByteBuffer
in BitmapCounter#peekLength
Posted by li...@apache.org.
KYLIN-2044 Fix unclosed DataInputByteBuffer in BitmapCounter#peekLength
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a346db51
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a346db51
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a346db51
Branch: refs/heads/master
Commit: a346db5108b55acb667539a5269d1b1864ea3084
Parents: 818188d
Author: lidongsjtu <li...@apache.org>
Authored: Sat Sep 24 10:30:40 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Sep 24 10:42:46 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/measure/bitmap/BitmapCounter.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a346db51/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapCounter.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapCounter.java b/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapCounter.java
index b52adde..d3b57a7 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapCounter.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapCounter.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Iterator;
+import org.apache.commons.io.IOUtils;
import org.roaringbitmap.buffer.MutableRoaringBitmap;
/**
@@ -97,8 +98,12 @@ public class BitmapCounter implements Comparable<BitmapCounter> {
public void readRegisters(ByteBuffer in) throws IOException {
DataInputByteBuffer input = new DataInputByteBuffer();
- input.reset(new ByteBuffer[] { in });
- bitmap.deserialize(input);
+ try {
+ input.reset(new ByteBuffer[] { in });
+ bitmap.deserialize(input);
+ } finally {
+ IOUtils.closeQuietly(input);
+ }
}
@Override
@@ -148,6 +153,8 @@ public class BitmapCounter implements Comparable<BitmapCounter> {
bitmap.deserialize(input);
} catch (IOException e) {
throw new IllegalStateException(e);
+ } finally {
+ IOUtils.closeQuietly(input);
}
len = in.position() - mark;
[2/4] kylin git commit: KYLIN-2045 Fix argument order in
JobInstanceExtractor#executeExtract()
Posted by li...@apache.org.
KYLIN-2045 Fix argument order in JobInstanceExtractor#executeExtract()
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/818188d4
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/818188d4
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/818188d4
Branch: refs/heads/master
Commit: 818188d484f2a848c84d3b1f79865e04e74dcd22
Parents: 5658283
Author: lidongsjtu <li...@apache.org>
Authored: Sat Sep 24 10:27:25 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Sep 24 10:42:46 2016 +0800
----------------------------------------------------------------------
tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/818188d4/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java b/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
index ef77c6a..1023a8b 100644
--- a/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
+++ b/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
@@ -85,7 +85,7 @@ public class JobInstanceExtractor extends AbstractInfoExtractor {
long endTime = System.currentTimeMillis();
long startTime = endTime - period * 24 * 3600 * 1000; // time in Millis
- List<JobInstance> jobInstances = listJobInstances(cube, project, startTime, endTime);
+ List<JobInstance> jobInstances = listJobInstances(project, cube, startTime, endTime);
logger.info("There are {} jobInstances to extract.", jobInstances.size());
ObjectMapper mapper = new ObjectMapper();
[4/4] kylin git commit: minor, more logging in storage query
Posted by li...@apache.org.
minor, more logging in storage query
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5658283d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5658283d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5658283d
Branch: refs/heads/master
Commit: 5658283de1dd653881eacd8442ae6f3122600581
Parents: 5aeedd5
Author: lidongsjtu <li...@apache.org>
Authored: Sat Sep 24 10:26:44 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Sep 24 10:42:46 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5658283d/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
index 31663d0..4ba134d 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
@@ -103,6 +103,7 @@ public abstract class GTCubeStorageQueryBase implements IStorageQuery {
dimensionsD.addAll(groupsD);
dimensionsD.addAll(otherDimsD);
Cuboid cuboid = Cuboid.identifyCuboid(cubeDesc, dimensionsD, metrics);
+ logger.info("Cuboid identified: cube={}, cuboidId={}", cubeInstance.getName(), cuboid.getId());
context.setCuboid(cuboid);
// isExactAggregation? meaning: tuples returned from storage requires no further aggregation in query engine