http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java index d01d1a8..a3f277a 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java @@ -21,7 +21,6 @@ package org.apache.asterix.external.indexing; import java.io.ByteArrayInputStream; import java.io.DataInput; import java.io.DataInputStream; -import java.io.Serializable; import java.util.Date; import org.apache.asterix.common.exceptions.ErrorCode; @@ -44,20 +43,20 @@ import org.apache.hyracks.storage.am.btree.impls.RangePredicate; import org.apache.hyracks.storage.am.btree.util.BTreeUtils; import org.apache.hyracks.storage.am.common.api.IIndexCursor; import org.apache.hyracks.storage.am.common.api.ISearchOperationCallback; +import org.apache.hyracks.storage.am.common.api.IndexException; import org.apache.hyracks.storage.am.common.ophelpers.MultiComparator; import org.apache.hyracks.storage.am.lsm.btree.dataflow.ExternalBTreeDataflowHelper; import org.apache.hyracks.storage.am.lsm.btree.impls.ExternalBTree; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessorInternal; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor; /* * This class was created specifically to facilitate accessing * external file index when doing external lookup during runtime */ @SuppressWarnings({ "rawtypes", "unchecked" }) -public class ExternalFileIndexAccessor implements Serializable { +public class ExternalFileIndexAccessor { private final FilesIndexDescription filesIndexDescription = new FilesIndexDescription(); - private static final long serialVersionUID = 1L; private ExternalBTreeDataflowHelper indexDataflowHelper; private ExternalLookupOperatorDescriptor opDesc; @@ -65,12 +64,11 @@ public class ExternalFileIndexAccessor implements Serializable { private ExternalBTree index; private ArrayTupleBuilder searchKeyTupleBuilder; private ArrayTupleReference searchKey; - private MultiComparator searchCmp; private AMutableInt32 currentFileNumber = new AMutableInt32(-1); - private ISerializerDeserializer intSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT32); + private ISerializerDeserializer intSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); private RangePredicate searchPredicate; - private ILSMIndexAccessorInternal fileIndexAccessor; + private ILSMIndexAccessor fileIndexAccessor; private IIndexCursor fileIndexSearchCursor; public ExternalFileIndexAccessor(ExternalBTreeDataflowHelper indexDataflowHelper, @@ -89,7 +87,7 @@ public class ExternalFileIndexAccessor implements Serializable { searchKeyTupleBuilder.reset(); searchKeyTupleBuilder.addField(intSerde, currentFileNumber); searchKey.reset(searchKeyTupleBuilder.getFieldEndOffsets(), searchKeyTupleBuilder.getByteArray()); - searchCmp = BTreeUtils.getSearchMultiComparator(index.getComparatorFactories(), searchKey); + MultiComparator searchCmp = BTreeUtils.getSearchMultiComparator(index.getComparatorFactories(), searchKey); searchPredicate = new RangePredicate(searchKey, searchKey, true, true, searchCmp, searchCmp); // create the accessor and the cursor using the passed version @@ -99,7 +97,7 @@ public class ExternalFileIndexAccessor implements Serializable { fileIndexSearchCursor = fileIndexAccessor.createSearchCursor(false); } - public void lookup(int fileId, ExternalFile file) throws Exception { + public void lookup(int fileId, ExternalFile file) throws HyracksDataException, IndexException { // Set search parameters currentFileNumber.setValue(fileId); searchKeyTupleBuilder.reset(); @@ -122,8 +120,7 @@ public class ExternalFileIndexAccessor implements Serializable { setFile(externalFileRecord, file); } else { // This should never happen - throw new RuntimeDataException( - ErrorCode.INDEXING_EXTERNAL_FILE_INDEX_ACCESSOR_UNABLE_TO_FIND_FILE_INDEX); + throw new RuntimeDataException(ErrorCode.INDEXING_EXTERNAL_FILE_INDEX_ACCESSOR_UNABLE_TO_FIND_FILE_INDEX); } } @@ -133,9 +130,8 @@ public class ExternalFileIndexAccessor implements Serializable { .getStringValue()); file.setSize(((AInt64) externalFileRecord.getValueByPos(FilesIndexDescription.EXTERNAL_FILE_SIZE_FIELD_INDEX)) .getLongValue()); - file.setLastModefiedTime((new Date( - ((ADateTime) externalFileRecord.getValueByPos(FilesIndexDescription.EXTERNAL_FILE_MOD_DATE_FIELD_INDEX)) - .getChrononTime()))); + file.setLastModefiedTime(new Date(((ADateTime) externalFileRecord + .getValueByPos(FilesIndexDescription.EXTERNAL_FILE_MOD_DATE_FIELD_INDEX)).getChrononTime())); } public void close() throws HyracksDataException {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-lang-sqlpp/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml b/asterixdb/asterix-lang-sqlpp/pom.xml index 51a4191..6369ee2 100644 --- a/asterixdb/asterix-lang-sqlpp/pom.xml +++ b/asterixdb/asterix-lang-sqlpp/pom.xml @@ -23,7 +23,6 @@ <groupId>org.apache.asterix</groupId> <version>0.9.1-SNAPSHOT</version> </parent> - <licenses> <license> <name>Apache License, Version 2.0</name> @@ -32,7 +31,6 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> - <artifactId>asterix-lang-sqlpp</artifactId> <build> <plugins> @@ -93,15 +91,9 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - javacc-maven-plugin - </artifactId> - <versionRange> - [2.6,) - </versionRange> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <versionRange>[2.6,)</versionRange> <goals> <goal>jjdoc</goal> <goal>javacc</goal> @@ -118,7 +110,6 @@ </plugins> </pluginManagement> </build> - <dependencies> <dependency> <groupId>org.apache.asterix</groupId> @@ -162,5 +153,4 @@ <scope>test</scope> </dependency> </dependencies> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml index 4bcdff1..0064565 100644 --- a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml @@ -11,7 +11,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.3.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -31,6 +30,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> <version>${project.version}</version> @@ -47,10 +50,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-common</artifactId> - </dependency> - <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> <version>${project.version}</version> @@ -97,7 +96,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <configuration> <usedDependencies> <usedDependency>org.apache.maven:maven-core</usedDependency> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java index 15f0a35..6cd1f8b 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java @@ -361,8 +361,8 @@ public class MetadataBootstrap { runtimeContext.getMetadataMergePolicyFactory().createMergePolicy( GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, dataLifecycleManager), opTrackerProvider.getOperationTracker(appCtx), runtimeContext.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), index.isPrimaryIndex(), null, null, null, null, - true, runtimeContext.getStorageComponentProvider().getMetadataPageManagerFactory()); + ioOpCallbackFactory.createIoOpCallback(), index.isPrimaryIndex(), null, null, null, null, true, + runtimeContext.getStorageComponentProvider().getMetadataPageManagerFactory()); lsmBtree.create(); resourceID = index.getResourceID(); Resource localResourceMetadata = new LSMBTreeLocalResourceMetadata(typeTraits, comparatorFactories, @@ -396,8 +396,8 @@ public class MetadataBootstrap { runtimeContext.getMetadataMergePolicyFactory().createMergePolicy( GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, dataLifecycleManager), opTrackerProvider.getOperationTracker(appCtx), runtimeContext.getLSMIOScheduler(), - LSMBTreeIOOperationCallbackFactory.INSTANCE.createIOOperationCallback(), - index.isPrimaryIndex(), null, null, null, null, true, + LSMBTreeIOOperationCallbackFactory.INSTANCE.createIoOpCallback(), index.isPrimaryIndex(), null, + null, null, null, true, runtimeContext.getStorageComponentProvider().getMetadataPageManagerFactory()); dataLifecycleManager.register(file.getRelativePath(), lsmBtree); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java index ce1e315..936f5a0 100644 --- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java +++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java @@ -83,9 +83,8 @@ import org.apache.hyracks.api.replication.IReplicationJob; import org.apache.hyracks.api.replication.IReplicationJob.ReplicationExecutionType; import org.apache.hyracks.api.replication.IReplicationJob.ReplicationJobType; import org.apache.hyracks.api.replication.IReplicationJob.ReplicationOperation; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexReplicationJob; -import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex; import org.apache.hyracks.util.StorageUtil; import org.apache.hyracks.util.StorageUtil.StorageUnit; @@ -123,8 +122,8 @@ public class ReplicationManager implements IReplicationManager { private ReplicationJobsProccessor replicationJobsProcessor; private final ReplicasEventsMonitor replicationMonitor; //dummy job used to stop ReplicationJobsProccessor thread. - private static final IReplicationJob REPLICATION_JOB_POISON_PILL = new ReplicationJob( - ReplicationJobType.METADATA, ReplicationOperation.REPLICATE, ReplicationExecutionType.ASYNC, null); + private static final IReplicationJob REPLICATION_JOB_POISON_PILL = new ReplicationJob(ReplicationJobType.METADATA, + ReplicationOperation.REPLICATE, ReplicationExecutionType.ASYNC, null); //used to identify the correct IP address when the node has multiple network interfaces private String hostIPAddressFirstOctet = null; @@ -163,8 +162,9 @@ public class ReplicationManager implements IReplicationManager { replicationJobsProcessor = new ReplicationJobsProccessor(); replicationMonitor = new ReplicasEventsMonitor(); - Map<String, ClusterPartition[]> nodePartitions = ((IPropertiesProvider) asterixAppRuntimeContextProvider - .getAppContext()).getMetadataProperties().getNodePartitions(); + Map<String, ClusterPartition[]> nodePartitions = + ((IPropertiesProvider) asterixAppRuntimeContextProvider.getAppContext()).getMetadataProperties() + .getNodePartitions(); //add list of replicas from configurations (To be read from another source e.g. Zookeeper) Set<Replica> replicaNodes = replicationProperties.getRemoteReplicas(nodeId); replica2PartitionsMap = new HashMap<>(replicaNodes.size()); @@ -300,8 +300,8 @@ public class ReplicationManager implements IReplicationManager { //send LSMComponent properties LSMComponentJob = (ILSMIndexReplicationJob) job; LSMComponentProperties lsmCompProp = new LSMComponentProperties(LSMComponentJob, nodeId); - requestBuffer = ReplicationProtocol.writeLSMComponentPropertiesRequest(lsmCompProp, - requestBuffer); + requestBuffer = + ReplicationProtocol.writeLSMComponentPropertiesRequest(lsmCompProp, requestBuffer); sendRequest(replicasSockets, requestBuffer); } @@ -325,10 +325,10 @@ public class ReplicationManager implements IReplicationManager { * since this is LSM_COMPONENT REPLICATE job, the job will contain * only the component being replicated. */ - ILSMComponent diskComponent = LSMComponentJob.getLSMIndexOperationContext() + ILSMDiskComponent diskComponent = LSMComponentJob.getLSMIndexOperationContext() .getComponentsToBeReplicated().get(0); - long lsnOffset = LSMIndexUtil.getComponentFileLSNOffset( - (AbstractLSMIndex) LSMComponentJob.getLSMIndex(), diskComponent, filePath); + long lsnOffset = LSMIndexUtil.getComponentFileLSNOffset(LSMComponentJob.getLSMIndex(), + diskComponent, filePath); asterixFileProperties.initialize(filePath, fileSize, nodeId, isLSMComponentFile, lsnOffset, remainingFiles == 0); } else { @@ -338,7 +338,8 @@ public class ReplicationManager implements IReplicationManager { requestBuffer = ReplicationProtocol.writeFileReplicationRequest(requestBuffer, asterixFileProperties, ReplicationRequestType.REPLICATE_FILE); - Iterator<Map.Entry<String, SocketChannel>> iterator = replicasSockets.entrySet().iterator(); + Iterator<Map.Entry<String, SocketChannel>> iterator = + replicasSockets.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry<String, SocketChannel> entry = iterator.next(); //if the remote replica is not interested in this partition, skip it. @@ -351,8 +352,8 @@ public class ReplicationManager implements IReplicationManager { NetworkingUtil.transferBufferToChannel(socketChannel, requestBuffer); NetworkingUtil.sendFile(fileChannel, socketChannel); if (asterixFileProperties.requiresAck()) { - ReplicationRequestType responseType = waitForResponse(socketChannel, - responseBuffer); + ReplicationRequestType responseType = + waitForResponse(socketChannel, responseBuffer); if (responseType != ReplicationRequestType.ACK) { throw new IOException( "Could not receive ACK from replica " + entry.getKey()); @@ -788,10 +789,11 @@ public class ReplicationManager implements IReplicationManager { //if got ACKs from all remote replicas, notify pending jobs if any - if (jobCommitAcks.get(jobId).size() == replicationFactor && replicationJobsPendingAcks.containsKey(jobId)) { + if (jobCommitAcks.get(jobId).size() == replicationFactor + && replicationJobsPendingAcks.containsKey(jobId)) { ILogRecord pendingLog = replicationJobsPendingAcks.get(jobId); synchronized (pendingLog) { - pendingLog.notify(); + pendingLog.notifyAll(); } } } @@ -997,17 +999,17 @@ public class ReplicationManager implements IReplicationManager { ByteBuffer requestBuffer = ByteBuffer.allocate(INITIAL_BUFFER_SIZE); for (String replicaId : replicaIds) { //1. identify replica indexes with LSN less than nonSharpCheckpointTargetLSN. - Map<Long, String> laggingIndexes = replicaResourcesManager.getLaggingReplicaIndexesId2PathMap(replicaId, - nonSharpCheckpointTargetLSN); + Map<Long, String> laggingIndexes = + replicaResourcesManager.getLaggingReplicaIndexesId2PathMap(replicaId, nonSharpCheckpointTargetLSN); if (laggingIndexes.size() > 0) { //2. send request to remote replicas that have lagging indexes. ReplicaIndexFlushRequest laggingIndexesResponse = null; try (SocketChannel socketChannel = getReplicaSocket(replicaId)) { - ReplicaIndexFlushRequest laggingIndexesRequest = new ReplicaIndexFlushRequest( - laggingIndexes.keySet()); - requestBuffer = ReplicationProtocol.writeGetReplicaIndexFlushRequest(requestBuffer, - laggingIndexesRequest); + ReplicaIndexFlushRequest laggingIndexesRequest = + new ReplicaIndexFlushRequest(laggingIndexes.keySet()); + requestBuffer = + ReplicationProtocol.writeGetReplicaIndexFlushRequest(requestBuffer, laggingIndexesRequest); NetworkingUtil.transferBufferToChannel(socketChannel, requestBuffer); //3. remote replicas will respond with indexes that were not flushed. @@ -1298,8 +1300,8 @@ public class ReplicationManager implements IReplicationManager { Thread.currentThread().setName("TxnLogs Replication Listener Thread"); LOGGER.log(Level.INFO, "Started listening on socket: " + replicaSocket.socket().getRemoteSocketAddress()); - try (BufferedReader incomingResponse = new BufferedReader( - new InputStreamReader(replicaSocket.socket().getInputStream()))) { + try (BufferedReader incomingResponse = + new BufferedReader(new InputStreamReader(replicaSocket.socket().getInputStream()))) { while (true) { String responseLine = incomingResponse.readLine(); if (responseLine == null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java index 2d6f3c9..06ca8e6 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeLocalResourceMetadata.java @@ -41,9 +41,8 @@ public class ExternalBTreeLocalResourceMetadata extends LSMBTreeLocalResourceMet public ExternalBTreeLocalResourceMetadata(ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories, int[] bloomFilterKeyFields, boolean isPrimary, int datasetID, int partition, - ILSMMergePolicyFactory mergePolicyFactory, - Map<String, String> mergePolicyProperties, ILSMOperationTrackerFactory opTrackerProvider, - ILSMIOOperationCallbackFactory ioOpCallbackFactory, + ILSMMergePolicyFactory mergePolicyFactory, Map<String, String> mergePolicyProperties, + ILSMOperationTrackerFactory opTrackerProvider, ILSMIOOperationCallbackFactory ioOpCallbackFactory, IMetadataPageManagerFactory metadataPageManagerFactory) { super(typeTraits, cmpFactories, bloomFilterKeyFields, isPrimary, datasetID, partition, mergePolicyFactory, mergePolicyProperties, null, null, null, null, opTrackerProvider, ioOpCallbackFactory, @@ -51,8 +50,8 @@ public class ExternalBTreeLocalResourceMetadata extends LSMBTreeLocalResourceMet } @Override - public ILSMIndex createIndexInstance(INCApplicationContext appCtx, - LocalResource resource) throws HyracksDataException { + public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource) + throws HyracksDataException { IAppRuntimeContext runtimeContextProvider = (IAppRuntimeContext) appCtx.getApplicationObject(); IIOManager ioManager = runtimeContextProvider.getIOManager(); FileReference file = ioManager.resolve(resource.getPath()); @@ -61,9 +60,7 @@ public class ExternalBTreeLocalResourceMetadata extends LSMBTreeLocalResourceMet runtimeContextProvider.getBloomFilterFalsePositiveRate(), mergePolicyFactory.createMergePolicy(mergePolicyProperties, runtimeContextProvider.getDatasetLifecycleManager()), - opTrackerProvider.getOperationTracker(appCtx), - runtimeContextProvider.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), -1, true, - metadataPageManagerFactory); + opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(), + ioOpCallbackFactory.createIoOpCallback(), -1, true, metadataPageManagerFactory); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java index e411f8b..1a080b2 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalBTreeWithBuddyLocalResourceMetadata.java @@ -50,10 +50,10 @@ public class ExternalBTreeWithBuddyLocalResourceMetadata extends Resource { private final int[] buddyBtreeFields; public ExternalBTreeWithBuddyLocalResourceMetadata(int datasetID, int partition, - IBinaryComparatorFactory[] btreeCmpFactories, - ITypeTraits[] typeTraits, ILSMMergePolicyFactory mergePolicyFactory, - Map<String, String> mergePolicyProperties, int[] buddyBtreeFields, - ILSMOperationTrackerFactory opTrackerProvider, ILSMIOOperationCallbackFactory ioOpCallbackFactory, + IBinaryComparatorFactory[] btreeCmpFactories, ITypeTraits[] typeTraits, + ILSMMergePolicyFactory mergePolicyFactory, Map<String, String> mergePolicyProperties, + int[] buddyBtreeFields, ILSMOperationTrackerFactory opTrackerProvider, + ILSMIOOperationCallbackFactory ioOpCallbackFactory, IMetadataPageManagerFactory metadataPageManagerFactory) { super(datasetID, partition, null, null, null, opTrackerProvider, ioOpCallbackFactory, metadataPageManagerFactory); @@ -70,16 +70,12 @@ public class ExternalBTreeWithBuddyLocalResourceMetadata extends Resource { IAppRuntimeContext appRuntimeCtx = (IAppRuntimeContext) appCtx.getApplicationObject(); IIOManager ioManager = appCtx.getIoManager(); FileReference file = ioManager.resolve(resource.getPath()); - return LSMBTreeUtil.createExternalBTreeWithBuddy( - ioManager, file, appRuntimeCtx.getBufferCache(), + return LSMBTreeUtil.createExternalBTreeWithBuddy(ioManager, file, appRuntimeCtx.getBufferCache(), appRuntimeCtx.getFileMapManager(), typeTraits, btreeCmpFactories, appRuntimeCtx.getBloomFilterFalsePositiveRate(), - mergePolicyFactory.createMergePolicy( - mergePolicyProperties, + mergePolicyFactory.createMergePolicy(mergePolicyProperties, appRuntimeCtx.getDatasetLifecycleManager()), - opTrackerProvider.getOperationTracker(appCtx), - appRuntimeCtx.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), buddyBtreeFields, -1, - true, metadataPageManagerFactory); + opTrackerProvider.getOperationTracker(appCtx), appRuntimeCtx.getLSMIOScheduler(), + ioOpCallbackFactory.createIoOpCallback(), buddyBtreeFields, -1, true, metadataPageManagerFactory); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java index 3de3a58..c923046 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/ExternalRTreeLocalResourceMetadata.java @@ -59,8 +59,8 @@ public class ExternalRTreeLocalResourceMetadata extends LSMRTreeLocalResourceMet } @Override - public ILSMIndex createIndexInstance(INCApplicationContext appCtx, - LocalResource resource) throws HyracksDataException { + public ILSMIndex createIndexInstance(INCApplicationContext appCtx, LocalResource resource) + throws HyracksDataException { IAppRuntimeContext runtimeContextProvider = (IAppRuntimeContext) appCtx.getApplicationObject(); IIOManager ioManager = runtimeContextProvider.getIOManager(); FileReference file = ioManager.resolve(resource.getPath()); @@ -70,10 +70,9 @@ public class ExternalRTreeLocalResourceMetadata extends LSMRTreeLocalResourceMet valueProviderFactories, rtreePolicyType, runtimeContextProvider.getBloomFilterFalsePositiveRate(), mergePolicyFactory.createMergePolicy(mergePolicyProperties, runtimeContextProvider.getDatasetLifecycleManager()), - opTrackerProvider.getOperationTracker(appCtx), - runtimeContextProvider.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), linearizeCmpFactory, - btreeFields, -1, true, isPointMBR, metadataPageManagerFactory); + opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(), + ioOpCallbackFactory.createIoOpCallback(), linearizeCmpFactory, btreeFields, -1, true, isPointMBR, + metadataPageManagerFactory); } catch (TreeIndexException e) { throw new HyracksDataException(e); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java index 0ecb396..f38711c 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java @@ -69,9 +69,9 @@ public class LSMBTreeLocalResourceMetadata extends Resource { @Override public String toString() { - return new StringBuilder().append(" { \"").append(LSMBTreeLocalResourceMetadata.class.getName()).append( - "\" : {").append("\"datasetId\" : ").append(datasetId()).append(", \"partition\" : ").append( - partition()).append(" } ").append(" }").toString(); + return new StringBuilder().append(" { \"").append(LSMBTreeLocalResourceMetadata.class.getName()) + .append("\" : {").append("\"datasetId\" : ").append(datasetId()).append(", \"partition\" : ") + .append(partition()).append(" } ").append(" }").toString(); } @Override @@ -82,15 +82,13 @@ public class LSMBTreeLocalResourceMetadata extends Resource { FileReference file = ioManager.resolve(resource.getPath()); int ioDeviceNum = Resource.getIoDeviceNum(ioManager, file.getDeviceHandle()); final IDatasetLifecycleManager datasetLifecycleManager = appRuntimeCtx.getDatasetLifecycleManager(); - return LSMBTreeUtil.createLSMTree(ioManager, datasetLifecycleManager.getVirtualBufferCaches( - datasetId(), ioDeviceNum), file, appRuntimeCtx.getBufferCache(), appRuntimeCtx - .getFileMapManager(), - typeTraits, cmpFactories, bloomFilterKeyFields, appRuntimeCtx - .getBloomFilterFalsePositiveRate(), + return LSMBTreeUtil.createLSMTree(ioManager, + datasetLifecycleManager.getVirtualBufferCaches(datasetId(), ioDeviceNum), file, + appRuntimeCtx.getBufferCache(), appRuntimeCtx.getFileMapManager(), typeTraits, cmpFactories, + bloomFilterKeyFields, appRuntimeCtx.getBloomFilterFalsePositiveRate(), mergePolicyFactory.createMergePolicy(mergePolicyProperties, datasetLifecycleManager), - opTrackerProvider.getOperationTracker(appCtx), - appRuntimeCtx.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), isPrimary, filterTypeTraits, - filterCmpFactories, btreeFields, filterFields, true, metadataPageManagerFactory); + opTrackerProvider.getOperationTracker(appCtx), appRuntimeCtx.getLSMIOScheduler(), + ioOpCallbackFactory.createIoOpCallback(), isPrimary, filterTypeTraits, filterCmpFactories, btreeFields, + filterFields, true, metadataPageManagerFactory); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java index 097c922..acb087a 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java @@ -98,7 +98,7 @@ public class LSMInvertedIndexLocalResourceMetadata extends Resource { mergePolicyFactory.createMergePolicy(mergePolicyProperties, runtimeContextProvider.getDatasetLifecycleManager()), opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), invertedIndexFields, filterTypeTraits, + ioOpCallbackFactory.createIoOpCallback(), invertedIndexFields, filterTypeTraits, filterCmpFactories, filterFields, filterFieldsForNonBulkLoadOps, invertedIndexFieldsForNonBulkLoadOps, true, metadataPageManagerFactory); } else { @@ -109,7 +109,7 @@ public class LSMInvertedIndexLocalResourceMetadata extends Resource { mergePolicyFactory.createMergePolicy(mergePolicyProperties, runtimeContextProvider.getDatasetLifecycleManager()), opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), invertedIndexFields, filterTypeTraits, + ioOpCallbackFactory.createIoOpCallback(), invertedIndexFields, filterTypeTraits, filterCmpFactories, filterFields, filterFieldsForNonBulkLoadOps, invertedIndexFieldsForNonBulkLoadOps, true, metadataPageManagerFactory); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java index c9c5d25..500ca30 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java @@ -97,8 +97,8 @@ public class LSMRTreeLocalResourceMetadata extends Resource { mergePolicyFactory.createMergePolicy(mergePolicyProperties, runtimeContextProvider.getDatasetLifecycleManager()), opTrackerProvider.getOperationTracker(appCtx), runtimeContextProvider.getLSMIOScheduler(), - ioOpCallbackFactory.createIOOperationCallback(), linearizeCmpFactory, rtreeFields, - filterTypeTraits, filterCmpFactories, filterFields, true, isPointMBR, metadataPageManagerFactory); + ioOpCallbackFactory.createIoOpCallback(), linearizeCmpFactory, rtreeFields, filterTypeTraits, + filterCmpFactories, filterFields, true, isPointMBR, metadataPageManagerFactory); } catch (TreeIndexException e) { throw new HyracksDataException(e); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Pair.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Pair.java b/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Pair.java index 77e6f4c..2dd71cd 100644 --- a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Pair.java +++ b/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Pair.java @@ -19,7 +19,9 @@ package org.apache.hyracks.algebricks.common.utils; import java.io.Serializable; +import java.util.Objects; +//TODO: Remove and use apache commons lang3 instead public class Pair<T1, T2> implements Serializable { private static final long serialVersionUID = 1L; @@ -38,17 +40,15 @@ public class Pair<T1, T2> implements Serializable { @Override public boolean equals(Object obj) { - if (!(obj instanceof Pair<?, ?>)) { + if (!(obj instanceof Pair)) { return false; - } else { - Pair<?, ?> p = (Pair<?, ?>) obj; - return this.first.equals(p.first) && this.second.equals(p.second); } + Pair<?, ?> p = (Pair<?, ?>) obj; + return Objects.equals(first, p.first) && Objects.equals(second, p.second); } @Override public int hashCode() { - return first.hashCode() * 31 + second.hashCode(); + return Objects.hash(first, second); } - } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Triple.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Triple.java b/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Triple.java index d5b188f..a30ee12 100644 --- a/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Triple.java +++ b/hyracks-fullstack/algebricks/algebricks-common/src/main/java/org/apache/hyracks/algebricks/common/utils/Triple.java @@ -18,6 +18,9 @@ */ package org.apache.hyracks.algebricks.common.utils; +import java.util.Objects; + +//TODO: Remove and use apache commons lang3 instead public class Triple<T1, T2, T3> { public T1 first; public T2 second; @@ -36,15 +39,17 @@ public class Triple<T1, T2, T3> { @Override public int hashCode() { - return first.hashCode() * 31 + second.hashCode() * 15 + third.hashCode(); + return Objects.hash(first, second, third); } @Override public boolean equals(Object o) { - if (!(o instanceof Triple<?, ?, ?>)) + if (!(o instanceof Triple<?, ?, ?>)) { return false; + } Triple<?, ?, ?> triple = (Triple<?, ?, ?>) o; - return first.equals(triple.first) && second.equals(triple.second) && third.equals(triple.third); + return Objects.equals(first, triple.first) && Objects.equals(second, triple.second) + && Objects.equals(third, triple.third); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractStableSortPOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractStableSortPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractStableSortPOperator.java index 3759956..78e96a4 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractStableSortPOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractStableSortPOperator.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.List; import org.apache.commons.lang3.mutable.Mutable; - import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/OneToOneExchangePOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/OneToOneExchangePOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/OneToOneExchangePOperator.java index 083e4d3..18da96b 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/OneToOneExchangePOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/OneToOneExchangePOperator.java @@ -18,8 +18,8 @@ */ package org.apache.hyracks.algebricks.core.algebra.operators.physical; -import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.base.IHyracksJobBuilder.TargetConstraint; +import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; import org.apache.hyracks.algebricks.core.algebra.base.PhysicalOperatorTag; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomMergeExchangePOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomMergeExchangePOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomMergeExchangePOperator.java index aedf046..650c9e0 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomMergeExchangePOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomMergeExchangePOperator.java @@ -20,8 +20,8 @@ package org.apache.hyracks.algebricks.core.algebra.operators.physical; import java.util.ArrayList; -import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.base.IHyracksJobBuilder.TargetConstraint; +import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; import org.apache.hyracks.algebricks.core.algebra.base.PhysicalOperatorTag; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml index 2488c3f..386b824 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml @@ -16,18 +16,15 @@ ! specific language governing permissions and 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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>algebricks-rewriter</artifactId> <name>algebricks-rewriter</name> - <parent> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks</artifactId> <version>0.3.1-SNAPSHOT</version> </parent> - <licenses> <license> <name>Apache License, Version 2.0</name> @@ -36,11 +33,9 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> - <properties> <root.dir>${basedir}/../..</root.dir> </properties> - <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> @@ -62,4 +57,4 @@ <artifactId>commons-lang3</artifactId> </dependency> </dependencies> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java index 1ca8bb3..963e123 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java @@ -46,6 +46,7 @@ public class ErrorCode { public static final int JOB_REQUIREMENTS_EXCEED_CAPACITY = 9; public static final int NO_SUCH_NODE = 10; public static final int CLASS_LOADING_ISSUE = 11; + public static final int ILLEGAL_WRITE_AFTER_FLUSH_ATTEMPT = 12; // Compilation error codes. public static final int RULECOLLECTION_NOT_INSTANCE_OF_LIST = 10001; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties b/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties index d17c9aa..6b74b54 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties @@ -20,15 +20,16 @@ # 0 --- 9999: runtime errors # 10000 ---- 19999: compilation errors -1=Unsupported operation %1$s in %2$s operator -2=Error in processing tuple %1$s in a frame -4=The file with absolute path %1$s is not within any of the current IO devices -5=Phrase search in Full-text is not supported. An expression should include only one word -6=Job queue is full with %1$s jobs -7=Network address cannot be resolved -- %1$s -8=Invalid internal input parameter -9=Job requirement %1$s exceeds capacity %2$s -10=Node %1$s does not exist -11=Class loading issue: %1$s +1 = Unsupported operation %1$s in %2$s operator +2 = Error in processing tuple %1$s in a frame +4 = The file with absolute path %1$s is not within any of the current IO devices +5 = Phrase search in Full-text is not supported. An expression should include only one word +6 = Job queue is full with %1$s jobs +7 = Network address cannot be resolved -- %1$s +8 = Invalid internal input parameter +9 = Job requirement %1$s exceeds capacity %2$s +10 = Node %1$s does not exist +11 = Class loading issue: %1$s +12 = Invalid attempt to write to a flushed append only metadata page 10000 = The given rule collection %1$s is not an instance of the List class. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/api/IValueReference.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/api/IValueReference.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/api/IValueReference.java index e83d2ad..01567e1 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/api/IValueReference.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/api/IValueReference.java @@ -19,9 +19,9 @@ package org.apache.hyracks.data.std.api; public interface IValueReference { - public byte[] getByteArray(); + byte[] getByteArray(); - public int getStartOffset(); + int getStartOffset(); - public int getLength(); + int getLength(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/LongPointable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/LongPointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/LongPointable.java index 41af193..0f27e63 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/LongPointable.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/LongPointable.java @@ -27,6 +27,7 @@ import org.apache.hyracks.data.std.api.IPointable; import org.apache.hyracks.data.std.api.IPointableFactory; public final class LongPointable extends AbstractPointable implements IHashable, IComparable, INumeric { + public static final LongPointableFactory FACTORY = new LongPointableFactory(); public static final ITypeTraits TYPE_TRAITS = new ITypeTraits() { private static final long serialVersionUID = 1L; @@ -41,19 +42,28 @@ public final class LongPointable extends AbstractPointable implements IHashable, } }; - public static final IPointableFactory FACTORY = new IPointableFactory() { + public static class LongPointableFactory implements IPointableFactory { private static final long serialVersionUID = 1L; + private LongPointableFactory() { + } + @Override - public IPointable createPointable() { + public LongPointable createPointable() { return new LongPointable(); } + public LongPointable createPointable(long value) { + LongPointable pointable = new LongPointable(); + pointable.setLong(value); + return pointable; + } + @Override public ITypeTraits getTypeTraits() { return TYPE_TRAITS; } - }; + } public static long getLong(byte[] bytes, int start) { return (((long) (bytes[start] & 0xff)) << 56) + (((long) (bytes[start + 1] & 0xff)) << 48) @@ -78,6 +88,11 @@ public final class LongPointable extends AbstractPointable implements IHashable, } public void setLong(long value) { + if (bytes == null) { + start = 0; + length = TYPE_TRAITS.getFixedLength(); + bytes = new byte[length]; + } setLong(bytes, start, value); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/ArrayBackedValueStorage.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/ArrayBackedValueStorage.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/ArrayBackedValueStorage.java index 33aa58b..e075f4e 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/ArrayBackedValueStorage.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/ArrayBackedValueStorage.java @@ -20,6 +20,7 @@ package org.apache.hyracks.data.std.util; import java.io.DataOutput; import java.io.IOException; +import java.util.Objects; import org.apache.hyracks.data.std.api.IMutableValueStorage; import org.apache.hyracks.data.std.api.IValueReference; @@ -53,6 +54,7 @@ public class ArrayBackedValueStorage implements IMutableValueStorage { return data.getLength(); } + //TODO: don't swallow, but throw the exception public void append(IValueReference value) { try { data.append(value); @@ -69,4 +71,22 @@ public class ArrayBackedValueStorage implements IMutableValueStorage { public void setSize(int bytesRequired) { data.setSize(bytesRequired); } + + @Override + public int hashCode() { + return Objects.hash(data); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ArrayBackedValueStorage)) { + return false; + } + ArrayBackedValueStorage other = (ArrayBackedValueStorage) obj; + return Objects.equals(data, other.data); + } + } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/GrowableArray.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/GrowableArray.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/GrowableArray.java index 39c9095..994d286 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/GrowableArray.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/GrowableArray.java @@ -71,4 +71,33 @@ public class GrowableArray implements IDataOutputProvider { public void setSize(int bytesRequired) { baaos.setSize(bytesRequired); } + + @Override + public int hashCode() { + return 31 * baaos.getLength(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof GrowableArray)) { + return false; + } + GrowableArray other = (GrowableArray) obj; + int length = baaos.getLength(); + if (other.baaos.getLength() != length) { + return false; + } + byte[] array1 = baaos.getByteArray(); + byte[] array2 = other.baaos.getByteArray(); + for (int i = 0; i < length; i++) { + if (array1[i] != array2[i]) { + return false; + } + } + return true; + } + } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/JobFailureTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/JobFailureTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/JobFailureTest.java index b76e458..6571f7e 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/JobFailureTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/JobFailureTest.java @@ -39,8 +39,8 @@ public class JobFailureTest extends AbstractMultiNCIntegrationTest { private void execTest() throws Exception { JobSpecification spec = new JobSpecification(); - AbstractSingleActivityOperatorDescriptor sourceOpDesc = new ExceptionOnCreatePushRuntimeOperatorDescriptor(spec, - 0, 1, new int[] { 4 }, true); + AbstractSingleActivityOperatorDescriptor sourceOpDesc = + new ExceptionOnCreatePushRuntimeOperatorDescriptor(spec, 0, 1, new int[] { 4 }, true); PartitionConstraintHelper.addAbsoluteLocationConstraint(spec, sourceOpDesc, ASTERIX_IDS); SinkOperatorDescriptor sinkOpDesc = new SinkOperatorDescriptor(spec, 1); PartitionConstraintHelper.addAbsoluteLocationConstraint(spec, sinkOpDesc, ASTERIX_IDS); @@ -53,7 +53,10 @@ public class JobFailureTest extends AbstractMultiNCIntegrationTest { e.printStackTrace(); throw e; } - Assert.assertTrue(ExceptionOnCreatePushRuntimeOperatorDescriptor.succeed()); + Assert.assertTrue( + ExceptionOnCreatePushRuntimeOperatorDescriptor.stats() + + ExceptionOnCreatePushRuntimeOperatorDescriptor.succeed(), + ExceptionOnCreatePushRuntimeOperatorDescriptor.succeed()); // should also check the content of the different ncs } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java index 14c644a..f814cd5 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java @@ -136,4 +136,9 @@ public class ExceptionOnCreatePushRuntimeOperatorDescriptor extends AbstractSing } return success; } + + public static String stats() { + return "Failure: CreatePushRuntime:" + createPushRuntime.get() + ", InitializeCounter:" + + initializeCounter.get() + ", OpenCloseCounter:" + openCloseCounter.get(); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java index 65cdd52..6509dcc 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java @@ -34,6 +34,7 @@ public class ChunkedNettyOutputStream extends OutputStream { private final ChannelHandlerContext ctx; private final ChunkedResponse response; private ByteBuf buffer; + private boolean closed; public ChunkedNettyOutputStream(ChannelHandlerContext ctx, int chunkSize, ChunkedResponse response) { this.response = response; @@ -73,13 +74,16 @@ public class ChunkedNettyOutputStream extends OutputStream { @Override public void close() throws IOException { - if (response.isHeaderSent() || response.status() != HttpResponseStatus.OK) { - flush(); - buffer.release(); - } else { - response.fullReponse(buffer); + if (!closed) { + if (response.isHeaderSent() || response.status() != HttpResponseStatus.OK) { + flush(); + buffer.release(); + } else { + response.fullReponse(buffer); + } + super.close(); } - super.close(); + closed = true; } @Override @@ -96,6 +100,7 @@ public class ChunkedNettyOutputStream extends OutputStream { ByteBuf aBuffer = ctx.alloc().buffer(buffer.readableBytes()); aBuffer.writeBytes(buffer); response.error(aBuffer); + buffer.clear(); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/dataflow/BTreeDataflowHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/dataflow/BTreeDataflowHelper.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/dataflow/BTreeDataflowHelper.java index 82333a9..6f6722a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/dataflow/BTreeDataflowHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/dataflow/BTreeDataflowHelper.java @@ -22,7 +22,6 @@ package org.apache.hyracks.storage.am.btree.dataflow; import org.apache.hyracks.api.context.IHyracksTaskContext; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.io.FileReference; -import org.apache.hyracks.storage.am.btree.exceptions.BTreeException; import org.apache.hyracks.storage.am.btree.frames.BTreeLeafFrameType; import org.apache.hyracks.storage.am.btree.util.BTreeUtils; import org.apache.hyracks.storage.am.common.api.ITreeIndex; @@ -42,16 +41,11 @@ public class BTreeDataflowHelper extends TreeIndexDataflowHelper { @Override public ITreeIndex createIndexInstance() throws HyracksDataException { AbstractTreeIndexOperatorDescriptor treeOpDesc = (AbstractTreeIndexOperatorDescriptor) opDesc; - try { - FileReference fileRef = IndexFileNameUtil.getIndexAbsoluteFileRef(treeOpDesc, ctx.getTaskAttemptId() - .getTaskId().getPartition(), ctx.getIOManager()); - IBufferCache bufferCache = opDesc.getStorageManager().getBufferCache(ctx); - return BTreeUtils.createBTree(bufferCache, opDesc.getStorageManager() - .getFileMapProvider(ctx), treeOpDesc.getTreeIndexTypeTraits(), treeOpDesc - .getTreeIndexComparatorFactories(), BTreeLeafFrameType.REGULAR_NSM, fileRef, - pageManagerFactory.createPageManager(bufferCache)); - } catch (BTreeException e) { - throw new HyracksDataException(e); - } + FileReference fileRef = IndexFileNameUtil.getIndexAbsoluteFileRef(treeOpDesc, + ctx.getTaskAttemptId().getTaskId().getPartition(), ctx.getIOManager()); + IBufferCache bufferCache = opDesc.getStorageManager().getBufferCache(ctx); + return BTreeUtils.createBTree(bufferCache, opDesc.getStorageManager().getFileMapProvider(ctx), + treeOpDesc.getTreeIndexTypeTraits(), treeOpDesc.getTreeIndexComparatorFactories(), + BTreeLeafFrameType.REGULAR_NSM, fileRef, pageManagerFactory.createPageManager(bufferCache)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/util/BTreeUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/util/BTreeUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/util/BTreeUtils.java index 37e15b4..c7a2fee 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/util/BTreeUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/util/BTreeUtils.java @@ -21,9 +21,9 @@ package org.apache.hyracks.storage.am.btree.util; import org.apache.hyracks.api.dataflow.value.IBinaryComparator; import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory; import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.io.FileReference; import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; -import org.apache.hyracks.storage.am.btree.exceptions.BTreeException; import org.apache.hyracks.storage.am.btree.frames.BTreeFieldPrefixNSMLeafFrameFactory; import org.apache.hyracks.storage.am.btree.frames.BTreeLeafFrameType; import org.apache.hyracks.storage.am.btree.frames.BTreeNSMInteriorFrameFactory; @@ -40,7 +40,7 @@ import org.apache.hyracks.storage.common.file.IFileMapProvider; public class BTreeUtils { public static BTree createBTree(IBufferCache bufferCache, IFileMapProvider fileMapProvider, ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories, BTreeLeafFrameType leafType, - FileReference file, IPageManager freePageManager) throws BTreeException { + FileReference file, IPageManager freePageManager) throws HyracksDataException { TypeAwareTupleWriterFactory tupleWriterFactory = new TypeAwareTupleWriterFactory(typeTraits); ITreeIndexFrameFactory leafFrameFactory = getLeafFrameFactory(tupleWriterFactory, leafType); ITreeIndexFrameFactory interiorFrameFactory = new BTreeNSMInteriorFrameFactory(tupleWriterFactory); @@ -51,7 +51,7 @@ public class BTreeUtils { public static BTree createBTree(IBufferCache bufferCache, IPageManager freePageManager, IFileMapProvider fileMapProvider, ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories, - BTreeLeafFrameType leafType, FileReference file) throws BTreeException { + BTreeLeafFrameType leafType, FileReference file) throws HyracksDataException { TypeAwareTupleWriterFactory tupleWriterFactory = new TypeAwareTupleWriterFactory(typeTraits); ITreeIndexFrameFactory leafFrameFactory = getLeafFrameFactory(tupleWriterFactory, leafType); ITreeIndexFrameFactory interiorFrameFactory = new BTreeNSMInteriorFrameFactory(tupleWriterFactory); @@ -74,7 +74,7 @@ public class BTreeUtils { } public static ITreeIndexFrameFactory getLeafFrameFactory(ITreeIndexTupleWriterFactory tupleWriterFactory, - BTreeLeafFrameType leafType) throws BTreeException { + BTreeLeafFrameType leafType) throws HyracksDataException { switch (leafType) { case REGULAR_NSM: { return new BTreeNSMLeafFrameFactory(tupleWriterFactory); @@ -83,7 +83,7 @@ public class BTreeUtils { return new BTreeFieldPrefixNSMLeafFrameFactory(tupleWriterFactory); } default: { - throw new BTreeException("Unknown BTreeLeafFrameType: " + leafType.toString()); + throw new HyracksDataException("Unknown BTreeLeafFrameType: " + leafType.toString()); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java index 32d2515..1ee48f6 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java @@ -18,6 +18,7 @@ */ package org.apache.hyracks.storage.am.common.freepage; +import org.apache.hyracks.api.exceptions.ErrorCode; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.data.std.api.IPointable; import org.apache.hyracks.data.std.api.IValueReference; @@ -38,9 +39,8 @@ public class AppendOnlyLinkedMetadataPageManager implements IMetadataPageManager private int metadataPage = IBufferCache.INVALID_PAGEID; private int fileId = -1; private final ITreeIndexMetadataFrameFactory frameFactory; - ICachedPage confiscatedPage; - ICachedPage filterPage; - boolean ready = false; + private ICachedPage confiscatedPage; + private boolean ready = false; public AppendOnlyLinkedMetadataPageManager(IBufferCache bufferCache, ITreeIndexMetadataFrameFactory frameFactory) { this.bufferCache = bufferCache; @@ -299,6 +299,9 @@ public class AppendOnlyLinkedMetadataPageManager implements IMetadataPageManager @Override public void put(ITreeIndexMetadataFrame frame, IValueReference key, IValueReference value) throws HyracksDataException { + if (confiscatedPage == null) { + throw HyracksDataException.create(ErrorCode.ILLEGAL_WRITE_AFTER_FLUSH_ATTEMPT); + } confiscatedPage.acquireWriteLatch(); try { frame.setPage(confiscatedPage); @@ -309,8 +312,9 @@ public class AppendOnlyLinkedMetadataPageManager implements IMetadataPageManager } private ICachedPage pinPage() throws HyracksDataException { - return confiscatedPage == null ? bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, getMetadataPageId()), - false) : confiscatedPage; + return confiscatedPage == null + ? bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, getMetadataPageId()), false) + : confiscatedPage; } private void unpinPage(ICachedPage page) throws HyracksDataException { @@ -342,8 +346,7 @@ public class AppendOnlyLinkedMetadataPageManager implements IMetadataPageManager frame.setPage(page); int inPageOffset = frame.getOffset(key); return inPageOffset >= 0 ? ((long) pageId * bufferCache.getPageSizeWithHeader()) + frame.getOffset(key) - + IBufferCache.RESERVED_HEADER_BYTES - : -1L; + + IBufferCache.RESERVED_HEADER_BYTES : -1L; } finally { page.releaseReadLatch(); unpinPage(page); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java index 0d8f32e..d471956 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java @@ -72,7 +72,7 @@ public class ExternalBTreeDataflowHelper extends LSMBTreeDataflowHelper { .getTreeIndexComparatorFactories(), treeOpDesc.getTreeIndexBloomFilterKeyFields(), bloomFilterFalsePositiveRate, mergePolicy, opTrackerFactory.getOperationTracker(ctx.getJobletContext() .getApplicationContext()), ioScheduler, - ioOpCallbackFactory.createIOOperationCallback(), getVersion(), durable, + ioOpCallbackFactory.createIoOpCallback(), getVersion(), durable, (IMetadataPageManagerFactory) opDesc.getPageManagerFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java index b4d2797..1e60690 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java @@ -83,7 +83,7 @@ public class ExternalBTreeWithBuddyDataflowHelper extends AbstractLSMIndexDatafl opDesc.getStorageManager().getFileMapProvider(ctx), treeOpDesc.getTreeIndexTypeTraits(), treeOpDesc.getTreeIndexComparatorFactories(), bloomFilterFalsePositiveRate, mergePolicy, opTrackerFactory.getOperationTracker(ctx.getJobletContext().getApplicationContext()), ioScheduler, - ioOpCallbackFactory.createIOOperationCallback(), buddyBtreeFields, version, durable, + ioOpCallbackFactory.createIoOpCallback(), buddyBtreeFields, version, durable, (IMetadataPageManagerFactory) opDesc.getPageManagerFactory()); } public int getTargetVersion() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d718dc4a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeDataflowHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeDataflowHelper.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeDataflowHelper.java index 5f8c951..0346624 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeDataflowHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeDataflowHelper.java @@ -78,7 +78,7 @@ public class LSMBTreeDataflowHelper extends AbstractLSMIndexDataflowHelper { treeOpDesc.getTreeIndexComparatorFactories(), treeOpDesc.getTreeIndexBloomFilterKeyFields(), bloomFilterFalsePositiveRate, mergePolicy, opTrackerFactory.getOperationTracker(ctx.getJobletContext() .getApplicationContext()), ioScheduler, - ioOpCallbackFactory.createIOOperationCallback(), needKeyDupCheck, filterTypeTraits, filterCmpFactories, + ioOpCallbackFactory.createIoOpCallback(), needKeyDupCheck, filterTypeTraits, filterCmpFactories, btreeFields, filterFields, durable, (IMetadataPageManagerFactory) opDesc.getPageManagerFactory()); } }
