asterixdb git commit: Refactor docs and make it reusable.
Repository: asterixdb Updated Branches: refs/heads/master 653386a6f -> c2cd8bd93 Refactor docs and make it reusable. Change-Id: I7d5580a2bcd3d535ba6ea1faccc31a6d4af60444 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1607 Sonar-Qube: JenkinsTested-by: Jenkins BAD: Jenkins Integration-Tests: Jenkins Reviewed-by: Michael Blow Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/c2cd8bd9 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/c2cd8bd9 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/c2cd8bd9 Branch: refs/heads/master Commit: c2cd8bd93e24ca04f20c2d30718cb029c667c726 Parents: 653386a Author: Yingyi Bu Authored: Tue Mar 21 17:00:57 2017 -0700 Committer: Yingyi Bu Committed: Wed Mar 22 10:55:07 2017 -0700 -- asterixdb/asterix-doc/pom.xml | 2 +- .../src/main/markdown/sqlpp/0_toc.md| 2 - .../src/main/markdown/sqlpp/2_expr.md | 2 - .../src/main/markdown/sqlpp/2_expr_title.md | 20 + .../src/main/markdown/sqlpp/3_query.md | 2 - .../src/main/markdown/sqlpp/3_query_title.md| 20 + .../src/main/markdown/sqlpp/4_error.md | 20 - .../src/main/markdown/sqlpp/4_error_title.md| 20 + .../main/markdown/sqlpp/appendix_1_keywords.md | 20 - .../src/main/markdown/sqlpp/appendix_1_title.md | 20 + .../main/markdown/sqlpp/appendix_2_parameter.md | 70 .../markdown/sqlpp/appendix_2_parameters.md | 88 .../src/main/markdown/sqlpp/appendix_2_title.md | 20 + .../asterix-doc/src/site/markdown/ansible.md| 2 - asterixdb/asterix-doc/src/site/markdown/aws.md | 2 - 15 files changed, 227 insertions(+), 83 deletions(-) -- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c2cd8bd9/asterixdb/asterix-doc/pom.xml -- diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml index df6db2c..5faf161 100644 --- a/asterixdb/asterix-doc/pom.xml +++ b/asterixdb/asterix-doc/pom.xml @@ -53,7 +53,7 @@ - + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c2cd8bd9/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md -- diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md index f8e999b..cdb2a1e 100644 --- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md +++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md @@ -19,8 +19,6 @@ # The SQL++ Query Language -## Table of Contents ## - * [1. Introduction](#Introduction) * [2. Expressions](#Expressions) * [Operator Expressions](#Operator_expressions) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c2cd8bd9/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md -- diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md index 792ea08..41e8c97 100644 --- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md +++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md @@ -17,8 +17,6 @@ ! under the License. !--> -# 2. Expressions - SQL++ is a highly composable expression language. Each SQL++ expression returns zero or more data model instances. There are three major kinds of expressions in SQL++. At the topmost level, a SQL++ expression can be an OperatorExpression (similar to a mathematical expression), an ConditionalExpression (to choose between http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c2cd8bd9/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr_title.md -- diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr_title.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr_title.md new file mode 100644 index 000..8b8f337 --- /dev/null +++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr_title.md @@ -0,0 +1,20 @@ + + +# 2. Expressions http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c2cd8bd9/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md -- diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
asterixdb git commit: Prevent hangs on active runtime stop
Repository: asterixdb Updated Branches: refs/heads/master c2cd8bd93 -> 91756a341 Prevent hangs on active runtime stop Change-Id: I2e60f633cac8e835dcc7211e87d104ecbb8947b0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1608 Sonar-Qube: JenkinsTested-by: Jenkins Reviewed-by: Michael Blow Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/91756a34 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/91756a34 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/91756a34 Branch: refs/heads/master Commit: 91756a341ec47491228e6cdf024e8050806b6518 Parents: c2cd8bd Author: Abdullah Alamoudi Authored: Wed Mar 22 13:30:30 2017 -0700 Committer: abdullah alamoudi Committed: Wed Mar 22 14:28:57 2017 -0700 -- .../adapter/factory/GenericAdapterFactory.java | 4 ++ .../external/api/IDataFlowController.java | 2 +- .../external/api/IDataSourceAdapter.java| 3 +- .../AbstractFeedDataFlowController.java | 2 +- .../dataflow/FeedRecordDataFlowController.java | 23 ++-- .../external/dataset/adapter/FeedAdapter.java | 4 +- .../dataset/adapter/GenericAdapter.java | 2 +- .../external/feed/runtime/AdapterExecutor.java | 37 .../feed/runtime/AdapterRuntimeManager.java | 61 +--- .../external/feed/runtime/IngestionRuntime.java | 3 +- 10 files changed, 96 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/91756a34/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/GenericAdapterFactory.java -- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/GenericAdapterFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/GenericAdapterFactory.java index 577da5e..46da770 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/GenericAdapterFactory.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/GenericAdapterFactory.java @@ -20,6 +20,8 @@ package org.apache.asterix.external.adapter.factory; import java.util.List; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.asterix.common.api.IAppRuntimeContext; import org.apache.asterix.common.library.ILibraryManager; @@ -52,6 +54,7 @@ import org.apache.hyracks.api.io.FileSplit; public class GenericAdapterFactory implements IIndexingAdapterFactory, IAdapterFactory { private static final long serialVersionUID = 1L; +private static final Logger LOGGER = Logger.getLogger(GenericAdapterFactory.class.getName()); private IExternalDataSourceFactory dataSourceFactory; private IDataParserFactory dataParserFactory; private ARecordType recordType; @@ -90,6 +93,7 @@ public class GenericAdapterFactory implements IIndexingAdapterFactory, IAdapterF try { restoreExternalObjects(appCtx.getLibraryManager()); } catch (Exception e) { +LOGGER.log(Level.INFO, "Failure restoring external objects", e); throw HyracksDataException.create(e); } if (isFeed) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/91756a34/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java -- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java index 33f262a..def0bf1 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java @@ -24,7 +24,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; public interface IDataFlowController { //TODO: Refactor this interface. Remove writer from start() signature -public void start(IFrameWriter writer) throws HyracksDataException; +public void start(IFrameWriter writer) throws HyracksDataException, InterruptedException; public default boolean pause() throws HyracksDataException { throw new HyracksDataException("Method not implemented");
asterixdb git commit: Decrement Large Pages When Releasing From VBC
Repository: asterixdb Updated Branches: refs/heads/master e791206fb -> 7d554fcb2 Decrement Large Pages When Releasing From VBC Change-Id: Ic61951fdc48f501d8b006f89f5d77791cd072ae3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1610 Reviewed-by: Ian MaxonTested-by: Jenkins Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/7d554fcb Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/7d554fcb Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/7d554fcb Branch: refs/heads/master Commit: 7d554fcb259e128c077a62b57728c069f50871b3 Parents: e791206 Author: Michael Blow Authored: Wed Mar 22 20:12:17 2017 -0700 Committer: Michael Blow Committed: Wed Mar 22 22:05:13 2017 -0700 -- .../hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7d554fcb/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java -- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java index fce0b74..27d879c 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java @@ -105,6 +105,9 @@ public class VirtualBufferCache implements IVirtualBufferCache { VirtualPage curr = bucket.cachedPage; while (curr != null) { if (BufferedFileHandle.getFileId(curr.dpid()) == fileId) { +if (curr.getFrameSizeMultiplier() > 1) { + largePages.getAndAdd(-curr.getFrameSizeMultiplier()); +} if (prev == null) { bucket.cachedPage = curr.next(); curr.reset();