This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 4daaf2f53eafba5c5fe90a6aa2f9580590161235 Merge: 53849ef f8b8151 Author: Michael Blow <[email protected]> AuthorDate: Fri Oct 18 08:46:29 2019 -0400 Merge branch 'gerrit/mad-hatter' into 'master' Change-Id: I892dfdc0f2f61cb20e17995d797598b420e8c554 .../asterix/translator/IStatementExecutor.java | 9 ---- .../apache/asterix/api/common/ResultMetadata.java | 8 ---- .../api/http/server/NCQueryServiceServlet.java | 1 - .../api/http/server/QueryResultApiServlet.java | 2 +- .../api/http/server/QueryServiceServlet.java | 6 +-- .../asterix/app/result/JobResultCallback.java | 3 -- .../apache/asterix/app/result/ResponseMetrics.java | 7 +--- .../asterix/app/result/fields/MetricsPrinter.java | 10 +---- .../asterix/app/translator/QueryTranslator.java | 1 - .../apache/asterix/test/common/TestExecutor.java | 1 + .../TestLsmBTreeResourceFactoryProvider.java | 3 +- .../src/test/resources/runtimets/metrics.xml | 5 --- .../disk-io-count/disk-io-count.1.ddl.sqlpp | 49 ---------------------- .../disk-io-count/disk-io-count.2.update.sqlpp | 30 ------------- .../disk-io-count/disk-io-count.3.metrics.sqlpp | 28 ------------- .../disk-io-count/disk-io-count.4.ddl.sqlpp | 25 ----------- .../metrics/disk-io-count/disk-io-count.3.regexadm | 1 - .../profile/full-scan/full-scan.3.regexjson | 15 ++++--- .../metadata/bootstrap/MetadataBootstrap.java | 2 +- .../declared/BTreeResourceFactoryProvider.java | 8 ++-- .../common/job/profiling/om/TaskProfile.java | 2 +- .../java/org/apache/hyracks/control/nc/Task.java | 11 ++++- .../am/lsm/btree/LSMBTreeOperatorTestHelper.java | 2 +- .../btree/dataflow/ExternalBTreeLocalResource.java | 12 +++--- .../ExternalBTreeLocalResourceFactory.java | 7 ++-- .../ExternalBTreeWithBuddyLocalResource.java | 13 +++--- ...ExternalBTreeWithBuddyLocalResourceFactory.java | 7 ++-- .../lsm/btree/dataflow/LSMBTreeLocalResource.java | 30 ++++++------- .../dataflow/LSMBTreeLocalResourceFactory.java | 6 ++- .../storage/am/lsm/btree/utils/LSMBTreeUtil.java | 6 +-- .../storage/common/buffercache/BufferCache.java | 8 ++-- .../am/btree/AbstractOperationCallbackTest.java | 1 + .../storage/am/lsm/btree/LSMBTreeExamplesTest.java | 2 +- .../LSMBTreeModificationOperationCallbackTest.java | 2 +- .../btree/LSMBTreeSearchOperationCallbackTest.java | 2 +- .../am/lsm/btree/LSMBTreeUpdateInPlaceTest.java | 2 +- .../lsm/btree/impl/TestLsmBtreeLocalResource.java | 12 +++--- .../impl/TestLsmBtreeLocalResourceFactory.java | 6 +-- .../btree/multithread/LSMBTreeMultiThreadTest.java | 2 +- .../storage/am/lsm/btree/perf/LSMTreeRunner.java | 2 +- .../am/lsm/btree/util/LSMBTreeTestContext.java | 4 +- 41 files changed, 104 insertions(+), 249 deletions(-)
