Yingyi Bu has submitted this change and it was merged. Change subject: Clean up asterix-om to eliminate compilation warnings. ......................................................................
Clean up asterix-om to eliminate compilation warnings. Change-Id: Ib1c562d087097d9cc749f1e04f1f06106c7f1625 Reviewed-on: https://asterix-gerrit.ics.uci.edu/503 Tested-by: Jenkins <[email protected]> Reviewed-by: abdullah alamoudi <[email protected]> --- M asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java M asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java M asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java A asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalTypeComputer.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryPrinterFactory.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryPrinterFactory.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryPrinterFactory.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AObjectSerializerDeserializer.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUUIDStringSerializerDeserializer.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java M asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java M asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java M asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/IResultTypeComputer.java M asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java M asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java M asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/RecordMergeTypeComputer.java M asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/SubsetCollectionTypeComputer.java M asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java M asterix-om/src/main/java/org/apache/asterix/om/types/TypeSignature.java M asterix-om/src/main/java/org/apache/asterix/om/util/AsterixRuntimeUtil.java 45 files changed, 198 insertions(+), 221 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Verified diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java index 9ae5650..cb409d5 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java @@ -48,7 +48,6 @@ import org.apache.asterix.metadata.entities.NodeGroup; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.transaction.management.service.transaction.JobIdFactory; -import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.exceptions.HyracksDataException; /** @@ -95,7 +94,6 @@ private IMetadataNode metadataNode; private final ReadWriteLock metadataLatch; private final AsterixMetadataProperties metadataProperties; - private IHyracksClientConnection hcc; public boolean rebindMetadataNode = false; public MetadataManager(IAsterixStateProxy proxy, AsterixMetadataProperties metadataProperties) { @@ -392,8 +390,8 @@ throw new MetadataException(e); } try { - ctx.addDatatype(metadataNode.getDatatype(ctx.getJobId(), datatype.getDataverseName(), - datatype.getDatatypeName())); + ctx.addDatatype( + metadataNode.getDatatype(ctx.getJobId(), datatype.getDataverseName(), datatype.getDatatypeName())); } catch (RemoteException e) { throw new MetadataException(e); } @@ -435,8 +433,9 @@ //concurrent access to UTF8StringPointable comparator in ARecordType object. //see issue 510 ARecordType aRecType = (ARecordType) datatype.getDatatype(); - return new Datatype(datatype.getDataverseName(), datatype.getDatatypeName(), new ARecordType( - aRecType.getTypeName(), aRecType.getFieldNames(), aRecType.getFieldTypes(), aRecType.isOpen()), + return new Datatype( + datatype.getDataverseName(), datatype.getDatatypeName(), new ARecordType(aRecType.getTypeName(), + aRecType.getFieldNames(), aRecType.getFieldTypes(), aRecType.isOpen()), datatype.getIsAnonymous()); } catch (AsterixException | HyracksDataException e) { throw new MetadataException(e); @@ -702,7 +701,8 @@ } @Override - public void dropAdapter(MetadataTransactionContext ctx, String dataverseName, String name) throws MetadataException { + public void dropAdapter(MetadataTransactionContext ctx, String dataverseName, String name) + throws MetadataException { try { metadataNode.dropAdapter(ctx.getJobId(), dataverseName, name); } catch (RemoteException e) { @@ -916,7 +916,8 @@ //TODO: Optimize <-- use keys instead of object --> @Override - public void dropDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset) throws MetadataException { + public void dropDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset) + throws MetadataException { try { metadataNode.dropExternalFiles(mdTxnCtx.getJobId(), dataset); } catch (RemoteException e) { diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java index 07675fe..47203cf 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java @@ -94,7 +94,6 @@ import org.apache.hyracks.storage.am.common.api.IIndex; import org.apache.hyracks.storage.am.common.api.IIndexAccessor; import org.apache.hyracks.storage.am.common.api.IIndexCursor; -import org.apache.hyracks.storage.am.common.api.IIndexLifecycleManager; import org.apache.hyracks.storage.am.common.api.IModificationOperationCallback; import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor; import org.apache.hyracks.storage.am.common.api.TreeIndexException; @@ -168,8 +167,8 @@ ITupleReference tuple = tupleReaderWriter.getTupleFromMetadataEntity(dataverse); insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATAVERSE_DATASET, tuple); } catch (TreeIndexDuplicateKeyException e) { - throw new MetadataException("A dataverse with this name " + dataverse.getDataverseName() - + " already exists.", e); + throw new MetadataException( + "A dataverse with this name " + dataverse.getDataverseName() + " already exists.", e); } catch (Exception e) { throw new MetadataException(e); } @@ -409,8 +408,8 @@ } @Override - public void dropDataset(JobId jobId, String dataverseName, String datasetName) throws MetadataException, - RemoteException { + public void dropDataset(JobId jobId, String dataverseName, String datasetName) + throws MetadataException, RemoteException { Dataset dataset; try { dataset = getDataset(jobId, dataverseName, datasetName); @@ -430,7 +429,8 @@ datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey); // Delete entry from secondary index 'group'. - ITupleReference groupNameSearchKey = createTuple(dataset.getNodeGroupName(), dataverseName, datasetName); + ITupleReference groupNameSearchKey = createTuple(dataset.getNodeGroupName(), dataverseName, + datasetName); // Searches the index for the tuple to be deleted. Acquires an S // lock on the GROUPNAME_ON_DATASET_INDEX index. try { @@ -499,8 +499,8 @@ // TODO: Change this to be a BTree specific exception, e.g., // BTreeKeyDoesNotExistException. } catch (TreeIndexException e) { - throw new MetadataException("Cannot drop index '" + datasetName + "." + indexName - + "' because it doesn't exist.", e); + throw new MetadataException( + "Cannot drop index '" + datasetName + "." + indexName + "' because it doesn't exist.", e); } catch (Exception e) { throw new MetadataException(e); } @@ -538,8 +538,8 @@ } @Override - public void dropDatatype(JobId jobId, String dataverseName, String datatypeName) throws MetadataException, - RemoteException { + public void dropDatatype(JobId jobId, String dataverseName, String datatypeName) + throws MetadataException, RemoteException { List<String> datasetNames; List<String> usedDatatypes; try { @@ -697,8 +697,8 @@ } @Override - public List<Dataset> getDataverseDatasets(JobId jobId, String dataverseName) throws MetadataException, - RemoteException { + public List<Dataset> getDataverseDatasets(JobId jobId, String dataverseName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName); DatasetTupleTranslator tupleReaderWriter = new DatasetTupleTranslator(false); @@ -725,8 +725,9 @@ } } - public List<Library> getDataverseLibraries(JobId jobId, String dataverseName) throws MetadataException, - RemoteException { + @Override + public List<Library> getDataverseLibraries(JobId jobId, String dataverseName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName); LibraryTupleTranslator tupleReaderWriter = new LibraryTupleTranslator(false); @@ -739,8 +740,8 @@ } } - private List<Datatype> getDataverseDatatypes(JobId jobId, String dataverseName) throws MetadataException, - RemoteException { + private List<Datatype> getDataverseDatatypes(JobId jobId, String dataverseName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName); DatatypeTupleTranslator tupleReaderWriter = new DatatypeTupleTranslator(jobId, this, false); @@ -754,8 +755,8 @@ } @Override - public Dataset getDataset(JobId jobId, String dataverseName, String datasetName) throws MetadataException, - RemoteException { + public Dataset getDataset(JobId jobId, String dataverseName, String datasetName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName, datasetName); DatasetTupleTranslator tupleReaderWriter = new DatasetTupleTranslator(false); @@ -860,8 +861,8 @@ } @Override - public Datatype getDatatype(JobId jobId, String dataverseName, String datatypeName) throws MetadataException, - RemoteException { + public Datatype getDatatype(JobId jobId, String dataverseName, String datatypeName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName, datatypeName); DatatypeTupleTranslator tupleReaderWriter = new DatatypeTupleTranslator(jobId, this, false); @@ -896,11 +897,11 @@ } @Override - public Function getFunction(JobId jobId, FunctionSignature functionSignature) throws MetadataException, - RemoteException { + public Function getFunction(JobId jobId, FunctionSignature functionSignature) + throws MetadataException, RemoteException { try { - ITupleReference searchKey = createTuple(functionSignature.getNamespace(), functionSignature.getName(), "" - + functionSignature.getArity()); + ITupleReference searchKey = createTuple(functionSignature.getNamespace(), functionSignature.getName(), + "" + functionSignature.getArity()); FunctionTupleTranslator tupleReaderWriter = new FunctionTupleTranslator(false); List<Function> results = new ArrayList<Function>(); IValueExtractor<Function> valueExtractor = new MetadataEntityValueExtractor<Function>(tupleReaderWriter); @@ -916,8 +917,8 @@ } @Override - public void dropFunction(JobId jobId, FunctionSignature functionSignature) throws MetadataException, - RemoteException { + public void dropFunction(JobId jobId, FunctionSignature functionSignature) + throws MetadataException, RemoteException { Function function; try { @@ -926,13 +927,13 @@ throw new MetadataException(e); } if (function == null) { - throw new MetadataException("Cannot drop function '" + functionSignature.toString() - + "' because it doesn't exist."); + throw new MetadataException( + "Cannot drop function '" + functionSignature.toString() + "' because it doesn't exist."); } try { // Delete entry from the 'function' dataset. - ITupleReference searchKey = createTuple(functionSignature.getNamespace(), functionSignature.getName(), "" - + functionSignature.getArity()); + ITupleReference searchKey = createTuple(functionSignature.getNamespace(), functionSignature.getName(), + "" + functionSignature.getArity()); // Searches the index for the tuple to be deleted. Acquires an S // lock on the 'function' dataset. ITupleReference functionTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, @@ -994,8 +995,8 @@ index = MetadataPrimaryIndexes.DATASET_DATASET; indexInstance = datasetLifecycleManager.getIndex(resourceName); datasetLifecycleManager.open(resourceName); - indexAccessor = indexInstance - .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); + indexAccessor = indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, + NoOpOperationCallback.INSTANCE); rangeCursor = (ITreeIndexCursor) indexAccessor.createSearchCursor(false); rangePred = null; @@ -1004,9 +1005,12 @@ try { while (rangeCursor.hasNext()) { rangeCursor.next(); - sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), new ISerializerDeserializer[] { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING) })); + sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), + new ISerializerDeserializer[] { + AqlSerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.ASTRING), + AqlSerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.ASTRING) })); } } finally { rangeCursor.close(); @@ -1016,8 +1020,8 @@ index = MetadataPrimaryIndexes.INDEX_DATASET; indexInstance = datasetLifecycleManager.getIndex(resourceName); datasetLifecycleManager.open(resourceName); - indexAccessor = indexInstance - .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); + indexAccessor = indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, + NoOpOperationCallback.INSTANCE); rangeCursor = (ITreeIndexCursor) indexAccessor.createSearchCursor(false); rangePred = null; @@ -1026,10 +1030,13 @@ try { while (rangeCursor.hasNext()) { rangeCursor.next(); - sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), new ISerializerDeserializer[] { + sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), + new ISerializerDeserializer[] { + AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( + BuiltinType.ASTRING), AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING) })); + AqlSerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.ASTRING) })); } } finally { rangeCursor.close(); @@ -1139,8 +1146,8 @@ } @Override - public List<Function> getDataverseFunctions(JobId jobId, String dataverseName) throws MetadataException, - RemoteException { + public List<Function> getDataverseFunctions(JobId jobId, String dataverseName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName); FunctionTupleTranslator tupleReaderWriter = new FunctionTupleTranslator(false); @@ -1162,8 +1169,10 @@ insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, adapterTuple); } catch (TreeIndexDuplicateKeyException e) { - throw new MetadataException("A adapter with this name " + adapter.getAdapterIdentifier().getName() - + " already exists in dataverse '" + adapter.getAdapterIdentifier().getNamespace() + "'.", e); + throw new MetadataException( + "A adapter with this name " + adapter.getAdapterIdentifier().getName() + + " already exists in dataverse '" + adapter.getAdapterIdentifier().getNamespace() + "'.", + e); } catch (Exception e) { throw new MetadataException(e); } @@ -1171,8 +1180,8 @@ } @Override - public void dropAdapter(JobId jobId, String dataverseName, String adapterName) throws MetadataException, - RemoteException { + public void dropAdapter(JobId jobId, String dataverseName, String adapterName) + throws MetadataException, RemoteException { DatasourceAdapter adapter; try { adapter = getAdapter(jobId, dataverseName, adapterName); @@ -1187,8 +1196,8 @@ ITupleReference searchKey = createTuple(dataverseName, adapterName); // Searches the index for the tuple to be deleted. Acquires an S // lock on the 'Adapter' dataset. - ITupleReference datasetTuple = getTupleToBeDeleted(jobId, - MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey); + ITupleReference datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, + searchKey); deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, datasetTuple); // TODO: Change this to be a BTree specific exception, e.g., @@ -1221,8 +1230,8 @@ } @Override - public void addCompactionPolicy(JobId jobId, CompactionPolicy compactionPolicy) throws MetadataException, - RemoteException { + public void addCompactionPolicy(JobId jobId, CompactionPolicy compactionPolicy) + throws MetadataException, RemoteException { try { // Insert into the 'CompactionPolicy' dataset. CompactionPolicyTupleTranslator tupleReaderWriter = new CompactionPolicyTupleTranslator(true); @@ -1259,8 +1268,8 @@ } @Override - public List<DatasourceAdapter> getDataverseAdapters(JobId jobId, String dataverseName) throws MetadataException, - RemoteException { + public List<DatasourceAdapter> getDataverseAdapters(JobId jobId, String dataverseName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName); DatasourceAdapterTupleTranslator tupleReaderWriter = new DatasourceAdapterTupleTranslator(false); @@ -1292,8 +1301,8 @@ } @Override - public void dropLibrary(JobId jobId, String dataverseName, String libraryName) throws MetadataException, - RemoteException { + public void dropLibrary(JobId jobId, String dataverseName, String libraryName) + throws MetadataException, RemoteException { Library library; try { library = getLibrary(jobId, dataverseName, libraryName); @@ -1308,7 +1317,8 @@ ITupleReference searchKey = createTuple(dataverseName, libraryName); // Searches the index for the tuple to be deleted. Acquires an S // lock on the 'Adapter' dataset. - ITupleReference datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey); + ITupleReference datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, + searchKey); deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, datasetTuple); // TODO: Change this to be a BTree specific exception, e.g., @@ -1322,8 +1332,8 @@ } @Override - public Library getLibrary(JobId jobId, String dataverseName, String libraryName) throws MetadataException, - RemoteException { + public Library getLibrary(JobId jobId, String dataverseName, String libraryName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName, libraryName); LibraryTupleTranslator tupleReaderWriter = new LibraryTupleTranslator(false); @@ -1339,6 +1349,7 @@ } } + @Override public int getMostRecentDatasetId() throws MetadataException, RemoteException { return DatasetIdFactory.getMostRecentDatasetId(); } @@ -1361,14 +1372,15 @@ } @Override - public FeedPolicy getFeedPolicy(JobId jobId, String dataverse, String policyName) throws MetadataException, - RemoteException { + public FeedPolicy getFeedPolicy(JobId jobId, String dataverse, String policyName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverse, policyName); FeedPolicyTupleTranslator tupleReaderWriter = new FeedPolicyTupleTranslator(false); List<FeedPolicy> results = new ArrayList<FeedPolicy>(); - IValueExtractor<FeedPolicy> valueExtractor = new MetadataEntityValueExtractor<FeedPolicy>(tupleReaderWriter); + IValueExtractor<FeedPolicy> valueExtractor = new MetadataEntityValueExtractor<FeedPolicy>( + tupleReaderWriter); searchIndex(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey, valueExtractor, results); if (!results.isEmpty()) { return results.get(0); @@ -1388,8 +1400,8 @@ insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.FEED_DATASET, feedTuple); } catch (TreeIndexException e) { - throw new MetadataException("A feed with this name " + feed.getFeedName() - + " already exists in dataverse '" + feed.getDataverseName() + "'.", e); + throw new MetadataException("A feed with this name " + feed.getFeedName() + " already exists in dataverse '" + + feed.getDataverseName() + "'.", e); } catch (Exception e) { throw new MetadataException(e); } @@ -1432,8 +1444,8 @@ } @Override - public void dropFeedPolicy(JobId jobId, String dataverseName, String policyName) throws MetadataException, - RemoteException { + public void dropFeedPolicy(JobId jobId, String dataverseName, String policyName) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverseName, policyName); ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey); @@ -1446,12 +1458,13 @@ } @Override - public List<FeedPolicy> getDataversePolicies(JobId jobId, String dataverse) throws MetadataException, - RemoteException { + public List<FeedPolicy> getDataversePolicies(JobId jobId, String dataverse) + throws MetadataException, RemoteException { try { ITupleReference searchKey = createTuple(dataverse); FeedPolicyTupleTranslator tupleReaderWriter = new FeedPolicyTupleTranslator(false); - IValueExtractor<FeedPolicy> valueExtractor = new MetadataEntityValueExtractor<FeedPolicy>(tupleReaderWriter); + IValueExtractor<FeedPolicy> valueExtractor = new MetadataEntityValueExtractor<FeedPolicy>( + tupleReaderWriter); List<FeedPolicy> results = new ArrayList<FeedPolicy>(); searchIndex(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey, valueExtractor, results); return results; @@ -1520,8 +1533,8 @@ try { //loop through files and delete them for (int i = 0; i < files.size(); i++) { - dropExternalFile(jobId, files.get(i).getDataverseName(), files.get(i).getDatasetName(), files.get(i) - .getFileNumber()); + dropExternalFile(jobId, files.get(i).getDataverseName(), files.get(i).getDatasetName(), + files.get(i).getFileNumber()); } } catch (Exception e) { throw new MetadataException(e); @@ -1587,7 +1600,8 @@ searchKey = createTuple(dataset.getDataverseName(), dataset.getDatasetName()); // Searches the index for the tuple to be deleted. Acquires an S // lock on the 'dataset' dataset. - ITupleReference datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey); + ITupleReference datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASET_DATASET, + searchKey); deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple); // Previous tuple was deleted // Insert into the 'dataset' dataset. diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java index 3e3a23a..ea39a90 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java @@ -18,11 +18,6 @@ */ package org.apache.asterix.metadata.functions; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; @@ -52,7 +47,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -public class ExternalFunctionCompilerUtil implements Serializable { +public class ExternalFunctionCompilerUtil { private static Pattern orderedListPattern = Pattern.compile("\\[*\\]"); private static Pattern unorderedListPattern = Pattern.compile("[{{*}}]"); @@ -88,9 +83,9 @@ returnType = getTypeInfo(function.getReturnType(), txnCtx, function); - AsterixExternalScalarFunctionInfo scalarFunctionInfo = new AsterixExternalScalarFunctionInfo( - fid.getNamespace(), new AsterixFunction(fid.getName(), fid.getArity()), returnType, - function.getFunctionBody(), function.getLanguage(), arguments, typeComputer); + AsterixExternalScalarFunctionInfo scalarFunctionInfo = new AsterixExternalScalarFunctionInfo(fid.getNamespace(), + new AsterixFunction(fid.getName(), fid.getArity()), returnType, function.getFunctionBody(), + function.getLanguage(), arguments, typeComputer); return scalarFunctionInfo; } @@ -152,18 +147,22 @@ case STRING: return AStringTypeComputer.INSTANCE; case ORDEREDLIST: - return new IResultTypeComputer() { + return new ExternalTypeComputer() { + private static final long serialVersionUID = 1L; + @Override public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env, IMetadataProvider<?, ?> metadataProvider) throws AlgebricksException { - return new AOrderedListType(((AOrderedListType) type).getItemType(), ((AOrderedListType) type) - .getItemType().getTypeName()); + return new AOrderedListType(((AOrderedListType) type).getItemType(), + ((AOrderedListType) type).getItemType().getTypeName()); } }; case UNORDEREDLIST: - return new IResultTypeComputer() { + return new ExternalTypeComputer() { + private static final long serialVersionUID = 1L; + @Override public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env, IMetadataProvider<?, ?> metadataProvider) throws AlgebricksException { @@ -173,55 +172,29 @@ }; default: - IResultTypeComputer typeComputer = new IResultTypeComputer() { + return new ExternalTypeComputer() { + private static final long serialVersionUID = 1L; + @Override public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env, IMetadataProvider<?, ?> mp) throws AlgebricksException { return type; } }; - return typeComputer; } - } - - private static IAType getType(Function function, MetadataTransactionContext txnCtx) throws AlgebricksException { - IAType collectionType = null; - try { - collectionType = getCollectionType(function.getReturnType(), txnCtx, function); - if (collectionType != null) { - return collectionType; - } else { - - Datatype datatype; - datatype = MetadataManager.INSTANCE.getDatatype(txnCtx, function.getDataverseName(), - function.getReturnType()); - return datatype.getDatatype(); - } - } catch (MetadataException me) { - throw new AlgebricksException(me); - } } private static IFunctionInfo getUnnestFunctionInfo(MetadataTransactionContext txnCtx, Function function) { - // TODO Auto-generated method stub return null; } private static IFunctionInfo getStatefulFunctionInfo(MetadataTransactionContext txnCtx, Function function) { - // TODO Auto-generated method stub return null; } private static IFunctionInfo getAggregateFunctionInfo(MetadataTransactionContext txnCtx, Function function) { - // TODO Auto-generated method stub return null; - } - - public static void main(String args[]) throws FileNotFoundException, IOException { - ExternalFunctionCompilerUtil obj = new ExternalFunctionCompilerUtil(); - ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream("/tmp/ecu.obj")); - oos.writeObject(obj); } } \ No newline at end of file diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalTypeComputer.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalTypeComputer.java new file mode 100644 index 0000000..d50f4cb --- /dev/null +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalTypeComputer.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.asterix.metadata.functions; + +import java.io.Serializable; + +import org.apache.asterix.om.typecomputer.base.IResultTypeComputer; + +public interface ExternalTypeComputer extends IResultTypeComputer, Serializable { + +} diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java index 7d88a90..b31c962 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java @@ -18,23 +18,19 @@ */ package org.apache.asterix.dataflow.data.nontagged.printers; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; + import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.utils.WriteValueTools; -import org.apache.hyracks.data.std.primitive.UTF8StringPointable; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; - -import org.apache.hyracks.data.std.primitive.UTF8StringPointable; import org.apache.hyracks.util.bytes.HexPrinter; import org.apache.hyracks.util.string.UTF8StringUtil; public class PrintTools { - private static final GregorianCalendarSystem gCalInstance = GregorianCalendarSystem.getInstance(); private static long CHRONON_OF_DAY = 24 * 60 * 60 * 1000; @@ -43,7 +39,8 @@ long chrononTime = AInt32SerializerDeserializer.getInt(b, s + 1) * CHRONON_OF_DAY; try { - gCalInstance.getExtendStringRepUntilField(chrononTime, 0, ps, GregorianCalendarSystem.Fields.YEAR, GregorianCalendarSystem.Fields.DAY, false); + gCalInstance.getExtendStringRepUntilField(chrononTime, 0, ps, GregorianCalendarSystem.Fields.YEAR, + GregorianCalendarSystem.Fields.DAY, false); } catch (IOException e) { throw new AlgebricksException(e); } @@ -53,7 +50,8 @@ long chrononTime = AInt64SerializerDeserializer.getLong(b, s + 1); try { - gCalInstance.getExtendStringRepUntilField(chrononTime, 0, ps, GregorianCalendarSystem.Fields.YEAR, GregorianCalendarSystem.Fields.MILLISECOND, true); + gCalInstance.getExtendStringRepUntilField(chrononTime, 0, ps, GregorianCalendarSystem.Fields.YEAR, + GregorianCalendarSystem.Fields.MILLISECOND, true); } catch (IOException e) { throw new AlgebricksException(e); } @@ -178,7 +176,8 @@ int time = AInt32SerializerDeserializer.getInt(b, s + 1); try { - gCalInstance.getExtendStringRepUntilField(time, 0, ps, GregorianCalendarSystem.Fields.HOUR, GregorianCalendarSystem.Fields.MILLISECOND, true); + gCalInstance.getExtendStringRepUntilField(time, 0, ps, GregorianCalendarSystem.Fields.HOUR, + GregorianCalendarSystem.Fields.MILLISECOND, true); } catch (IOException e) { throw new AlgebricksException(e); } @@ -304,6 +303,5 @@ os.write(HexPrinter.hex((c >>> 4) & 0x0f, HexPrinter.CASE.LOWER_CASE)); os.write(HexPrinter.hex(c & 0x0f, HexPrinter.CASE.LOWER_CASE)); } - } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java index 1379154..2155369 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java @@ -23,13 +23,15 @@ import org.apache.hyracks.algebricks.data.IPrinterFactory; public class ABinaryPrinterFactory implements IPrinterFactory { + private static final long serialVersionUID = 1L; private ABinaryPrinterFactory() { } public static final ABinaryPrinterFactory INSTANCE = new ABinaryPrinterFactory(); - @Override public IPrinter createPrinter() { + @Override + public IPrinter createPrinter() { return ABinaryHexPrinter.INSTANCE; } } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java index e23b3ab..77a5a90 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java index 26c6fc0..0d329a6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java @@ -21,14 +21,12 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; public class ADurationPrinter implements IPrinter { public static final ADurationPrinter INSTANCE = new ADurationPrinter(); - private static final GregorianCalendarSystem gCalInstance = GregorianCalendarSystem.getInstance(); @Override public void init() { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java index 6ac3dd1..ea1c21a 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java @@ -18,8 +18,6 @@ */ package org.apache.asterix.dataflow.data.nontagged.printers.adm; -import java.io.DataOutput; -import java.io.DataOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -27,7 +25,6 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.utils.WriteValueTools; -import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream; public class AInt16Printer implements IPrinter { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java index 240f68c..4ad745f 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java @@ -18,8 +18,6 @@ */ package org.apache.asterix.dataflow.data.nontagged.printers.adm; -import java.io.DataOutput; -import java.io.DataOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -27,7 +25,6 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.utils.WriteValueTools; -import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream; public class AInt32Printer implements IPrinter { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java index b74a177..415a34e 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java @@ -18,8 +18,6 @@ */ package org.apache.asterix.dataflow.data.nontagged.printers.adm; -import java.io.DataOutput; -import java.io.DataOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -27,7 +25,6 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.utils.WriteValueTools; -import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream; public class AInt8Printer implements IPrinter { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java index 10c4575..30f5646 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java index f298af6..23b5383 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java @@ -19,15 +19,13 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv; -import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer; +import java.io.IOException; +import java.io.PrintStream; + import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.data.std.primitive.ByteArrayPointable; import org.apache.hyracks.util.bytes.HexPrinter; - -import java.io.IOException; -import java.io.PrintStream; public class ABinaryHexPrinter implements IPrinter { private ABinaryHexPrinter() { @@ -35,11 +33,13 @@ public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter(); - @Override public void init() throws AlgebricksException { + @Override + public void init() throws AlgebricksException { } - @Override public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException { + @Override + public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException { int validLength = ByteArrayPointable.getContentLength(b, s + 1); int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength); try { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryPrinterFactory.java index 4c65895..83a93fc 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryPrinterFactory.java @@ -24,13 +24,15 @@ import org.apache.hyracks.algebricks.data.IPrinterFactory; public class ABinaryPrinterFactory implements IPrinterFactory { + private static final long serialVersionUID = 1L; private ABinaryPrinterFactory() { } public static final ABinaryPrinterFactory INSTANCE = new ABinaryPrinterFactory(); - @Override public IPrinter createPrinter() { + @Override + public IPrinter createPrinter() { return ABinaryHexPrinter.INSTANCE; } } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java index 05b1d79..2eb64f7 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java index d37027b..a764891 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java @@ -21,8 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java index ab0dd99..cdd232d 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java index e26eafa..b23430d 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java index 01647c6..ee82826 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java @@ -19,15 +19,13 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean; -import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer; +import java.io.IOException; +import java.io.PrintStream; + import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.data.std.primitive.ByteArrayPointable; import org.apache.hyracks.util.bytes.HexPrinter; - -import java.io.IOException; -import java.io.PrintStream; public class ABinaryHexPrinter implements IPrinter { private ABinaryHexPrinter() { @@ -35,11 +33,13 @@ public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter(); - @Override public void init() throws AlgebricksException { + @Override + public void init() throws AlgebricksException { } - @Override public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException { + @Override + public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException { int validLength = ByteArrayPointable.getContentLength(b, s + 1); int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength); diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryPrinterFactory.java index 68b8858..aeee4cb 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryPrinterFactory.java @@ -23,13 +23,15 @@ import org.apache.hyracks.algebricks.data.IPrinterFactory; public class ABinaryPrinterFactory implements IPrinterFactory { + private static final long serialVersionUID = 1L; private ABinaryPrinterFactory() { } public static final ABinaryPrinterFactory INSTANCE = new ABinaryPrinterFactory(); - @Override public IPrinter createPrinter() { + @Override + public IPrinter createPrinter() { return ABinaryHexPrinter.INSTANCE; } } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java index 5994adc..4e85b3e 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java index 6d98b8d..f340a17 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java index 409586c..0679f41 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java index 59874af..ed7b3ed 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java @@ -21,8 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java index 1ffceea..b65c2da 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java index 4698c49..70a5d1c 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java @@ -19,15 +19,13 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless; -import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer; +import java.io.IOException; +import java.io.PrintStream; + import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.data.std.primitive.ByteArrayPointable; import org.apache.hyracks.util.bytes.HexPrinter; - -import java.io.IOException; -import java.io.PrintStream; public class ABinaryHexPrinter implements IPrinter { private ABinaryHexPrinter() { @@ -35,11 +33,13 @@ public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter(); - @Override public void init() throws AlgebricksException { + @Override + public void init() throws AlgebricksException { } - @Override public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException { + @Override + public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException { int validLength = ByteArrayPointable.getContentLength(b, s + 1); int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength); try { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryPrinterFactory.java index 06b423f..65c4fad 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryPrinterFactory.java @@ -23,13 +23,15 @@ import org.apache.hyracks.algebricks.data.IPrinterFactory; public class ABinaryPrinterFactory implements IPrinterFactory { + private static final long serialVersionUID = 1L; private ABinaryPrinterFactory() { } public static final ABinaryPrinterFactory INSTANCE = new ABinaryPrinterFactory(); - @Override public IPrinter createPrinter() { + @Override + public IPrinter createPrinter() { return ABinaryHexPrinter.INSTANCE; } } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java index 0cc8eb5..7d0ce75 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java index de9445e..7195edd 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java index 3b29ba8..d376e10 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java index 1642afa..248490a 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java @@ -21,8 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java index 59328c0..e3c85b2 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java @@ -21,7 +21,6 @@ import java.io.PrintStream; import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; -import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AObjectSerializerDeserializer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AObjectSerializerDeserializer.java index b2cb477..c2c9fd6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AObjectSerializerDeserializer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AObjectSerializerDeserializer.java @@ -153,9 +153,6 @@ case UNORDEREDLIST: { return AUnorderedListSerializerDeserializer.SCHEMALESS_INSTANCE.deserialize(in); } - // case TYPE: { - // return AUnorderedListBytesConverter.INSTANCE.deserialize(in); - // } default: { throw new NotImplementedException("No serializer/deserializer implemented for type " + typeTag + " ."); } @@ -273,8 +270,8 @@ break; } default: { - throw new NotImplementedException("No serializer/deserializer implemented for type " + t.getTypeTag() - + " ."); + throw new NotImplementedException( + "No serializer/deserializer implemented for type " + t.getTypeTag() + " ."); } } } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUUIDStringSerializerDeserializer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUUIDStringSerializerDeserializer.java index 63c29a8..72c9388 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUUIDStringSerializerDeserializer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUUIDStringSerializerDeserializer.java @@ -22,11 +22,9 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.om.base.AString; import org.apache.asterix.om.base.AUUID; import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; import org.apache.hyracks.api.exceptions.HyracksDataException; -import org.apache.hyracks.dataflow.common.data.marshalling.Integer64SerializerDeserializer; import org.apache.hyracks.dataflow.common.data.marshalling.UTF8StringSerializerDeserializer; public class AUUIDStringSerializerDeserializer implements ISerializerDeserializer<AUUID> { diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java index beba9da..e109a32 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java @@ -46,9 +46,9 @@ private IAType itemType; private AUnorderedListType unorderedlistType; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private ISerializerDeserializer nontaggedSerDes; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private ISerializerDeserializer taggedSerDes; private AUnorderedListSerializerDeserializer() { @@ -59,9 +59,9 @@ public AUnorderedListSerializerDeserializer(AUnorderedListType unorderedlistType) { this.itemType = unorderedlistType.getItemType(); this.unorderedlistType = unorderedlistType; - nontaggedSerDes = itemType.getTypeTag() == ATypeTag.ANY ? AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(itemType) : AqlSerializerDeserializerProvider.INSTANCE - .getNonTaggedSerializerDeserializer(itemType); + nontaggedSerDes = itemType.getTypeTag() == ATypeTag.ANY + ? AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType) + : AqlSerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(itemType); taggedSerDes = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); } diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java index e2e67c4..129f14b 100644 --- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java +++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java @@ -79,6 +79,7 @@ } class TypeTrait implements ITypeTraits { + private static final long serialVersionUID = 1L; @Override public boolean isFixedLength() { diff --git a/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java b/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java index bf68710..4d630ec 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixFunction.java @@ -18,9 +18,7 @@ */ package org.apache.asterix.om.functions; -import java.io.Serializable; - -public class AsterixFunction implements Serializable { +public class AsterixFunction { private final String name; private final int arity; @@ -39,6 +37,7 @@ return arity; } + @Override public String toString() { return name; } diff --git a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/IResultTypeComputer.java b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/IResultTypeComputer.java index 2bd3192..04f9c96 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/IResultTypeComputer.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/IResultTypeComputer.java @@ -18,15 +18,13 @@ */ package org.apache.asterix.om.typecomputer.base; -import java.io.Serializable; - import org.apache.asterix.om.types.IAType; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -public interface IResultTypeComputer extends Serializable { +public interface IResultTypeComputer { public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env, IMetadataProvider<?, ?> metadataProvider) throws AlgebricksException; } diff --git a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java index 0432d02..d5d324c 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java @@ -29,8 +29,6 @@ public class AUUIDTypeComputer implements IResultTypeComputer { - private static final long serialVersionUID = 1L; - public static final AUUIDTypeComputer INSTANCE = new AUUIDTypeComputer(); private AUUIDTypeComputer() { diff --git a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java index 364ebfe..f97e0ac 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java @@ -40,7 +40,6 @@ import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; public class FieldAccessNestedResultType implements IResultTypeComputer { - private static final long serialVersionUID = 1L; public static final FieldAccessNestedResultType INSTANCE = new FieldAccessNestedResultType(); private FieldAccessNestedResultType() { diff --git a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/RecordMergeTypeComputer.java b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/RecordMergeTypeComputer.java index 2d9cd5d..19aae54 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/RecordMergeTypeComputer.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/RecordMergeTypeComputer.java @@ -40,8 +40,6 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; public class RecordMergeTypeComputer implements IResultTypeComputer { - private static final long serialVersionUID = 1L; - public static final RecordMergeTypeComputer INSTANCE = new RecordMergeTypeComputer(); private RecordMergeTypeComputer() { diff --git a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/SubsetCollectionTypeComputer.java b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/SubsetCollectionTypeComputer.java index a531777..4ceec49 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/SubsetCollectionTypeComputer.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/SubsetCollectionTypeComputer.java @@ -19,11 +19,9 @@ package org.apache.asterix.om.typecomputer.impl; import org.apache.asterix.om.typecomputer.base.IResultTypeComputer; -import org.apache.asterix.om.types.AOrderedListType; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.AbstractCollectionType; -import org.apache.asterix.om.types.BuiltinType; import org.apache.asterix.om.types.IAType; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; diff --git a/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java b/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java index 41d197f..de4b5d3 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java @@ -18,12 +18,11 @@ */ package org.apache.asterix.om.types; -import org.json.JSONException; -import org.json.JSONObject; - import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.om.base.IAObject; import org.apache.asterix.om.visitors.IOMVisitor; +import org.json.JSONException; +import org.json.JSONObject; public abstract class BuiltinType implements IAType { @@ -718,6 +717,7 @@ }; public static final BuiltinType AUUID = new LowerCaseConstructorType() { + private static final long serialVersionUID = 1L; @Override public ATypeTag getTypeTag() { @@ -742,8 +742,8 @@ } }; - // AUUID_STRING is used when converting between the string representation of - // UUID and corresponding a UUID instance + // AUUID_STRING is used when converting between the string representation of + // UUID and corresponding a UUID instance public static final BuiltinType AUUID_STRING = new LowerCaseConstructorType() { private static final long serialVersionUID = 1L; diff --git a/asterix-om/src/main/java/org/apache/asterix/om/types/TypeSignature.java b/asterix-om/src/main/java/org/apache/asterix/om/types/TypeSignature.java index ff207f1..f4c7869 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/types/TypeSignature.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/types/TypeSignature.java @@ -18,9 +18,7 @@ */ package org.apache.asterix.om.types; -import java.io.Serializable; - -public class TypeSignature implements Serializable { +public class TypeSignature { private final String dataverse; private final String name; @@ -32,6 +30,7 @@ this.alias = dataverse + "@" + name; } + @Override public boolean equals(Object o) { if (!(o instanceof TypeSignature)) { return false; @@ -41,10 +40,12 @@ } } + @Override public String toString() { return alias; } + @Override public int hashCode() { return alias.hashCode(); } diff --git a/asterix-om/src/main/java/org/apache/asterix/om/util/AsterixRuntimeUtil.java b/asterix-om/src/main/java/org/apache/asterix/om/util/AsterixRuntimeUtil.java index 31ed17d..dcc4891 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/util/AsterixRuntimeUtil.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/util/AsterixRuntimeUtil.java @@ -19,7 +19,6 @@ package org.apache.asterix.om.util; import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -- To view, visit https://asterix-gerrit.ics.uci.edu/503 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1c562d087097d9cc749f1e04f1f06106c7f1625 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Yingyi Bu <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Yingyi Bu <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
