Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
some small cleanup

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/raman/master_feeds_merge' into zheilbron/asterix_msr_demo

Conflicts:

.gitignore

asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/FeedScanCollectionToUnnest.java

asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/IntroduceMaterializationForInsertWithSelfScanRule.java

asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/UnnestToDataScanRule.java

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContextProdiverForRecovery.java

asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java

asterix-app/src/test/resources/metadata/results/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.1.adm

asterix-app/src/test/resources/metadata/results/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.1.adm

asterix-app/src/test/resources/metadata/results/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.1.adm

asterix-app/src/test/resources/metadata/results/basic/meta02/meta02.1.adm

asterix-app/src/test/resources/metadata/results/basic/meta09/meta09.1.adm

asterix-app/src/test/resources/metadata/results/basic/meta16/meta16.1.adm

asterix-app/src/test/resources/metadata/results/basic/meta17/meta17.1.adm

asterix-app/src/test/resources/metadata/results/basic/metadata_dataset/metadata_dataset.1.adm

asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm

asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv02/cross-dv02.1.adm

asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv04/cross-dv04.1.adm

asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv19/cross-dv19.1.adm

asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf23/udf23.1.adm

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/FeedDetailsDecl.java

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/InternalDetailsDecl.java

asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/visitor/AQLPrintVisitor.java

asterix-aql/src/main/javacc/AQL.jj

asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/IAsterixAppRuntimeContextProvider.java

asterix-external-data/src/main/java/edu/uci/ics/asterix/external/dataset/adapter/FileSystemBasedAdapter.java

asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataBootstrap.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataRecordTypes.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/DatasetDataSource.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/InternalDatasetDetails.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedMetaOperatorDescriptor.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedUtil.java

asterix-om/src/main/java/edu/uci/ics/asterix/om/functions/AsterixExternalFunctionInfo.java

asterix-om/src/main/java/edu/uci/ics/asterix/om/util/AsterixAppContextInfo.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/logging/LogManager.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/transaction/AsterixRuntimeComponentsProvider.java

  1. … 53 more files in changeset.
cosmetic changes

    • -1
    • +0
    ./ResettableByteArrayOutputStream.java
  1. … 213 more files in changeset.
checkpoint

  1. … 13 more files in changeset.
merge from master

  1. … 20 more files in changeset.
added UUID type; added autogenerate syntax and AST info

  1. … 42 more files in changeset.
Merge branch 'master' into dev/asterix_msr

Conflicts:

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContextProviderForRecovery.java

asterix-common/src/main/java/edu/uci/ics/asterix/common/api/IAsterixAppRuntimeContext.java

asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/IAsterixAppRuntimeContextProvider.java

asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/ITransactionSubsystem.java

asterix-common/src/main/java/edu/uci/ics/asterix/common/transactions/LogUtil.java

asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataBootstrap.java

asterix-om/src/main/java/edu/uci/ics/asterix/om/util/AsterixAppContextInfo.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/logging/IndexLoggerRepository.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/logging/IndexResourceManager.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/logging/LogManager.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/recovery/RecoveryManager.java

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/transaction/TransactionSubsystem.java

asterix-transactions/src/test/java/edu/uci/ics/asterix/transaction/management/test/TransactionSimulator.java

  1. … 18 more files in changeset.
Added many fixes. Checkpointpoing.

  1. … 24 more files in changeset.
fault-tolerance checkpoint

  1. … 34 more files in changeset.
merge from master

  1. … 39 more files in changeset.
checkpoint

  1. … 8 more files in changeset.
added managix commands for starting/stopping a node

  1. … 43 more files in changeset.
checkpoint

  1. … 56 more files in changeset.
merge up-to-date master to jimahn/master_invix_internal_renaming

  1. … 10 more files in changeset.
Pass absolute directoey info to the lsm indexes.

  1. … 10 more files in changeset.
checkpoint

  1. … 15 more files in changeset.
code cleanup for adaptors/factories

  1. … 35 more files in changeset.
checkpoint post merge from master

  1. … 28 more files in changeset.
completed merge from master

  1. … 39 more files in changeset.
checkpoint

  1. … 18 more files in changeset.
merge from master

  1. … 149 more files in changeset.
add/update license headers

    • -0
    • +14
    ./ResettableByteArrayOutputStream.java
  1. … 1231 more files in changeset.
Internal renaming for inverted index to have prefix SINGLE_PARTITOIN and LENGTH_PARTITOINED

  1. … 127 more files in changeset.
merge from master

  1. … 402 more files in changeset.
Addressed code review comments.

  1. … 5 more files in changeset.
resolved dependency issue around AsterixClusterProperties that escaped the master fix, as it was hiding in a private branch.

    • -0
    • +82
    ./AsterixClusterProperties.java
  1. … 5 more files in changeset.
merge master into branch.

  1. … 15 more files in changeset.
Task complete: dependency between asterix-transactions and asterix-common broken. All test case PASS

    • -0
    • +113
    ./AsterixAppContextInfo.java
  1. … 14 more files in changeset.
dependency resolution checkpoint 1

  1. … 5 more files in changeset.
merged master into dependency branch, resolving all conflicts and made it compatible with hyracks master

  1. … 38 more files in changeset.