Commit Graph

71 Commits

Author SHA1 Message Date
11e2bef240 ENT-2473: Removed copyright headers (#1364) 2018-09-03 16:38:52 +01:00
79909a5ea9 ENT-2430 Swap over output_index and transaction_id in database indexes (#1354)
(cherry picked from commit 2d33ba3)
2018-08-23 16:24:56 +01:00
524803bf76 ENT-2377 Unit test mocking fix.
(cherry picked from commit 746a182)
2018-08-21 09:43:01 +01:00
2acd89850a ENT-2198 Add more benchmarks to the overnight performance run (#1313) 2018-08-02 09:57:30 +01:00
9acb6d8a55 Merge fixes 2018-07-31 15:02:58 +01:00
8dbb9eb07f Fix compile errors post merge 2018-07-25 18:37:30 +01:00
d040945b0e Merge fixes 2018-07-24 18:37:04 +01:00
a4d65dae22 Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26
# Conflicts:
#	confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
#	docs/source/changelog.rst
#	node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTSMaRtTests.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
#	node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
#	node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
#	node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
#	node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-23 15:22:39 +01:00
0c8c914882 Removing warnings 2018-07-05 15:45:28 +01:00
9b5a099302 ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +01:00
0a1f49fbaf Perftestcordapp result contains immutable list (#1027) 2018-06-20 15:24:51 +01:00
b09a57d768 ENT-1943 non clustered primary keys (#880)
* ENT-1943 Add liquibase change sets to remove clustered indices from primary  keys

* ENT-1943 Add liquibase change sets to remove clustered indices from primary  keys

* Don't apply non-clustered PK change when using H2

* Move primary key changesets to separate file for core migration files
Use `onValidationFail` rather than precondition to exclude these changes from H2

* Remove/readd foreign key constraint to make SQL server less unhappy

* Fix linear states schema migration

* Fix notary states changelog issues

* Remove v3-GA from master changelog
2018-06-12 15:40:25 +01:00
d675a17e17 ENT-2023 Restore rpcThreadPoolSize enterprise config setting (#922)
* Add a sampler for EmptyFlow, and also re-establish wiring to the rpcThreadPoolSize config parameter.

* Remove mutex from multi-threaded SMM startFlow

* Add EmptyFlow to nightly benchmark and also a CashIssue 200
2018-06-06 11:47:37 +01:00
b3b57ccb19 Dl perftest cordapp measure (#782)
* Added summary logging

* Added logging of summary metrics to performance log

* Minor arithmetic change

* Tweak

* Reformatted code
2018-05-31 09:05:26 +01:00
af1c3289ab ENT-1975 Remove mutex and SQLException handling around perfcordapp coin selection to rely on flow hospital. 2018-05-29 14:25:41 +01:00
e62d1f12c1 DEVOPS-663 Publishing of performance test artefacts (#769)
* Enable publishing of perftest cordapps

* Enable publishing of jmeter-corda as capsule jar

* Enable publishing of jmeter-corda as capsule jar

* jar name

* Correct module name to publish
2018-04-30 14:41:55 +01:00
51df3872b2 ENT-1791 Stop performance tests returning whole transactions (#752) 2018-04-23 16:55:55 +01:00
a83f3f3abe Removing explicit waits for the default notary in driver tests.
This issue was fixed in https://github.com/corda/corda/pull/2947.
2018-04-12 15:13:01 +01:00
b86071c5c5 ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes (#521)
ENT-1575 Add db migrations for db attachment changes,

ENT-1566 Fixes for db integration tests -following changes in CORDA-926 (obligatory node properties), upgrade db schema setup in draining mode/RPC tests, set runMigration=true in properties files for db tests, add new tables for deletion in SQL setup scrips
Updated db integration tests description in testing.rst
2018-03-09 09:52:44 +00:00
da1afd9c55 Introduced copyright in all source files. (#519) 2018-03-06 17:29:21 +00:00
9dc5ce2161 Apply new test api to enterprise tests 2018-02-28 17:07:49 +00:00
c72b3ad4fa Merge remote-tracking branch 'open/master' into anthony-os-merge-2
# Conflicts:
#	.ci/api-current.txt
#	client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
#	client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
#	docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
#	finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
#	node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
#	node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
#	node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
#	node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
#	samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
2018-02-28 16:55:15 +00:00
25263c20c7 Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb 2018-02-20 15:52:09 +00:00
6b2b7b6a3c Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb 2018-02-20 13:26:31 +00:00
66dd6afe2e Merge commit 'd072f6c275a5ff770aa66e37b9492a387d757329' into aslemmer-merge-19-Feb 2018-02-19 16:46:15 +00:00
b71f0c49fb Multi threaded state machine 2018-01-31 18:13:25 +00:00
1ecf646f7e Oracle 11xe and 12c database compatibility (#206)
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change) 
* Removed unnecessary code from ConfigUtilities (non Oracle specific change) 
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
336aeb96e5 Merge fixes 2018-01-26 13:45:03 +00:00
42b4b80545 Fixed imports 2018-01-16 13:24:53 +00:00
2921b8044d Ack unhandled messages when recipient flow is shut or shutting down (#335) 2018-01-10 17:55:08 +00:00
0c646ff662 [ENT-1339]: for h2, allow schemas without migrations to run (#294) (#305)
* [ENT-1339]: for h2, allow schemas without migrations to run (#294)

* [ENT-1339]: for h2, allow schemas without migrations to run

* [ENT-1339]: fix various migration issues and change author name

* [ENT-1339]: add naming convention for migrations

* [ENT-1339]: change naming convention to use hyphens

* [ENT-1339]: change mapping of participants to be able to control the table name

* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility

* [ENT-1339]: cmd line argument for migrations made consistent

* [ENT-1339]: revert abstract state superclasses

* Update db integration test setup - new tables.

* Update db integration test setup - new tables.

* [ENT-1339]: remove final from participants to allow table name config

* [ENT-1339]: shortened pk

* [ENT-1339]: revert constructor

* [ENT-1339]: change getMigrationResource api to Nullable
2018-01-09 14:44:17 +00:00
a2344f15fb Unicode columns for SqlServer (#248)
* ENT-1291 Switch liquibase changelogs to use nvarchar instead of varchar

* Configure Hibernate to use nationalised strings

* Configure Hibernate to use nationalised strings

* Change schema so that UUIDs are varchars

* Update schema certificate signing request status is not unicode

* Upper case suffix for audit tables

* nvarchar -> varchar for status in the audit table

* Capitalisation

* Capitalisation

* Force hibernate to use unicode columns on SQL server

* Force hibernate to use unicode columns on SQL server

* Schema change to make PostgreSql happy

* SQL files to initialise the perfcluster db for SQL server and PostgreSql

* Code ordering and extra comment
2017-12-21 17:34:21 +00:00
4958d26048 Remove change address usage from CashTests 2017-12-19 18:43:18 +00:00
f55e565a3d Re-instate previous commit fix removed by exfalso. 2017-12-18 17:01:05 +00:00
107fcf82e3 Fixing stuff 2017-12-18 15:39:08 +00:00
f3f06976d0 Fix failing perftestcordapp tests. 2017-12-18 15:23:16 +00:00
79f288dcf6 Fix compilation errors on Tests following rebase from OS. 2017-12-18 14:30:46 +00:00
f2194fcfd4 Integrate db migration tool - liquibase (#150)
[ENT-996]: integrate Liquibase for data migration
2017-12-16 15:58:12 +00:00
af596cfdde First working notary functional tests for R3Net. (#200) 2017-12-15 17:11:51 +00:00
037673abe4 perftest scripts (#172)
* SQL scripts to set up SQL server for perftest cluster

* Fix notary name in jmx files
2017-12-15 16:15:11 +00:00
223737ebb8 Fix perftestcordapp unit tests (#198) 2017-12-15 08:13:28 +00:00
205663d37f SQL coin selection (#186)
* Copy SQL server cash selection and all other required changes from finance to perftestcordapp

* Copy SQL server cash selection and all other required changes from finance to perftestcordapp

* Add cash selection to manifest
2017-12-14 11:56:48 +00:00
8bb02c63f0 ENT-1161 Notary load testing flow (#175) 2017-12-13 14:34:01 +00:00
16ef2df1d5 Added missing RigourousMock assertions. 2017-12-11 12:23:14 +00:00
d984b4722e Re-enable perftestcordapp and jmeter - fix compilation errors caused by MockServices and DriverDSL refactoring. 2017-12-11 11:42:53 +00:00
57c6460ddc Fixes after merge Open Source into Enterprise. 2017-12-06 10:43:09 +00:00
63027a077d State machine rewrite 2017-12-05 11:36:20 +00:00
07e46ddb3c Merge OS to Enterprise - fixes after merge: update SQL Server cash query, test in pertestcordapp module, platform version 1 2017-12-01 00:02:11 +00:00
456c020575 Merge pull request #141 from corda/christians-jmeter-flows
Sampler and configuration for multi node flow in JMeter
2017-11-30 11:05:37 +00:00
aab2ad58d9 Hook up anonymised payment and add test for that + some code reformatting 2017-11-24 14:54:57 +00:00